bug处理及订单逆向去除是否预付运费逻辑

performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java

@@ -92,13 +92,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
             if (!result.succeed()) {
                 throw new RuntimeException("货主取消订单失败,原因：远程调用取消订单失败");
             }
-            //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
-
-            ThawAccountParam thawAccountParam = new ThawAccountParam();
-            thawAccountParam.setOrderNo(orderNo);
-            thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
-            log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
-            ownerAccountService.ownerAccountThaw(thawAccountParam);
+            //TODO 注意判断普通单还是网运单 普通单类型 2  网运单 1
             this.ownerConfirmCancelProcess(orderNo);
             return;
         }
@@ -180,17 +174,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
             }
 
         }
-        //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
-        Integer invoiceType = settlementOwnerDetailDao.getInvoiceType(orderNo);
-        ThawAccountParam thawAccountParam = new ThawAccountParam();
-        if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(invoiceType)) {
-            thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
-        } else {
-            thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode());
-        }
-        thawAccountParam.setOrderNo(orderNo);
-        log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
-        ownerAccountService.ownerAccountThaw(thawAccountParam);
+
         Result<Object> result = orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode);
         if (!result.succeed()) {
             throw new RuntimeException("货主取消订单失败,原因：远程调用取消订单失败");
@@ -342,17 +326,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
         orderFeign.orderCancelReason(orderCancelReasonParam);
 
-        //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
-        Integer invoiceType = settlementOwnerDetailDao.getInvoiceType(orderNo);
-        ThawAccountParam thawAccountParam = new ThawAccountParam();
-        if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(invoiceType)) {
-            thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
-        } else {
-            thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode());
-        }
-        thawAccountParam.setOrderNo(orderNo);
-        log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
-        ownerAccountService.ownerAccountThaw(thawAccountParam);
+        //TODO 注意判断普通单还是网运单 普通单类型 2  网运单 1
 
         log.info("执行货主订单取消前置：更改相关状态完毕，开始执行吨数回填，发送MQ消息,订单No {}", orderNo);
 
@@ -479,18 +453,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         orderCancelReasonParam.setCreateNo(loginUserInfo.getUserNo());
         orderCancelReasonParam.setCreateName(loginUserInfo.getUserName());
         orderFeign.orderCancelReason(orderCancelReasonParam);
-
         //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
-        Integer invoiceType = settlementOwnerDetailDao.getInvoiceType(orderNo);
-        ThawAccountParam thawAccountParam = new ThawAccountParam();
-        if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(invoiceType)) {
-            thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
-        } else {
-            thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode());
-        }
-        thawAccountParam.setOrderNo(orderNo);
-        log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
-        ownerAccountService.ownerAccountThaw(thawAccountParam);
 
         log.info("执行订单状态更改");
         if (!orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode).succeed()) {

performance-web/src/main/java/com/clx/performance/service/impl/TransportSyncServiceImpl.java

@@ -297,14 +297,16 @@ public class TransportSyncServiceImpl implements TransportSyncService {
     //司机银行卡
     public void generateDriverBankCard(BankCardVO bankCardVO, UserIdCardVO idCardVO, ThirdOrderChildBrokerParam param) {
         OrderChildBankInfoDTO dto = new OrderChildBankInfoDTO();
-        dto.setName(bankCardVO.getName());
-        dto.setCardNo(bankCardVO.getCardNo());
-        dto.setMobile(bankCardVO.getMobile());
-        dto.setAccountType(StringUtils.isBlank(bankCardVO.getAccountType()) ? null : Integer.valueOf(bankCardVO.getAccountType()));
-        dto.setType(bankCardVO.getType());
-        dto.setIdCard(bankCardVO.getIdCard());
-        dto.setBank(bankCardVO.getBank());
-        dto.setBankCode(bankCardVO.getBankCode());
+        if (null != bankCardVO) {
+            dto.setName(bankCardVO.getName());
+            dto.setCardNo(bankCardVO.getCardNo());
+            dto.setMobile(bankCardVO.getMobile());
+            dto.setAccountType(StringUtils.isBlank(bankCardVO.getAccountType()) ? null : Integer.valueOf(bankCardVO.getAccountType()));
+            dto.setType(bankCardVO.getType());
+            dto.setIdCard(bankCardVO.getIdCard());
+            dto.setBank(bankCardVO.getBank());
+            dto.setBankCode(bankCardVO.getBankCode());
+        }
         dto.setIdCardFrontImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
         dto.setIdCardBackImg(documentFeign.getHost().getData() + idCardVO.getCardBackImg());
         param.setDriverBankInfoDTO(dto);
@@ -313,14 +315,16 @@ public class TransportSyncServiceImpl implements TransportSyncService {
     //车主银行卡
     public void generateTruckDriverBankCard(BankCardVO bankCardVO, UserIdCardVO idCardVO, ThirdOrderChildBrokerParam param) {
         OrderChildBankInfoDTO dto = new OrderChildBankInfoDTO();
-        dto.setName(bankCardVO.getName());
-        dto.setCardNo(bankCardVO.getCardNo());
-        dto.setMobile(bankCardVO.getMobile());
-        dto.setAccountType(StringUtils.isBlank(bankCardVO.getAccountType()) ? null : Integer.valueOf(bankCardVO.getAccountType()));
-        dto.setType(bankCardVO.getType());
-        dto.setIdCard(bankCardVO.getIdCard());
-        dto.setBank(bankCardVO.getBank());
-        dto.setBankCode(bankCardVO.getBankCode());
+        if (null != bankCardVO) {
+            dto.setName(bankCardVO.getName());
+            dto.setCardNo(bankCardVO.getCardNo());
+            dto.setMobile(bankCardVO.getMobile());
+            dto.setAccountType(StringUtils.isBlank(bankCardVO.getAccountType()) ? null : Integer.valueOf(bankCardVO.getAccountType()));
+            dto.setType(bankCardVO.getType());
+            dto.setIdCard(bankCardVO.getIdCard());
+            dto.setBank(bankCardVO.getBank());
+            dto.setBankCode(bankCardVO.getBankCode());
+        }
         dto.setIdCardFrontImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
         dto.setIdCardBackImg(documentFeign.getHost().getData() + idCardVO.getCardBackImg());
         param.setTruckDriverBankInfoDTO(dto);