Merge remote-tracking branch 'origin/qa' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java

@@ -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);
@@ -102,6 +104,7 @@ public class CalculationSharingDiscountService {
                 CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
                 coupon.setCode(checkSpqInfo.getCouponCode());
                 coupon.setActivityCode(checkSpqInfo.getActiveCode());
+                log.info("coupons={},coupon={}", JSON.toJSONString(coupons), JSON.toJSONString(coupon));
                 coupons.add(coupon);
 
                 // 添加商品券代表的商品放入促销