Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into…

performance-api/src/main/java/com/clx/performance/vo/pc/CarrierOrderChildDetailVO.java

@@ -76,9 +76,6 @@ public class CarrierOrderChildDetailVO {
     @ApiModelProperty(value = "卸货净重（单位吨）", example = "1.23")
     private BigDecimal unloadNet;
 
-    @ApiModelProperty(value = "运费（元）", example = "1.23")
-    @MoneyOutConvert
-    private BigDecimal freight;
 
     @ApiModelProperty(value = "取消原因", example = "抢错了")
     private String cancelRemark;

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -52,7 +52,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
             " where order_goods_no = #{orderGoodsNo}")
     void updateOrderGoodsStatusByOrderGoodsNo(@Param("orderGoodsNo") String orderGoodsNo, @Param("code") Integer code);
 
-    @SelectProvider(type = OrderGoodsTruckBindSqlProvider.class, method = "saveBatchEntity")
+    @SelectProvider(type = OrderGoodsSqlProvider.class, method = "saveBatchEntity")
     void saveBatchEntity(List<OrderGoods> orderGoodsList);
 
 }

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

@@ -1114,14 +1114,14 @@ public class OrderChildServiceImpl implements OrderChildService {
         //应付运费
         BigDecimal payableFreight=BigDecimal.ZERO;
         if(Objects.nonNull(orderChild.getLoadNet())){
-            payableFreight = orderChild.getLoadNet().multiply(carrierOrderChildDetailVO.getFreight());
+            payableFreight = orderChild.getLoadNet().multiply(carrierOrderChildDetailVO.getFreightPrice());
         }
 
         //亏吨扣款（元）
         BigDecimal lossDeduction=BigDecimal.ZERO;
         if(Objects.nonNull(orderChild.getLoadNet()) && Objects.nonNull(orderChild.getUnloadNet())){
             if(orderChild.getLoadNet().compareTo(orderChild.getUnloadNet()) >0){
-                lossDeduction = carrierOrderChildDetailVO.getFreight().multiply(orderChild.getLoadNet().subtract(orderChild.getUnloadNet()));
+                lossDeduction = carrierOrderChildDetailVO.getLossPrice().multiply(orderChild.getLoadNet().subtract(orderChild.getUnloadNet()));
             }
         }
 

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

@@ -141,11 +141,11 @@ public class OrderGoodsSqlProvider {
     public String saveBatchEntity( List<OrderGoods> orderGoodsList) {
         StringBuffer sqlList = new StringBuffer();
 
-        sqlList.append("INSERT INTO order_goods(extract_weight,residue_transport_weight,already_transport_weight,loss_price,truck_demand,extract_way,\n" +
-                "need_truck_num,pending_order_way,pending_order_time,pending_order_freight,last_arrive_send_time,senior_logistics_manager_id,\n" +
-                "senior_logistics_manager_name,order_no,order_goods_no,order_goods_status,send_address_id,send_address_shorter,send_longitude,\n" +
-                "send_latitude,receive_latitude,receive_longitude,receive_address_id,receive_address_shorter,goods_name,goods_id,create_time,modified_time,\n" +
-                "user_name,user_no VALUES ");
+        sqlList.append("INSERT INTO order_goods(extract_weight,residue_transport_weight,already_transport_weight,loss_price,truck_demand,extract_way," +
+                "need_truck_num,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_longitude," +
+                "send_latitude,receive_latitude,receive_longitude,receive_address_id,receive_address_shorter,goods_name,goods_id,create_time,modified_time," +
+                "user_name,user_no) VALUES ");
 
         for (int i = 0; i < orderGoodsList.size(); i++) {
             OrderGoods o = orderGoodsList.get(i);
@@ -156,9 +156,10 @@ public class OrderGoodsSqlProvider {
                     .append(o.getPendingOrderFreight()).append("','").append(o.getLastArriveSendTime()).append("','").append(o.getSeniorLogisticsManagerId()).append("','")
                     .append(o.getSeniorLogisticsManagerName()).append("','").append(o.getOrderNo()).append("','").append(o.getOrderGoodsNo()).append("','")
                     .append(o.getOrderGoodsStatus()).append("','").append(o.getSendAddressId()).append("','").append(o.getSendAddressShorter()).append("','")
-                    .append(o.getSendLongitude()).append("','").append(o.getReceiveLatitude()).append("','").append(o.getReceiveLongitude()).append("','")
+                    .append(o.getSendLongitude()).append("','").append(o.getSendLatitude()).append("','").append(o.getReceiveLatitude()).append("','").append(o.getReceiveLongitude()).append("','")
                     .append(o.getReceiveAddressId()).append("','").append(o.getReceiveAddressShorter()).append("','").append(o.getGoodsName()).append("','")
-                    .append(o.getGoodsId()).append("','").append(o.getCreateTime()).append("','").append(o.getModifiedTime()).append("','")
+                    .append(o.getGoodsId()).append("','").append(o.getCreateTime()).append("','").append(o.getModifiedTime()).append("','").append(o.getUserName()).append("','")
+                    .append(o.getUserNo())
                     .append("')");
 
             if (i < orderGoodsList.size() - 1) {