[fix]订单支付改为使用id
This commit is contained in:
parent
d4079a5f28
commit
913aebcb3d
@ -71,13 +71,6 @@ public class AppRedPacketController {
|
|||||||
redPacketService.checkAndRefundExpiredRedPackets();
|
redPacketService.checkAndRefundExpiredRedPackets();
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
//
|
|
||||||
// /**
|
|
||||||
// * 查询用户领取的红包记录
|
|
||||||
// * @param userId 用户ID
|
|
||||||
// * @param pageNum 页码
|
|
||||||
// * @param pageSize 每页条数
|
|
||||||
// * @return 领取记录列表
|
|
||||||
// */
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -97,7 +97,6 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper,Member> implemen
|
|||||||
|
|
||||||
MemberAccount account=MemberAccount.builder().memberId(entity.getId()).build();
|
MemberAccount account=MemberAccount.builder().memberId(entity.getId()).build();
|
||||||
memberAccountMapper.insert(account);
|
memberAccountMapper.insert(account);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -115,7 +114,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper,Member> implemen
|
|||||||
return this.baseMapper.selectOne(queryWrapper);
|
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) {
|
public int updateMark(MemberBO member) {
|
||||||
UpdateWrapper<Member> updateWrapper = new UpdateWrapper<>();
|
UpdateWrapper<Member> updateWrapper = new UpdateWrapper<>();
|
||||||
updateWrapper.set("mark",member.getMark())
|
updateWrapper.set("mark",member.getMark())
|
||||||
@ -126,7 +125,8 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper,Member> 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) {
|
public Integer changeStatus(MemberBO bo) {
|
||||||
UpdateWrapper<Member> wrapper = new UpdateWrapper<>();
|
UpdateWrapper<Member> wrapper = new UpdateWrapper<>();
|
||||||
wrapper.eq("id", bo.getId());
|
wrapper.eq("id", bo.getId());
|
||||||
|
@ -540,7 +540,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|||||||
@Override
|
@Override
|
||||||
public void paySuccess(String orderNo,String payNo,Integer payType) {
|
public void paySuccess(String orderNo,String payNo,Integer payType) {
|
||||||
// 根据订单编号查询订单信息
|
// 根据订单编号查询订单信息
|
||||||
Order order = getByNo(orderNo);
|
Order order = getById(orderNo);
|
||||||
Assert.notNull(order, "订单不存在");
|
Assert.notNull(order, "订单不存在");
|
||||||
// 生成订单核销码信息
|
// 生成订单核销码信息
|
||||||
verificationCodeService.generateVerificationCode(order);
|
verificationCodeService.generateVerificationCode(order);
|
||||||
|
@ -51,7 +51,7 @@ public class OrderCashier implements CashierExecute {
|
|||||||
//准备返回的数据
|
//准备返回的数据
|
||||||
CashierParam cashierParam = new CashierParam();
|
CashierParam cashierParam = new CashierParam();
|
||||||
//订单信息获取
|
//订单信息获取
|
||||||
Order order = orderService.getByNo(payParam.getSn());
|
Order order = orderService.getById(payParam.getSn());
|
||||||
|
|
||||||
// //如果订单已支付,则不能发器支付
|
// //如果订单已支付,则不能发器支付
|
||||||
if (!order.getStatus().equals(OrderStatusEnum.UNPAID.getValue())) {
|
if (!order.getStatus().equals(OrderStatusEnum.UNPAID.getValue())) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user