Commit a4f86ce2 by xiaoer.li@freemud.com

Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

parents 8c35e557 c6242af4
......@@ -82,8 +82,10 @@ public class CalculationSharingDiscountService {
CheckSpqInfoResponseDto checkSpqInfo = null;
if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
log.info("coupon:{},{}", "hg", JSON.toJSONString(checkSpqInfo));
} else {
checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto);
log.info("coupon:{},{}", "sp", JSON.toJSONString(checkSpqInfo));
}
if (null == checkSpqInfo) {
cartGoodsList.remove(i);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment