修改保险分账

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

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+import com.xxfc.platform.order.entity.inter.OrderDetail;
 import com.xxfc.platform.order.feign.OrderFeign;
 import com.xxfc.platform.order.pojo.dto.OrderDetailDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -210,7 +211,28 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
         acceptDetailed.setStatus(0);
         insertSelective(acceptDetailed);
 
+        //添加保险
+        addInsure(orderDetailDTO,0);
 
+
+    }
+
+
+    public  void  addInsure(OrderDetailDTO orderDetailDTO,Integer status){
+        BigDecimal insureAmount = orderDetailDTO.getInsureAmount() == null ? BigDecimal.ZERO : orderDetailDTO.getInsureAmount();
+        if (insureAmount.compareTo(BigDecimal.ZERO) > 0){
+            Integer type = status == 1 ? 2 : 1;
+            BaseOrderAcceptDetailed acceptDetailed=new BaseOrderAcceptDetailed();
+            acceptDetailed.setOrderNo(orderDetailDTO.getOrderNo());
+            acceptDetailed.setOrderId(orderDetailDTO.getOrderId());
+            acceptDetailed.setOrderAmount(orderDetailDTO.getOrderAmount());
+            acceptDetailed.setDivisionAmount(insureAmount);
+            acceptDetailed.setDivisionType(9);
+            acceptDetailed.setAddTime(System.currentTimeMillis());
+            acceptDetailed.setStatus(status);
+            acceptDetailed.setType(type);
+            insertSelective(acceptDetailed);
+        }
     }
 
     public void payOrderFAccept(OrderWaterDTO orderWaterDTO,OrderDetailDTO orderDetailDTO) {
@@ -296,6 +318,8 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                 payOrderFAccept(orderWaterDTO,orderDetailDTO);
             }
             othderAccept(orderDetailDTO);
+            //保险
+            addInsure(orderDetailDTO,1);
             log.info("订单完成分账----finishOrderWater--------orderId===" + orderId + "----amount====" + amount + "--orderType===" + orderType);
         }
 

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/OrderDetailDTO.java

@@ -99,6 +99,10 @@ public class OrderDetailDTO {
     private BigDecimal chageAmount =BigDecimal.ZERO;
 
 
+    @ApiModelProperty("保险金额")
+    private BigDecimal insureAmount =BigDecimal.ZERO;
+
+
     @ApiModelProperty("分账金额")
     private BigDecimal acceptAmount;
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderDetailBiz.java

@@ -89,6 +89,13 @@ public class OrderDetailBiz{
         List<OrderItem> orderItems = orderItemBiz.selectList(orderItem);
         //不计免赔
         BigDecimal damageSafeAmount = orderItems.stream().filter(x->x.getType()==102).map(OrderItem::getRealAmount).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
+
+        Integer insureStatus = baseOrder.getInsureStatus() == null ? 0 : baseOrder.getInsureStatus();
+
+        BigDecimal insureAmount = BigDecimal.ZERO;
+        if ((insureStatus == 1 && baseOrder.getStatus() .equals(OrderStatusEnum.ORDER_TOSTART.getCode())) ||insureStatus == 2 )
+            insureAmount = orderItems.stream().filter(x->x.getType()==104).map(OrderItem::getRealAmount).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
+
         OrderRentVehicleDetail vehicleDetail=orderRentVehicleDetails.get(0);
         //获取营收明细dto
         OrderDetailDTO orderDetailDTO = new OrderDetailDTO();
@@ -99,6 +106,7 @@ public class OrderDetailBiz{
         orderDetailDTO.setOrderId(baseOrder.getId());
         orderDetailDTO.setUserId(baseOrder.getUserId());
         orderDetailDTO.setOrderNo(baseOrder.getNo());
+        orderDetailDTO.setInsureAmount(insureAmount);
         orderDetailDTO.setGoodsDepositType(vehicleDetail.getGoodsDepositType());
         if (accountDetail !=  null){
             List<OrderAccountDeduction> deductions = accountDetail.getDeductions();