Merge branch 'KA-起送价是否按照原价计算-20210918-zxh' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/dto/delivery/QueryDeliveryTemplateResponse.java
#	order-application-service/src/main/java/cn/freemud/service/impl/SpellGroupOrderServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java

@@ -68,7 +68,6 @@ public class SpellGroupOrderAdapter {
         //运费
         long freight = 0 ;
         //判断是否包邮，包邮的话运费为0
-        //判断是否包邮，包邮的话运费为0
         QueryDeliveryTemplateResponse.DeliveryTemplateInfoVo deliveryTemplateInfo = createSpellGroupOrderDto.getDeliveryTemplateInfo();
         if (deliveryTemplateInfo != null && Objects.equals(deliveryTemplateInfo.getCostType(),0)) {
             freight = deliveryTemplateInfo.getFreight() == null? 0: deliveryTemplateInfo.getFreight();

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -186,6 +186,11 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
     private Long shoppingCartGoodsAmount;
 
     /**
+     * 购物车商品原总价
+     */
+    private Long shoppingCartOriginalGoodsAmount;
+
+    /**
      * 加价购商品总价
      */
     private Long sendGoodsAmount;

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

@@ -838,9 +838,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         // 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
         shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(0L);
-        if (CollectionUtils.isNotEmpty(shoppingCartGoodsResponseVo.getProducts())){
+        shoppingCartGoodsResponseVo.setShoppingCartOriginalGoodsAmount(0L);
+        if (CollectionUtils.isNotEmpty(shoppingCartGoodsResponseVo.getProducts())) {
             long shoppingCartGoodsAmount = shoppingCartGoodsResponseVo.getProducts().stream().mapToLong(CartGoods::getAmount).sum();
             shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(shoppingCartGoodsAmount);
+            long shoppingCartOriginalGoodsAmount = shoppingCartGoodsResponseVo.getProducts().stream().mapToLong(CartGoods::getOriginalAmount).sum();
+            shoppingCartGoodsResponseVo.setShoppingCartOriginalGoodsAmount(shoppingCartOriginalGoodsAmount);
         }
 
         if (CollectionUtils.isNotEmpty(shoppingCartInfoRequestVo.getSendGoods())) {
@@ -981,6 +984,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             //SVC卡支付
             SVCCardPay(shoppingCartInfoRequestVo.getCardCode(), shoppingCartInfoRequestVo.getReceiveId(), partnerId, storeId, result);
             return ResponseUtil.success(goodsList.getResult());
+
         } else {
             BaseResponse<ShoppingCartGoodsResponseVo> goodsList = null;
             goodsList = getGoodsList(shoppingCartInfoRequestVo);
@@ -1297,8 +1301,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             List<CartGoods> cartGoodsList = orderItemList.stream().map(this::convert2ShopCartGoods).collect(toList());
 
             ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoodsList, partnerId
-                    , memberId, request.getStoreId(), new CouponPromotionVO(), false, request.getOrderType(), 0,"","", "");
-            if (activityClassifyCouponBean != null && CollectionUtils.isNotEmpty(activityClassifyCouponBean.getUsableCoupons())){
+                    , memberId, request.getStoreId(), new CouponPromotionVO(), false, request.getOrderType(), 0, "", "", "");
+//            if (activityClassifyCouponBean != null && CollectionUtils.isNotEmpty(activityClassifyCouponBean.getUsableCoupons())) {
+//                List<GetMemberInfoResponseVo.Coupon> coupons = activityClassifyCouponBean.getUsableCoupons().stream().map(each -> convert2MemberCoupon(each)).collect(toList());
+//                    , memberId, request.getStoreId(), new CouponPromotionVO(), false, request.getOrderType(), 0,"","", "");
+            if (activityClassifyCouponBean != null && CollectionUtils.isNotEmpty(activityClassifyCouponBean.getUsableCoupons())) {
                 List<GetMemberInfoResponseVo.Coupon> coupons = activityClassifyCouponBean.getUsableCoupons().stream().map(this::convert2MemberCoupon).collect(toList());
                 responseData.setCoupons(coupons);
             }
@@ -2660,7 +2667,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (customerInfoVo == null) throw new ServiceException(ResponseResult.NOT_LOGIN);
         String jsonObject = JSON.toJSONString(customerInfoVo);
         CustomerInfoVo customerInfoVo1 = JSON.parseObject(jsonObject, CustomerInfoVo.class);
-//        BeanUtil.convertBean(customerInfoVo,customerInfoVo1);
         return customerInfoVo1;
     }
 
@@ -2799,8 +2805,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         String redisKey = RedisUtil.limitCart + partnerId + "_" + appid;
         //购物车内部缓存
         String value = redisCache.hashGet(redisKey, "cartLimitType");
-
-        ShoppingSdkLogUtil.infoLog("queryLimitCount",redisKey,value);
         if (StringUtils.isNotBlank(value)) {
             return Integer.parseInt(value);
         }
@@ -3440,10 +3444,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 });
 
                 // 获取到最新的 库存 stockLimitGoods 数据 放入 nowCartGoodsList 中
-//                LogUtil.info("request check stock limit 002 ",stockLimitGoods,notCheckStock);
                 notCheckStock.addAll(stockLimitGoods);
             } else {
-//                LogUtil.info("request check stock limit fail",requestDto,null);
                 fullReplace = false;
             }
         }