|
|
|
@@ -1572,8 +1572,12 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
if (updateOrder.getCouponChannelId() != null) { |
|
|
|
WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId(),updateOrder.getTenantId()); |
|
|
|
creditHistory.setCouponId(wxCouponChannel.getCouponId()); |
|
|
|
|
|
|
|
} |
|
|
|
creditHistory.setChangePurpose("("+wxMerchant.getName()+")付款码消费("+creditHistory.getSpendStr()+")元"); |
|
|
|
|
|
|
|
creditHistory.setChangePurpose("付款码消费:消费商户["+wxMerchant.getName()+"] 金额["+creditHistory.getSpendStr()+"元]"); |
|
|
|
|
|
|
|
|
|
|
|
wxCreditHistoryService.saveOrUpdate(creditHistory); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("积分值:" + e.getMessage()); |
|
|
|
@@ -2206,7 +2210,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
creditHistory.setTenantId(coupon.getFinalTenantId()); |
|
|
|
creditHistory.setFinalTenantId(coupon.getFinalTenantId()); |
|
|
|
creditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); |
|
|
|
creditHistory.setChangePurpose(EnumScoreType.CHANGE_CREDIT.getMessage()+"("+coupon.getTitle()+")"); |
|
|
|
creditHistory.setChangePurpose(EnumScoreType.CHANGE_CREDIT.getMessage()+"["+coupon.getTitle()+"]"); |
|
|
|
creditHistory.setCouponId(coupon.getId()); |
|
|
|
//如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 |
|
|
|
setMerchantId(coupon, creditHistory); |
|
|
|
|