|
|
|
@@ -316,7 +316,6 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { |
|
|
|
orderUpdate.setPayment(payment); |
|
|
|
}else if(coupon.getCardScoreRule().intValue() == EnumCardScoreRule.BY_PRICE.getCode().intValue()){ |
|
|
|
orderUpdate.setPayment(record.getDeductionAmount()); |
|
|
|
orderUpdate.setCreditByPamentRate(false); |
|
|
|
} |
|
|
|
if (null != merchant) { |
|
|
|
wxScoreRulesService.addScore2(coupon,EnumScoreType.CONSUMPTION, orderUpdate, merchant.getBusinessId()); |
|
|
|
@@ -345,7 +344,6 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { |
|
|
|
creditHistory.setSpend(payment); |
|
|
|
}else if(coupon.getCardScoreRule().intValue() == EnumCardScoreRule.BY_PRICE.getCode().intValue()){ |
|
|
|
creditHistory.setSpend(record.getDeductionAmount()); |
|
|
|
creditHistory.setCreditByPamentRate(false); |
|
|
|
} |
|
|
|
//如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 |
|
|
|
creditHistory.setMerchantId(record.getMerchantId()); |
|
|
|
|