Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260518' into dev_jzg_lipf_v20260518

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

@@ -99,10 +99,6 @@ public class SysAmountAuditing extends BaseModel {
     @Schema(description = "系统code")
     private String systemCode;
 
-    // 解决对应mapper报错的问题
-    private String bankNumber;
-
-
     /**
      * 构造提现
      * @param applyWithdrawParam

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

@@ -1,21 +1,23 @@
 package com.jzg.commons.entity.vo;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+import java.io.Serial;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+@EqualsAndHashCode(callSuper = true)
 @Schema(description = "提现申请表VO")
 @Data
 public class AmountAuditVo  extends BaseModel {
 
+    @Serial
+    private static final long serialVersionUID = 4658187667789639800L;
     @ExcelProperty("主键")
     @Schema(description = "主键")
     private String id;
@@ -91,4 +93,17 @@ public class AmountAuditVo  extends BaseModel {
     @Schema(description = "驳回人")
     private String rejectPerson;
 
+    @Schema(description = "提现人")
+    private String withdrawalRequester;
+
+    @Schema(description = "提现时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime withdrawalRequestTime;
+
+    @Schema(description = "审核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime auditingTime;
+
+    @Schema(description = "凭证号")
+    private String voucherId;
 }

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/request/GuoRenCrawlerGetCarPriceRequest.java

@@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
+import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
 import com.jzg.quotation.commons.utils.TimeProcessing;
 import com.jzg.quotation.guoren.crawler.entity.dto.PrpTMainDTO;
 import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerQueryByVinNoData;
-import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerQueryCarModelData;
 import com.jzg.quotation.guoren.crawler.entity.response.GuoRenCrawlerWriteBackAddressData;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -622,15 +622,17 @@ public class GuoRenCrawlerGetCarPriceRequest {
 
         CarInfoVo carInfoVo = quoteVo.getCarInfoVo();
         CustomerInfoVo ownersInfo = quoteVo.getOwnersInfo();
+        InsOrdersOtherInfoVo otherInfo = quoteVo.getOtherInfo();
+
         this.licenseNo = carInfoVo.getLicenseNo();
         this.vinNo = carInfoVo.getVinNo();
         this.engineNo = carInfoVo.getEngineNo();
         this.carIdentifyType = "01";
         this.rateCode = "20";
         this.loanVehicleFlag = "0";
-        this.chgOwnerFlag = "0";
-        this.ciChgOwnerFlag = "0";
-        this.biChgOwnerFlag = "0";
+        this.chgOwnerFlag =String.valueOf(otherInfo.getTransfer());
+        this.ciChgOwnerFlag = String.valueOf(otherInfo.getTransfer());
+        this.biChgOwnerFlag = String.valueOf(otherInfo.getTransfer());
         this.newDeviceFlag = "0";
         this.chargingpostFlag = "0";
         this.productType = "0101";

tenant/insurance/quotation-hengbang/src/main/java/com/jzg/quotation/hengbang/crawler/service/Impl/HengBangCrawlerRequestImpl.java

@@ -42,17 +42,15 @@ import com.jzg.quotation.hengbang.crawler.properties.HengBangCrawlerProperties;
 import com.jzg.quotation.hengbang.crawler.service.HbCrawlerOrderService;
 import com.jzg.quotation.hengbang.crawler.service.HengBangCrawlerRequest;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.compress.utils.IOUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.StringUtils;
 
-
-import java.io.IOException;
-import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -183,7 +181,7 @@ public class HengBangCrawlerRequestImpl implements HengBangCrawlerRequest {
             status = JSONObject.parseObject(resJson).getString("status");
         }
 
-        if (errorMsg.equals("成功") || status.equals("9")) {
+        if (errorMsg.equals("成功")) {
             errorMsg = "成功";
             // 5.2 报价第三步，获取报价数据
             proposalResponse = hbCrawlerRequestComponent.proposal(plyappno, headers);

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangSubmitRequest.java

@@ -8,6 +8,7 @@ import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersCosts;
 import com.jzg.commons.entity.quote.vo.aggregated.UnderwritingVo;
+import com.jzg.commons.util.StringUtils;
 import com.jzg.quotation.yangguang.api.entity.YangGuangConfigureParameters;
 import com.jzg.quotation.yangguang.api.entity.po.YangGuangApiOrder;
 import lombok.Data;

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangApiOrderServiceImpl.java

@@ -29,7 +29,7 @@ public class YangGuangApiOrderServiceImpl implements YangGuangApiOrderService {
         yangGuangApiOrder.setOrdersNo(quoteVo.getOrder().getOrdersNo());
         yangGuangApiOrder.setProductsCode(quoteVo.getProductId());
         List<YangGuangAccuracyCalculateResponse.PtptNonVehicleProductInformationList> list = yangGuangAccuracyCalculateResponse.getPtptNonVehicleProductInformationList();
-        yangGuangApiOrder.setCrossInsurance(list.toString());
+        yangGuangApiOrder.setCrossInsurance(JSON.toJSONString(list));
         yangGuangApiOrder.setInfotransNo(yangGuangAccuracyCalculateResponse.getInfotransNo());
         yangGuangApiOrderRepository.save(yangGuangApiOrder);
     }

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

@@ -95,13 +95,13 @@ public class AmountAuditingController extends BaseController {
 
     /**
      * 提现付款
-     * @return
+     *
+     * @return HttpResult<String>
      */
     @PostMapping("/verifyAmount")
     @Operation(summary = "提现付款")
-    public HttpResult verifyAmount(@RequestBody AmountAuditEditParam param){
-        sysAmountAuditingService.verifyAmount(param);
-        return HttpResult.ok("提现审核成功");
+    public HttpResult<String> verifyAmount(@RequestBody AmountAuditEditParam param){
+        return sysAmountAuditingService.verifyAmount(param);
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.jzg.organization.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.AmountAuditEditParam;
 import com.jzg.commons.entity.dto.AmountAuditParam;
 import com.jzg.commons.entity.dto.AmountAuditRejectParam;
@@ -50,7 +51,7 @@ public interface SysAmountAuditingService extends IService<SysAmountAuditing> {
      * 提现付款
      * @param param
      */
-    void verifyAmount(AmountAuditEditParam param);
+    HttpResult<String> verifyAmount(AmountAuditEditParam param);
 
     /**
      * 提现驳回

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

@@ -1,6 +1,7 @@
 package com.jzg.organization.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.base.StateResult;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.SysAmountAuditing;
 import com.jzg.commons.entity.po.SysUserAccount;
@@ -163,9 +165,12 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void verifyAmount(AmountAuditEditParam param) {
+    public HttpResult<String> verifyAmount(AmountAuditEditParam param) {
         String userName = baseController.getUserName();
         log.info("用户开始进行付款操作。userName=[{}],param=[{}]",userName,JSONUtil.toJsonStr(param));
+        if(StrUtil.isEmpty(param.getAccountId())){
+            return HttpResult.error("付款账户不能为空");
+        }
         SysAmountAuditing audit = this.getById(param.getId());
         if(audit.getAuditingStatus() > 0){
             if(audit.getAuditingStatus() == 1){
@@ -209,6 +214,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         }else{
             AssertionUtils.isFail(true, "提现申请未领取");
         }
+        return HttpResult.ok("提现审核成功");
     }
 
     @Override

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

@@ -6,7 +6,6 @@
 
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.po.SysAmountAuditing">
             <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="bankNumber" column="bank_number" jdbcType="VARCHAR"/>
             <result property="amount" column="amount" jdbcType="DECIMAL"/>
             <result property="balanceAmount" column="balance_amount" jdbcType="DECIMAL"/>
             <result property="userId" column="user_id" jdbcType="VARCHAR"/>
@@ -143,10 +142,23 @@
 
     <select id="queryPaymentPage" resultType="com.jzg.commons.entity.vo.AmountAuditVo">
         SELECT
-        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.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
+        saa.id,
+        saa.create_by as withdrawal_requester,
+        saa.create_time as withdrawal_request_time,
+        saa.voucher_id,
+        saa.auditing_time,
+        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.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
         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