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

平台协议-结算的时候按照对接人的维度进行结算

lipf 4 месяцев назад
Родитель
Сommit
083f489744

+ 31 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/ContractVO.java

@@ -0,0 +1,31 @@
+package com.jzg.commons.entity.finance.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 对接人信息
+ * 
+ * @author lipf
+ * @date 2026/5/30 10:10
+ */
+@AllArgsConstructor
+@Data
+@EqualsAndHashCode()
+public class ContractVO implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -1054621082010388438L;
+
+
+    // 对接人姓名
+    private String contactPerson;
+
+    // 对接人手机号
+    private String contactPersonPhone;
+
+
+}

+ 7 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/InvoicingVo.java

@@ -21,6 +21,13 @@ public class InvoicingVo {
     @Schema(description = "开票的保司id")
     private String companyId;
 
+    @Schema(description = "对接人姓名")
+    private String contactPerson;
+
+    @Schema(description = "对接人手机号")
+    private String contactPersonPhone;
+
+
     // 开票类型  1、手续费  2、跟单费  3、驾意险手续费 4、驾意险跟单费 5、平台应收-车险 6、平台应收-非车险
     @Schema(description = "开票类型")
     private String invoiceType;

+ 1 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/SettlementVo.java

@@ -31,4 +31,5 @@ public class SettlementVo {
 
     @Schema(description = "附加id")
     private List<String> attachmentIds;
+
 }

+ 13 - 0
tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -213,6 +213,19 @@ public class ReceivableController {
         return HttpResult.ok(receivableService.getReceivableCompany(invoicingVo));
     }
 
+    /**
+     * 查询应收订单关联的所有对接人信息
+     *
+     * @author lipf
+     * @date 2026/5/30 10:09
+     */
+    @PostMapping("queryReceivableContact")
+    @Operation(summary = "获取对接人列表")
+    public HttpResult<List<ContractVO>> queryReceivableContact(@RequestBody InvoicingVo invoicingVo){
+        return receivableService.queryReceivableContact(invoicingVo);
+    }
+
+
     @PostMapping("settlement")
     @Operation(summary = "私有协议结算")
     public HttpResult<String> settlement(@RequestBody SettlementVo settlementVo){

+ 10 - 0
tenant/organization/src/main/java/com/jzg/organization/mapper/ReceivableMapper.java

@@ -49,6 +49,16 @@ public interface ReceivableMapper extends BaseMapper<InsPlyIncome> {
      */
     List<EsmInsCompany> getReceivableCompany(@Param("invoicingVo") InvoicingVo invoicingVo);
 
+    /**
+     * 更加应收订单的编号查询应收记录
+     *
+     * @param invoicingVo 应收订单编号集
+     * @return List<InsPlyIncome> 应收订单
+     * @author lipf
+     * @date 2026/5/30 10:17
+     */
+    List<InsPlyIncome> queryIncomeByIds(@Param("invoicingVo") InvoicingVo invoicingVo);
+
     /**
      * 获取车险应收列表
      * @param receivableQueryVo

+ 13 - 1
tenant/organization/src/main/java/com/jzg/organization/service/ReceivableService.java

@@ -35,10 +35,20 @@ public interface ReceivableService extends IService<InsPlyIncome> {
     /**
      * 获取应收订单的保司
      * @param invoicingVo
-     * @return
+     * @return List<EsmInsCompany>
      */
     List<EsmInsCompany> getReceivableCompany(InvoicingVo invoicingVo);
 
+    /**
+     * 查询应收订单关联的所有对接人信息
+     *
+     * @param invoicingVo 包含应收订单编号级的对象
+     * @return HttpResult<List<ContractVO>> 应收订单关联的对接人信息
+     * @author lipf
+     * @date 2026/5/30 10:09
+     */
+    HttpResult<List<ContractVO>> queryReceivableContact(InvoicingVo invoicingVo);
+
     /**
      * 获取私有协议手续费列表
      *
@@ -362,4 +372,6 @@ public interface ReceivableService extends IService<InsPlyIncome> {
      * @return
      */
     ImportUpdateExcelResultVo importReceivableListUpdate(MultipartFile file);
+
+
 }

+ 16 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -175,6 +175,22 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         return baseMapper.getReceivableCompany(invoicingVo);
     }
 
+    /**
+     * 查询应收订单关联的所有对接人信息
+     *
+     * @param invoicingVo 包含应收订单编号级的对象
+     * @return HttpResult<List<ContractVO>> 应收订单关联的对接人信息
+     * @author lipf
+     * @date 2026/5/30 10:09
+     */
+    @Override
+    public HttpResult<List<ContractVO>> queryReceivableContact(InvoicingVo invoicingVo) {
+        List<InsPlyIncome> insPlyIncomes = baseMapper.queryIncomeByIds(invoicingVo);
+        List<ContractVO> contractVOS = insPlyIncomes.stream().map(action -> new ContractVO(action.getContactPerson(), action.getContactPersonPhone())).distinct().toList();
+        log.info("根据订单编号查询得到的对接人信息[{}]个", CollUtil.size(contractVOS));
+        return HttpResult.ok(contractVOS);
+    }
+
     /**
      * 获取私有协议手续费列表
      *

+ 9 - 0
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -1108,6 +1108,15 @@
             eic.id
     </select>
 
+    <!-- 根据应收订单的编号,查询应收记录 lipf 2026年5月30日10:25:14 -->
+    <select id="queryIncomeByIds" resultType="com.jzg.commons.entity.finance.po.InsPlyIncome">
+        SELECT ipii.*  FROM ins_ply_income ipi WHERE
+        ipi.id IN
+        <foreach collection="invoicingVo.incomeIds" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
     <select id="invoicingCheck" resultType="java.lang.Integer">
         SELECT count(id) AS count
         FROM ins_ply_income_invoice_link