Merge remote-tracking branch 'origin/developerD' into developerD

src/main/java/com/caimei365/order/mapper/OrderClubMapper.java

@@ -95,6 +95,12 @@ public interface OrderClubMapper {
      */
     void updateOrderStatus(OrderPo order);
 
+    /**
+     * 修改订单
+     * @param orderId
+     */
+    void updateOrder(Integer orderId);
+
     /**
      * 更新子订单状态
      * @param shopOrderVo

src/main/java/com/caimei365/order/model/po/OrderShopPo.java

@@ -153,6 +153,10 @@ public class OrderShopPo implements Serializable {
      * 订单提交时间
      */
     private String orderTime;
+    /**
+     * 订单确认时间
+     */
+    private String confirmTime;
     /**
      * 0:个人自己下单 1:企业自己下单 2:员工帮会所下单 3:协销帮会所下单  4:后台下单 5:采美豆订单
      */

src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -462,6 +462,7 @@ public class OrderClubServiceImpl implements OrderClubService {
         Date date = new Date();
         String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
         String note = "【确认订单】";
+        shopOrder.setConfirmTime(curDateStr);
         List<OrderProductPo> orderProducts = orderClubMapper.getShopOrderProductList(shopOrderId);
         orderProducts.forEach(product -> {
             // 是否二手商品
@@ -572,6 +573,8 @@ public class OrderClubServiceImpl implements OrderClubService {
         shopOrder.setStatus(1);
         // 更新订单状态
         orderClubMapper.updateShopOrderStatus(shopOrder);
+        // 修改订单确认时间
+        orderClubMapper.updateOrder(shopOrder.getOrderId());
         return ResponseJson.success("确认订单成功！", null);
     }
 

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -1061,6 +1061,7 @@ public class SubmitServiceImpl implements SubmitService {
             } else {
                 // 普通订单
                 shopOrder.setOrderType(1);
+                shopOrder.setConfirmTime(curDateStr);
             }
             // 余额支付标识，0不使用，1使用
             log.info("balance.get()====="+balance.get());
@@ -1458,6 +1459,8 @@ public class SubmitServiceImpl implements SubmitService {
                 shopOrder.setShopStatus(0);
             } else {
                 shopOrder.setShopStatus(1);
+                // 普通订单 订单默认已确认
+                shopOrder.setConfirmTime(curDateStr);
             }
             // 生成子订单编号
             StringBuilder shopOrderNo = new StringBuilder();

src/main/resources/mapper/OrderClubMapper.xml

@@ -38,6 +38,12 @@
         ,updateDate = #{updateDate}
         WHERE orderID = #{orderId}
     </update>
+    <update id="updateOrder">
+        UPDATE cm_order SET
+         confirmTime = now(),
+         updateDate = now()
+        WHERE orderID = #{orderId}
+    </update>
     <update id="updateShopOrderStatus">
         UPDATE cm_shop_order SET
         shopStatus = #{status}

src/main/resources/mapper/OrderSellerMapper.xml

@@ -465,10 +465,7 @@
     </select>
     <select id="getSellerOrderCount" resultType="java.lang.Integer">
         SELECT COUNT(*) FROM cm_shop_order
-        WHERE delFlag = 0 AND userID IN
-        <foreach item="userId" index="index" collection="userIds" open="(" separator="," close=")">
-            #{userId}
-        </foreach>
+        WHERE delFlag = 0
         <if test="orderState == 1 ">
             AND shopStatus = 0
         </if>
@@ -484,6 +481,10 @@
         <if test="orderState == 5 ">
             AND (orderStatusFlag in (2, 3) or refundStatus in (2, 3)) AND shopStatus not in (0, 4)
         </if>
+        AND userID IN
+        <foreach item="userId" index="index" collection="userIds" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
     </select>
     <select id="getLastCheckOrderDate" resultType="java.util.Date">
         SELECT lastCheckOrderDate

src/main/resources/mapper/SubmitMapper.xml

@@ -37,7 +37,7 @@
                                    canRefundAmount, itemCount, shopStatus, accountAmount, useBalanceFlag,
                                    totalAmount, productAmount, needPayAmount, shopProductAmount, shopPostFee,
                                    shopPostFlag,
-                                   shopTaxFee,
+                                   shopTaxFee, confirmTime,
                                    shouldPayShopAmount, orderTime, orderSubmitType, splitFlag, payStatus,
                                    payedShopAmount, splitCode, realPay, eachDiscount, receiptStatus)
         VALUES (#{onlinePayWays}, #{shopOrderNo}, #{orderId}, #{orderNo}, #{organizeId}, #{isColdChina}, #{shopId},
@@ -45,7 +45,7 @@
                 #{spId}, #{orderPromotionsId}, #{promotionFullReduction}, #{svipShopReduction}, #{brokerage},
                 #{canRefundAmount}, #{itemCount}, #{shopStatus}, #{accountAmount}, #{useBalanceFlag},
                 #{totalAmount}, #{productAmount}, #{needPayAmount}, #{shopProductAmount}, #{shopPostFee},
-                #{shopPostFlag}, #{shopTaxFee},
+                #{shopPostFlag}, #{shopTaxFee}, #{confirmTime},
                 #{shouldPayShopAmount}, #{orderTime}, #{orderSubmitType}, #{splitFlag}, #{payStatus},
                 #{payedShopAmount}, #{splitCode}, #{realPay}, #{eachDiscount}, 1)
     </insert>