Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260518'

authentication/src/main/java/com/jzg/controller/SendSmsCodeController.java

@@ -65,7 +65,7 @@ public class SendSmsCodeController {
         try {
             url = String.format(URL, mobile, TPL_ID, URLEncoder.encode("#code#=" + variable, "utf-8"), KEY);
         } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
+            log.error("print:",e);
         }
         JSONObject jsonObject = JSONObject.parseObject(doGet(url));
         int error_code = jsonObject.getIntValue("error_code");
@@ -117,23 +117,23 @@ public class SendSmsCodeController {
                 result = sbf.toString();
             }
         } catch (MalformedURLException e) {
-            e.printStackTrace();
+            log.error("doGet:",e);
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("doGet:IOException",e);
         } finally {
             // 关闭资源
             if (null != bufferedReader) {
                 try {
                     bufferedReader.close();
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    log.error("doGet1",e);
                 }
             }
             if (null != inputStream) {
                 try {
                     inputStream.close();
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    log.error("doGet2",e);
                 }
             }
             if (connection != null) {

authentication/src/main/java/com/jzg/service/impl/InitializePartnerCommissionServiceImpl.java

@@ -26,8 +26,7 @@ public class InitializePartnerCommissionServiceImpl implements InitializePartner
         try {
             distributionClient.initializeCommissionDetails(userId,tokenStore.getTokenByUsername(mobile));
         }catch (Exception e){
-            log.error("初始化用户佣金失败:{}", e.getMessage());
-            e.printStackTrace();
+            log.error("初始化用户佣金失败:{}", e.getMessage(),e);
         }
     }
 }

commons/src/main/java/com/jzg/commons/core/base/BaseController.java

