Jelajahi Sumber

我的审核部分表添加租户代码

lipf 4 bulan lalu
induk
melakukan
4139ee15cd

+ 6 - 1
commons/src/main/java/com/jzg/commons/entity/orders/po/InsFeeAudit.java

@@ -9,11 +9,13 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.core.base.BaseModel;
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 
 /**
 /**
  * 订单审核表
  * 订单审核表
- * @TableName ins_fee_audit
+ * ins_fee_audit
  */
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Data
 @Schema(description = "订单审核表")
 @Schema(description = "订单审核表")
 public class InsFeeAudit extends BaseModel {
 public class InsFeeAudit extends BaseModel {
@@ -34,6 +36,9 @@ public class InsFeeAudit extends BaseModel {
     @Schema(description = "审核人")
     @Schema(description = "审核人")
     private String auditUser;
     private String auditUser;
 
 
+    @Schema(description = "租户代码")
+    private String systemCode;
+
     @Schema(description = "领取时间")
     @Schema(description = "领取时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime receiveTime;
     private LocalDateTime receiveTime;

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrders.java

@@ -22,6 +22,9 @@ public class InsOrders extends BaseModel {
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
     private String id;
 
 
+    @Schema(description = "租户代码")
+    private String systemCode;
+
     @Schema(description = "parentId")
     @Schema(description = "parentId")
     private String parentId;
     private String parentId;
 
 

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/po/InsFeeOrders.java

@@ -25,6 +25,9 @@ public class InsFeeOrders {
     @TableId
     @TableId
     private String orderNo;
     private String orderNo;
 
 
+    @Schema(description = "租户代码")
+    private String systemCode;
+
     @Schema(description = "协议id")
     @Schema(description = "协议id")
     private String agreementId;
     private String agreementId;
 
 

+ 2 - 2
commons/src/main/java/com/jzg/commons/entity/po/SysAmountAuditing.java

@@ -114,8 +114,8 @@ public class SysAmountAuditing extends BaseModel {
     ){
     ){
         // 提现金额
         // 提现金额
         this.setAmount(applyWithdrawParam.getWithdrawAmount());
         this.setAmount(applyWithdrawParam.getWithdrawAmount());
-        // 当前账户金额
-        this.setBalanceAmount(sysUserAccount.getSumAmount());
+        // 当前账户金额 modify by lipf 2026年6月3日16:55:06 账户中剩余的金额。 该金额 是没有扣除当前提现金额的金额
+        this.setBalanceAmount(sysUserAccount.getSumAmountUnpaid());
         // 提现用户
         // 提现用户
         this.setUserId(userId);
         this.setUserId(userId);
         // 银行卡卡号
         // 银行卡卡号

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/po/SysUserAccount.java

@@ -40,6 +40,9 @@ public class SysUserAccount extends BaseModel {
     @Schema(description = "积分")
     @Schema(description = "积分")
     private BigDecimal integral;
     private BigDecimal integral;
 
 
+    @Schema(description = "租户代码")
+    private String systemCode;
+
     public BigDecimal getSumAmount() {
     public BigDecimal getSumAmount() {
         return Objects.requireNonNullElse(this.sumAmount, BigDecimal.ZERO);
         return Objects.requireNonNullElse(this.sumAmount, BigDecimal.ZERO);
     }
     }

+ 7 - 1
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsFeeAuditMapper.java

@@ -12,11 +12,17 @@ import java.util.List;
 /**
 /**
 * @author dongxin
 * @author dongxin
 * @description 针对表【ins_fee_audit(订单审核表)】的数据库操作Mapper
 * @description 针对表【ins_fee_audit(订单审核表)】的数据库操作Mapper
-* @createDate 2025-07-02 14:35:50
+* @date 2025-07-02 14:35:50
 * @Entity generator.domain.InsFeeAudit
 * @Entity generator.domain.InsFeeAudit
 */
 */
 public interface InsFeeAuditMapper extends BaseMapper<InsFeeAudit> {
 public interface InsFeeAuditMapper extends BaseMapper<InsFeeAudit> {
 
 
+    /**
+     * 查询订单审核信息
+     *
+     * @author lipf
+     * @date 2026/6/3 17:48
+     */
     Page<FeeAuditVo> queryPage(Page page, @Param("param") FeeAuditParam param);
     Page<FeeAuditVo> queryPage(Page page, @Param("param") FeeAuditParam param);
 
 
     List<FeeAuditVo> queryList(Page page, @Param("param") FeeAuditParam param);
     List<FeeAuditVo> queryList(Page page, @Param("param") FeeAuditParam param);

+ 1 - 1
tenant/insurance/quotation-summary/src/main/resources/mapper/InsFeeAuditMapper.xml

@@ -79,7 +79,7 @@
         LEFT JOIN ins_orders_costs ioc on ioc.order_no = io.id AND ioc.is_delete=0
         LEFT JOIN ins_orders_costs ioc on ioc.order_no = io.id AND ioc.is_delete=0
         LEFT JOIN ins_orders_external_policy ioep on ioep.order_no = io.id AND ioep.is_delete=0
         LEFT JOIN ins_orders_external_policy ioep on ioep.order_no = io.id AND ioep.is_delete=0
         <where>
         <where>
-            and ifa.is_delete=0
+            and ifa.is_delete=0 and ifa.system_code = #{param.systemCode}
             <choose>
             <choose>
                 <when test="param.receiveUser != null and param.receiveUser != ''">
                 <when test="param.receiveUser != null and param.receiveUser != ''">
                     and ifa.receive_user = #{param.receiveUser}
                     and ifa.receive_user = #{param.receiveUser}

+ 0 - 1
tenant/organization/src/main/resources/application.yml

@@ -88,7 +88,6 @@ tenant:
     - ins_ply_income_invoice
     - ins_ply_income_invoice
     - ins_ply_income_invoice_settlement
     - ins_ply_income_invoice_settlement
     - esm_user_referrer
     - esm_user_referrer
-    - sys_user_account
     - ins_ply_income_invoice_settlement_file
     - ins_ply_income_invoice_settlement_file
     - wechat_customer_service
     - wechat_customer_service
     - wechat_customer_service_duty
     - wechat_customer_service_duty