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

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

@@ -311,11 +311,14 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);
 
+        log.info("参数 getInvoicingCompanyId {}",orderInfo.getInvoicingCompanyId());
         /** 存在开票公司 **/
         if (Objects.nonNull(orderInfo.getInvoicingCompanyId())
                 && orderInfo.getInvoicingCompanyId() > 0) {
             InvoicingCompanyVO invoicingCompanyVO = invoicingCompanyService.
                     getInvoicingCompany(orderInfo.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+            log.info("参数 getSupportOwnerOrder {} orderGoods.getSettlementWay(){} ,{} ",
+                    invoicingCompanyVO.getSupportOwnerOrder(),orderGoods.getSettlementWay(),truckOwnerFlag);
             /** 是否支持车主接单,0:否,1:是,默认是
              * 逻辑：如果结算方式是 卸车净重（减货损）,开票公司支持车主模式 , 那么都可以接单 如果不支持车主模式 ,只能车主接单**/
             if (Objects.equals(invoicingCompanyVO.getSupportOwnerOrder(), 1) &&
@@ -2003,6 +2006,8 @@ public class OrderChildServiceImpl implements OrderChildService {
                 String remark = truckOwnerFlag ? "钱包余额不足" : "车主钱包余额不足";
                 throw new ServiceSystemException(PerformanceResultEnum.APP_POP_UP_ERROR, remark);
             }
+            log.info("参数 data.getResidue() {} deposit.longValue() {} ,{} ",
+                    data.getResidue(),deposit.longValue(),truckOwnerFlag);
             //判断余额是否能够缴纳保证金
             if (data.getResidue() < deposit.longValue()) {
                 String remark = truckOwnerFlag ? "账户可用余额不足，接单保证金冻结失败，请尽快充值，本次需重置"+deposit.movePointLeft(2) +"元" : "车主钱包余额不足，保证金冻结失败请联系车主充值";

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

@@ -169,12 +169,15 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         }
         //货源详情页面 是否显示弹窗和显示平台服务费率
         /**  订单结算方式为“卸车净重（减货损）”且平台运费报价为“未税”时 显示平台服务费率和弹窗提示司机平台服务费率**/
+        log.info("orderGoodsVO.getSettlementWay() {}  ， quotationDetailVO.getPlatformFreightQuotationTaxType() {}" +
+                "",orderGoodsVO.getSettlementWay(),quotationDetailVO.getPlatformFreightQuotationTaxType());
         if (Objects.equals(orderGoodsVO.getSettlementWay(),
                 SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())
                 && Objects.equals(quotationDetailVO.getPlatformFreightQuotationTaxType(),
                 InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
             orderGoodsVO.setGoodsOrderDetailShow(0);
         }
+        log.info("  orderGoodsVO  {}",orderGoodsVO);
 
         return orderGoodsVO;
     }