quyixiao/eb-service-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2025-11-23 22:11:35 +08:00
parent 28a730c611
commit 32807fd8bb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvMySettlementDao.java
View File

@ -44,7 +44,6 @@ public interface VvMySettlementDao extends BaseMapper<VvMySettlementEntity> {
@IF String status, @IF String status,
@IF @Column(VvMySettlementEntity.amount_) @GE BigDecimal minAmount, @IF @Column(VvMySettlementEntity.amount_) @GE BigDecimal minAmount,
@IF @Column(VvMySettlementEntity.amount_) @LE BigDecimal maxAmount, @IF @Column(VvMySettlementEntity.amount_) @LE BigDecimal maxAmount,
@IF String userName,
@IF @Column(VvMySettlementEntity.create_timestamp) @GE Long minCreateTimestamp, @IF @Column(VvMySettlementEntity.create_timestamp) @GE Long minCreateTimestamp,
@IF @Column(VvMySettlementEntity.create_timestamp) @LE Long maxCreateTimestamp @IF @Column(VvMySettlementEntity.create_timestamp) @LE Long maxCreateTimestamp
); );

7
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminMySettlementController.java
View File

@ -1,6 +1,7 @@
package com.heyu.api.controller.mm; package com.heyu.api.controller.mm;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.heyu.api.alibaba.request.mm.order.VVMySettlementApprovalRequest; import com.heyu.api.alibaba.request.mm.order.VVMySettlementApprovalRequest;
import com.heyu.api.alibaba.request.mm.order.VVMySettlementRequest; import com.heyu.api.alibaba.request.mm.order.VVMySettlementRequest;
@ -46,6 +47,7 @@ public class AdminMySettlementController {
@Describe("公款列表") @Describe("公款列表")
@RequestMapping("/list") @RequestMapping("/list")
public R list(@RequestBody VVMySettlementRequest vvMySettlementRequest) { public R list(@RequestBody VVMySettlementRequest vvMySettlementRequest) {
log.info("AdminMySettlementController json :{}", JSONObject.toJSONString(vvMySettlementRequest));
VvMyAccountEntity vvMyAccountEntity = vvMyAccountDao.selectVvMyAccount(AccountTypeEnums.common.getType()); VvMyAccountEntity vvMyAccountEntity = vvMyAccountDao.selectVvMyAccount(AccountTypeEnums.common.getType());
PPageUtils pageUtils = PPageUtils.startPage(vvMySettlementRequest.getPageNum(), vvMySettlementRequest.getPageSize()) PPageUtils pageUtils = PPageUtils.startPage(vvMySettlementRequest.getPageNum(), vvMySettlementRequest.getPageSize())
.doSelect(new ISelect() { .doSelect(new ISelect() {
@ -55,7 +57,6 @@ public class AdminMySettlementController {
vvMySettlementRequest.getStatus(), vvMySettlementRequest.getStatus(),
vvMySettlementRequest.getMinAmount(), vvMySettlementRequest.getMinAmount(),
vvMySettlementRequest.getMaxAmount(), vvMySettlementRequest.getMaxAmount(),
vvMySettlementRequest.getUserName(),
vvMySettlementRequest.getMinCreateTimestamp(), vvMySettlementRequest.getMinCreateTimestamp(),
vvMySettlementRequest.getMaxCreateTimestamp() vvMySettlementRequest.getMaxCreateTimestamp()
); );
@ -83,7 +84,7 @@ public class AdminMySettlementController {
vvMyAccountDao.updateVvMyAccountById(vvMyAccountEntity); vvMyAccountDao.updateVvMyAccountById(vvMyAccountEntity);
String content = vvMySettlementEntity.getApplyUserName() String content = vvMySettlementEntity.getApplyUserName()
+ "，充值了:" + vvMySettlementEntity.getAmount() + "，充值了:" + vvMySettlementEntity.getAmount()
+ "，账户余额:" +vvMyAccountEntity.getAmount() ; + "，账户余额:" + vvMyAccountEntity.getAmount();
DingDingSettlementUtils.sendText(content, "账户充值"); DingDingSettlementUtils.sendText(content, "账户充值");
vvMySettlementEntity.setStatus(MySettlementStatusEnums.no_approval.getStatus()); vvMySettlementEntity.setStatus(MySettlementStatusEnums.no_approval.getStatus());
vvMySettlementEntity.setRemainAmount(vvMySettlementEntity.getAmount()); vvMySettlementEntity.setRemainAmount(vvMySettlementEntity.getAmount());
@ -120,7 +121,7 @@ public class AdminMySettlementController {
vvMySettlement.setApprovalUserName(vvMySettlementApprovalRequest.getUserName()); 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("状态不对"); return R.error("状态不对");
} }