Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -15,6 +15,7 @@ import cn.freemud.service.impl.mcoffee.entity.*;
 import cn.freemud.service.thirdparty.CouponClient;
 import cn.freemud.service.thirdparty.CustomerExtendClient;
 import cn.freemud.utils.BarcodeUtil;
+import cn.freemud.utils.ExceptionUtils;
 import cn.freemud.utils.LogUtil;
 import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.log.ApiLog;
@@ -45,6 +46,7 @@ import java.util.stream.Collectors;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
+@Slf4j
 public class CouponDiscountCalculation {
 
     @Autowired
@@ -544,7 +546,9 @@ public class CouponDiscountCalculation {
         try {
             for (CartGoods cartGood : cartGoods) {
                 // 剔除商品券得商品
-                if (StringUtils.isEmpty(cartGood.getSkuId()) && StringUtils.isEmpty(cartGood.getSpuId()) || StringUtils.equals("9999",cartGood.getSkuId())) {
+                if (StringUtils.isEmpty(cartGood.getSkuId()) && StringUtils.isEmpty(cartGood.getSpuId())
+                        || StringUtils.equals("9999",cartGood.getSkuId())
+                        || StringUtils.equals("9998",cartGood.getSkuId())) {
                     continue;
                 }
                 // 剔除商品券得商品,麦咖啡逻辑
@@ -570,6 +574,7 @@ public class CouponDiscountCalculation {
                 totalAmount = totalAmount +product.getAmount() * cartGood.getQty();
             }
         } catch (NumberFormatException e) {
+            log.error("数字转换异常:" + ExceptionUtils.getExceptionInfo(e));
             throw new ServiceException(ResponseResult.SYSTEM_ERROR);
         }
         return totalAmount;