会员充值问题
This commit is contained in:
parent
bf8c4812b4
commit
6c4da6d5a9
|
|
@ -535,7 +535,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||
} else {
|
||||
shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.CASH_IN);
|
||||
}
|
||||
//更新会员余额 并生成流水
|
||||
Long flowId = shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
|
||||
String extParam = czgCallBackDto.getExtParam();
|
||||
if (StrUtil.isBlank(extParam)) {
|
||||
return;
|
||||
}
|
||||
JSONObject jsonObject = JSONObject.parseObject(extParam);
|
||||
if (isFree) {
|
||||
if (StrUtil.isBlank(jsonObject.getString("orderId"))) {
|
||||
|
|
@ -547,10 +552,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||
.set(OrderInfo::getIsFreeDine, 1)
|
||||
.set(OrderInfo::getPayAmount, 0)
|
||||
.update();
|
||||
}
|
||||
//更新会员余额 并生成流水
|
||||
Long flowId = shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
|
||||
if (!isFree) {
|
||||
} else {
|
||||
//会员活动
|
||||
activateService.giveActivate(shopUser, new BigDecimal(czgCallBackDto.getAmount()).divide(new BigDecimal(100), 2, RoundingMode.DOWN),
|
||||
StrUtil.isNotBlank(jsonObject.getString("activateId")) ? jsonObject.getLong("activateId") : null, flowId);
|
||||
|
|
|
|||
Loading…
Reference in New Issue