From 69badbcbe746c4a5c9b300b600db879bea3b9673 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Mon, 13 Oct 2025 16:14:33 +0800 Subject: [PATCH] =?UTF-8?q?10-13-=E6=A0=B9=E6=8D=AE=E7=B2=BE=E7=BD=91?= =?UTF-8?q?=E5=8F=B7=E8=8E=B7=E5=8F=96=E5=9C=B0=E5=8C=BA=E4=B8=8E=E5=A7=93?= =?UTF-8?q?=E5=90=8D=E3=80=81=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/cash/CashCollectionController.java | 20 ++++++++++++++++++-- .../java/com/example/demo/domain/entity/User.java | 1 + .../demo/mapper/cash/CashCollectionMapper.java | 6 ++++++ .../demo/service/cash/CashCollectionService.java | 7 +++++++ .../serviceImpl/cash/CashCollectionServiceImpl.java | 20 ++++++++++++++++++-- .../resources/cashMapper/CashCollectionMapper.xml | 12 +++++++++++- 6 files changed, 61 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java index b898547..8977852 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -3,6 +3,7 @@ package com.example.demo.controller.cash; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.CashRecord; +import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.cash.CashCollection; import com.example.demo.domain.vo.coin.Page; import com.example.demo.domain.vo.coin.Result; @@ -36,11 +37,25 @@ public class CashCollectionController { @Autowired private CashCollectionService cashCollectionService; + //根据精网号获取姓名和地区 + @PostMapping("/getNameAndMarket") + public User getNameAndMarket(@RequestBody Integer jwcode) { + return cashCollectionService.getNameAndMarket(jwcode); + + } + //获取收款活动列表 + @PostMapping("/getActivityList") + public Result getActivityList() + { + List list = cashCollectionService.getActivityList(); + return Result.success(list); + } //新增收款订单 @PostMapping("/add") public Result add(@RequestBody CashCollection cashCollection) { try { - return cashCollectionService.add(cashCollection); + + return Result.success(cashCollectionService.add(cashCollection)); } catch (Exception e) { return Result.error(e.getMessage()); } @@ -49,7 +64,8 @@ public class CashCollectionController { @PostMapping("/cancel") public Result cancel(@RequestBody CashRecord cashRecord) { try { - return cashCollectionService.cancel(cashRecord.getOrderCode()); + + return Result.success( cashCollectionService.cancel(cashRecord.getOrderCode())); }catch (Exception e){ return Result.error(e.getMessage()); } diff --git a/src/main/java/com/example/demo/domain/entity/User.java b/src/main/java/com/example/demo/domain/entity/User.java index 1d7f71f..20b0cc8 100644 --- a/src/main/java/com/example/demo/domain/entity/User.java +++ b/src/main/java/com/example/demo/domain/entity/User.java @@ -26,6 +26,7 @@ public class User implements Serializable { private String name; // 客户姓名 @ExcelProperty("所属地区") private String market; // 所属地区 + private String marketName; // 所属地区 @ExcelIgnore private BigDecimal sumPermanentGold; // 历史永久金币 @ExcelIgnore diff --git a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java index f51def2..d4a76db 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -39,4 +39,10 @@ public interface CashCollectionMapper { CashRecord selectUnAuditByOrderCode(@Param("orderCode") String orderCode); //补全手续费等信息 int complete(@Param("cashRecord") CashRecord cashRecord); + //根据精网号获取姓名 + String getNameByJwcode(@Param("jwcode") Integer jwcode); + //根据精网号获取市场名 + String getMarketNameByJwcode(Integer jwcode); + //获取收款活动列表 + List getActivityList(); } diff --git a/src/main/java/com/example/demo/service/cash/CashCollectionService.java b/src/main/java/com/example/demo/service/cash/CashCollectionService.java index 7e9e8fd..089c902 100644 --- a/src/main/java/com/example/demo/service/cash/CashCollectionService.java +++ b/src/main/java/com/example/demo/service/cash/CashCollectionService.java @@ -1,10 +1,13 @@ package com.example.demo.service.cash; import com.example.demo.domain.entity.CashRecord; +import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.cash.CashCollection; import com.example.demo.domain.vo.coin.Result; import com.github.pagehelper.PageInfo; +import java.util.List; + /** * @program: gold-java * @ClassName cashCollectionService @@ -25,4 +28,8 @@ public interface CashCollectionService { PageInfo selectCollection(Integer pageNum, Integer pageSize, CashCollection cashCollection); //补全手续费等 Result complete(CashRecord cashRecord); + //根据精网号获取姓名和地区 + User getNameAndMarket(Integer jwcode); + //获取活动列表 + List getActivityList(); } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index 7a572e6..d1fa08e 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -1,6 +1,7 @@ package com.example.demo.serviceImpl.cash; import com.example.demo.domain.entity.CashRecord; +import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.cash.CashCollection; import com.example.demo.domain.vo.coin.Result; import com.example.demo.mapper.cash.CashCollectionMapper; @@ -160,8 +161,8 @@ public class CashCollectionServiceImpl implements CashCollectionService { if (!status.getStatus().equals(5)){ return Result.error("只允许编辑已撤回订单"); } - //地区，根据jwcode插入 - cashRecord.setMarket(cashCollectionMapper.getMarketByJwcode(cashRecord.getJwcode())); + //地区，根据jwcode插入（弃用，插入前调用接口获取地区和姓名，之后前端传入） + //cashRecord.setMarket(cashCollectionMapper.getMarketByJwcode(cashRecord.getJwcode())); int rows = cashCollectionMapper.updateByOrderCode(cashRecord); return rows > 0 ? Result.success("重新提交成功") : Result.error("重新提交失败"); } @@ -185,4 +186,19 @@ public class CashCollectionServiceImpl implements CashCollectionService { return rows > 0 ? Result.success("编辑成功") : Result.error("编辑失败"); } + //根据精网号查询姓名和地区 + @Override + public User getNameAndMarket(Integer jwcode) { + User user = new User(); + user.setMarket(cashCollectionMapper.getMarketByJwcode(jwcode)); + user.setName(cashCollectionMapper.getNameByJwcode(jwcode)); + user.setMarketName(cashCollectionMapper.getMarketNameByJwcode(jwcode)); + + return user; + } + //获取收款活动列表 + @Override + public List getActivityList() { + return cashCollectionMapper.getActivityList(); + } } diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 2b11ffc..b67b5ca 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -60,7 +60,7 @@ select status,order_code from cash_record where order_code=#{orderCode} + + + + \ No newline at end of file