Просмотр исходного кода

修改bug:
bug表984,平台应收 批量修改出单协议时,保险公司与保司机构、对接人是一体的吧

jiakai 1 месяц назад
Родитель
Сommit
c94d2c48f3

+ 18 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/UpdateCompanyBatchVo.java

@@ -0,0 +1,18 @@
+package com.jzg.commons.entity.finance.vo;
+
+import com.jzg.commons.entity.vo.AgreementVo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UpdateCompanyBatchVo {
+
+    private AgreementVo agreementVo;
+
+    private BatchModifyVo batchModifyVo;
+}

+ 4 - 3
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsOrdersController.java

@@ -14,6 +14,7 @@ import com.jzg.commons.entity.dto.InsOrdersParam;
 import com.jzg.commons.entity.dto.InsOrdersParamVO;
 import com.jzg.commons.entity.dto.UpdateFeeRatioDTO;
 import com.jzg.commons.entity.finance.vo.BatchModifyVo;
+import com.jzg.commons.entity.finance.vo.UpdateCompanyBatchVo;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
 import com.jzg.commons.entity.orders.vo.HistoryQuoteQueryVo;
@@ -260,14 +261,14 @@ public class InsOrdersController extends BaseController {
     /**
      * 批量修改ins_orders和ins_order_adjust的保司信息
      *
-     * @param batchModifyVo 批量修改参数,包含orderNos和companyIds
+     * @param updateCompanyBatchVo 批量修改参数,包含orderNos和companyIds
      * @author lipf
      * @date 2026/8/5
      */
     @PostMapping("/updateCompanyBatch")
     @Operation(summary = "批量修改订单和批改表的保司信息")
-    public HttpResult<String> updateCompanyBatch(@RequestBody BatchModifyVo batchModifyVo){
-        return insOrdersService.updateCompanyBatch(batchModifyVo);
+    public HttpResult<String> updateCompanyBatch(@RequestBody UpdateCompanyBatchVo updateCompanyBatchVo){
+        return insOrdersService.updateCompanyBatch(updateCompanyBatchVo);
     }
 
     @GetMapping("/comparePrice")

+ 3 - 2
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersService.java

@@ -8,6 +8,7 @@ import com.jzg.commons.entity.dto.InsOrdersParam;
 import com.jzg.commons.entity.dto.InsOrdersParamVO;
 import com.jzg.commons.entity.enums.MessageCodeEnum;
 import com.jzg.commons.entity.finance.vo.BatchModifyVo;
+import com.jzg.commons.entity.finance.vo.UpdateCompanyBatchVo;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
 
@@ -291,11 +292,11 @@ public interface InsOrdersService extends IService<InsOrders> {
     /**
      * 批量修改ins_orders和ins_order_adjust的保司信息
      *
-     * @param batchModifyVo 批量修改参数,包含orderNos和companyIds
+     * @param updateCompanyBatchVo 批量修改参数,包含orderNos和companyIds
      * @author lipf
      * @date 2026/8/5
      */
-    HttpResult<String> updateCompanyBatch(BatchModifyVo batchModifyVo);
+    HttpResult<String> updateCompanyBatch(UpdateCompanyBatchVo updateCompanyBatchVo);
 
     /**
      * 获取订单关联协议的税率

+ 15 - 9
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -25,6 +25,7 @@ import com.jzg.commons.entity.dto.InsOrdersParamVO;
 import com.jzg.commons.entity.dto.InsTaskImagesAdd;
 import com.jzg.commons.entity.enums.MessageCodeEnum;
 import com.jzg.commons.entity.finance.vo.BatchModifyVo;
+import com.jzg.commons.entity.finance.vo.UpdateCompanyBatchVo;
 import com.jzg.commons.entity.orders.po.*;
 import com.jzg.commons.entity.orders.vo.HistoryQuoteQueryVo;
 import com.jzg.commons.entity.orders.vo.HistoryQuoteResultVo;
@@ -2396,42 +2397,47 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      * 3. 根据orderNos批量修改ins_order_adjust表的companyId和companyName
      * </p>
      *
-     * @param batchModifyVo 批量修改参数,包含orderNos和companyIds
+     * @param updateCompanyBatchVo 批量修改参数,包含orderNos和companyIds
      * @author lipf
      * @date 2026/8/5
      */
     @Override
-    public HttpResult<String> updateCompanyBatch(BatchModifyVo batchModifyVo) {
+    public HttpResult<String> updateCompanyBatch(UpdateCompanyBatchVo updateCompanyBatchVo) {
+        BatchModifyVo batchModifyVo = updateCompanyBatchVo.getBatchModifyVo();
+        AgreementVo agreementVo = updateCompanyBatchVo.getAgreementVo();
+
         log.info("批量修改订单和批改表的保司信息: batchModifyVo=[{}]", JSONUtil.toJsonStr(batchModifyVo));
         List<String> orderNos = batchModifyVo.getOrderNos();
         if (CollUtil.isEmpty(orderNos)) {
             return HttpResult.error("批量修改保司信息时,请指定订单编号");
         }
-        List<String> companyIds = batchModifyVo.getCompanyIds();
-        if (CollUtil.isEmpty(companyIds)) {
+
+        // 获取新的保司ID
+        String newPartnerCompanyId = agreementVo.getPartnerCompanyId();
+        if (StrUtil.isBlank(newPartnerCompanyId)) {
             return HttpResult.error("批量修改保司信息时,请指定保司ID");
         }
 
-        // 获取新的保司ID
-        String companyId = CollUtil.getFirst(companyIds);
         // 通过保司ID查询保司名称
         String companyName = "";
-        HttpResult<EsmInsCompany> companyResult = esmInsCompanyClient.findById(companyId);
+        HttpResult<EsmInsCompany> companyResult = esmInsCompanyClient.findById(newPartnerCompanyId);
         if (companyResult != null && companyResult.isSuccess() && companyResult.getData() != null) {
             companyName = companyResult.getData().getName();
         }
 
         // 修改ins_orders表的保司信息
         int orderCount = baseMapper.update(null, new LambdaUpdateWrapper<InsOrders>()
-                .set(InsOrders::getCompanyId, companyId)
+                .set(InsOrders::getCompanyId, newPartnerCompanyId)
                 .set(InsOrders::getCompanyName, companyName)
                 .set(InsOrders::getAgreementId, batchModifyVo.getUpdateAgreementId())
+                .set(InsOrders::getDockingPerson, agreementVo.getDockingPerson())
+                .set(InsOrders::getDockingPersonPhone, agreementVo.getDockingPhone())
                 .in(InsOrders::getId, orderNos));
         log.info("修改ins_orders保司信息完成,影响行数: {}", orderCount);
 
         // 修改ins_order_adjust表的保司信息
         int adjustCount = insOrderAdjustMapper.update(null, new LambdaUpdateWrapper<InsOrderAdjust>()
-                .set(InsOrderAdjust::getCompanyId, companyId)
+                .set(InsOrderAdjust::getCompanyId, newPartnerCompanyId)
                 .set(InsOrderAdjust::getCompanyName, companyName)
                 .in(InsOrderAdjust::getOrderNo, orderNos));
         log.info("修改ins_order_adjust保司信息完成,影响行数: {}", adjustCount);

+ 3 - 2
tenant/organization/src/main/java/com/jzg/organization/client/InsOrdersClient.java

@@ -2,6 +2,7 @@ package com.jzg.organization.client;
 
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.finance.vo.BatchModifyVo;
+import com.jzg.commons.entity.finance.vo.UpdateCompanyBatchVo;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersTrack;
@@ -77,11 +78,11 @@ public interface InsOrdersClient {
     /**
      * 根据订单号批量修改ins_orders和ins_order_adjust的保司信息
      *
-     * @param batchModifyVo 批量修改参数,包含orderNos和companyIds
+     * @param updateCompanyBatchVo 批量修改参数,包含orderNos和companyIds
      * @author jk
      * @date 2026/8/5
      */
     @PostMapping("/supplementOrder/updateCompanyBatch")
     @Operation(summary = "批量修改订单和批改表的保司信息")
-    HttpResult<String> updateCompanyBatch(@RequestBody BatchModifyVo batchModifyVo);
+    HttpResult<String> updateCompanyBatch(@RequestBody UpdateCompanyBatchVo updateCompanyBatchVo);
 }

+ 4 - 2
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -3995,13 +3995,15 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                     .set(InsPlyIncome::getPartnerCompanyId, newPartnerCompanyId)
                     .set(InsPlyIncome::getAgreementId, updateAgreementId)
                     .set(InsPlyIncome::getAgreementName, agreementVo.getAgreementName())
+                    .set(InsPlyIncome::getContactPerson, agreementVo.getDockingPerson())
+                    .set(InsPlyIncome::getContactPersonPhone, agreementVo.getDockingPhone())
                     .in(InsPlyIncome::getId, updateIncomeIds);
             baseMapper.update(null, incomeUpdateWrapper);
             log.info("修改ins_ply_income保司信息完成,未对账数据条数: {}", updateIncomeIds.size());
 
             // 2. 修改ins_orders和ins_order_adjust表(通过feignClient调用quotation-summary服务)
-            batchModifyVo.setCompanyIds(CollUtil.newArrayList(newCompanyId));
-            HttpResult<String> updateCompanyRes = insOrdersClient.updateCompanyBatch(batchModifyVo);
+            UpdateCompanyBatchVo updateCompanyBatchVo = UpdateCompanyBatchVo.builder().batchModifyVo(batchModifyVo).agreementVo(agreementVo).build();
+            HttpResult<String> updateCompanyRes = insOrdersClient.updateCompanyBatch(updateCompanyBatchVo);
             log.info("修改ins_orders和ins_order_adjust保司信息的结果:updateCompanyRes=[{}]", JSONUtil.toJsonStr(updateCompanyRes));
         }