Merge remote-tracking branch 'origin/pre-production'

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillOrderMapper.xml

@@ -96,7 +96,7 @@
         where waybill_no = #{waybillNo}
           and order_code = #{orderCode}
           and is_deleted = 0
-        group by id
+        group by waybill_no,order_code
     </select>
 
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -4638,14 +4638,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			String productNum = carsLoadWaybillInfoVO.getProductNum();
 			String productVolume = carsLoadWaybillInfoVO.getProductVolume();
 			String productWeight = carsLoadWaybillInfoVO.getProductWeight();
-//			String chargeTypes = carsLoadWaybillInfoVO.getChargeTypes();
+			String chargeTypes = carsLoadWaybillInfoVO.getChargeTypes();
 
 			String[] nameArray = goodsName.split(",");
 			String[] priceArray = productPrice.split(",");
 			String[] numArray = productNum.split(",");
 			String[] volumeArray = productVolume.split(",");
 			String[] weightArray = productWeight.split(",");
-//			String[] chargeTypeArray = chargeTypes.split(",");
+			String[] chargeTypeArray = chargeTypes.split(",");
 
 
 
@@ -4661,7 +4661,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				String weight = weightArray[i];
 				volumeMap.put(nameArray[i],new BigDecimal(volume).divide(new BigDecimal(num),2, RoundingMode.HALF_UP).toString());
 				weightMap.put(nameArray[i],new BigDecimal(weight).divide(new BigDecimal(num),2, RoundingMode.HALF_UP).toString());
-//				chargeTypeMap.put(nameArray[i],chargeTypeArray[i]);
+				chargeTypeMap.put(nameArray[i],chargeTypeArray[i]);
 			}
 
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillOrderServiceImpl.java

@@ -1,6 +1,5 @@
 package com.logpm.trunkline.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
 import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
 import com.logpm.trunkline.mapper.TrunklineWaybillOrderMapper;