消息中心
This commit is contained in:
@@ -1265,7 +1265,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
|
||||
//积分使用
|
||||
if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) {
|
||||
pointsUserService.alterPoints(null, shopUser.getId(), orderInfo.getShopId(), PointsConstant.SUB,
|
||||
orderInfo.getPointsNum(), orderInfo.getId().toString(), "积分抵扣账单");
|
||||
orderInfo.getPointsNum(), orderInfo.getId(), "积分抵扣账单");
|
||||
|
||||
}
|
||||
//更新优惠券信息
|
||||
@@ -1289,8 +1289,6 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
|
||||
|| (payType != null && !ArrayUtil.contains(payTypes, payType))) {
|
||||
//下单赠送积分
|
||||
pointsConfigService.consumeAwardPoints(shopUser.getId(), orderInfo);
|
||||
// pointsUserService.alterPoints(null, shopUser.getId(), orderInfo.getShopId(), PointsConstant.ADD,
|
||||
// rechargeDetail.getRewardPoints(), orderInfo.getId(), "下单赠送积分");
|
||||
|
||||
//消费返现
|
||||
if (!orderInfo.getPayType().equals(PayEnums.CASH_PAY.getValue())) {
|
||||
@@ -1505,7 +1503,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
|
||||
//积分使用
|
||||
if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) {
|
||||
pointsUserService.alterPoints(null, shopUser.getId(), orderInfo.getShopId(), PointsConstant.ADD,
|
||||
orderInfo.getPointsNum(), orderInfo.getId().toString(), "积分抵扣账单");
|
||||
orderInfo.getPointsNum(), orderInfo.getId(), "积分抵扣账单");
|
||||
}
|
||||
//更新优惠券信息
|
||||
if (StrUtil.isNotBlank(orderInfo.getCouponInfoList()) && !"null".equals(orderInfo.getCouponInfoList())) {
|
||||
|
||||
@@ -115,7 +115,7 @@ public class PointsGoodPayServiceImpl implements PointsGoodPayService {
|
||||
if (record.getSpendPoints() != null && record.getSpendPoints() > 0) {
|
||||
//回增积分
|
||||
pointsUserService.alterPoints(record.getUserId(), record.getShopUserId(), record.getShopId(), PointsConstant.ADD,
|
||||
record.getSpendPoints(), record.getId().toString(), "积分商品兑换退款");
|
||||
record.getSpendPoints(), record.getId(), "积分商品兑换退款");
|
||||
}
|
||||
//退钱
|
||||
if (record.getExtraPaymentAmount() != null && record.getExtraPaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
|
||||
@@ -147,7 +147,7 @@ public class PointsGoodPayServiceImpl implements PointsGoodPayService {
|
||||
}
|
||||
//扣除积分
|
||||
pointsUserService.alterPoints(record.getUserId(), null, record.getShopId(), PointsConstant.SUB,
|
||||
record.getSpendPoints(), record.getId().toString(), "积分商品兑换");
|
||||
record.getSpendPoints(), record.getId(), "积分商品兑换");
|
||||
record.setIsDel(0);
|
||||
if (goods.getGoodsCategory().equals("优惠券")) {
|
||||
record.setStatus("已完成");
|
||||
|
||||
Reference in New Issue
Block a user