线上bug修复

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -625,7 +625,8 @@
 
     <update id="updateStatus" parameterType="NewOrder">
         UPDATE cm_order
-        SET status = #{status}
+        SET status = #{status},
+            closeTime = NOW()
         WHERE orderID = #{orderID}
     </update>
 

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -259,11 +259,13 @@
         SELECT<include refid="shopOrderColumns"/>,
         b.name as shopName,
         oa.id as orderArchiveId,
+        css.commercialCode as commercialCode,
         co.receiptStatus
         FROM cm_shop_order a
         left join shop b on a.shopID = b.shopID
         left join cm_order_archive oa on a.shopOrderID = oa.shopOrderId
         left join cm_order co on co.orderID = a.orderID
+        left join cm_shop_splitcode css on a.shopID = css.shopId
         WHERE a.orderID = #{orderID} ORDER BY a.shopOrderNo DESC
     </select>
 

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -576,13 +576,6 @@
             <c:if test="${order.receiptStatus == 3 && order.confirmType != null && order.confirmType != ''}">
                 <%--                <span style='color:#FF0000'>（已抹平收款）</span>--%>
             </c:if>
-            <c:forEach items="${order.newShopOrders}" var="on" varStatus="index">
-                <c:forEach items="${on.newOrderProducts}" var="op" varStatus="index">
-                    <c:if test="${op.splitCode eq 'E1807059160'}">
-                        <font color="red">(采美信息线上收款)</font>
-                    </c:if>
-                </c:forEach>
-            </c:forEach>
         </td>
         <td>
             退款金额（已完成）：<fmt:formatNumber value="${returnValue}" type="currency"/>
@@ -839,7 +832,12 @@
             <span>商品总额：<fmt:formatNumber value="${shopOrder.needPayAmount}" type="currency"/></span>
             <span>优惠：<fmt:formatNumber value="${shopOrder.eachDiscount}" type="currency"/></span>
             <span>应付金额：<fmt:formatNumber value="${shopOrder.realPay}" type="currency"/></span>
-            <span>已付金额：<fmt:formatNumber value="${shopOrder.receiptAmount}" type="currency"/></span>
+            <span>
+                已付金额：<fmt:formatNumber value="${shopOrder.receiptAmount}" type="currency"/>
+                <c:if test="${shopOrder.commercialCode eq 'E1807059160' && (order.receiptStatus == 2 || order.receiptStatus == 3)}">
+                    <font color="red">(采美信息线上收款)</font>
+                </c:if>
+            </span>
             <span>待付金额：<fmt:formatNumber value="${shopOrder.restAmount}" type="currency"/></span>
             <br/>
             <span>收款状态：