Merge branch 'KA-【华莱士】【半定制】一个订单多张优惠券使用场景-zxh' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2201,7 +2201,6 @@ public class OrderServiceImpl implements Orderservice {
             queueIndexMap.put("queueIndex", response.getData() == null ? "" : response.getData().toString());
             return ResponseUtil.success(queueIndexMap);
         } catch (Exception e) {
-            AppLogUtil.errorLog("",JSONObject.toJSONString(queryOrderQueueIndexVo),"",e);
             return ResponseUtil.error(ResponseResult.SYSTEM_BUSINESS_ERROR);
         }
     }

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

@@ -699,8 +699,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 for (int i = cartGoodsList.size() - 1; i >= 0; i--) {
                     CartGoods cartGoods = cartGoodsList.get(i);
                     if (GoodsTypeEnum.COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType()) || GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                        //fisherman 一单多券 判断传递过来的券 是哪个商品
-                        if (unChooseCouponCode.equals(cartGoods.getSkuId())) {
+                        if (unChooseCouponCode.equals(cartGoods.getSpuId())) {
                             CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, cartGoods.getSpuId(), menuType,null);
                             GetProductsVo productInfo = null;
                             if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
@@ -714,8 +713,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                             } else {
                                 convert2CartGoods(cartGoods, productInfo);
                             }
-
                         }
+
                     }
                 }
             }