合伙人锁定时候解锁bug修改

src/main/java/com/ydtech/modules/partner/dao/PartnerLiftingRecordMapper.java

@@ -21,7 +21,10 @@ public interface PartnerLiftingRecordMapper extends BaseMapper<PartnerLiftingRec
     @Select("select audit_status as auditStatus,count(1) as count from partner_lifting_record group by audit_status")
     List<Map<String, Object>> groupByAuditStatus();
 
-    @Select("SELECT r.id,r.`name`,r.mobile,r.user_id,r.dept_id,r.type,r.original_level,r.after_change,r.cycle,r.upgrade_strategy,r.audit_status,r.audit_time,r.audit_user,r.reject_reason,r.conditions,r.rules,r.create_time,r.upgrade_type,( SELECT `name` FROM sys_dept WHERE sys_dept.id = r.dept_id ) dept_name FROM partner_lifting_record r ${ew.customSqlSegment} ")
+    @Select("SELECT r.id,r.`name`,r.mobile,r.user_id,r.dept_id,r.type,r.original_level,r.after_change,r.cycle,r.upgrade_strategy,r.audit_status,r.audit_time,r.audit_user,r.reject_reason,r.conditions, " +
+            " r.rules,r.create_time,r.upgrade_type,( SELECT `name` FROM sys_dept WHERE sys_dept.id = r.dept_id ) dept_name , " +
+            " (SELECT SUM(extract_fee) FROM partner_premium_details d WHERE d.app_status = 1 AND d.user_id = r.user_id AND d.source = r.original_level) frozenAmount " +
+            " FROM partner_lifting_record r ${ew.customSqlSegment} ")
     Page<PartnerLiftingRecord> queryPage(Page page,@Param("ew") QueryWrapper<PartnerLiftingRecord> queryWrapper);
 
     @Select("SELECT * FROM partner_lifting_record WHERE type = 1 AND audit_status = 0 AND DATE(DATE_ADD(create_time, INTERVAL #{expireDays} DAY)) =  CURDATE() ")

src/main/java/com/ydtech/modules/partner/model/PartnerLiftingRecord.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.partner.model;
 
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydtech.modules.base.model.BaseEntity;
@@ -94,4 +93,11 @@ public class PartnerLiftingRecord extends BaseEntity {
     @TableField(value = "update_time")
     private Date updateTime;
 
+
+    /**
+     * 冻结金额
+     */
+    @TableField(exist = false)
+    private String frozenAmount;
+
 }