diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvMySettlementDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvMySettlementDao.java index 80b2472..68e1b64 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvMySettlementDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvMySettlementDao.java @@ -44,7 +44,6 @@ public interface VvMySettlementDao extends BaseMapper { @IF String status, @IF @Column(VvMySettlementEntity.amount_) @GE BigDecimal minAmount, @IF @Column(VvMySettlementEntity.amount_) @LE BigDecimal maxAmount, - @IF String userName, @IF @Column(VvMySettlementEntity.create_timestamp) @GE Long minCreateTimestamp, @IF @Column(VvMySettlementEntity.create_timestamp) @LE Long maxCreateTimestamp ); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminMySettlementController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminMySettlementController.java index 34c5159..1107bee 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminMySettlementController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminMySettlementController.java @@ -1,6 +1,7 @@ package com.heyu.api.controller.mm; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.heyu.api.alibaba.request.mm.order.VVMySettlementApprovalRequest; import com.heyu.api.alibaba.request.mm.order.VVMySettlementRequest; @@ -46,6 +47,7 @@ public class AdminMySettlementController { @Describe("公款列表") @RequestMapping("/list") public R list(@RequestBody VVMySettlementRequest vvMySettlementRequest) { + log.info("AdminMySettlementController json :{}", JSONObject.toJSONString(vvMySettlementRequest)); VvMyAccountEntity vvMyAccountEntity = vvMyAccountDao.selectVvMyAccount(AccountTypeEnums.common.getType()); PPageUtils pageUtils = PPageUtils.startPage(vvMySettlementRequest.getPageNum(), vvMySettlementRequest.getPageSize()) .doSelect(new ISelect() { @@ -55,7 +57,6 @@ public class AdminMySettlementController { vvMySettlementRequest.getStatus(), vvMySettlementRequest.getMinAmount(), vvMySettlementRequest.getMaxAmount(), - vvMySettlementRequest.getUserName(), vvMySettlementRequest.getMinCreateTimestamp(), vvMySettlementRequest.getMaxCreateTimestamp() ); @@ -83,7 +84,7 @@ public class AdminMySettlementController { vvMyAccountDao.updateVvMyAccountById(vvMyAccountEntity); String content = vvMySettlementEntity.getApplyUserName() + ",充值了:" + vvMySettlementEntity.getAmount() - + ",账户余额:" +vvMyAccountEntity.getAmount() ; + + ",账户余额:" + vvMyAccountEntity.getAmount(); DingDingSettlementUtils.sendText(content, "账户充值"); vvMySettlementEntity.setStatus(MySettlementStatusEnums.no_approval.getStatus()); vvMySettlementEntity.setRemainAmount(vvMySettlementEntity.getAmount()); @@ -120,7 +121,7 @@ public class AdminMySettlementController { vvMySettlement.setApprovalUserName(vvMySettlementApprovalRequest.getUserName()); - if(!MySettlementStatusEnums.apply_for_approval.getStatus().equals(vvMySettlement.getStatus())){ + if (!MySettlementStatusEnums.apply_for_approval.getStatus().equals(vvMySettlement.getStatus())) { return R.error("状态不对"); }