diff --git a/ruoyi-admin/src/main/java/org/dromara/app/customer/AppRedPacketController.java b/ruoyi-admin/src/main/java/org/dromara/app/customer/AppRedPacketController.java index bb1f83cc2..b5003cf16 100644 --- a/ruoyi-admin/src/main/java/org/dromara/app/customer/AppRedPacketController.java +++ b/ruoyi-admin/src/main/java/org/dromara/app/customer/AppRedPacketController.java @@ -71,13 +71,6 @@ public class AppRedPacketController { redPacketService.checkAndRefundExpiredRedPackets(); return R.ok(); } -// -// /** -// * 查询用户领取的红包记录 -// * @param userId 用户ID -// * @param pageNum 页码 -// * @param pageSize 每页条数 -// * @return 领取记录列表 -// */ + } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java index c947c1c3f..8157cb7e2 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java @@ -97,7 +97,6 @@ public class MemberServiceImpl extends ServiceImpl implemen MemberAccount account=MemberAccount.builder().memberId(entity.getId()).build(); memberAccountMapper.insert(account); - return true; } @@ -115,7 +114,7 @@ public class MemberServiceImpl extends ServiceImpl implemen return this.baseMapper.selectOne(queryWrapper); } - @CacheEvict(value = GlobalConstants.MEMBER_KEY, key = "#id") + @CacheEvict(value = GlobalConstants.MEMBER_KEY, key = "#member.id") public int updateMark(MemberBO member) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.set("mark",member.getMark()) @@ -126,7 +125,8 @@ public class MemberServiceImpl extends ServiceImpl implemen - @CacheEvict(value = GlobalConstants.MEMBER_KEY, key = "#id") + @CacheEvict(value = GlobalConstants.MEMBER_KEY, key = "#bo.id") + @Cacheable(value = GlobalConstants.MEMBER_KEY, key = "#bo.phone") public Integer changeStatus(MemberBO bo) { UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.eq("id", bo.getId()); diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java index 5dfda9065..a8a4c4362 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java @@ -540,7 +540,7 @@ public class OrderServiceImpl extends ServiceImpl implements @Override public void paySuccess(String orderNo,String payNo,Integer payType) { // 根据订单编号查询订单信息 - Order order = getByNo(orderNo); + Order order = getById(orderNo); Assert.notNull(order, "订单不存在"); // 生成订单核销码信息 verificationCodeService.generateVerificationCode(order); diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/kit/params/impl/OrderCashier.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/kit/params/impl/OrderCashier.java index b1e4dc130..469c3bf0d 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/kit/params/impl/OrderCashier.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/kit/params/impl/OrderCashier.java @@ -51,7 +51,7 @@ public class OrderCashier implements CashierExecute { //准备返回的数据 CashierParam cashierParam = new CashierParam(); //订单信息获取 - Order order = orderService.getByNo(payParam.getSn()); + Order order = orderService.getById(payParam.getSn()); // //如果订单已支付,则不能发器支付 if (!order.getStatus().equals(OrderStatusEnum.UNPAID.getValue())) {