From edcf32fee232c74669fd73fe8e49166218d3cb34 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 26 Nov 2025 08:05:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/entity/vv/VvMySettlementEntity.java | 6 ++--- .../data/enums/MySettlementStatusEnums.java | 2 +- .../mm/order/VVMySettlementAddRequest.java | 23 +++++++++++++++++++ .../mm/AdminMySettlementController.java | 7 +++++- 4 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVMySettlementAddRequest.java diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvMySettlementEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvMySettlementEntity.java index 1541de7..2c063b8 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvMySettlementEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvMySettlementEntity.java @@ -1,12 +1,12 @@ package com.heyu.api.data.entity.vv; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.lz.mybatis.plugin.annotations.AS; import java.math.BigDecimal; -import java.util.Date;import java.util.Date; +import java.util.Date; /** *结算 * @author quyixiao @@ -15,7 +15,7 @@ import java.util.Date;import java.util.Date; @Data @TableName("vv_my_settlement") -public class VvMySettlementEntity implements java.io.Serializable { +public class VvMySettlementEntity implements java.io.Serializable { private static final long serialVersionUID = 1L; public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvMySettlementEntity:"; diff --git a/api-mapper/src/main/java/com/heyu/api/data/enums/MySettlementStatusEnums.java b/api-mapper/src/main/java/com/heyu/api/data/enums/MySettlementStatusEnums.java index 7eac74f..76e7d6d 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/enums/MySettlementStatusEnums.java +++ b/api-mapper/src/main/java/com/heyu/api/data/enums/MySettlementStatusEnums.java @@ -6,7 +6,7 @@ package com.heyu.api.data.enums; public enum MySettlementStatusEnums { // apply_for_approval:同意审批，agree_approval: 同意审批 ,reject_approval：拒绝审批 apply_for_approval("apply_for_approval", "申请审批"), - no_approval("no_approval", "不需要审批"), + no_approval("no_approval", "不需要审批,加钱的时候不需要审批"), agree_approval("agree_approval", "同意审批"), reject_approval("reject_approval", "拒绝审批"); diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVMySettlementAddRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVMySettlementAddRequest.java new file mode 100644 index 0000000..844190d --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVMySettlementAddRequest.java @@ -0,0 +1,23 @@ +package com.heyu.api.alibaba.request.mm.order; + + +import com.heyu.api.data.entity.vv.VvMySettlementEntity; +import lombok.Data; + +@Data +public class VVMySettlementAddRequest extends VvMySettlementEntity { + + /*** + * 用户名 + */ + private String userName; + + /*** + * + */ + private Long adminId; + + +} + + 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 1107bee..5f8b7bb 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 @@ -3,6 +3,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.VVMySettlementAddRequest; 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.resp.MyAccountDTO; @@ -75,7 +76,10 @@ public class AdminMySettlementController { */ @Describe("公款添加") @RequestMapping("/add") - public R add(@RequestBody VvMySettlementEntity vvMySettlementEntity) { + public R add(@RequestBody VVMySettlementAddRequest vvMySettlementEntity) { + String userName = vvMySettlementEntity.getUserName(); + vvMySettlementEntity.setApplyUserName(userName); + vvMySettlementEntity.setType(AccountTypeEnums.common.getType()); if (AccountOperateEnums.plus.getSign().equals(vvMySettlementEntity.getOperate())) { VvMyAccountEntity vvMyAccountEntity = vvMyAccountDao.selectVvMyAccount(AccountTypeEnums.common.getType()); @@ -97,6 +101,7 @@ public class AdminMySettlementController { } vvMySettlementEntity.setCreateTimestamp(System.currentTimeMillis()); vvMySettlementEntity.setModifyTimestamp(System.currentTimeMillis()); + vvMySettlementDao.insertVvMySettlement(vvMySettlementEntity); return R.ok().setData(vvMySettlementEntity); From b2f499e7496650ba6b54cfe8fac525dbd777a88b Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 26 Nov 2025 08:06:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=82=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/heyu/api/controller/mm/AdminMySettlementController.java | 1 - 1 file changed, 1 deletion(-) 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 5f8b7bb..23e3477 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 @@ -79,7 +79,6 @@ public class AdminMySettlementController { public R add(@RequestBody VVMySettlementAddRequest vvMySettlementEntity) { String userName = vvMySettlementEntity.getUserName(); vvMySettlementEntity.setApplyUserName(userName); - vvMySettlementEntity.setType(AccountTypeEnums.common.getType()); if (AccountOperateEnums.plus.getSign().equals(vvMySettlementEntity.getOperate())) { VvMyAccountEntity vvMyAccountEntity = vvMyAccountDao.selectVvMyAccount(AccountTypeEnums.common.getType());