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

blade-service/logpm-aftersales/src/main/resources/application.yml

@@ -36,17 +36,5 @@ spring:
   main:
     allow-circular-references: true
 
-
-xxl:
-  job:
-    accessToken: ''
-    admin:
-      addresses: http://127.0.0.1:7009/xxl-job-admin
-    executor:
-      appname: logpm-aftersales-xxljob
-      ip: 127.0.0.1
-      logpath: ../data/applogs/logpm-aftersales-xxljob/jobhandler
-      logretentiondays: -1
-      port: 7012
 logpm:
   file_system_path: /home/java_works/logpm_temp_file/

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java

@@ -71,7 +71,7 @@ public class BillReViewReportListener {
 					.orderPackageCode(detail.getPackageCode())
 					.reviewUserName(bean.getOperator())
 					.reviewTime(bean.getOperatorTime())
-					.bizCode(detail.getPickupBatch())
+					.bizCode(vo.getPickupBatch())
 					.bizStatus(100)
 					.build();
 				if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java

@@ -76,7 +76,6 @@ public class ReViewReportListener {
 					.build();
 				if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {
 					qualityDeliverEntity.setConditions(1);
-					qualityDeliverEntity.setLoadNum(1);
 					sendReport(bizOperation, qualityDeliverEntity);
 				} else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) {
 					qualityDeliverEntity.setOrderCode(detail.getOrderCode());