发放积分顺序调整
This commit is contained in:
@@ -446,7 +446,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public boolean joinMember(Long shopId, Long userId, Long memberOrderId) {
|
public boolean joinMember(Long shopId, Long userId, Long memberOrderId) {
|
||||||
MemberConfigVO memberConfigVO = detail(shopId);
|
MemberConfigVO memberConfigVO = detail(shopId);
|
||||||
ShopUser shopUser = shopUserService.getShopUserInfo(shopId, userId);
|
ShopUser shopUser = shopUserService.getShopUserInfo(shopId, userId);
|
||||||
@@ -520,14 +520,15 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
|
|||||||
memberOrder.setPayAmount(memberOrder.getAmount());
|
memberOrder.setPayAmount(memberOrder.getAmount());
|
||||||
memberOrder.setStatus(OrderStatusEnums.DONE.getCode());
|
memberOrder.setStatus(OrderStatusEnums.DONE.getCode());
|
||||||
memberOrderService.updateById(memberOrder);
|
memberOrderService.updateById(memberOrder);
|
||||||
if (memberOrder.getReward() != null) {
|
|
||||||
deliver(shopUser, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getAmount(), memberOrder.getReward(), memberOrderId);
|
|
||||||
}
|
|
||||||
if (shopUser.getMemberLevelId() == null || shopUser.getMemberLevelId() == 0) {
|
if (shopUser.getMemberLevelId() == null || shopUser.getMemberLevelId() == 0) {
|
||||||
shopUser.setMemberLevelId(levelConfig.getId());
|
shopUser.setMemberLevelId(levelConfig.getId());
|
||||||
}
|
}
|
||||||
shopUser.setIsVip(1);
|
shopUser.setIsVip(1);
|
||||||
shopUser.setOpenType("PAY");
|
shopUser.setOpenType("PAY");
|
||||||
|
if (memberOrder.getReward() != null) {
|
||||||
|
deliver(shopUser, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getAmount(), memberOrder.getReward(), memberOrderId);
|
||||||
|
}
|
||||||
return shopUserService.updateInfo(shopUser);
|
return shopUserService.updateInfo(shopUser);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user