From 9e45a73dbb2351781455083f77fe3276e918c6a2 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 21 Nov 2025 16:27:08 +0800 Subject: [PATCH] =?UTF-8?q?11-21=20=E6=A0=B9=E6=8D=AEgoldcoin=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/cash/CashCollectionController.java | 9 +++++++++ .../com/example/demo/domain/entity/RechargeActivity.java | 1 + .../java/com/example/demo/domain/vo/cash/CashCollection.java | 6 ++++++ .../com/example/demo/mapper/cash/CashCollectionMapper.java | 4 +++- .../com/example/demo/service/cash/CashCollectionService.java | 2 ++ .../demo/serviceImpl/cash/CashCollectionServiceImpl.java | 8 ++++++-- src/main/resources/cashMapper/CashCollectionMapper.xml | 12 ++++++++---- 7 files changed, 35 insertions(+), 7 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 51cb578..0316c0e 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -153,4 +153,13 @@ public class CashCollectionController { return Result.error(e.getMessage()); } } + //根据goldcoin订单号查询收款订单 + @PostMapping("/selectByGoldCoinOrderCode") + public Result selectByGoldCoinOrderCode(@RequestBody String orderNo) { + try { + return Result.success(cashCollectionService.selectByGoldCoinOrderCode(orderNo)); + }catch (Exception e){ + return Result.error(e.getMessage()); + } + } } diff --git a/src/main/java/com/example/demo/domain/entity/RechargeActivity.java b/src/main/java/com/example/demo/domain/entity/RechargeActivity.java index 32e76b7..a7feace 100644 --- a/src/main/java/com/example/demo/domain/entity/RechargeActivity.java +++ b/src/main/java/com/example/demo/domain/entity/RechargeActivity.java @@ -24,6 +24,7 @@ public class RechargeActivity { private String businessBelong; //业绩归属地 private Integer status; //状态 0未开始 1进行中 2已结束（不是实时更新的，仅展示，不要拿这个做校验） private Integer creator; //添加人 + private String area; //归属地 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private LocalDateTime startTime; // 开始时间（到秒） @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java index 0590983..7e75c41 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashCollection.java @@ -123,5 +123,11 @@ public class CashCollection implements Serializable { private String sortOrder; //排序顺序 @ExcelIgnore private List markets; // 所属地区列表 + @ExcelIgnore + private String orderNo; + @ExcelIgnore + private String orderNoStatus; + @ExcelIgnore + private String payload; } 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 347183e..4659680 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -48,7 +48,7 @@ public interface CashCollectionMapper { //根据精网号获取市场名 String getMarketNameByJwcode(Integer jwcode); //获取收款活动列表 - List getActivityList(@Param("now")LocalDateTime now); + List getActivityList(); //查找未同步的订单 ListgetUnSync(@Param("size")int size); //给同步过去的gOrder设置同步状态 @@ -57,4 +57,6 @@ public interface CashCollectionMapper { CashCollection selectById(Integer id); List selectBatchIds(Set relatedIds); + //根据glodcoin订单号查询收款订单 + CashCollection selectByGoldCoinOrderCode(String orderNo); } 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 81a1226..9667928 100644 --- a/src/main/java/com/example/demo/service/cash/CashCollectionService.java +++ b/src/main/java/com/example/demo/service/cash/CashCollectionService.java @@ -37,4 +37,6 @@ public interface CashCollectionService { Object syncToCashRecord(); //根据id查询收款订单 CashCollection selectById(CashCollection cashCollection); + //根据goldcoin订单号查询收款订单 + CashCollection selectByGoldCoinOrderCode(String orderNo); } 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 fbac154..891dd33 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -326,8 +326,7 @@ public User getNameAndMarket(Integer jwcode) { //获取收款活动列表 @Override public List getActivityList() { - LocalDateTime now = LocalDateTime.now(); - return cashCollectionMapper.getActivityList(now); + return cashCollectionMapper.getActivityList(); } //同步g_order订单到cash_record表 @@ -401,4 +400,9 @@ public User getNameAndMarket(Integer jwcode) { return cashCollectionMapper.selectById(cashCollection.getId()); } + //根据goldcoin订单号查询收款订单 + @Override + public CashCollection selectByGoldCoinOrderCode(String orderNo) { + return cashCollectionMapper.selectByGoldCoinOrderCode(orderNo); + } } diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 020aeb1..e932168 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -219,10 +219,11 @@ select m.name from user u left join market m on u.market=m.id where u.jwcode=#{jwcode} + select ra.id,ra.activity_name,ra.business_belong,m.name as area,ra.status + from recharge_activity ra + left join market m on m.id=ra.area + where ra.flag=1 + + \ No newline at end of file