问题处理

hx-customer/src/main/java/com/fjhx/customer/service/xiaoman/impl/XiaomanApiServiceImpl.java

@@ -354,7 +354,9 @@ public class XiaomanApiServiceImpl implements XiaomanApiService {
             JSONArray contactJsonArr = ObjectUtil.isEmpty(contactJsonStr) ? new JSONArray() : JSONArray.parseArray(contactJsonStr);
 
             JSONObject xCU = new JSONObject();
+            xCU.put("id", cu.getId());//联系人id
             xCU.put("mainCustomerFlag", 0);//主要联系人设置标志
+            xCU.put("customerId", cu.getCustomerId());//客户id
             xCU.put("name", cu.getName());//客户联系人名称
             xCU.put("email", cu.getEmail());//客户联系人邮箱
             xCU.put("remark", dto.getRemark());//客户联系人备注

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -411,4 +411,9 @@ public class Contract extends BasePo {
      */
     private Integer isSettled;
 
+    /**
+     * 售后id
+     */
+    private Long afterSalesId;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/ContractProduct.java

@@ -74,6 +74,15 @@ public class ContractProduct extends BasePo {
     private String ehsdJson;
 
     /**
+     * 售后id
+     */
+    private Long afterSalesId;
+    /**
+     * 售后明细id
+     */
+    private Long afterSalesDetailId;
+
+    /**
      * 附件列表
      */
     @TableField(exist = false)

hx-sale/src/main/java/com/fjhx/sale/flow/AfterSalesFlow.java

@@ -19,6 +19,7 @@ import com.fjhx.sale.entity.contract.dto.ContractDto;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.service.after.AfterSalesDetailService;
 import com.fjhx.sale.service.after.AfterSalesService;
+import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.tenant.utils.DictUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -46,6 +47,8 @@ public class AfterSalesFlow extends FlowDelegate {
     private ContractService contractService;
     @Autowired
     private FlowProcessService flowProcessService;
+    @Autowired
+    private ContractProductService contractProductService;
 
     @Override
     public String getFlowKey() {
@@ -108,12 +111,15 @@ public class AfterSalesFlow extends FlowDelegate {
         if (type.contains("补发") || type.contains("换货")) {
             ContractDto contractDto = BeanUtil.copyProperties(contractService.getById(afterSales.getContractId()), ContractDto.class);
             contractDto.setId(null);
+            contractDto.setAfterSalesId(afterSales.getId());
             contractDto.setAmount(BigDecimal.ZERO);
             List<AfterSalesDetail> afterSalesDetailList = afterSalesDetailService.list(q -> q.eq(AfterSalesDetail::getAfterSalesId, afterSales.getId()));
             List<ContractProduct> contractProductList = new ArrayList<>();
             for (AfterSalesDetail afterSalesDetail : afterSalesDetailList) {
-                ContractProduct contractProduct = new ContractProduct();
-                contractProduct.setProductId(afterSalesDetail.getProductId());
+                ContractProduct contractProduct = contractProductService.getById(afterSalesDetail.getContractProductId());
+                contractProduct.setId(null);
+                contractProduct.setAfterSalesId(afterSales.getId());
+                contractProduct.setAfterSalesDetailId(afterSalesDetail.getId());
                 contractProduct.setPrice(BigDecimal.ZERO);
                 contractProduct.setAmount(BigDecimal.ZERO);
                 contractProduct.setQuantity(afterSalesDetail.getQuantity());