123

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

@@ -86,14 +86,13 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
         } else if (status == 2) {
             BigDecimal acceptAmount = orderDetailDTO.getAcceptAmount();
             log.info("分账----acceptAmount===="+acceptAmount );
-            if (acceptAmount.compareTo(BigDecimal.ZERO) == 0){
-                return;
-            }
             orderWaterDTO.setOrderAmount(acceptAmount);
             finishOrderAccept(orderWaterDTO,orderDetailDTO);
             sellingWaterBiz.updWalletByOrderId(orderWaterDTO);
             companyWalletDetailBiz.addOrUpd(orderWaterDTO);
-        } else {
+        }else if (status == 3){
+            othderAccept(orderDetailDTO);
+        }else if (status == 4){
             refundOrderAccept(orderWaterDTO);
             sellingWaterBiz.updWalletByOrderId(orderWaterDTO);
             companyWalletDetailBiz.addOrUpd(orderWaterDTO);
@@ -261,6 +260,8 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
     public void finishOrderAccept(OrderWaterDTO orderWaterDTO,OrderDetailDTO orderDetailDTO) {
         //订单id
         Integer orderId = orderWaterDTO.getOrderId() == null ? 0 : orderWaterDTO.getOrderId();
+
+        BigDecimal acceptAmount = orderDetailDTO.getAcceptAmount() == null ? BigDecimal.ZERO : orderDetailDTO.getAcceptAmount();
         log.info("订单完成分账----finishOrderWater----orderId====" + orderId);
         if (orderId == 0) {
             return;
@@ -282,7 +283,9 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
             Integer orderType = orderDetailDTO.getOrderType() == null ? 0 : orderDetailDTO.getOrderType();
             BigDecimal unbooked = amount;
             log.info("订单完成分账----finishOrderWater----orderId====" + orderId + "---amount==" + amount + "---unbooked==" + unbooked);
+            if (acceptAmount.compareTo(BigDecimal.ZERO) > 0){
                 payOrderFAccept(orderWaterDTO,orderDetailDTO);
+            }
             log.info("订单完成分账----finishOrderWater--------orderId===" + orderId + "----amount====" + amount + "--orderType===" + orderType);
         }
 
@@ -329,7 +332,6 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
         acceptDetailed.setAddTime(System.currentTimeMillis());
         acceptDetailed.setStatusTime(System.currentTimeMillis());
         acceptDetailed.setStatus(1);
-        if (acceptDetailed != null ){
         BigDecimal violateAmount = orderDetailDTO.getViolateAmount() == null ? BigDecimal.ZERO :orderDetailDTO.getViolateAmount() ; //违约金
         if (violateAmount.compareTo(BigDecimal.ZERO) > 0 && orderDetailDTO.getOrderStatus().equals(OrderDetailDTO.DELAY)){
             acceptDetailed.setDivisionAmount(orderDetailDTO.getViolateAmount());
@@ -350,8 +352,6 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
             acceptDetailed.setDivisionType(7);
             insertSelective(acceptDetailed);
         }
-
-        }
     }