Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into dev

performance-web/src/main/java/com/clx/performance/model/OrderGoods.java

@@ -194,8 +194,10 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("开票服务率%")
     private BigDecimal invoiceServiceFeeRate;
 
+    @TableField("platform_service_fee_rate")
     @ApiModelProperty("平台服务费费率%")
     private BigDecimal platformServiceFeeRate;
+    @TableField("deposit")
     @ApiModelProperty("接单保证金（分/车）")
     private BigDecimal deposit;
 

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

@@ -299,7 +299,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
 
         FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);
-
+        log.info("开票公司id  {} " ,orderInfo.getInvoicingCompanyId());
         /** 存在开票公司 **/
         if (Objects.nonNull(orderInfo.getInvoicingCompanyId())
                 && orderInfo.getInvoicingCompanyId() > 0) {
@@ -307,7 +307,10 @@ public class OrderChildServiceImpl implements OrderChildService {
                     getInvoicingCompany(orderInfo.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
             /** 是否支持车主接单,0:否,1:是,默认是
              * 逻辑：如果结算方式是 卸车净重（减货损）,开票公司支持车主模式 , 那么都可以接单 如果不支持车主模式 ,只能车主接单**/
-            if (Objects.equals(invoicingCompanyVO.getSupportOwnerOrder(), 1) &&
+            log.info("是否支持车主模式  {} " ,invoicingCompanyVO.getSupportOwnerOrder());
+            log.info("结算方式  {} " ,orderGoods.getSettlementWay());
+            log.info("是否是车主  {} " ,truckOwnerFlag);
+            if (Objects.equals(invoicingCompanyVO.getSupportOwnerOrder(), 0) &&
                     Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
                 if (!truckOwnerFlag) {
                     throw new ServiceSystemException(PerformanceResultEnum.ORDER_DRIVER_LIMIT);
@@ -458,13 +461,6 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         // 新增运单
         orderChildDao.saveEntity(orderChild);
-
-        // 更新出车状态
-        updateDriverOrderStatusLock(orderChild.getDriverUserNo(), orderChild.getTruckId());
-
-        // 新增日志
-        orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.CREATED.getCode(),
-                OrderChildLogEnum.Type.CREATED.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
         // 冻结司机保证金
         if(deposit.compareTo(BigDecimal.ZERO) ==1){
             PayPlatformFeeParam payPlatformFeeParam = new PayPlatformFeeParam();
@@ -475,6 +471,13 @@ public class OrderChildServiceImpl implements OrderChildService {
             //冻结司机押金
             paymentService.paymentPlatformFee(payPlatformFeeParam);
         }
+        // 更新出车状态
+        updateDriverOrderStatusLock(orderChild.getDriverUserNo(), orderChild.getTruckId());
+
+        // 新增日志
+        orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.CREATED.getCode(),
+                OrderChildLogEnum.Type.CREATED.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+
         // 司机接单后置逻辑
         orderChildPostService.orderChildAdd(orderChild.getChildNo());
 
@@ -1611,7 +1614,7 @@ public class OrderChildServiceImpl implements OrderChildService {
                 SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())
                 && Objects.equals(quotationDetailVO.getPlatformFreightQuotationTaxType(),
                 InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
-            result.setGoodsOrderDetailShow(0);
+            result.setGoodsOrderDetailShow(1);
         }
         //查询进行中的运单车辆是否开启了中交兴路
         result.setNotOpenZJXLMsg(isOpenZJXL(orderChild.getStatus(),orderChild.getTruckNo()));

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

@@ -173,7 +173,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                 SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())
                 && Objects.equals(quotationDetailVO.getPlatformFreightQuotationTaxType(),
                 InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
-            orderGoodsVO.setGoodsOrderDetailShow(0);
+            orderGoodsVO.setGoodsOrderDetailShow(1);
         }
 
         return orderGoodsVO;

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

@@ -481,7 +481,7 @@ public class PaymentServiceImpl implements PaymentService {
         PayEncryptTools.sign(payUnitDTO, PrivateKeyConfig.privateKeyByte);
         /** 构建支付支付 ***/
         PayUserDTO payUserDTO = PayUserDTO.builder()
-                .pwd(payDTO.getPwd())
+                .pwd("noCheckPwd") // 暂时不校验用户密码
                 .system(SystemCodeEnum.PERFORMANCE_SERVICE.getCode())
                 .userCode(payDTO.getFrom())
                 .orderNo(orderPayment.getRelationNo())

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -179,7 +179,8 @@ public class OrderGoodsSqlProvider {
                 "need_truck_num,vehicle_usage,pending_order_way,pending_order_time,pending_order_freight,last_arrive_send_time,senior_logistics_manager_id," +
                 "senior_logistics_manager_name,order_no,order_goods_no,order_goods_status,send_address_id,send_address_shorter,send_system_address_id,send_longitude," +
                 "send_latitude,receive_latitude,receive_longitude,receive_address_id,receive_address_shorter,receive_system_address_id,goods_name,goods_id,create_time,modified_time," +
-                "user_name,user_no,batch_number,last_arrive_receive_time,last_load_time,last_order_time,settlement_account_period,settlement_way) VALUES ");
+                "user_name,user_no,batch_number,last_arrive_receive_time,last_load_time,last_order_time,settlement_account_period,settlement_way," +
+                "platform_freight_quotation_tax_type, platform_service_fee_rate, deposit, invoice_service_fee_rate) VALUES ");
 
         for (int i = 0; i < orderGoodsList.size(); i++) {
             OrderGoods o = orderGoodsList.get(i);
@@ -194,7 +195,8 @@ public class OrderGoodsSqlProvider {
                     .append(o.getReceiveAddressId()).append("','").append(o.getReceiveAddressShorter()).append("',").append(o.getReceiveSystemAddressId()).append(",'").append(o.getGoodsName()).append("','")
                     .append(o.getGoodsId()).append("','").append(o.getCreateTime()).append("','").append(o.getModifiedTime()).append("','").append(o.getUserName()).append("','")
                     .append(o.getUserNo()).append("','").append(o.getBatchNumber()).append("','").append(o.getLastArriveReceiveTime()).append("','")
-                    .append(o.getLastLoadTime()).append("','").append(o.getLastOrderTime()).append("','").append(o.getSettlementAccountPeriod()).append("','").append(o.getSettlementWay())
+                    .append(o.getLastLoadTime()).append("','").append(o.getLastOrderTime()).append("','").append(o.getSettlementAccountPeriod()).append("','").append(o.getSettlementWay()).append("','")
+                    .append(o.getPlatformFreightQuotationTaxType()).append("','").append(o.getPlatformServiceFeeRate()).append("','").append(o.getDeposit()).append("','").append(o.getInvoiceServiceFeeRate())
                     .append("')");
 
             if (i < orderGoodsList.size() - 1) {