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

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -559,4 +559,5 @@ public class ShoppingCartAdapter {
         }
         return false;
     }
+
 }

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

@@ -2752,10 +2752,8 @@ public class OrderServiceImpl implements Orderservice {
                 // 拼单人数大于1人时参加拼单补贴
                 if (null != orderBean.getProductList() && orderBean.getProductList().stream().map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getUserId).distinct().collect(Collectors.toList()).size() > 1) {
                     Map<String, String> goodsTagMap = this.goodsTagMap();
-                    if (null != goodsTagMap && !goodsTagMap.isEmpty()) {
-                        // 根据商户号获取
-                        request.setGoodsTag(goodsTagMap.get(orderBean.getCompanyId()) == null ? collageGoodsTag : goodsTagMap.get(orderBean.getCompanyId()));
-                    }
+                    String goodsTag = goodsTagMap.get(orderBean.getCompanyId());
+                    request.setGoodsTag(StringUtils.isBlank(goodsTag) ? collageGoodsTag : goodsTag);
                 }
             }
             // add by miaohui for 拼单群收款判断拼单人数大于1时参与微信平台补贴活动，创建预支付时上送goodsTag，后续抽成促销服务活动时删除此逻辑 end

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/CheckSpqInfoResponseDto.java

@@ -23,6 +23,7 @@ public class CheckSpqInfoResponseDto {
      * 券名称
      */
     private String couponName;
+    private boolean stockLimit;
     /**
      * 商品券code
      */

shopping-cart-application-service/src/main/java/cn/freemud/factory/AbstractShoppingCartImpl.java

@@ -22,6 +22,7 @@ import cn.freemud.service.impl.*;
 import cn.freemud.service.thirdparty.CustomerApplicationClient;
 import cn.freemud.service.thirdparty.StockClient;
 import cn.freemud.utils.PromotionFactory;
+import com.alibaba.fastjson.JSON;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerStoreDeliveryConfig;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerStoreDeliveryConfigManager;
 import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
@@ -354,9 +355,9 @@ public abstract class AbstractShoppingCartImpl implements ShoppingCartNewService
      */
     public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList
             , ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, UserLoginInfoDto userLoginInfoDto,String menuType,Long deliveryAmount) {
-        log.info("pindantest cuxiao->" + calculationDiscountResult);
-        log.info("pindantest cartGoodsList->" + cartGoodsList);
-        log.info("pindantest activityQueryDto->" + activityQueryDto);
+        log.info("pindantest calculationDiscountResult->" + JSON.toJSONString(calculationDiscountResult));
+        log.info("pindantest cartGoodsList->" + JSON.toJSONString(cartGoodsList));
+        log.info("pindantest activityQueryDto->" + JSON.toJSONString(activityQueryDto));
         //默认计算优惠
         DefaultPromotionService defaultPromotionService = (DefaultPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.DEFAULT_PROMOTION);
         defaultPromotionService.updateShoppingCartGoodsDiscount(couponPromotionVO, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
@@ -503,7 +504,7 @@ public abstract class AbstractShoppingCartImpl implements ShoppingCartNewService
          */
         MaterialPromotionService materialPromotionService = (MaterialPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.Material);
         materialPromotionService.updateShoppingCartGoodsDiscount(couponPromotionVO, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
-
+        log.info("pindantest shoppingCartGoodsResponseVo->" + JSON.toJSONString(shoppingCartGoodsResponseVo));
     }
 
     /**

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

@@ -48,10 +48,12 @@ import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.couponcenter.offline.domain.CodeInfoVO;
 import com.freemud.application.sdk.api.couponcenter.offline.response.CouponQueryResponse;
 import com.freemud.application.sdk.api.productcenter.constant.ResponseConstant;
+import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductRequest;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
 import com.freemud.application.sdk.api.productcenter.response.ProductResponseDTO;
 import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopProductResponse;
+import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopProductResult;
 import com.freemud.card.sdk.comm.Finals;
 import com.freemud.card.sdk.comm.SignUtil;
 import com.freemud.card.sdk.service.CouponAvailableService;
@@ -691,6 +693,7 @@ public class CouponServiceImpl implements CouponService {
         dto.setPrice(productsVo.getFinalPrice());
         dto.setSpuId(productsVo.getSpuId());
         dto.setSpuName(productsVo.getSkuName());
+        dto.setStockLimit(ObjectUtils.equals(1, productsVo.getStockLimit()));
         dto.setSkuId(productsVo.getSkuId());
         dto.setSkuName(StringUtils.isNotBlank(productsVo.getSkuName()) ? productsVo.getSkuName() : productsVo.getSpuName());
         dto.setPicture(productsVo.getSpuPicture());
@@ -783,7 +786,6 @@ public class CouponServiceImpl implements CouponService {
              return null;
         }
 
-
         //券返回的商品id
         List<String> skuIds = Lists.newArrayList();
         String skuId = goodsId;
@@ -814,6 +816,7 @@ public class CouponServiceImpl implements CouponService {
         dto.setPicture(productsVo.getSpuPicture());
         dto.setDefaultSpecName(productsVo.getDefaultSpecName());
         dto.setDefaultSpecId(productsVo.getDefaultSpecId());
+        dto.setStockLimit(ObjectUtils.equals(1, productsVo.getStockLimit()));
         dto.setExtras(productsVo.getExtra());
         dto.setCouponType(couponType);
         log.info("dto***" + dto);

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

@@ -791,6 +791,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo,
                 shoppingCartInfoRequestVo.getOrderType(), tableNumber, shoppingCartInfoRequestVo.getMenuType() ,shoppingCartBaseService);
         com.freemud.sdk.api.assortment.shoppingcart.domain.ShoppingCartGoodsResponseVo cartGoodsResponseVo = checkCartRequest.getShoppingCartGoodsResponseVo();
+        // 校验商品券库存
+
+
         //商品不再售卖状态或价格变动，直接返回报错
         if (cartGoodsResponseVo != null) {
             if (cartGoodsResponseVo.getCartGoodsStates() != null && cartGoodsResponseVo.getCartGoodsStates().isHasInvalidGoods()) {
@@ -1004,6 +1007,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     validCouponMap.put(spqId, checkSpqInfoResponseDto);
                     cartGoods.setName(checkSpqInfoResponseDto.getCouponName());
                     cartGoods.setSpuName(checkSpqInfoResponseDto.getCouponName());
+                    cartGoods.setStockLimit(checkSpqInfoResponseDto.isStockLimit());
                     // 添加请求的优惠券信息
                     ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
                     coupon.setCode(checkSpqInfoResponseDto.getCouponCode());

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

@@ -106,7 +106,7 @@ public class CalculationSharingDiscountService {
                     validCouponMap.put(spqId, checkSpqInfo);
                     cartGoods.setName(checkSpqInfo.getCouponName());
                     cartGoods.setSpuName(checkSpqInfo.getCouponName());
-
+                    cartGoods.setStockLimit(checkSpqInfo.isStockLimit());
                     CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
                     coupon.setCode(checkSpqInfo.getCouponCode());
                     coupon.setActivityCode(checkSpqInfo.getActiveCode());

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

@@ -24,6 +24,7 @@ import cn.freemud.utils.WebUtil;
 import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +32,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.stream.Collectors;
-
+@Slf4j
 @Service("cocoShoppingCartRelationService")
 public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelationService {
 
@@ -356,10 +357,15 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                     product.setGoodsId(null);
                 }
 
+
+                // 如果是赠品行，这行的价格就不用算了
+                if(!gifeProductIds.contains(product.getGoodsId()) && product.getActivityType() == null){
                     // 商品的单价 = 商品单价+小料单价
                     product.setOriginalPrice(originalPrice);
                     // 商品现单价 = 商品现单价+小料现单价
-                product.setFinalPrice(new Long(smallMaterialOriTotal) + product.getFinalPrice());
+                    smallMaterialOriTotal = smallMaterialOriTotal == null ? 0 : smallMaterialOriTotal;
+                    product.setFinalPrice(new Long(smallMaterialOriTotal) + (product.getFinalPrice() == null ? 0L : product.getFinalPrice()));
+                }
 
                 newProducts.add(product);
             }