Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of…

Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

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

+package cn.freemud.entities.dto;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: OpenPlatformPartnerWxappConfig
+ * @Package cn.freemud.entities.dto
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2020/9/15 15:59
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class OpenPlatformPartnerWxappConfig {
+
+    private String wxAppid;
+
+    private String appKey;
+    private String appValue;
+
+    private Integer state;
+}

shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -89,6 +89,8 @@ public enum ResponseResult {
     SHOPPING_CART_GOODS_COUPON_CAN_NOT_USE("44022", "已加入同样优惠券，第二张暂不可用"),
     SHOPPING_CART_PRODUCT_CAN_NOT_USE("44023", "商品不可用"),
     SHOPPING_CART_COUPON_CAN_NOT_USE("44024", "商品券不可用"),
+    SHOPPING_CART_LIMIT_ADD("44025", "加购数量超过限制"),
+
     /**
      * 订单状态码
      */

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

@@ -30,6 +30,7 @@ import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.interceptor.BizServiceException;
+import cn.freemud.redis.RedisCache;
 import cn.freemud.service.*;
 import cn.freemud.service.thirdparty.*;
 import cn.freemud.utils.PromotionFactory;
@@ -39,6 +40,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerStoreDeliveryConfig;
+import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerWxappConfig;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerStoreDeliveryConfigManager;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.application.sdk.api.log.ErrorLog;
@@ -67,6 +69,8 @@ import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.BoundHashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.awt.geom.Point2D;
@@ -254,6 +258,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
          allCartGoodsList.get(allCartGoodsList.indexOf(cartGoods)).getQty() + cartGoods.getQty() : cartGoods.getQty();
          */
         Integer checkQty = this.checkSkuQty(allCartGoodsList, cartGoods);
+        //购物车添加数量限制
+        limitGoodsQty(checkQty,appId);
         //查询多个商品库存信息
         queryManyGoodsStocks(addShoppingCartGoodsRequestVo, productIds, productBeanListSpuClass, skuId, checkQty);
         String productName = null;
@@ -345,6 +351,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (cartGoods == null) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_UPDATE_ERROR);
         }
+        //购物车添加数量限制
+        limitGoodsQty(qty,appId);
         // 检查购物车商品库存数量
         checkUpdateStock(updateShoppingCartGoodsQtyRequestVo, cartGoods);
 
@@ -1627,4 +1635,42 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             shoppingCartGoodsResponseVo.setToastMsg("");
         }
     }
+
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    /**
+     * 查询生态配置限制加购开关与限制数量
+     */
+    public void limitGoodsQty(Integer qty,String appid){
+        String redisKey = "ecology:kgd:wxappconfig:open_platform_partner_wxapp_config:appkey_"+appid;
+
+        Object value = redisCache.hashGet(redisKey, "2");
+        List<AssortmentOpenPlatformPartnerWxappConfig> configs = null;
+        if (value == null) {
+            return ;
+        } else {
+            JSONArray jsonArray = (JSONArray)value;
+            int cartLimitFlag = 0;
+            int cartLimitCount = 0;
+            for (Object object : jsonArray){
+                JSONObject jsonObject = (JSONObject)object;
+                HashMap hashMap = JSONObject.parseObject(jsonObject.toJSONString(),HashMap.class);
+                if("cartLimitFlag".equals(hashMap.get("appKey"))){
+                    cartLimitFlag = Integer.parseInt((String)hashMap.get("appValue"));
+                }
+                if("cartLimitCount".equals(hashMap.get("appKey"))){
+                    cartLimitCount = Integer.parseInt((String)hashMap.get("appValue"));
+                }
+            }
+            if(cartLimitFlag == 1 && cartLimitCount != 0 && qty > cartLimitCount){
+                throw new ServiceException(ResponseResult.SHOPPING_CART_LIMIT_ADD);
+            }
+        }
+
+    }
 }