From 481dc9fda84e870ecc3c59cbcf41bf622fe6584c Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Fri, 21 Nov 2025 18:12:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?11=E6=9C=8821=E6=97=A5=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/serviceImpl/coin/RechargeActivityCenterServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RechargeActivityCenterServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RechargeActivityCenterServiceImpl.java index 7fa6b9f..8651f93 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RechargeActivityCenterServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RechargeActivityCenterServiceImpl.java @@ -29,7 +29,7 @@ public class RechargeActivityCenterServiceImpl implements RechargeActivityCenter @Autowired private RechargeActivityCenterMapper rechargeActivityCenterMapper; - private static final String ACTIVITY_NAME_REGEX = "^[\\u4e00-\\u9fa5a-zA-Z0-9，。！？、；：\"'‘’“”（）《》【】—～~,.:;!()\\[\\]\\-_&+=]{1,100}$"; + private static final String ACTIVITY_NAME_REGEX = "^[\\u4e00-\\u9fa5a-zA-Z0-9，。！？?、；：\"'‘’“”（）《》【】—～~,.:;!()\\[\\]\\-_&+=]{1,100}$"; private static final Pattern ACTIVITY_NAME_PATTERN = Pattern.compile(ACTIVITY_NAME_REGEX); // 根据ID查询活动 @Override From e6dde95ead8c6939cc48f8b479eeca6f7b8cdcf2 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Fri, 21 Nov 2025 18:20:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?11=E6=9C=8821=E6=97=A5=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/mapper/cash/CashCollectionMapper.java | 3 +++ src/main/resources/cashMapper/CashCollectionMapper.xml | 15 +++++++++++++++ 2 files changed, 18 insertions(+) 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 4659680..1d086b4 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -1,5 +1,6 @@ package com.example.demo.mapper.cash; +import com.example.demo.domain.DTO.PaymentDTO; import com.example.demo.domain.entity.CashRecord; import com.example.demo.domain.entity.GOrder; import com.example.demo.domain.entity.RechargeActivity; @@ -59,4 +60,6 @@ public interface CashCollectionMapper { List selectBatchIds(Set relatedIds); //根据glodcoin订单号查询收款订单 CashCollection selectByGoldCoinOrderCode(String orderNo); + + void updateByGoldCoinOrderCode(PaymentDTO paymentDTO); } diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index c49a2a3..a3c438a 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -276,4 +276,19 @@ + + + + update cash_record_collection + + received_time=#{time}, + payment_currency=#{currency}, + received_currency=#{currency}, + payment_amount=#{order_amount}, + received_amount=#{net_amount}, + handling_charge=#{charge}, + order_no_status=0 + + where order_code=#{merchant_reference} + \ No newline at end of file From ed018ec2ec54520c9632d19414986e3063f4da57 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Fri, 21 Nov 2025 18:34:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?11.21=20=E6=B6=88=E6=81=AF=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/cash/MessageController.java | 5 +++-- .../com/example/demo/domain/vo/cash/Status.java | 22 ++++++++++++++++++++++ .../example/demo/mapper/cash/MessageMapper.java | 2 +- .../example/demo/service/cash/MessageService.java | 2 +- .../demo/serviceImpl/cash/MessageServiceImpl.java | 2 +- src/main/resources/cashMapper/MessageMapper.xml | 13 +++++++++---- 6 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/example/demo/domain/vo/cash/Status.java diff --git a/src/main/java/com/example/demo/controller/cash/MessageController.java b/src/main/java/com/example/demo/controller/cash/MessageController.java index 19288ca..127f114 100644 --- a/src/main/java/com/example/demo/controller/cash/MessageController.java +++ b/src/main/java/com/example/demo/controller/cash/MessageController.java @@ -3,6 +3,7 @@ package com.example.demo.controller.cash; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.DTO.IdRequest; import com.example.demo.domain.entity.Admin; +import com.example.demo.domain.vo.cash.Status; import com.example.demo.domain.vo.coin.Result; import com.example.demo.service.cash.MessageService; import com.example.demo.service.coin.MarketService; @@ -38,7 +39,7 @@ public class MessageController { @Autowired private MarketService marketService; @PostMapping - public Result getMessage(@RequestParam Integer status) throws Exception { + public Result getMessage(@RequestBody Status status) throws Exception { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = request.getHeader("token"); @@ -51,7 +52,7 @@ public class MessageController { if (markets.contains("9") || markets.contains("9999")) { markets=null; } - return Result.success(messageService.getMessage(markets, status)); + return Result.success(messageService.getMessage(markets, status.getStatus())); } @PostMapping("/update") public Result update(@RequestBody IdRequest idRequest) throws Exception { diff --git a/src/main/java/com/example/demo/domain/vo/cash/Status.java b/src/main/java/com/example/demo/domain/vo/cash/Status.java new file mode 100644 index 0000000..e68fe7d --- /dev/null +++ b/src/main/java/com/example/demo/domain/vo/cash/Status.java @@ -0,0 +1,22 @@ +package com.example.demo.domain.vo.cash; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @program: GOLD + * @ClassName Status + * @description: + * @author: huangqizhen + * @create: 2025−11-21 18:32 + * @Version 1.0 + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class Status { + private List status; +} diff --git a/src/main/java/com/example/demo/mapper/cash/MessageMapper.java b/src/main/java/com/example/demo/mapper/cash/MessageMapper.java index 450c0d4..81cd7c8 100644 --- a/src/main/java/com/example/demo/mapper/cash/MessageMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/MessageMapper.java @@ -16,7 +16,7 @@ import java.util.List; **/ @Mapper public interface MessageMapper { - List getMessage(List markets, Integer status); + List getMessage(List markets, List status); void update(Integer id); } diff --git a/src/main/java/com/example/demo/service/cash/MessageService.java b/src/main/java/com/example/demo/service/cash/MessageService.java index c90a995..8e51301 100644 --- a/src/main/java/com/example/demo/service/cash/MessageService.java +++ b/src/main/java/com/example/demo/service/cash/MessageService.java @@ -16,7 +16,7 @@ import java.util.List; **/ @Service public interface MessageService { - List getMessage(List markets, Integer status); + List getMessage(List markets, List status); void update(Integer id) throws Exception; } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java index 36a5fda..cffadd4 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java @@ -23,7 +23,7 @@ public class MessageServiceImpl implements MessageService { @Autowired private MessageMapper messageMapper; @Override - public List getMessage(List markets, Integer status) { + public List getMessage(List markets, List status) { return messageMapper.getMessage(markets, status) ; } diff --git a/src/main/resources/cashMapper/MessageMapper.xml b/src/main/resources/cashMapper/MessageMapper.xml index f10cb70..268e0fd 100644 --- a/src/main/resources/cashMapper/MessageMapper.xml +++ b/src/main/resources/cashMapper/MessageMapper.xml @@ -11,12 +11,17 @@ FROM message flag=0 - - and status=#{status} - + + + and status IN + + #{item} + + + - market IN + and market IN #{item}