售后工单维护处理结果总金额、零担取消装车校验

1 修改志邦工厂原始订单日志记录

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java

@@ -25,6 +25,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -326,6 +327,11 @@ public class AftersalesWorkOrderEntity extends TenantEntity {
 
 	private Integer packageFinish;
 
+	/**
+	 * 赔款金额
+	 */
+	private BigDecimal compensationMoney;
+
 
 
 	/**

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml

@@ -92,7 +92,7 @@
         lawo.warehouse_id warehouseId,
         lawo.investigation_process investigationProcess,
         lawo.customer_service_id customerServiceId,
-        IFNULL( sum( lapr.money ), 0 ) AS totalAmountNum,
+        lawo.compensation_money totalAmountNum,
         GROUP_CONCAT(DISTINCT lapr.result_type) AS resultTypes,
         GROUP_CONCAT(DISTINCT lapr.compensation_method) AS compensationMethods
         FROM
@@ -1109,6 +1109,7 @@
         GROUP_CONCAT(DISTINCT lapr.result_type) AS resultTypes,
         IFNULL( sum( lapr.money ), 0 ) AS totalAmountNum,
         lawo.ceator,
+        lawo.compensation_money totalAmountNum,
         IF(lawo.work_order_status = '80',lawo.update_time,'') AS completeTime,
         IF(lawo.work_order_status = '100','是','否') AS isAppeal,
         lawo.process_number,
@@ -1149,6 +1150,7 @@
         a.id) AS t ON t.id = lawo.id
         LEFT JOIN logpm_aftersales_processing_results AS lapr ON lapr.work_order_id = lawo.id AND lapr.is_deleted = 0
         LEFT JOIN logpm_aftersales_person_responsible AS laprr ON laprr.word_order_id = lawo.id  AND laprr.is_deleted = '0'
+       <where>
         lawo.is_deleted = 0
         <if test="param.workOrderNumbers != null and param.workOrderNumbers != '' ">
             and  lawo.work_order_number in
@@ -1233,7 +1235,7 @@
         <if test="param.brandName != null and param.brandName != '' ">and t.brand_name like concat('%',#{param.brandName},'%') </if>
         <if test="param.waybillNumber != null and param.waybillNumber != ''">and t.waybill_number like concat('%',#{param.waybillNumber},'%') </if>
         <if test="param.packageCode != null and param.packageCode != ''">and t.package_code like concat('%',#{param.packageCode},'%') </if>
-
+       </where>
         group by lawo.id
         ORDER BY lawo.create_time DESC
     </select>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -1912,13 +1912,19 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			//处理赔付方式
 			aftersalesProcessingResultsDTO.setCompensationMethod(aftersalesProcessingResultsDTO.getCompensationMethod());
 		}
+		BigDecimal totalMoney = BigDecimal.ZERO;
 		aftersalesProcessingResultsDTO.setWarehouseId(aftersalesWorkOrderDTO.getWarehouseId());
-
+		if (!Objects.isNull(aftersalesProcessingResultsDTO.getProcessingMoneyEntityList())){
+			for (AftersalesProcessingMoneyEntity aftersalesProcessingMoneyEntity : aftersalesProcessingResultsDTO.getProcessingMoneyEntityList()) {
+				BigDecimal money = aftersalesProcessingMoneyEntity.getMoney();
+				totalMoney = totalMoney.add(aftersalesProcessingMoneyEntity.getMoney());
+			}
+		}
 		aftersalesProcessingResultsService.ownSaveOrUpdate(aftersalesProcessingResultsDTO);
 		//修改异常工单处理信息！
 		AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();
 		workOrderEntity.setId(aftersalesWorkOrderDTO.getId());
-
+		workOrderEntity.setCompensationMoney(totalMoney);
 		//是否为已提交
 		if ("1".equals(aftersalesWorkOrderDTO.getResultIdentification())) {
 			workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yichuli.getValue());

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

@@ -1715,7 +1715,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		//查询是否进行装车或者签收
 		List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
 			.eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
-			.eq(DistributionLoadscanEntity::getDriverId, distrilbutionloadingscanDTO.getDeliveryId())
+//			.eq(DistributionLoadscanEntity::getDriverId, distrilbutionloadingscanDTO.getDeliveryId())
 			.in(DistributionLoadscanEntity::getPackageId, list)
 			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
 		);

blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java

@@ -38,9 +38,7 @@ public class ZbFactoryAccountsInterceptor implements HandlerInterceptor {
 		String customerId = request.getParameter("customerId");
 
 		String body = myRequestWrapper.getBody();
-		JSONObject bodyJson = JSONObject.parseObject(body);
+		log.info("body ={}",body);
-		log.info("bodyJson ={}",bodyJson.toString());
-
 		Map<String, String> params = new HashMap<>();
 		params.put("app_key",appKey);
 		params.put("customerId",customerId);