@@ -115,7 +115,7 @@ public class BaseController {
 
         List<String> userPerms = new ArrayList<>();
         String userJsonStr = redissonClient.getBucket(authorizationHeader).get().toString();
-        log.info("获取平台权限：authorizationHeader=[{}]，userJsonStr=[{}]",authorizationHeader, userJsonStr);
+        //log.info("获取平台权限：authorizationHeader=[{}]，userJsonStr=[{}]",authorizationHeader, userJsonStr);
         JSONObject userInfo = JSONObject.parseObject(userJsonStr);
         JSONArray auths = userInfo.getJSONArray("auths");
         auths.forEach(auth->{
@@ -152,7 +152,7 @@ public class BaseController {
         }
         valiedToken(authorizationHeader);
         String userJsonStr = redissonClient.getBucket(authorizationHeader).get().toString();
-        log.info("authorizationHeader=[{}], userJsonStr=[{}]",authorizationHeader, userJsonStr);
+        //log.info("authorizationHeader=[{}], userJsonStr=[{}]",authorizationHeader, userJsonStr);
         JSONObject userInfo = JSONObject.parseObject(userJsonStr);
         return userInfo.getString("system");
     }

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

@@ -1,12 +1,9 @@
 package com.jzg.commons.entity.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jzg.commons.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 @Schema(description = "申请提现param")
 @Data

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

@@ -27,6 +27,9 @@ public class SysUserJzgInfoBankCardDto implements Serializable {
     @Schema(description = "用户名称")
     private String name;
 
+    @Schema(description = "用户表的username")
+    private String username;
+
     @Schema(description = "银行名称")
     private String bankName;
 

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

@@ -1,13 +1,12 @@
 
 package com.jzg.commons.entity.po;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serial;
+
 /**
  * 合伙人/推荐人和机构负责人关系表
  * @TableName sys_relation_person
@@ -17,6 +16,8 @@ import lombok.Data;
 public class SysRelationPerson extends BaseModel {
 
 
+    @Serial
+    private static final long serialVersionUID = -6394009209924555421L;
     @Schema(description = "主键")
     private Long id;
 

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

@@ -1,6 +1,7 @@
 package com.jzg.commons.entity.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -76,6 +77,11 @@ public class AmountAuditVo  extends BaseModel {
     @Schema(description = "内部银行卡开户行名称")
     private String bankName;
 
+    @TableField(exist = false)
+    @ExcelProperty("银行卡持卡人姓名")
+    @Schema(description = "银行卡持卡人姓名")
+    private String cardHolderName;
+
     @ExcelProperty("内部银行卡开户行号")
     @Schema(description = "内部银行卡开户行号")
     private String bankNum;

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

@@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.aop.LogDescriptionField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -72,6 +74,15 @@ public class PtlAgreementCostVo {
     @Schema(description = "审核不通过原因")
     private String reviewDescription;
 
+    @Schema(description = "交强险入口手续费比例")
+    private String jqEntranceFeeRatio;
+
+    @Schema(description = "商业险入口手续费比例")
+    private String syEntranceFeeRatio;
+
+    @Schema(description = "驾意险入口手续费比例")
+    private String jyEntranceFeeRatio;
+
     @Schema(description = "费用类型集合")
     private List<PtlAgreementCostTypeVo> ptlAgreementCostTypeList;
 

commons/src/main/java/com/jzg/commons/util/Base64Utils.java

@@ -1,6 +1,9 @@
 package com.jzg.commons.util;
 
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 
@@ -8,6 +11,8 @@ import java.util.Base64;
  * 2021/6/4
  **/
 public class Base64Utils {
+
+    private static final Logger log = LoggerFactory.getLogger(Base64Utils.class);
     /**
      * 判断图片base64字符串的文件格式
      *
@@ -53,7 +58,7 @@ public class Base64Utils {
                 b = Base64.getDecoder().decode(s);
                 result = new String(b, StandardCharsets.UTF_8);
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("Exception",e);
             }
         }
         return result;

commons/src/main/java/com/jzg/commons/util/CompressUtil.java

@@ -106,7 +106,7 @@ public class CompressUtil {
             }
             return dest;
         } catch (ZipException e) {
-            e.printStackTrace();
+            log.error("zip:",e);
         }
         return null;
     }
@@ -154,7 +154,7 @@ public class CompressUtil {
             }
             zipFile.delete();
         } catch (ZipException e) {
-            e.printStackTrace();
+            log.error("unZip",e);
         }
     }
 

commons/src/main/java/com/jzg/commons/util/FileUtil.java

@@ -232,7 +232,7 @@ public class FileUtil {
                 url = url.replaceAll(tmp, URLEncoder.encode(tmp, "UTF-8"));
             }
         } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
+            log.error("urlEncodeChinese",e);
         }
         return url;
     }

commons/src/main/java/com/jzg/commons/util/IDCardUtils.java

@@ -1,5 +1,8 @@
 package com.jzg.commons.util;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -14,6 +17,8 @@ import java.util.regex.Pattern;
  * @date: 2025/3/3 17:35
  **/
 public class IDCardUtils {
+
+    private static final Logger log = LoggerFactory.getLogger(IDCardUtils.class);
     /**
      * <p>
      * 身份证号码合法性校验。
@@ -68,10 +73,10 @@ public class IDCardUtils {
                     return false;
                 }
             } catch (NumberFormatException e) {
-                e.printStackTrace();
+                log.error("idCardValidate",e);
                 return false;
             } catch (ParseException e) {
-                e.printStackTrace();
+                log.error("idCardValidate1",e);
                 return false;
             }
             if (Integer.parseInt(strMonth) > 12 || Integer.parseInt(strMonth) == 0) {
@@ -269,7 +274,7 @@ public class IDCardUtils {
             }
             return age;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("getAgeFromIDCard",e);
         }
         return 0;
     }

commons/src/main/java/com/jzg/commons/util/ImageUtil.java

@@ -1,5 +1,8 @@
 package com.jzg.commons.util;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
@@ -13,6 +16,8 @@ import java.util.Base64;
  */
 public class ImageUtil {
 
+    private static final Logger log = LoggerFactory.getLogger(ImageUtil.class);
+
     /**
      * base64转BufferedImage对象
      * @param base64String
@@ -30,7 +35,7 @@ public class ImageUtil {
             BufferedImage image = ImageIO.read(bis);
             return image;
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("base64ToBufferedImage",e);
             return null;
         }
     }

commons/src/main/java/com/jzg/commons/util/MinioUtils.java

@@ -277,7 +277,7 @@ public class MinioUtils {
             byte[] bytes = Base64.getEncoder().encode(base64.trim().getBytes());
             stream = new ByteArrayInputStream(bytes);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("base64ToInputStream",e);
         }
         return stream;
     }

commons/src/main/java/com/jzg/commons/util/ObjectUtil.java

@@ -1,8 +1,13 @@
 package com.jzg.commons.util;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.lang.reflect.Field;
 
 public class ObjectUtil {
+
+    private static final Logger log = LoggerFactory.getLogger(ObjectUtil.class);
     /**
      * 判断该对象是否所有属性为空
      * 返回ture表示所有属性为null，返回false表示不是所有属性都是null
@@ -26,7 +31,7 @@ public class ObjectUtil {
                     break;
                 }
             } catch (IllegalAccessException e) {
-                e.printStackTrace();
+                log.error("IllegalAccessException",e);
             }
         }
 

commons/src/main/java/com/jzg/commons/util/PDFUtil.java

@@ -50,7 +50,6 @@ public class PDFUtil {
      * 将base64编码转换成PDF
      * @param base64sString
      * @param filePath
-     *    
      */
     public static void base64StringToPDF(String base64sString, String filePath) {
         BufferedInputStream bin = null;
@@ -82,14 +81,14 @@ public class PDFUtil {
             //刷新此输出流并强制写出所有缓冲的输出字节，必须这行代码，否则有可能有问题
             bout.flush();
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("base64StringToPDF",e);
         }  finally {
             try {
                 bin.close();
                 fout.close();
                 bout.close();
             } catch (IOException e) {
-                e.printStackTrace();
+                log.error("base64StringToPDF",e);
             }
         }
     }
@@ -126,9 +125,9 @@ public class PDFUtil {
         //    return encoder.encodeBuffer(bytes).trim();
             return Base64Convert.byteToBase64(bytes);
         } catch (FileNotFoundException e) {
-            e.printStackTrace();
+            log.error("FileNotFoundException",e);
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("IOException",e);
         }finally{
             try {
                 fin.close();
@@ -136,7 +135,7 @@ public class PDFUtil {
                 bout.close();
 //              deleteDir(encriptPath.getParent());
             } catch (IOException e) {
-                e.printStackTrace();
+                log.error("IOException",e);
             }
         }
         return null;
@@ -554,7 +553,7 @@ public class PDFUtil {
                 InputStream inputStream = u.toURL().openStream();
                 FileUtil.copyInputStreamToFile(inputStream, file);
             }catch(Exception e){
-                e.printStackTrace();
+                log.error(e.getMessage(),e);
             }
             return file.getPath();
         } else {

commons/src/main/java/com/jzg/commons/util/ServletUtils.java

@@ -13,6 +13,8 @@ import jakarta.servlet.ServletRequest;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -22,8 +24,9 @@ import org.springframework.web.context.request.ServletRequestAttributes;
  *
  * @author dongxin
  */
-public class ServletUtils
-{
+public class ServletUtils {
+
+    private static final Logger log = LoggerFactory.getLogger(ServletUtils.class);
     /**
      * 获取String参数
      */
@@ -145,9 +148,8 @@ public class ServletUtils
             response.setCharacterEncoding("utf-8");
             response.getWriter().print(string);
         }
-        catch (IOException e)
-        {
-            e.printStackTrace();
+        catch (IOException e) {
+            log.error("IOException",e);
         }
     }
 

commons/src/main/java/com/jzg/commons/util/UnionPayUtils.java

@@ -1,5 +1,8 @@
 package com.jzg.commons.util;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -7,6 +10,8 @@ import java.util.Random;
 
 public class UnionPayUtils {
 
+    private static final Logger log = LoggerFactory.getLogger(UnionPayUtils.class);
+
 
     /**
      * 生成定长的随机数
@@ -48,11 +53,10 @@ public class UnionPayUtils {
             }
             return hexString.toString();
         } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
+            log.error("NoSuchAlgorithmException",e);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("Exception",e);
         }
-
         return "ERROR";
     }
 

commons/src/main/java/com/jzg/commons/util/comparble/SchemaAnnotationUtils.java

@@ -29,7 +29,7 @@ public class SchemaAnnotationUtils {
             }
             return null;
         } catch (NoSuchFieldException e) {
-            e.printStackTrace();
+            log.error("NoSuchFieldException", e);
         }
         return null;
     }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeAuditServiceImpl.java

@@ -546,7 +546,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
             List<String> orderNos = new ArrayList<>();
             orderNos.add(audit.getOrderNo());
             JSONObject requestData = new JSONObject();
-            requestData.put("orderNos",orderNos);
+            requestData.put("orderNo",orderNos);
             HttpResult httpResult = orgClient.addReceivable(requestData);
             AssertionUtils.isFail(httpResult.getCode() == 500,"应收出错");
 

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

@@ -1378,8 +1378,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         // 比例信息
         if (insFeeOrders != null) {
             resultVo.setInsFeeOrders(new InsFeeOrdersVo(insFeeOrders));
-            List<PtlAgreementCostTypeVo> ptlAgreementCostTypeList = orgClient.queryByCostId(insFeeOrders.getCostId());
-            PtlAgreement ptlAgreement = orgClient.getByAgreementId(insOrdersVo.getInsOrders().getAgreementId());
+            // modify by lipf,  resultVo.setCostRatio(new PtlAgreementCostRatioVo(ptlAgreementCostTypeList, ptlAgreement)); 这一行代码被注视掉，那么上面两个查询也就没有必要调用了
+            // List<PtlAgreementCostTypeVo> ptlAgreementCostTypeList = orgClient.queryByCostId(insFeeOrders.getCostId());
+            //PtlAgreement ptlAgreement = orgClient.getByAgreementId(insOrdersVo.getInsOrders().getAgreementId());
             //resultVo.setCostRatio(new PtlAgreementCostRatioVo(ptlAgreementCostTypeList, ptlAgreement));
             resultVo.setCostRatio(new PtlAgreementCostRatioVo(insFeeOrders));
         }

tenant/organization/src/main/java/com/jzg/organization/controller/AmountAuditingController.java

@@ -137,7 +137,7 @@ public class AmountAuditingController extends BaseController {
      */
     @PostMapping("/applyWithdraw")
     @Operation(summary = "申请提现")
-    public HttpResult applyWithdraw(@RequestBody ApplyWithdrawParam applyWithdrawParam){
-        return sysAmountAuditingService.applyWithdraw(applyWithdrawParam) ? HttpResult.ok("提现成功") : HttpResult.error("提现失败");
+    public HttpResult<String> applyWithdraw(@RequestBody ApplyWithdrawParam applyWithdrawParam){
+        return sysAmountAuditingService.applyWithdraw(applyWithdrawParam);
     }
 }

tenant/organization/src/main/java/com/jzg/organization/controller/AppUserController.java

@@ -1,12 +1,14 @@
 package com.jzg.organization.controller;
 
 
+import cn.hutool.json.JSONUtil;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.AuthInfoAddParam;
 import com.jzg.commons.entity.dto.BusinessInfoAddParam;
 import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.SysUploadFiles;
+import com.jzg.commons.entity.vo.InvitationVo;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
@@ -16,6 +18,8 @@ import com.jzg.organization.service.SysUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.servlet.http.HttpServletRequest;
 import org.redisson.api.RedissonClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,6 +33,7 @@ import java.time.LocalDate;
 @RestController
 @RequestMapping("/appUser")
 public class AppUserController extends BaseController {
+    private static final Logger log = LoggerFactory.getLogger(AppUserController.class);
 
     @Autowired
     private SysUserJzgAppService userJzgAppService;
@@ -153,7 +158,8 @@ public class AppUserController extends BaseController {
 
     @Operation(summary = "邀请码注册")
     @PostMapping("/invitationRegister")
-    public HttpResult invitationRegister(@Validated @RequestBody InvitationAddParam param) {
+    public HttpResult<InvitationVo> invitationRegister(@Validated @RequestBody InvitationAddParam param) {
+        log.info("邀请码注册：param=[{}]", JSONUtil.toJsonStr(param));
         AssertionUtils.isSucceed(userService.validateSmsCode(param.getMobile(), param.getSmsCode()), "短信验证码不通过！");
         param.setToken(getToken());
         return HttpResult.ok(userJzgAppService.invitationRegister(param));

tenant/organization/src/main/java/com/jzg/organization/service/SysAmountAuditingService.java

@@ -49,6 +49,7 @@ public interface SysAmountAuditingService extends IService<SysAmountAuditing> {
 
     /**
      * 提现付款
+     *
      * @param param
      */
     HttpResult<String> verifyAmount(AmountAuditEditParam param);
@@ -82,10 +83,12 @@ public interface SysAmountAuditingService extends IService<SysAmountAuditing> {
 
     /**
      * 申请提现
-     * @param applyWithdrawParam
-     * @return
+     *      有待审核的提现申请的时候，不能再次进行体现申请
+     *
+     * @param applyWithdrawParam 提现申请相关参数
+     * @return HttpResult<String> 业务员提现处理结果
      */
-    Boolean applyWithdraw(ApplyWithdrawParam applyWithdrawParam);
+    HttpResult<String> applyWithdraw(ApplyWithdrawParam applyWithdrawParam);
 
     /**
      * 导出申请列表

tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgInfoBankCardService.java

@@ -9,6 +9,7 @@ import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
 import com.jzg.commons.entity.vo.SysUserJzgInfoBankCardVo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface SysUserJzgInfoBankCardService extends IService<SysUserJzgInfoBankCard> {
 
@@ -20,6 +21,24 @@ public interface SysUserJzgInfoBankCardService extends IService<SysUserJzgInfoBa
      */
     Page<SysUserJzgInfoBankCardDto> getBankCardPageList(Page page, SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo);
 
+    /**
+     * 查询所有的银行卡账号
+     *
+     * @return List<SysUserJzgInfoBankCard>
+     * @author lipf
+     * @date 2026/6/3 14:42
+     */
+    List<SysUserJzgInfoBankCard> queryAllBankCard();
+
+    /**
+     * 查询所有的银行卡账号
+     *
+     * @return Map<String, SysUserJzgInfoBankCard> key 是银行卡号， value是银行卡实体
+     * @author lipf
+     * @date 2026/6/3 14:42
+     */
+    Map<String, SysUserJzgInfoBankCard> queryAllBankCardMap();
+
     List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId, String systemCode);
 
     boolean setDefaultCard(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo);

tenant/organization/src/main/java/com/jzg/organization/service/SysUserService.java

@@ -179,9 +179,9 @@ public interface SysUserService extends IService<SysUser> {
     /**
      * 校验短信验证码
      *
-     * @param mobile
-     * @param smsCode
-     * @return
+     * @param mobile 手机号
+     * @param smsCode 验证码
+     * @return 验证码是否校验成功
      */
     boolean validateSmsCode(String mobile, String smsCode);
 

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

@@ -14,6 +14,7 @@ import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.SysAmountAuditing;
 import com.jzg.commons.entity.po.SysUserAccount;
 import com.jzg.commons.entity.po.SysUserJzgInfo;
+import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
 import com.jzg.commons.entity.vo.AmountAuditVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.AssertionUtils;
@@ -38,6 +39,7 @@ import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
@@ -77,6 +79,14 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     @Override
     public Page<AmountAuditVo> queryPage(AmountAuditParam param) {
         Page<AmountAuditVo> page = baseMapper.queryPage(param.getPage(), param);
+        List<AmountAuditVo> records = page.getRecords();
+        if(CollUtil.isNotEmpty(records)){
+            Map<String, SysUserJzgInfoBankCard> bankCards = sysUserJzgInfoBankCardService.queryAllBankCardMap();
+            for (AmountAuditVo record : records) {
+                SysUserJzgInfoBankCard bankCard = bankCards.getOrDefault(record.getBankCardNum(), new SysUserJzgInfoBankCard());
+                record.setCardHolderName(bankCard.getCardHolderName());
+            }
+        }
         return page;
     }
 
@@ -163,10 +173,16 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
 
     }
 
+    /**
+     * 提现付款
+     *
+     * @param param
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult<String> verifyAmount(AmountAuditEditParam param) {
         String userName = baseController.getUserName();
+        String userId = baseController.getUserId();
         log.info("用户开始进行付款操作。userName=[{}],param=[{}]",userName,JSONUtil.toJsonStr(param));
         if(StrUtil.isEmpty(param.getAccountId())){
             return HttpResult.error("付款账户不能为空");
@@ -188,7 +204,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         }
         if(StringUtils.isNotBlank(audit.getReceiveUser())){
             if(userName.equals(audit.getReceiveUser())){
-                StateResult stateFailResult = auditStateListener.statusChange(AuditState.AuditStateEnum.SUCCESS_AUDIT,audit.getAuditingStatus()+"");
+                StateResult stateFailResult = auditStateListener.statusChange(AuditState.AuditStateEnum.SUCCESS_AUDIT,audit.getAuditingStatus()+"", userName,userId);
                 audit.setAuditingStatus(stateFailResult.getCurrentState());
                 audit.setPicId(param.getPicId());
                 audit.setVoucherId(param.getVoucherId());
@@ -203,7 +219,9 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
                     log.info("账户金额少于提现金额，请审核账户。 userId=[{}}], userAccount.getSumAmount()=[{}],audit.getAmount()=[{}]",userAccount.getUserId(), userAccount.getSumAmount(), audit.getAmount());
                     throw new SystemException("账户金额少于提现金额,请审核账户");
                 }
-                userAccount.setSumAmount(userAccount.getSumAmount().subtract(audit.getAmount()));
+                // 应付总计： 只添加，不减。 modify by lipf ,2026年6月3日14:30:33
+                // sumAmount = sumAmountPaid + SumAmountUnpaid
+                //userAccount.setSumAmount(userAccount.getSumAmount().subtract(audit.getAmount()));
                 userAccount.setSumAmountPaid(userAccount.getSumAmountPaid().add(audit.getAmount()));
                 userAccount.setSumAmountUnpaid(userAccount.getSumAmountUnpaid().subtract(audit.getAmount()));
 
@@ -220,7 +238,8 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     @Override
     public void rejectAmount(AmountAuditRejectParam param) {
         String userName = baseController.getUserName();
-        log.info("用户[{}]驳回体现申请. param=[{}]",userName,JSONUtil.toJsonStr(param));
+        String userId  = baseController.getUserId();
+        log.info("用户[{}][{}]驳回体现申请. param=[{}]",userName,userId, JSONUtil.toJsonStr(param));
         SysAmountAuditing audit = this.getById(param.getId());
         if(audit.getAuditingStatus() > 0){
             if(audit.getAuditingStatus() == 1){
@@ -237,7 +256,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             AssertionUtils.isFail(true, "申请已被"+audit.getReceiveUser()+"领取返回待付款提现申请列表！");
         }
 
-        StateResult stateFailResult = auditStateListener.statusChange(AuditState.AuditStateEnum.FAIL_AUDIT,audit.getAuditingStatus()+"");
+        StateResult stateFailResult = auditStateListener.statusChange(AuditState.AuditStateEnum.FAIL_AUDIT,audit.getAuditingStatus()+"",userName , userId );
         audit.setAuditingStatus(stateFailResult.getCurrentState());
         audit.setRejectReason(param.getRejectReason());
         audit.setRejectPerson(userName);
@@ -255,6 +274,14 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     public Page<AmountAuditVo> myPayment(AmountAuditParam param) {
         log.info("应付账款-我的付款。param=[{}]", JSONUtil.toJsonStr(param));
         Page<AmountAuditVo> amountAuditVoPage = baseMapper.queryPaymentPage(param.getPage(), param, baseController.getUserName());
+        List<AmountAuditVo> records = amountAuditVoPage.getRecords();
+        if(CollUtil.isNotEmpty(records)){
+            Map<String, SysUserJzgInfoBankCard> bankCards = sysUserJzgInfoBankCardService.queryAllBankCardMap();
+            for (AmountAuditVo record : records) {
+                SysUserJzgInfoBankCard bankCard = bankCards.getOrDefault(record.getBankCardNum(), new SysUserJzgInfoBankCard());
+                record.setCardHolderName(bankCard.getCardHolderName());
+            }
+        }
         return amountAuditVoPage;
     }
 
@@ -265,16 +292,22 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     }
 
     @Override
-    public Boolean applyWithdraw(ApplyWithdrawParam applyWithdrawParam) {
+    public HttpResult<String> applyWithdraw(ApplyWithdrawParam applyWithdrawParam) {
         String userName = baseController.getUserName();
         String userId = baseController.getUserId();
         log.info("业务员提交提现申请：userName=[{}],userId=[{}],applyWithdrawParam=[{}]",userId, userName, JSONUtil.toJsonStr(applyWithdrawParam));
+        // 当前有处于待审核状态的提现申请的时候，不能再次提交提现申请 add by lipf,  2026年6月3日14:09:07
+        List<SysAmountAuditing> auditings = baseMapper.queryPaymentByUserId(userId, 0);
+        if(CollUtil.isNotEmpty(auditings)){
+            log.info("用户[{}][{}]存在未审核的提现申请，请审核通过后再继续提现",userId,userName);
+            return HttpResult.error("用户存在未审核的提现申请。请审核通过后再继续提现");
+        }
         if(applyWithdrawParam.getWithdrawAmount().compareTo(BigDecimal.ZERO) <= 0){
             log.info("业务员[{}]提现提现金额不能为负值[{}]",userName, applyWithdrawParam.getWithdrawAmount());
             throw new SystemException("提现金额错误,请重新输入");
         }
         SysUserAccount sysUserAccount = userAccountService.queryByUserId(userId);
-        AssertionUtils.isFail(Objects.isNull(sysUserAccount),"找不到用户");
+        AssertionUtils.isFail(Objects.isNull(sysUserAccount),"找不到用户账号");
 
         // sys_amount_auditing 表中的 balance_amount 字段，表示冻结的金额， 避免重复提现
         // 查询处于提现进程中的申请记录。 汇总其中的冻结金额
@@ -300,7 +333,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         // 构造提现对象
         SysAmountAuditing sysAmountAuditing = new SysAmountAuditing(applyWithdrawParam,sysUserAccount,sysUserJzgInfoBankCardDto,baseController.getUserId());
         baseMapper.insert(sysAmountAuditing);
-        return true;
+        return HttpResult.ok("提现申请完成");
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package com.jzg.organization.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,6 +26,8 @@ import com.jzg.organization.mapper.SysUploadFilesMapper;
 import com.jzg.organization.mapper.SysUserJzgAppMapper;
 import com.jzg.organization.mapper.SysUserMapper;
 import com.jzg.organization.service.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +42,8 @@ import java.util.stream.Collectors;
 @Service
 public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, SysUserJzgApp> implements SysUserJzgAppService {
 
+    private static final Logger log = LoggerFactory.getLogger(SysUserJzgAppServiceImpl.class);
+
     @Autowired
     private SysUserJzgAppMapper sysUserJzgAppMapper;
 
@@ -213,6 +218,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
     @Override
     @Transactional(rollbackFor = Exception.class)
     public InvitationVo invitationRegister(InvitationAddParam param) {
+        log.info("邀请码注册：param=[{}]", JSONUtil.toJsonStr(param));
         try {
             InvitationVo invitationVo = new InvitationVo();
             // 获取邀请人信息
@@ -285,13 +291,14 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
             teamInvitation(yqirInfo, param, userId, sysUserId);
             return invitationVo;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("invitationRegister",e);
             throw new SystemException("程序异常");
         }
     }
 
 
     public void teamInvitation(SysUserJzgInfo info, InvitationAddParam param, String userId, String sysUserId) {
+        log.info("teamInvitation：userId=[{}], sysUserId=[{}],info=[{}], param=[{}]", userId, sysUserId, JSONUtil.toJsonStr(info), JSONUtil.toJsonStr(param));
         try {
             if (StringUtils.isEmpty(userId)) {
                 return;
@@ -321,7 +328,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
 
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("teamInvitation:",e);
         }
     }
 

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

@@ -3,6 +3,7 @@ package com.jzg.organization.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
@@ -18,6 +19,7 @@ import com.jzg.organization.mapper.SysUploadFilesMapper;
 import com.jzg.organization.mapper.SysUserJzgInfoBankCardMapper;
 import com.jzg.organization.mapper.SysUserJzgInfoBankCardRecordMapper;
 import com.jzg.organization.service.SysUserJzgInfoBankCardService;
+import com.jzg.organization.service.SysUserJzgInfoSalesmanService;
 import jakarta.annotation.Resource;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
@@ -27,7 +29,10 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @author quchen
@@ -46,6 +51,9 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
     @Resource
     private SysUserJzgInfoBankCardRecordMapper sysUserJzgInfoBankCardRecordMapper;
 
+    @Resource
+    private SysUserJzgInfoSalesmanService sysUserJzgInfoSalesmanService;
+
     @Resource
     private SysUploadFilesMapper sysUploadFilesMapper;
 
@@ -54,6 +62,36 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
         return sysUserJzgInfoBankCardMapper.getBankCardByUserId(userInfoId,systemCode);
     }
 
+    /**
+     * 查询所有的银行卡账号
+     *
+     * @return List<SysUserJzgInfoBankCard>
+     * @author lipf
+     * @date 2026/6/3 14:42
+     */
+    @Override
+    public List<SysUserJzgInfoBankCard> queryAllBankCard() {
+        List<SysUserJzgInfoBankCard> bankCards = baseMapper.selectList(new QueryWrapper<SysUserJzgInfoBankCard>().eq("is_delete", 0));
+        log.debug("一共查询出[{}]个银行卡", CollUtil.size(bankCards));
+        return bankCards;
+    }
+
+    /**
+     * 查询所有的银行卡账号
+     *
+     * @return Map<String, SysUserJzgInfoBankCard> key 是银行卡号， value是银行卡实体
+     * @author lipf
+     * @date 2026/6/3 14:42
+     */
+    @Override
+    public Map<String, SysUserJzgInfoBankCard> queryAllBankCardMap() {
+        List<SysUserJzgInfoBankCard> bankCards = this.queryAllBankCard();
+        return bankCards.stream()
+                .collect(Collectors.toMap(SysUserJzgInfoBankCard::getBankCardNumber,
+                        Function.identity(),
+                        (o1, o2) -> o1));
+    }
+
     /**
      * 财务管理-业务管账户-查询
      *
@@ -64,6 +102,8 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
     public Page<SysUserJzgInfoBankCardDto> getBankCardPageList(Page page, SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
         log.info("查询业务员账户：sysUserJzgInfoBankCardVo=[{}]", JSONUtil.toJsonStr(sysUserJzgInfoBankCardVo));
         Page<SysUserJzgInfoBankCardDto> pageList = sysUserJzgInfoBankCardMapper.getBankCardPageList(page, sysUserJzgInfoBankCardVo);
+        // 查询业务员类型
+        Map<String, String> typeAttrMap = sysUserJzgInfoSalesmanService.queryYwyTypeAttrMap();
         pageList.getRecords().forEach(sysUserJzgInfoBankCardDto -> {
             if (sysUserJzgInfoBankCardDto.getFileId() != null) {
                 String cardFileId = sysUserJzgInfoBankCardDto.getFileId();
@@ -72,6 +112,9 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
                     sysUserJzgInfoBankCardDto.setCardFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
                 }
             }
+
+            // 设置业务员类型
+            sysUserJzgInfoBankCardDto.setTypeAttr(typeAttrMap.getOrDefault(sysUserJzgInfoBankCardDto.getUsername(), ""));
             List<SysUserJzgInfoBankCardRecord> sysUserJzgInfoBankCardRecordList = sysUserJzgInfoBankCardRecordMapper
                     .selectList(new LambdaQueryWrapper<SysUserJzgInfoBankCardRecord>()
                             .eq(SysUserJzgInfoBankCardRecord::getBankCardId, sysUserJzgInfoBankCardDto.getId()));

tenant/organization/src/main/java/com/jzg/organization/state/listener/AuditStateListener.java

@@ -4,7 +4,8 @@ import com.jzg.commons.core.base.StateResult;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.organization.state.AuditState;
 import jakarta.annotation.Resource;
-import org.checkerframework.checker.units.qual.A;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.statemachine.StateMachine;
@@ -22,6 +23,8 @@ public class AuditStateListener {
     @Resource
     private StateMachine<AuditState.AuditStateEnum, AuditState.AuditStateEvent> auditStateMachine;
 
+    private static final Logger log = LoggerFactory.getLogger(AuditStateListener.class);
+
     private synchronized boolean sendEvent(Mono<Message<AuditState.AuditStateEvent>> message) {
         AtomicBoolean result = new AtomicBoolean(false);
         try {
@@ -47,16 +50,20 @@ public class AuditStateListener {
                 result.set(true);
             }
         } catch (Exception e) {
-
+            log.error("AuditStateListener error", e);
         } finally {
             auditStateMachine.stopReactively();
             return result.get();
         }
     }
 
-    private StateResult callEvent(String auditStatus, AuditState.AuditStateEvent event) {
+    private StateResult callEvent(String auditStatus, AuditState.AuditStateEvent event, String userName, String userId) {
         StateResult stateResult = new StateResult();
-        Mono<Message<AuditState.AuditStateEvent>> message = Mono.just(MessageBuilder.withPayload(event).setHeader("entity",auditStatus).build());
+        Mono<Message<AuditState.AuditStateEvent>> message = Mono.just(MessageBuilder.withPayload(event)
+                .setHeader("entity",auditStatus)
+                .setHeader("userName",userName)
+                .setHeader("userId",userId)
+                .build());
         stateResult.setResult(sendEvent(message));
         stateResult.setCurrentState(auditStateMachine.getState().getId().getValue());
         return stateResult;
@@ -64,32 +71,38 @@ public class AuditStateListener {
 
     /**
      * 审核失败
+     *
      * @param cureentStatus
+     * @param userName
+     * @param userId
      * @return
      */
-    public StateResult auditFail(String cureentStatus) {
-        return callEvent(cureentStatus, AuditState.AuditStateEvent.AUDIT_FAIL_EVENT);
+    public StateResult auditFail(String cureentStatus, String userName, String userId) {
+        return callEvent(cureentStatus, AuditState.AuditStateEvent.AUDIT_FAIL_EVENT, userName, userId);
     }
 
     /**
      * 审核成功
+     *
      * @param currentStatus
+     * @param userName 审核用户
+     * @param userId 审核用户的序号
      * @return
      */
-    public StateResult auditSuccess(String currentStatus) {
-        return callEvent(currentStatus, AuditState.AuditStateEvent.AUDIT_SUCCESS_EVENT);
+    public StateResult auditSuccess(String currentStatus, String userName, String userId) {
+        return callEvent(currentStatus, AuditState.AuditStateEvent.AUDIT_SUCCESS_EVENT,userName ,userId);
     }
 
-    public StateResult statusChange(AuditState.AuditStateEnum auditStateEnum, String currentStatus) {
+    public StateResult statusChange(AuditState.AuditStateEnum auditStateEnum, String currentStatus, String userName, String userId) {
         StateResult stateResult = new StateResult();
         switch(auditStateEnum){
             //审核失败
             case FAIL_AUDIT -> {
-                stateResult = this.auditFail(currentStatus);
+                stateResult = this.auditFail(currentStatus, userName,userId );
             }
             //审核成功
             case SUCCESS_AUDIT -> {
-                stateResult = this.auditSuccess(currentStatus);
+                stateResult = this.auditSuccess(currentStatus,userName,userId);
             }
             default -> {
                 stateResult.setResult(false);

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

@@ -21,6 +21,9 @@
         <result column="review_description" property="reviewDescription" jdbcType="VARCHAR"/>
         <result column="agreement_code" property="ptlAgreementCode" jdbcType="VARCHAR"/>
         <result column="agreement_title" property="ptlAgreementName" jdbcType="VARCHAR"/>
+        <result column="jq_entrance_fee_ratio" property="jqEntranceFeeRatio" jdbcType="VARCHAR"/>
+        <result column="sy_entrance_fee_ratio" property="syEntranceFeeRatio" jdbcType="VARCHAR"/>
+        <result column="jy_entrance_fee_ratio" property="jyEntranceFeeRatio" jdbcType="VARCHAR"/>
         <result column="priority_level" property="priorityLevel" jdbcType="INTEGER"/>
         <collection property="ptlAgreementCostTypeList" column="{costId=id}" ofType="com.jzg.commons.entity.vo.PtlAgreementCostTypeVo" select="selectCostType" />
         <collection property="ruleConditions" column="{costId=id}" ofType="com.jzg.commons.entity.vo.PtlAgreementCostRuleVo" select="selectCostRule" />
@@ -220,7 +223,10 @@
             t.audit_time,
             t.priority_level,
             pa.agreement_code,
-            pa.agreement_title
+            pa.agreement_title,
+            pa.jq_entrance_fee_ratio,
+            pa.sy_entrance_fee_ratio,
+            pa.jy_entrance_fee_ratio
         FROM
             ptl_agreement_cost t
             LEFT JOIN ptl_agreement pa ON pa.id = t.ptl_agreement_id

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

@@ -158,7 +158,8 @@
         saa.account_name AS accountName ,
         saa.bank_card_num AS bankCardNum,
         saa.bank_name AS bankName,
-        saa.bank_num AS bankNum
+        saa.bank_num AS bankNum,
+        saa.auditing_time
         FROM sys_amount_auditing saa
         LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id
         LEFT JOIN sys_user su on su.id = saa.user_id

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

@@ -41,6 +41,7 @@
         suji.name as name,
         suji.work_number as workNumber,
         su.mobile as mobile,
+        su.username as username,
         suji.type_attr as typeAttr,
         ss.sys_name as systemName,
         ( select uu.name from sys_user_jzg_info uu where uu.id = suji.leader_id ) as leaderName