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

src/main/java/com/caimei/modules/order/entity/NewShopOrder.java

@@ -67,6 +67,7 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
     private Double freePostageFee;//    decimal(10,2) comment '订单包邮时本该支付的运费',
     private String associationType;//订单关联方式: 1手动 2自动
     private String confirmType;    // 收款确认类型（1 小额抹平确认，2 大额抹平确认，3 大额退款余额，4 确认关联）
+    private String confirmTime;    // 订单确认时间
     private boolean receiptOrderFlag;// 判断订单中抹平的订单是否是和多个订单一起支付的，
     private Double orderReceivedAmount;//订单已收金额（此收款只计算线上线下收款记录payableAmount表金额）
     private Double returnBalanceAmount;// 退款余额金额
@@ -641,6 +642,14 @@ public class NewShopOrder extends DataEntity<NewShopOrder> {
         this.confirmType = confirmType;
     }
 
+    public String getConfirmTime() {
+        return confirmTime;
+    }
+
+    public void setConfirmTime(String confirmTime) {
+        this.confirmTime = confirmTime;
+    }
+
     public boolean isReceiptOrderFlag() {
         return receiptOrderFlag;
     }

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1633,7 +1633,6 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
 
         order.getNewShopOrders().get(0).setStatus(1);//已确认
 
-
 //        //修改订单状态（余额抵扣）
 //        if (order.getPayableAmount() != null) {
 //            if (order.getPayableAmount() == 0 && order.getBalancePayFee() != null && order.getBalancePayFee() > 0) {
@@ -1660,6 +1659,8 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         String curDateStr = sdf.format(date);
         order.setConfirmTime(curDateStr);
 
+        // 订单确认时间
+        order.getNewShopOrders().get(0).setConfirmTime(curDateStr);
 //        if (order.getBalancePayFee() != null && order.getBalancePayFee() > 0) {
         if (balancePayFee != null && balancePayFee > 0) {
             //已付金额

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

@@ -284,6 +284,9 @@
             <if test="status != null and status != ''">
                 shopStatus = #{status},
             </if>
+            <if test="confirmTime != null and confirmTime != ''">
+                confirmTime = #{confirmTime},
+            </if>
             <if test="shopOrderNo != null and shopOrderNo != ''">
                 orderID = #{orderID},
             </if>