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

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseOrderAcceptDetailedBiz.java

@@ -222,6 +222,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
         BigDecimal insureAmount = orderDetailDTO.getInsureAmount() == null ? BigDecimal.ZERO : orderDetailDTO.getInsureAmount();
         log.info("-----保险分账---insureAmount===="+insureAmount);
         if (insureAmount.compareTo(BigDecimal.ZERO) > 0){
+            Long time = System.currentTimeMillis();
             Integer type = status == 1 ? 2 : 1;
             BaseOrderAcceptDetailed acceptDetailed=new BaseOrderAcceptDetailed();
             acceptDetailed.setMchId(0);
@@ -231,7 +232,9 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
             acceptDetailed.setOrderAmount(orderDetailDTO.getOrderAmount());
             acceptDetailed.setDivisionAmount(insureAmount);
             acceptDetailed.setDivisionType(9);
-            acceptDetailed.setAddTime(System.currentTimeMillis());
+            acceptDetailed.setAddTime(time);
+            if (status == 1)
+                acceptDetailed.setStatusTime(time);
             acceptDetailed.setStatus(status);
             acceptDetailed.setType(type);
             insertSelective(acceptDetailed);
@@ -262,6 +265,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                         acceptDetailed1.setType(2);
                         acceptDetailed1.setId(null);
                         acceptDetailed1.setOrderAmount(orderAmount);
+                        BigDecimal dAmount = BigDecimal.ZERO;
                         if (num.equals(acceptDetaileds.size())){
                             acceptDetailed1.setDivisionAmount(amount);
                             insertSelective(acceptDetailed1);
@@ -269,6 +273,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                             if (acceptDetailed1.getDivisionType() == 5) {
                                 acceptDetailed1.setDivisionAmount(companyDivisionAmount);
                                 insertSelective(acceptDetailed1);
+                                dAmount = acceptDetailed1.getDivisionAmount();
                             } else if (acceptDetailed1.getDivisionType() == 2 || acceptDetailed1.getDivisionType() == 3 || acceptDetailed1.getDivisionType() == 4) {
                                 if (otherDivisionAmount.compareTo(BigDecimal.ZERO) > 0) {
                                     if (!orderDetailDTO.getOrderStatus().equals(OrderDetailDTO.CANEL)) {
@@ -276,6 +281,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                                         acceptDetailed1.setDivisionAmount(divisionAmount);
                                     }
                                     insertSelective(acceptDetailed1);
+                                    dAmount = acceptDetailed1.getDivisionAmount();
                                     orderWaterDTO.setAcceptId(acceptDetailed1.getId());
                                     orderWaterDTO.setZAcceptId(zAcceptId);
                                     orderWaterDTO.setOrderAmount(orderAmount);
@@ -283,7 +289,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                                 }
                             }
                         }
-                        amount=amount.subtract(acceptDetailed1.getDivisionAmount());
+                        amount=amount.subtract(dAmount);
                     }
                 }
             }