冻结解冻日切

cif-api/src/main/java/com/txz/cif/param/FreezdParam.java

@@ -47,6 +47,11 @@ public class FreezdParam implements Serializable {
      */
     private Integer bizType;
 
+    /**
+     * 账户类型 1钱包账户 2收益账户
+     */
+    private Integer accountType;
+
 
     /**
      * 交易时间

cif-service/src/main/java/com/txz/cif/dao/AccountFlowMapper.java

@@ -11,4 +11,5 @@ import java.util.Map;
 public interface AccountFlowMapper extends Mapper<AccountFlow> {
 
 
+    BigDecimal sumOccur(Map<String, Object> map);
 }

cif-service/src/main/java/com/txz/cif/model/BizLog.java

@@ -35,7 +35,7 @@ public class BizLog {
     /**
      * type类型1提交充值订单 2充值调用第三方 3充值回调通知成功 4提交提现申请 5提现审核通过 6提现审核失败 7提现调用第三方 8提现回调通知成功
      */
-    @ApiModelProperty(value="type类型1提交充值订单 2充值调用第三方 3充值回调通知成功 4提交提现申请 5提现审核通过 6提现审核失败 7提现调用第三方 8提现回调通知成功")
+    @ApiModelProperty(value="type类型1提交充值订单 2充值调用第三方 3充值回调通知成功 4提交提现申请 5提现审核通过 6提现审核失败 7提现调用第三方 8提现回调通知成功 9提现回调通知失败")
     private Integer type;
 
     /**

cif-service/src/main/java/com/txz/cif/model/WithdrawRecord.java

@@ -38,6 +38,13 @@ public class WithdrawRecord {
     @ApiModelProperty(value="userId用户id")
     private Long userId;
 
+
+    @Column(name = "freeze_id")
+    @ApiModelProperty(value="冻结id")
+    private Long freezeId;
+
+
+
     /**
      * 交易金额
      */

cif-service/src/main/java/com/txz/cif/service/AccountFlowService.java

@@ -13,4 +13,13 @@ import java.util.Map;
 public interface AccountFlowService extends Service<AccountFlow> {
 
 
+    /**
+     * 查询某个科目下时间段的出入流水总金额
+     * @param aliases 获取别名（101）
+     * @param type 类型 1出金 2入金
+     * @param startTime 开始时间 2022-10-01 00:00:00 包含
+     * @param endTime 结束时间 2022-10-02 00:00:00 不包含
+     * @return
+     */
+    BigDecimal sumOccur(String aliases, int type, String startTime, String endTime);
 }

cif-service/src/main/java/com/txz/cif/service/FlowService.java

@@ -10,6 +10,18 @@ import com.txz.cif.param.*;
 public interface FlowService extends Service<Flow> {
 
 
+    /**
+     * 冻结
+     * @param param
+     * @return 流水号
+     */
+    Result freeze(FreezdParam param);
+
+    /**
+     * 解冻（全额解冻）
+     * @param freezdId
+     */
+    Result unFreeze(Long freezdId);
 
     /**
      * 充值

cif-service/src/main/java/com/txz/cif/service/WithdrawRecordService.java

@@ -11,4 +11,8 @@ public interface WithdrawRecordService extends Service<WithdrawRecord> {
     void add(WithdrawRecord withdrawRecord);
 
     void review(WithdrawRecord build);
+
+    void success(WithdrawRecord record);
+
+    void fail(WithdrawRecord record);
 }

cif-service/src/main/java/com/txz/cif/service/impl/AccountFlowServiceImpl.java

@@ -23,4 +23,15 @@ public class AccountFlowServiceImpl extends AbstractService<AccountFlow> impleme
     @Resource
     private AccountFlowMapper cAccountFlowMapper;
 
+    @Override
+    public BigDecimal sumOccur(String aliases, int type, String startTime,
+                               String endTime) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("aliases",aliases);
+        map.put("type",type);
+        map.put("startTime",startTime);
+        map.put("endTime",endTime);
+        return cAccountFlowMapper.sumOccur(map);
+    }
+
 }

cif-service/src/main/java/com/txz/cif/service/impl/AccountServiceImpl.java

@@ -194,12 +194,12 @@ public class AccountServiceImpl extends AbstractService<Account> implements Acco
     @Override
     public BigDecimal sumInit(String aliases) {
         //查询当日所有初始上日余额
-        BigDecimal today =  cAccountMapper.sumTodayInit(aliases+"%");
+        BigDecimal today =  cAccountMapper.sumTodayInit(aliases);
         if (today == null){
             today = BigDecimal.ZERO;
         }
         //查询非当日所有初始上日余额
-        BigDecimal befor =  cAccountMapper.sumBeforInit(aliases+"%");
+        BigDecimal befor =  cAccountMapper.sumBeforInit(aliases);
         if (befor == null){
             befor = BigDecimal.ZERO;
         }
@@ -209,12 +209,12 @@ public class AccountServiceImpl extends AbstractService<Account> implements Acco
     @Override
     public BigDecimal sumEnd(String aliases) {
 
-        BigDecimal today =  cAccountMapper.sumTodayEnd(aliases+"%");
+        BigDecimal today =  cAccountMapper.sumTodayEnd(aliases);
         if (today == null){
             today = BigDecimal.ZERO;
         }
         //查询非当日所有初始上日余额
-        BigDecimal befor =  cAccountMapper.sumBeforEnd(aliases+"%");
+        BigDecimal befor =  cAccountMapper.sumBeforEnd(aliases);
         if (befor == null){
             befor = BigDecimal.ZERO;
         }

cif-service/src/main/java/com/txz/cif/service/impl/DayCutServiceImpl.java

@@ -93,26 +93,26 @@ public class DayCutServiceImpl extends AbstractService<DayCut> implements DayCut
             }
             //类型 1出金 2入金
             //借方发生额
-//            BigDecimal debitAmount = accountFlowService.sumOccur(subject.getAliases(),
-//                    StrUtil.equals("D",subject.getDirection())? 2 : 1,
-//                    DateUtil.format(yesterday,"yyyy-MM-DD")+" 00:00:00",DateUtil.today()+" 00:00:00");
-//            if (debitAmount == null){
-//                debitAmount = BigDecimal.ZERO;
-//            }
+            BigDecimal debitAmount = accountFlowService.sumOccur(subject.getAliases(),
+                    StrUtil.equals("D",subject.getDirection())? 2 : 1,
+                    DateUtil.format(yesterday,"yyyy-MM-DD")+" 00:00:00",DateUtil.today()+" 00:00:00");
+            if (debitAmount == null){
+                debitAmount = BigDecimal.ZERO;
+            }
             //贷方发生额
-//            BigDecimal creditAmount = accountFlowService.sumOccur(subject.getAliases(),
-//                    StrUtil.equals("C",subject.getDirection())? 2 : 1,
-//                    DateUtil.format(yesterday,"yyyy-MM-DD")+" 00:00:00",DateUtil.today()+" 00:00:00");
-//            if (creditAmount == null){
-//                creditAmount = BigDecimal.ZERO;
-//            }
+            BigDecimal creditAmount = accountFlowService.sumOccur(subject.getAliases(),
+                    StrUtil.equals("C",subject.getDirection())? 2 : 1,
+                    DateUtil.format(yesterday,"yyyy-MM-DD")+" 00:00:00",DateUtil.today()+" 00:00:00");
+            if (creditAmount == null){
+                creditAmount = BigDecimal.ZERO;
+            }
             //保存日切数据
-//            DayCut dayCut = DayCut.builder().subjectId(subject.getId()).day(yesterday)
-//                    .creditAmount(creditAmount)
-//                    .debitAmount(debitAmount)
-//                    .createTime(DateUtil.date()).endAmount(endAmount)
-//                    .initAmount(initAmount).build();
-//            save(dayCut);
+            DayCut dayCut = DayCut.builder().subjectId(subject.getId()).day(yesterday)
+                    .creditAmount(creditAmount)
+                    .debitAmount(debitAmount)
+                    .createTime(DateUtil.date()).endAmount(endAmount)
+                    .initAmount(initAmount).build();
+            save(dayCut);
             if (StrUtil.equals("D",subject.getDirection())){
                 totalDebit = totalDebit.add(endAmount);
             } else if (StrUtil.equals("C",subject.getDirection())){

cif-service/src/main/java/com/txz/cif/service/impl/FlowServiceImpl.java

@@ -6,6 +6,7 @@ import com.txz.cif.dao.FlowMapper;
 import com.txz.cif.dto.Result;
 import com.txz.cif.model.Account;
 import com.txz.cif.model.AccountFlow;
+import com.txz.cif.model.AccountFreezd;
 import com.txz.cif.model.Flow;
 import com.txz.cif.param.*;
 import com.txz.cif.service.AccountFlowService;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -39,69 +41,69 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
     @Resource
     private AccountFreezdService accountFreezdService;
 
-//    @Override
-//    public Result freeze(FreezdParam param) {
-//        try{
-//            Account account = accountService.findById(param.getAccountId());
-//            if (account == null){
-//                return Result.genFailResult("账号未找到");
-//            }
-//            if (account.getEffectiveBalance().subtract(param.getAmount()).compareTo(BigDecimal.ZERO) < 0){
-//                return Result.genFailResult("冻结金额不足");
-//            }
-//            Date today = DateUtil.date();
-//
-//            Flow flow = Flow.builder().amount(param.getAmount()).bizType(param.getBizType())
-//                    .bizNo(param.getBizNo()).createTime(today).updateTime(today).transTime(param.getTransTime())
-//                    .debitAccount(param.getAccountId()).creditAccount(param.getAccountId())
-//                    .bizId(param.getBizId()).type(4)
-//                    .build();
-//            saveUseGeneratedKeys(flow);
-//            accountService.deal(AccountFlow.builder().accountId(param.getAccountId()).amount(flow.getAmount())
-//                    .bizId(flow.getBizId()).aliases(account.getAliases()).transTime(param.getTransTime())
-//                    .bizNo(flow.getBizNo()).balance(account.getBalance()).freezeAmount(account.getFreezeAmount().add(param.getAmount()))
-//                    .flowType(4).type(1).bizType(param.getBizType()).flowId(flow.getId()).build());
-//            AccountFreezd freezd = AccountFreezd.builder().accountId(param.getAccountId()).flowId(flow.getId())
-//                    .amount(param.getAmount()).createTime(today).unfreezeAmount(BigDecimal.ZERO)
-//                    .updateTime(today).status(1).build();
-//            accountFreezdService.saveUseGeneratedKeys(freezd);
-//            return Result.genSuccessResult(freezd.getId());
-//        }catch (Exception e){
-//            log.error("冻结异常",e);
-//            return Result.genFailResult("冻结异常",e);
-//        }
-//
-//    }
+    @Override
+    public Result freeze(FreezdParam param) {
+        try{
+            Account account = accountService.getAccount(param.getUserId(),param.getAccountType());
+            if (account == null){
+                return Result.genFailResult("账号未找到");
+            }
+            if (account.getEffectiveBalance().subtract(param.getAmount()).compareTo(BigDecimal.ZERO) < 0){
+                return Result.genFailResult("冻结金额不足");
+            }
+            Date today = DateUtil.date();
 
-//    @Override
-//    public Result unFreeze(Long freezdId) {
-//        AccountFreezd freezd = accountFreezdService.findById(freezdId);
-//        if (freezd == null){
-//            return Result.genFailResult("冻结记录未找到");
-//        }
-//        Flow oldFlow = findById(freezd.getFlowId());
-//        if (oldFlow == null){
-//            return Result.genFailResult("冻结记录未找到");
-//        }
-//
-//        Account account = accountService.findById(freezd.getAccountId());
-//        if (account == null){
-//            return Result.genFailResult("冻结账号未找到");
-//        }
-//        Date today = DateUtil.date();
-//        Flow flow = Flow.builder().amount(freezd.getAmount()).bizType(5001)
-//                .bizNo(oldFlow.getBizNo()).createTime(today).updateTime(today).transTime(today)
-//                .debitAccount(oldFlow.getDebitAccount()).creditAccount(oldFlow.getCreditAccount())
-//                .bizId(oldFlow.getBizId()).type(5)
-//                .build();
-//        saveUseGeneratedKeys(flow);
-//        accountService.deal(AccountFlow.builder().accountId(oldFlow.getDebitAccount()).amount(flow.getAmount())
-//                .bizId(flow.getBizId()).aliases(account.getAliases()).transTime(today)
-//                .bizNo(flow.getBizNo()).balance(account.getBalance()).freezeAmount(account.getFreezeAmount().subtract(oldFlow.getAmount()))
-//                .flowType(5).type(2).bizType(flow.getBizType()).flowId(flow.getId()).build());
-//        accountFreezdService.update(AccountFreezd.builder().id(freezdId).status(3).unfreezeAmount(oldFlow.getAmount()).build());
-//        return Result.genSuccessResult();
-//    }
+            Flow flow = Flow.builder().amount(param.getAmount()).bizType(param.getBizType())
+                    .bizNo(param.getBizNo()).createTime(today).updateTime(today).transTime(param.getTransTime())
+                    .debitAccount(account.getId()).creditAccount(account.getId())
+                    .bizId(param.getBizId()).type(4)
+                    .build();
+            saveUseGeneratedKeys(flow);
+            accountService.deal(AccountFlow.builder().accountId(account.getId()).amount(flow.getAmount())
+                    .bizId(flow.getBizId()).aliases(account.getAliases()).transTime(param.getTransTime())
+                    .bizNo(flow.getBizNo()).balance(account.getBalance()).freezeAmount(account.getFreezeAmount().add(param.getAmount()))
+                    .flowType(4).type(1).bizType(param.getBizType()).flowId(flow.getId()).build());
+            AccountFreezd freezd = AccountFreezd.builder().accountId(account.getId()).bizId(flow.getId())
+                    .amount(param.getAmount()).createTime(today).unfreezeAmount(BigDecimal.ZERO)
+                    .updateTime(today).status(1).build();
+            accountFreezdService.saveUseGeneratedKeys(freezd);
+            return Result.genSuccessResult(freezd.getId());
+        }catch (Exception e){
+            log.error("冻结异常",e);
+            return Result.genFailResult("冻结异常",e);
+        }
+
+    }
+
+    @Override
+    public Result unFreeze(Long freezdId) {
+        AccountFreezd freezd = accountFreezdService.findById(freezdId);
+        if (freezd == null){
+            return Result.genFailResult("冻结记录未找到");
+        }
+        Flow oldFlow = findById(freezd.getBizId());
+        if (oldFlow == null){
+            return Result.genFailResult("冻结记录未找到");
+        }
+
+        Account account = accountService.findById(freezd.getAccountId());
+        if (account == null){
+            return Result.genFailResult("冻结账号未找到");
+        }
+        Date today = DateUtil.date();
+        Flow flow = Flow.builder().amount(freezd.getAmount()).bizType(5001)
+                .bizNo(oldFlow.getBizNo()).createTime(today).updateTime(today).transTime(today)
+                .debitAccount(oldFlow.getDebitAccount()).creditAccount(oldFlow.getCreditAccount())
+                .bizId(oldFlow.getBizId()).type(5)
+                .build();
+        saveUseGeneratedKeys(flow);
+        accountService.deal(AccountFlow.builder().accountId(oldFlow.getDebitAccount()).amount(flow.getAmount())
+                .bizId(flow.getBizId()).aliases(account.getAliases()).transTime(today)
+                .bizNo(flow.getBizNo()).balance(account.getBalance()).freezeAmount(account.getFreezeAmount().subtract(oldFlow.getAmount()))
+                .flowType(5).type(2).bizType(flow.getBizType()).flowId(flow.getId()).build());
+        accountFreezdService.update(AccountFreezd.builder().id(freezdId).status(3).unfreezeAmount(oldFlow.getAmount()).build());
+        return Result.genSuccessResult();
+    }
 
 //    @Override
 //    public Result trans(TransParam param) {

cif-service/src/main/java/com/txz/cif/service/impl/WithdrawRecordServiceImpl.java

@@ -2,11 +2,16 @@ package com.txz.cif.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.txz.cif.dao.WithdrawRecordMapper;
+import com.txz.cif.dto.Result;
+import com.txz.cif.enums.BizTypeEnum;
 import com.txz.cif.model.Account;
 import com.txz.cif.model.AccountFreezd;
 import com.txz.cif.model.WithdrawRecord;
+import com.txz.cif.param.FreezdParam;
+import com.txz.cif.param.WithdrawParam;
 import com.txz.cif.service.AccountFreezdService;
 import com.txz.cif.service.AccountService;
+import com.txz.cif.service.FlowService;
 import com.txz.cif.service.WithdrawRecordService;
 import com.txz.cif.core.AbstractService;
 import org.springframework.stereotype.Service;
@@ -32,26 +37,57 @@ public class WithdrawRecordServiceImpl extends AbstractService<WithdrawRecord> i
     @Resource
     private AccountService accountService;
 
+    @Resource
+    private FlowService flowService;
+
     @Override
     public void add(WithdrawRecord withdrawRecord) {
         saveUseGeneratedKeys(withdrawRecord);
         Account account = accountService.getAccount(withdrawRecord.getUserId(), withdrawRecord.getAccountType());
         //冻结金额
-        accountFreezdService.save(AccountFreezd.builder()
-                        .bizId(withdrawRecord.getId())
-                        .accountId(account.getId())
-                        .amount(withdrawRecord.getAmount().add(withdrawRecord.getFee()))
-                        .createTime(DateUtil.date())
-                        .unfreezeAmount(BigDecimal.ZERO)
-                        .status(1)
+        Result freeze = flowService.freeze(FreezdParam.builder().accountType(withdrawRecord.getAccountType())
+                .amount(withdrawRecord.getAmount()).bizType(BizTypeEnum.WITHDRAW.getKey())
+                .bizId(withdrawRecord.getId() + "").bizNo(withdrawRecord.getOrderNo())
+                .transTime(withdrawRecord.getTransTime())
+                .userId(withdrawRecord.getUserId())
                 .build());
+        update(WithdrawRecord.builder().id(withdrawRecord.getId()).freezeId(Long.valueOf(freeze.getData().toString())).build());
     }
 
     @Override
     public void review(WithdrawRecord record) {
         if (record.getStatus() == 2){
-            //TODO 发起第三方提现
+            //TODO 审核通过 发起第三方提现
+
+        } else {
+            //解冻
+            if (record.getFreezeId() != null){
+                flowService.unFreeze(record.getFreezeId());
+            }
         }
         update(record);
     }
+
+    @Override
+    public void success(WithdrawRecord record) {
+        if (record.getFreezeId() != null){
+            flowService.unFreeze(record.getFreezeId());
+        }
+        flowService.withdraw(WithdrawParam.builder()
+                        .accountType(record.getAccountType()).bizType(BizTypeEnum.WITHDRAW.getKey())
+                        .userId(record.getUserId())
+                        .amount(record.getAmount())
+                        .bizId(record.getId()+"")
+                        .bizNo(record.getOrderNo())
+                        .transTime(record.getTransTime())
+                .build());
+    }
+
+    @Override
+    public void fail(WithdrawRecord record) {
+        if (record.getFreezeId() != null){
+            flowService.unFreeze(record.getFreezeId());
+        }
+        update(WithdrawRecord.builder().id(record.getId()).status(5).build());
+    }
 }

cif-service/src/main/java/com/txz/cif/web/WithdrawRecordApiController.java

@@ -1,17 +1,13 @@
 package com.txz.cif.web;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.txz.cif.core.Result;
 import com.txz.cif.core.ResultGenerator;
 import com.txz.cif.dubbo.client.OperatingConfigDubboServiceClient;
-import com.txz.cif.model.Account;
-import com.txz.cif.model.RechargeRecord;
-import com.txz.cif.model.User;
-import com.txz.cif.model.WithdrawRecord;
-import com.txz.cif.service.AccountService;
-import com.txz.cif.service.SequenceService;
-import com.txz.cif.service.UserService;
-import com.txz.cif.service.WithdrawRecordService;
+import com.txz.cif.model.*;
+import com.txz.cif.service.*;
 
 import com.txz.cif.core.ResultCode;
 
@@ -60,7 +56,7 @@ public class WithdrawRecordApiController {
 	private AuthService authService;
 
 	@Resource
-	private AccountService accountService;
+	private BizLogService bizLogService;
 
 	@Resource
 	private UserService userService;
@@ -188,4 +184,33 @@ public class WithdrawRecordApiController {
 		}
 		return ResultGenerator.genSuccessResult(pageInfo);
 	}
+
+	@GetMapping("/callback")
+	@ApiOperation(value = "三方回调",httpMethod = "GET")
+	public Result<RechargeRecord> detail(@RequestParam String data) {
+		//TODO 回调成功
+		JSONObject json = JSONUtil.parseObj(data);
+		String orderNo = json.getStr("orderNo");
+		WithdrawRecord record = withdrawRecordService.findBy("orderNo", orderNo);
+		if (record == null){
+			return ResultGenerator.genFailResult("订单未找到");
+		}
+		Integer type= 8;
+		if (StrUtil.equals("1",json.getStr("status"))){
+			withdrawRecordService.success(record);
+		} else {
+			withdrawRecordService.fail(record);
+			type= 9;
+		}
+		try{
+			//新增充值回调日志
+			bizLogService.save(BizLog.builder().bizType(2).bizNo(orderNo)
+					.type(type).createTime(DateUtil.date()).createUser("第三方")
+					.memo("提现回调").build());
+		}catch (Exception e){
+			log.error("新增充值回调日志失败",e);
+		}
+		return ResultGenerator.genSuccessResult();
+	}
+
 }

cif-service/src/main/java/com/txz/cif/web/mng/ConfigMemberController.java

@@ -8,6 +8,7 @@ import com.txz.cif.core.ResultCode;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.txz.cif.service.DayCutService;
 import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,6 +34,15 @@ public class ConfigMemberController {
     @Resource
     private ConfigMemberService configMemberService;
 
+	@Resource
+	private DayCutService dayCutService;
+	@GetMapping("/dayCut")
+	@ApiOperation(value = "日切",httpMethod = "GET")
+	public Result dayCut() {
+		dayCutService.dayCut();
+		return ResultGenerator.genSuccessResult();
+	}
+
     @PostMapping("/add")
 	@ApiOperation(value = "configMember新增",httpMethod = "POST")
     public Result add(@RequestBody ConfigMember configMember) {

cif-service/src/main/resources/mapper/AccountFlowMapper.xml

@@ -22,7 +22,11 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
 
+  <select id="sumOccur" resultType="java.math.BigDecimal" >
+    select sum(amount)  from  c_account_flow
+    where type =  #{type} and create_time >= #{startTime}  and #{endTime} > create_time  and flow_type not in (4,5)  and aliases = #{aliases}
 
+  </select>
 
 
 </mapper>

cif-service/src/main/resources/mapper/AccountMapper.xml

@@ -31,19 +31,19 @@
   </resultMap>
 
   <select id="sumTodayInit" resultType="java.math.BigDecimal" >
-    select sum(before_day_init_balance) from c_account where DATE(before_day_time) = CURDATE() and aliases like #{aliases} ;
+    select sum(before_day_init_balance) from c_account where DATE(before_day_time) = CURDATE() and aliases = #{aliases} ;
   </select>
 
   <select id="sumBeforInit" resultType="java.math.BigDecimal" >
-    select sum(before_day_balance) from c_account where DATE(before_day_time) != CURDATE()  and aliases like #{aliases};
+    select sum(before_day_balance) from c_account where DATE(before_day_time) != CURDATE()  and aliases = #{aliases};
   </select>
 
   <select id="sumTodayEnd" resultType="java.math.BigDecimal" >
-    select sum(before_day_balance) from c_account where DATE(before_day_time) = CURDATE() and aliases like #{aliases};
+    select sum(before_day_balance) from c_account where DATE(before_day_time) = CURDATE() and aliases = #{aliases};
   </select>
 
   <select id="sumBeforEnd" resultType="java.math.BigDecimal" >
-    select sum(balance) from c_account where DATE(before_day_time) != CURDATE()  and aliases like #{aliases};
+    select sum(balance) from c_account where DATE(before_day_time) != CURDATE()  and aliases = #{aliases};
   </select>
 
     <update id="dealWithDayCut"  >

cif-service/src/main/resources/mapper/WithdrawRecordMapper.xml

@@ -8,6 +8,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="user_id" jdbcType="BIGINT" property="userId" />
+    <result column="freeze_id" jdbcType="BIGINT" property="freezeId" />
     <result column="amount" jdbcType="DECIMAL" property="amount" />
     <result column="fee" jdbcType="DECIMAL" property="fee" />
     <result column="status" jdbcType="INTEGER" property="status" />