From 483e5c1a55672a38d8b3ea9157bff8ab861e0a7f Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 23 Jan 2026 09:27:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?01-23=20=E6=A0=B9=E6=8D=AE=E8=A7=92?= =?UTF-8?q?=E8=89=B2id=E8=8E=B7=E5=8F=96=E9=A2=91=E9=81=93=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/controller/bean/BeanConsumeController.java | 5 +++++ src/main/java/com/example/demo/service/bean/BeanConsumeService.java | 2 ++ .../com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java | 6 ++++++ 3 files changed, 13 insertions(+) diff --git a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java index 36c1f3f..b4d3f5a 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java @@ -40,6 +40,11 @@ public class BeanConsumeController { @Autowired private TranslationService translationService; + //获取角色的权限 + @PostMapping("/getRoleChannel") + public Result getRoleChannel(@RequestBody Integer roleId){ + return Result.success(beanConsumeService.getRoleChannel(roleId)); + } //获取消费用户分部信息 @PostMapping("/getDept") public Result getDept(@RequestHeader(defaultValue = "zh_CN") String lang){ diff --git a/src/main/java/com/example/demo/service/bean/BeanConsumeService.java b/src/main/java/com/example/demo/service/bean/BeanConsumeService.java index 45c9faa..1116db2 100644 --- a/src/main/java/com/example/demo/service/bean/BeanConsumeService.java +++ b/src/main/java/com/example/demo/service/bean/BeanConsumeService.java @@ -39,4 +39,6 @@ public interface BeanConsumeService { //筛选查询小黄车消费 Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCartDTO beanConsumeCartDTO); + //根据角色id获取角色频道 + Object getRoleChannel(Integer roleId); } diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java index 36f49a7..1f9ff95 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java @@ -209,6 +209,12 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { return new PageInfo<>(beanConsumeCarts); } + //根据角色id获取角色频道 + @Override + public Object getRoleChannel(Integer roleId) { + return roleMapper.getChannel(roleId); + } + @Override public BeanConsumeGold sumConsumeGold(Page page) { BeanConsumeGold gold = new BeanConsumeGold(); From c63f111c91b8b9056c20b02f1fdcd6a2ff4482e8 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Fri, 23 Jan 2026 13:20:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.23=20=E4=BF=AE=E6=94=B9=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=BA=BA=E9=83=A8=E5=88=86=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/cashMapper/CashRefundMapper.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index 4ffe6df..100f3a2 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -224,7 +224,7 @@ ORDER BY ${sortField} ${sortOrder} - ORDER BY crr.create_time DESC + ORDER BY crr.update_time DESC @@ -247,6 +247,7 @@ crr.free_gold, crr.audit_id, crr.related_id, + crr.reject_reason, la.area_servise, la.area_finance, la.area_charge, @@ -304,7 +305,7 @@ ORDER BY ${sortField} ${sortOrder} - ORDER BY crr.create_time DESC + ORDER BY crr.update_time DESC @@ -333,10 +334,13 @@ crr.refund_voucher, crr.refund_time, crr.executor, + crr.permanent_gold, + crr.free_gold, crr.status, crr.audit_id, crr.submitter_id, crr.related_id, + crr.refund_reason, la.area_servise, la.area_finance, la.area_charge, From fd6945381effc8a979bef355d1067f757c686377 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 23 Jan 2026 13:55:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?01-23=20=E5=B7=A5=E4=BD=9C=E5=8F=B0?= =?UTF-8?q?=E8=90=A5=E6=94=B6=E7=BB=9F=E8=AE=A1=E6=8C=89=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/WorkBenchMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/WorkBenchMapper.xml b/src/main/resources/mapper/WorkBenchMapper.xml index b45bc45..a272d4d 100644 --- a/src/main/resources/mapper/WorkBenchMapper.xml +++ b/src/main/resources/mapper/WorkBenchMapper.xml @@ -185,7 +185,7 @@ WHERE cr.received_currency IN (2,3,4,5,6,7,8) -- 只统计这7种币 AND m.name IN #{market} - AND cr.audit_time BETWEEN #{startDate} AND #{endDate} + AND cr.received_time BETWEEN #{startDate} AND #{endDate} AND cr.order_type=1 AND cr.status IN (0,1,3,4,6) GROUP BY m.name; From 21bc6f1f4c37d69472abf69b6dbb665e6c54e69c Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 23 Jan 2026 17:41:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?01-23=20=E7=BC=96=E8=BE=91=E6=89=8B?= =?UTF-8?q?=E7=BB=AD=E8=B4=B9=20Strip=EF=BC=8CPaypal=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=B8=8E=E6=94=B6=E6=AC=BE=E5=B8=81=E7=A7=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/serviceImpl/cash/CashCollectionServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 adec204..9d5546c 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -33,6 +33,7 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.UUID; import java.util.stream.Collectors; @@ -350,6 +351,11 @@ public class CashCollectionServiceImpl implements CashCollectionService { public String complete(CashRecord cashRecord) { + if (!Objects.equals(cashRecord.getPaymentCurrency(), cashRecord.getReceivedCurrency()) + && ("Stripe".equals(cashRecord.getPayType()) || "Paypal".equals(cashRecord.getPayType()))) { + return "支付币种与收款币种不一致"; + } + int rows = cashCollectionMapper.complete(cashRecord); return rows > 0 ? "编辑成功" : "编辑失败";