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

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

@@ -49,6 +49,10 @@ public class SysAmountAuditing extends BaseModel {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime auditingTime;
 
+    @Schema(description = "支付时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime paymentTime;
+
     @Schema(description = "审核人id")
     private String auditingUserId;
 

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

@@ -39,6 +39,10 @@ public class AmountAuditVo  extends BaseModel {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
+    @Schema(description = "支付时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime paymentTime;
+
     @Schema(description = "提现金额")
     private BigDecimal amount;
 

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/entity/request/AuditRequest.java

@@ -158,6 +158,9 @@ public class AuditRequest {
         @JacksonXmlProperty(localName = "ywFlag")
         private String ywFlag;
 
+        @JacksonXmlProperty(localName = "CBodyColor")
+        private String cBodyColor;
+
 
         @Data
         @NoArgsConstructor
@@ -384,6 +387,8 @@ public class AuditRequest {
         condition.setCProdNoSY(condition.getSyFlag().equals("1") ? "0364" : "");
         condition.setCProdNoJQ(condition.getJqFlag().equals("1") ? "0326" : "");
         condition.setQuerySequenceNoSy(underwritingVo.getPolicy().getSyApplyNo());
+        // 设置默认车身颜色为02（黑色）
+        condition.setCBodyColor("02");
         condition.setQuerySequenceNoJq(underwritingVo.getPolicy().getJqApplyNo());
         condition.setCommissionPercentage("0");
         condition.setPaymode("002018");

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

@@ -46,7 +46,8 @@
         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, suji.id as userJzgInfoId
+        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
         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