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