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

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java

@@ -83,7 +83,8 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity {
 	private String certificateTypeName;
 
 	private List<DistributionDeliveryChargeEntity> list;
-
+	private String collectFee;
+	private String otherFee;
 
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml

@@ -148,6 +148,7 @@
         dbl.total_cost AS totalCost,
         dbl.pick_up_plate AS pickUpPlate,
         dbl.pickup_batch AS pickupBatch,
+        dbl.total_cost totalCost,
         count(DISTINCT ldbls.id ) AS stopNum
         FROM
         logpm_distrilbution_bill_lading dbl

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -1168,9 +1168,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		List<DistrilbutionBillLadingExcel> listExcel = new ArrayList<>();
 		list.forEach(s -> {
 			DistrilbutionBillLadingExcel excel = new DistrilbutionBillLadingExcel();
-			s.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, s.getCertificateTypeName()));
+			s.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, s.getCertificateType()));
+			s.setConditionName(DictBizCache.getValue(DictBizConstant.BILL_CONDITIONS_STATUS, s.getConditions()));
+			s.setCollectFee(String.valueOf(s.getTotalCost()));
+			s.setTransport("0");
+			s.setStorageFee("0");
+			s.setForklift("0");
+			s.setOtherFee("0");
 			BeanUtil.copyProperties(s, excel);
-
 			listExcel.add(excel);
 		});