123

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

@@ -335,15 +335,17 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
             if (violateAmount.compareTo(BigDecimal.ZERO) > 0 && orderDetailDTO.getOrderStatus().equals(OrderDetailDTO.DELAY)){
                 acceptDetailed.setDivisionAmount(orderDetailDTO.getViolateAmount());
                 acceptDetailed.setDivisionType(8);
+                acceptDetailed.setEntryType(orderDetailDTO.getGoodsDepositType());
                 insertSelective(acceptDetailed);
             }
             BigDecimal lossSpecifiedAmount = orderDetailDTO.getLossSpecifiedAmount() == null ? BigDecimal.ZERO :orderDetailDTO.getLossSpecifiedAmount() ; //定损
             if (lossSpecifiedAmount.compareTo(BigDecimal.ZERO) > 0 ){
                 acceptDetailed.setDivisionAmount(lossSpecifiedAmount);
                 acceptDetailed.setDivisionType(6);
+                acceptDetailed.setEntryType(orderDetailDTO.getGoodsDepositType());
                 insertSelective(acceptDetailed);
             }
-            BigDecimal breakRulesRegulation = orderDetailDTO.getLossSpecifiedAmount() == null ? BigDecimal.ZERO :orderDetailDTO.getBreakRulesRegulation() ; //违章
+            BigDecimal breakRulesRegulation = orderDetailDTO.getBreakRulesRegulation() == null ? BigDecimal.ZERO :orderDetailDTO.getBreakRulesRegulation() ; //违章
             if (breakRulesRegulation.compareTo(BigDecimal.ZERO) > 0 ){
                 acceptDetailed.setDivisionAmount(breakRulesRegulation);
                 acceptDetailed.setDivisionType(7);

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

@@ -98,6 +98,7 @@ public class OrderDetailBiz{
         orderDetailDTO.setOrderId(baseOrder.getId());
         orderDetailDTO.setUserId(baseOrder.getUserId());
         orderDetailDTO.setOrderNo(baseOrder.getNo());
+        orderDetailDTO.setGoodsDepositType(vehicleDetail.getGoodsDepositType());
         if (accountDetail !=  null){
             List<OrderAccountDeduction> deductions = accountDetail.getDeductions();
             if (CollectionUtils.isNotEmpty(deductions)){

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleExtensionMapper.xml

@@ -94,8 +94,8 @@
                     IF(e1.cata_id is NULL,0,1) as isParentSelected
                 </when>
                 <when test="cataIds != null and cataIds.size() > 0">
-                    IF(e.cata_id is NULL,0,1) as isSelected,
-                    IF(e1.cata_id is NULL,0,1) as isParentSelected
+                    IF(c2.cata_id is NULL,0,1) as isSelected,
+                    IF(c1.cata_id is NULL,0,1) as isParentSelected
                 </when>
                 <otherwise>
                    0 as isSelected,