From 0d8ad277bddddcd107a8438f7241670a2f8c4773 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Mon, 24 Nov 2025 14:04:31 +0800 Subject: [PATCH] =?UTF-8?q?11-24=20=E6=94=B6=E6=AC=BE=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/entity/CashRecord.java | 1 + .../com/example/demo/mapper/cash/CashCollectionMapper.java | 8 ++++++++ .../example/demo/serviceImpl/bean/BeanAuditServiceImpl.java | 2 +- .../example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java | 8 ++++---- .../demo/serviceImpl/bean/BeanRechargeServiceImpl.java | 4 ++-- .../example/demo/serviceImpl/bean/BeanUserServiceImpl.java | 2 +- .../example/demo/serviceImpl/cash/CashAuditServiceImpl.java | 5 +++++ .../demo/serviceImpl/cash/CashCollectionServiceImpl.java | 2 +- .../example/demo/serviceImpl/cash/CashRefundServiceImpl.java | 6 +++--- .../com/example/demo/serviceImpl/coin/AuditServiceImpl.java | 4 ++-- .../com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java | 4 ++-- .../example/demo/serviceImpl/coin/GoldDetailServiceImpl.java | 4 ++-- .../example/demo/serviceImpl/coin/PermissionServiceImpl.java | 2 +- .../com/example/demo/serviceImpl/coin/RateServiceImpl.java | 2 +- .../serviceImpl/coin/RechargeActivityCenterServiceImpl.java | 2 +- .../example/demo/serviceImpl/coin/RechargeServiceImpl.java | 4 ++-- .../com/example/demo/serviceImpl/coin/RefundServiceImpl.java | 4 ++-- .../com/example/demo/serviceImpl/coin/RoleServiceImpl.java | 2 +- src/main/resources/cashMapper/CashCollectionMapper.xml | 11 ++++++++++- 19 files changed, 50 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/example/demo/domain/entity/CashRecord.java b/src/main/java/com/example/demo/domain/entity/CashRecord.java index d570bea..c161eeb 100644 --- a/src/main/java/com/example/demo/domain/entity/CashRecord.java +++ b/src/main/java/com/example/demo/domain/entity/CashRecord.java @@ -24,6 +24,7 @@ public class CashRecord implements Serializable { private static final long serialVersionUID = 1L; private Integer id; // 序号 + private Integer version; // 版本号 // 订单信息 private Integer orderType; // 订单类型：1-收款，2-退款 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 e20f36d..c02002f 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -60,6 +60,14 @@ public interface CashCollectionMapper { List selectBatchIds(Set relatedIds); //根据glodcoin订单号查询收款订单 CashCollection selectByGoldCoinOrderCode(String orderNo); + /** + * 带版本号的审核更新 + * @return 更新成功返回 1，失败返回 0 + */ + int updateOrderWithVersion(@Param("orderCode") String orderCode, + @Param("status") Integer status, + @Param("auditId") Integer auditId, + @Param("version") Integer version); // void updateByGoldCoinOrderCode(PaymentDTO paymentDTO); } diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java index 3d3af4b..68809d7 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java @@ -57,7 +57,7 @@ public class BeanAuditServiceImpl implements BeanAuditService { //查找审核信息 @Override public PageInfo selectBy(Integer pageNum, Integer pageSize, BeanAuditInfo beanAuditInfo) { - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List beanAuditInfos = beanAuditMapper.selectBy(beanAuditInfo); return new PageInfo<>(beanAuditInfos); } 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 44cb3e4..af68734 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java @@ -166,7 +166,7 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { if (!channel.equals("全部")){ beanConsumeLive.setLiveChannel(channel); } - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List beanConsumeLives = liveMapper.selectLiveBy(beanConsumeLive); //int total = liveMapper.selectLiveCount(beanConsumeLive); return new PageInfo<>(beanConsumeLives); @@ -182,21 +182,21 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { if (!channel.equals("全部")){ beanConsumeFan.setChannel(channel); } - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List beanConsumeFans = beanConsumeMapper.selectFanBy(beanConsumeFan); return new PageInfo<>(beanConsumeFans); } //筛选查询文章消费 @Override public Object selectArticleBy(Integer pageNum, Integer pageSize, BeanConsumeArticle beanConsumeArticle) { - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List beanConsumeArticles = beanConsumeMapper.selectArticleBy(beanConsumeArticle); return new PageInfo<>(beanConsumeArticles); } //筛选查询小黄车消费 @Override public Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCart beanConsumeCart) { - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List beanConsumeCarts = beanRechargeMapper1.selectCartBy(beanConsumeCart); return new PageInfo<>(beanConsumeCarts); } diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java index d5e31f0..3ff285b 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java @@ -124,7 +124,7 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { //系统充值明细 @Override public PageInfo selectBySystem(Integer pageNum, Integer pageSize, BeanSystemRechargeInfo beanSystemRechargeInfo){ - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List beanSystemRechargeInfos = beanRechargeMapper2.selectBySystem(beanSystemRechargeInfo); return new PageInfo<>(beanSystemRechargeInfos); } @@ -167,7 +167,7 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { //线上充值明细 @Override public PageInfo selectByOnline(Integer pageNum, Integer pageSize, BeanOnlineRechargeInfo beanOnlineRechargeInfo){ - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List beanOnlineRechargeInfos = beanRechargeMapper3.selectByOnline(beanOnlineRechargeInfo); return new PageInfo<>(beanOnlineRechargeInfos); } diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanUserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanUserServiceImpl.java index 2efb15e..955d335 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanUserServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanUserServiceImpl.java @@ -51,7 +51,7 @@ public class BeanUserServiceImpl implements BeanUserService { //查询客户金豆余额 @Override public Object selectUserBy(Integer pageNum, Integer pageSize, BeanUser beanUser) { - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List beanUsers = beanUserMapper.selectUserBy(beanUser); return new PageInfo<>(beanUsers); } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java index 328c554..3a5e484 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java @@ -54,6 +54,11 @@ public class CashAuditServiceImpl implements CashAuditService { ) { throw new IllegalArgumentException("订单不存在或已被审核"); } + //带版本更新 + int updated=cashCollectionMapper.updateOrderWithVersion(orderCode, action==1?1:2, auditId, order.getVersion()); + if (updated==0){ + throw new IllegalArgumentException("订单已被其他审核员审核"); + } CashRecord updateOrder = new CashRecord(); //设置审核人 updateOrder.setAuditId(auditId); 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 6e0e9bc..b78c735 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -278,7 +278,7 @@ public class CashCollectionServiceImpl implements CashCollectionService { cashCollection.setReceivedMarket(null); } // cashCollection.setMarkets(markets); - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List cashCollections = cashCollectionMapper.selectCollection1(pageNum, pageSize, cashCollection); return new PageInfo<>(cashCollections); } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index cf01b1b..2e9cc66 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -61,7 +61,7 @@ public class CashRefundServiceImpl implements RefundService { @Override public PageInfo select(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO) { - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List list = cashRefundMapper.select(cashRecordDTO); if (list.isEmpty()) { @@ -403,7 +403,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); @Override public PageInfo financeSelect(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO) { - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper // System.out.println(goldDetail.getMarkets()); List list = cashRefundMapper.financeSelect(cashRecordDTO); if (list.isEmpty()) { @@ -470,7 +470,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); @Override public PageInfo exSelect(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO) { - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper // System.out.println(goldDetail.getMarkets()); List list = cashRefundMapper.exSelect(cashRecordDTO); System.out.println( list); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java index 5a0fc9c..c704f61 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java @@ -174,7 +174,7 @@ public class AuditServiceImpl implements AuditService { markets=null; } rechargeAudit.setMarkets(markets); - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List rechargeAudits = auditMapper.selectRechargeBy(pageNum, pageSize, rechargeAudit); // rechargeAudit.setFreeGold(rechargeAudit.getFreeJune()+rechargeAudit.getFreeDecember()); return new PageInfo<>(rechargeAudits); @@ -191,7 +191,7 @@ public class AuditServiceImpl implements AuditService { markets=null; } refundAudit.setMarkets(markets); - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List refundAudits = auditMapper.selectRefundBy(pageNum, pageSize, refundAudit); //refundAudit.setFreeGold(refundAudit.getFreeJune()+refundAudit.getFreeDecember()); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java index 906c026..9dc5362 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java @@ -56,7 +56,7 @@ public class ConsumeServiceImpl implements ConsumeService { //获取市场id List markets = marketMapper.getMarketIds(consumeUser.getMarkets()); consumeUser.setMarkets(markets); - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List consumeUsers = consumeMapper.selectAll(consumeUser); return new PageInfo<>(consumeUsers); } @@ -83,7 +83,7 @@ public class ConsumeServiceImpl implements ConsumeService { markets=null; } consumeUser.setMarkets(markets); - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List consumeUsers = consumeMapper.selectBy(consumeUser); return new PageInfo<>(consumeUsers); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/GoldDetailServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/GoldDetailServiceImpl.java index 3c18f77..e8cf03b 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/GoldDetailServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/GoldDetailServiceImpl.java @@ -48,7 +48,7 @@ public class GoldDetailServiceImpl implements GoldDetailService { @Override public PageInfo getGoldDetail(Integer pageNum, Integer pageSize, GoldDetail goldDetail) { - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper // System.out.println(goldDetail.getMarkets()); List list = goldDetailMapper.getGoldDetail(goldDetail); return new PageInfo<>(list); @@ -62,7 +62,7 @@ public class GoldDetailServiceImpl implements GoldDetailService { @Override public PageInfo getGold(Integer pageNum, Integer pageSize, User user) { - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List list = goldDetailMapper.getGold(user); return new PageInfo<>(list); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/PermissionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/PermissionServiceImpl.java index 193f3fc..024259e 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/PermissionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/PermissionServiceImpl.java @@ -54,7 +54,7 @@ public class PermissionServiceImpl implements PermissionService { @Override public PageInfo getpermission(Integer pageNum, Integer pageSize, Permission permission) { - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List list = permissionMapper.getPermission(permission); for (Permission item : list) { String machineIdsStr = item.getMachineId(); // 假设原始字段是 String 类型 diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RateServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RateServiceImpl.java index ba3faf2..4c80951 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RateServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RateServiceImpl.java @@ -23,7 +23,7 @@ public class RateServiceImpl implements RateService { @Override public PageInfo selectAll(Integer pageNum, Integer pageSize) { - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List rates = rateMapper.selectAll(); return new PageInfo<>(rates); } 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 8651f93..51c28e5 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RechargeActivityCenterServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RechargeActivityCenterServiceImpl.java @@ -35,7 +35,7 @@ public class RechargeActivityCenterServiceImpl implements RechargeActivityCenter @Override public PageInfo queryActivity(Integer pageNum, Integer pageSize, RechargeActivity activity) { updateStatus(); - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List activityList = rechargeActivityCenterMapper.queryActivity(activity); return new PageInfo<>(activityList); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java index 9c45dc6..43f61ea 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java @@ -55,7 +55,7 @@ public class RechargeServiceImpl implements RechargeService { //获取市场id List markets = marketMapper.getMarketIds(rechargeUser.getMarkets()); rechargeUser.setMarkets(markets); - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List rechargeUsers = rechargeMapper.selectAll(rechargeUser); return new PageInfo<>(rechargeUsers); } @@ -68,7 +68,7 @@ public class RechargeServiceImpl implements RechargeService { markets=null; } rechargeUser.setMarkets(markets); - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List rechargeUsers = rechargeMapper.selectBy(rechargeUser); return new PageInfo<>(rechargeUsers); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java index 846c53f..0401b67 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java @@ -51,7 +51,7 @@ public class RefundServiceImpl implements RefundService { public PageInfo selectAll(Integer pageNum, Integer pageSize, RefundUser refundUser) throws Exception { List markets = marketMapper.getMarketIds(refundUser.getMarkets()); refundUser.setMarkets(markets); - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List refundUsers = refundMapper.selectAll(refundUser); return new PageInfo<>(refundUsers); } @@ -76,7 +76,7 @@ public class RefundServiceImpl implements RefundService { markets = null; } refundUser.setMarkets(markets); - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List refundUsers = refundMapper.selectBy(refundUser); return new PageInfo<>(refundUsers); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java index d2ca389..d830aca 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java @@ -237,7 +237,7 @@ public class RoleServiceImpl implements RoleService { //分页查找角色 @Override public PageInfo selectBy(Integer pageNum, Integer pageSize, RoleVo roleVo) { - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper List roleVos = roleMapper.selectBy(roleVo); // 遍历 roleVos 列表 for (RoleVo role : roleVos) { diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 2159410..220bf91 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -206,7 +206,7 @@ select crc.id,jwcode,name,market,ra.activity_name as activity, order_code,bank_code,goods_name,good_num,num_unit,permanent_gold,free_gold, payment_currency,payment_amount,pay_type,pay_time,crc.status,submitter_id, - voucher,remark + voucher,remark,version from cash_record_collection crc left join recharge_activity ra on ra.id = crc.activity where order_code=#{orderCode} @@ -291,4 +291,13 @@ where order_code=#{merchant_reference} + + UPDATE cash_record_collection + SET status = #{status}, + audit_id = #{auditId}, + version = version + 1 + WHERE order_code = #{orderCode} + AND status = 0 + AND version = #{version} + \ No newline at end of file