提现申请进行领取的时候，为领取人新领取人姓名字段并且赋值

1. 调整包结构，将调用summary的rest请求的类都统一放到summary子包下
2. 提现申请进行领取的时候，为领取人新领取人姓名字段并且赋值
ALTER TABLE platform_prod.sys_amount_auditing ADD receive_user_name varchar(32) NULL COMMENT '领取人姓名';
3. 提现申请-待付款查询tab页支持按照领取人进行查询

commons/src/main/java/com/jzg/commons/entity/dto/AmountAuditParam.java

@@ -20,6 +20,15 @@ public class AmountAuditParam extends PageRequest {
     @Schema(description = "业务员类型1.前线人员 2:后线人员 3:合伙人 4:工作室管理员 5:团队 6:个代 7：电销 8 渠道")
     private String attrType;
 
+    @Schema(description = "管理人姓名")
+    private String managerName;
+
+    @Schema(description = "提现金额")
+    private String amount;
+
+    @Schema(description = "领取人姓名")
+    private String receiveUserName;
+
     @Schema(description = "提现时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate createTimeStart;

commons/src/main/java/com/jzg/commons/entity/po/SysAmountAuditing.java

@@ -4,6 +4,7 @@ import java.io.Serial;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.core.base.BaseModel;
@@ -97,6 +98,9 @@ public class SysAmountAuditing extends BaseModel {
     @Schema(description = "领取人")
     private String receiveUser;
 
+    @Schema(description = "领取人姓名")
+    private String receiveUserName;
+
     @Schema(description = "系统code")
     private String systemCode;
 

commons/src/main/java/com/jzg/commons/entity/vo/AmountAuditVo.java

@@ -135,6 +135,10 @@ public class AmountAuditVo  extends BaseModel {
     @Schema(description = "提现人")
     private String withdrawalRequester;
 
+    @ExcelIgnore
+    @Schema(description = "领取人姓名")
+    private String receiveUserName;
+
     @ExcelProperty("提现时间")
     @Schema(description = "提现时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UserInfoController.java

@@ -0,0 +1,24 @@
+package com.jzg.quotation.summary.controller;
+
+import com.jzg.quotation.summary.service.userinfo.UserInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class UserInfoController {
+
+    @Autowired
+    private UserInfoService userInfoService;
+
+    /**
+     * 根据用户手机号查询名称
+     *
+     * @param mobile
+     * @return
+     */
+    @GetMapping("/api/v1/getUserNameByMobile")
+    String getUserNameByMobile(String mobile){
+        return userInfoService.getUserNameByMobile(mobile);
+    }
+}

tenant/organization/src/main/java/com/jzg/organization/action/service/ChangeBsAccountHandler.java

@@ -3,11 +3,9 @@ package com.jzg.organization.action.service;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.action.base.ActionHandler;
 import com.jzg.commons.entity.action.enums.ActionEnum;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.commons.entity.quote.vo.orders.InsOrdersVo;
 import com.jzg.commons.exception.SystemException;
-import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.client.summary.QuoteClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

tenant/organization/src/main/java/com/jzg/organization/action/service/ChangePocHandler.java

@@ -5,8 +5,7 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.action.base.ActionHandler;
 import com.jzg.commons.entity.action.enums.ActionEnum;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.commons.exception.SystemException;
-import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.client.summary.QuoteClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

tenant/organization/src/main/java/com/jzg/organization/action/service/SendNotifyMsgHandler.java

@@ -8,15 +8,13 @@ import com.jzg.commons.entity.enums.MessageCodeEnum;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.client.summary.QuoteClient;
 import com.jzg.organization.consumer.templete.UserMessageTemplate;
 import com.jzg.organization.service.SysUserJzgInfoService;
 import lombok.Setter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * 发送通知消息动作
  */

tenant/organization/src/main/java/com/jzg/organization/action/service/SupplementaryOrderHandler.java

@@ -4,7 +4,7 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.action.base.ActionHandler;
 import com.jzg.commons.entity.action.enums.ActionEnum;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.client.summary.QuoteClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

tenant/organization/src/main/java/com/jzg/organization/aop/OrderOperationLogAspect.java

@@ -12,7 +12,7 @@ import com.jzg.commons.entity.quote.vo.aggregated.QuoteEchoVo;
 import com.jzg.commons.entity.vo.QuestionOrder;
 import com.jzg.commons.util.JsonDiffUtil;
 import com.jzg.commons.util.SchemaDescriptionParser;
-import com.jzg.organization.client.InsOrdersClient;
+import com.jzg.organization.client.summary.InsOrdersClient;
 import com.jzg.quotation.summary.aop.aspect.OrderOperationLog;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;

tenant/organization/src/main/java/com/jzg/organization/client/InsFeeOrdersClient.java → tenant/organization/src/main/java/com/jzg/organization/client/summary/InsFeeOrdersClient.java

@@ -1,4 +1,4 @@
-package com.jzg.organization.client;
+package com.jzg.organization.client.summary;
 
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.finance.vo.BatchModifyVo;
@@ -6,6 +6,7 @@ import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.commons.entity.vo.PtlAgreementCostRatioVo;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -38,4 +39,13 @@ public interface InsFeeOrdersClient {
      */
     @PostMapping("/supplementOrder/adjustmentCostAndSave")
     HttpResult<InsFeeOrders> adjustmentCostAndSave(@RequestBody PtlAgreementCostRatioVo ptlAgreementCostRatioVo);
+
+    /**
+     * 根据用户手机号查询名称
+     *
+     * @param mobile
+     * @return
+     */
+    @GetMapping("/api/v1/getUserNameByMobile")
+    String getUserNameByMobile(@RequestParam("mobile") String mobile);
 }

tenant/organization/src/main/java/com/jzg/organization/client/InsOrdersClient.java → tenant/organization/src/main/java/com/jzg/organization/client/summary/InsOrdersClient.java

@@ -1,7 +1,6 @@
-package com.jzg.organization.client;
+package com.jzg.organization.client.summary;
 
 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;

tenant/organization/src/main/java/com/jzg/organization/client/QuoteClient.java → tenant/organization/src/main/java/com/jzg/organization/client/summary/QuoteClient.java

@@ -1,4 +1,4 @@
-package com.jzg.organization.client;
+package com.jzg.organization.client.summary;
 
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.InsFeeOrdersParam;

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -46,8 +46,8 @@ import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.*;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.organization.client.EsmInsCompanyClient;
-import com.jzg.organization.client.InsFeeOrdersClient;
-import com.jzg.organization.client.InsOrdersClient;
+import com.jzg.organization.client.summary.InsFeeOrdersClient;
+import com.jzg.organization.client.summary.InsOrdersClient;
 import com.jzg.organization.entity.dto.CalRes;
 import com.jzg.organization.excel.listener.JyExcelListener;
 import com.jzg.organization.excel.listener.OtherExcelListener;

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysAmountAuditingServiceImpl.java

@@ -23,6 +23,7 @@ import com.jzg.commons.entity.vo.AmountAuditVo;
 import com.jzg.commons.entity.vo.IncomeAndExpenseList;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.*;
+import com.jzg.organization.client.summary.InsFeeOrdersClient;
 import com.jzg.organization.mapper.SysAmountAuditingMapper;
 import com.jzg.organization.service.*;
 import com.jzg.organization.state.AuditState;
@@ -83,6 +84,9 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     @Autowired
     private InvAccountCardService invAccountCardService;
 
+    @Autowired
+    private InsFeeOrdersClient insFeeOrdersClient;
+
     private static final String AMOUNT_LOCK_PREFIX = "amountLock:";
 
     @Override
@@ -150,6 +154,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             }else{
                 // 领取订单
                 audit.setReceiveUser(receiveUser);
+                audit.setReceiveUserName(insFeeOrdersClient.getUserNameByMobile(receiveUser));
                 audit.setReceiveTime(LocalDateTime.now());
                 this.updateById(audit);
                 // redis 锁定按钮

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDistributionSettingServiceImpl.java

@@ -12,7 +12,7 @@ import com.jzg.commons.entity.vo.*;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.EasyExcelUtils;
 import com.jzg.commons.util.ServletUtils;
-import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.client.summary.QuoteClient;
 import com.jzg.organization.mapper.SysDistributionAuditMapper;
 import com.jzg.organization.mapper.SysDistributionSettingMapper;
 import com.jzg.organization.mapper.SysUserJzgInfoMapper;

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserAccountServiceImpl.java

@@ -14,7 +14,7 @@ import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.po.SysAmountAuditing;
 import com.jzg.commons.entity.vo.*;
 import com.jzg.commons.util.BigDecimalUtil;
-import com.jzg.organization.client.QuoteClient;
+import com.jzg.organization.client.summary.QuoteClient;
 import com.jzg.organization.mapper.SysAmountAuditingMapper;
 import com.jzg.organization.mapper.SysUserAccountIncomeLogMapper;
 import com.jzg.organization.mapper.SysUserAccountMapper;

tenant/organization/src/main/resources/mapper/SysAmountAuditingMapper.xml

@@ -47,8 +47,9 @@
 
     <select id="queryPage" resultType="com.jzg.commons.entity.vo.AmountAuditVo">
         SELECT
+        saa.receive_user_name,
         saa.id,suji.name as name, su.mobile as mobile,suji.type_attr as attrType,
-        sujim.name as managerName,sum.mobile as managerMobile,saa.create_time as createTime,
+        saa.manager_user_name  as managerName,sum.mobile as managerMobile,saa.create_time as createTime,
         saa.amount, saa.balance_amount as balanceAmount,saa.account_name AS accountName,
         saa.bank_card_num as bankCardNum, saa.bank_name as bankName, saa.bank_num as bankNum, suji.id as userJzgInfoId,
         saa.payment_time as paymentTime, saa.reject_reason as rejectReason, saa.reject_time as rejectTime, saa.reject_person as rejectPerson,
@@ -70,7 +71,12 @@
             <if test="param.attrType != null ">
                 and suji.type_attr = #{param.attrType}
             </if>
-
+            <if test="param.amount != null and param.amount != ''">
+                and saa.amount = #{param.amount}
+            </if>
+            <if test="param.receiveUserName != null and param.receiveUserName !=''">
+                and saa.receive_user_name = #{param.receiveUserName}
+            </if>
             <if test="param.createTimeStart != null and param.createTimeEnd != null">
                 and DATE_FORMAT(saa.create_time, '%Y-%m-%d') between #{param.createTimeStart} AND #{param.createTimeEnd}
             </if>
@@ -83,7 +89,9 @@
             <if test="param.userJzgInfoId != null and param.userJzgInfoId != ''">
                 and suji.id = #{param.userJzgInfoId}
             </if>
-
+            <if test="param.managerName != null and param.managerName !=''">
+                and saa.manager_user_name  like concat('%',#{param.managerName},'%')
+            </if>
             <if test="param.auditingStatus != null ">
                 and saa.auditing_status = #{param.auditingStatus}
             </if>