商户基础服务订购控制商品资源

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/EnterpriseListDTO.java

 package com.gic.enterprise.dto;
 
 import com.gic.enterprise.constant.LicenseTypeEnum;
+import com.gic.enterprise.utils.LicenseUtils;
 
 import java.io.Serializable;
 import java.util.Arrays;
@@ -65,6 +66,11 @@ public class EnterpriseListDTO implements Serializable{
      */
     private Integer isInitComplete;
 
+    /**
+     * 商品license数量
+     */
+    private Integer goodsCount;
+
     public Integer getEnterpriseId() {
         return enterpriseId;
     }
@@ -162,10 +168,14 @@ public class EnterpriseListDTO implements Serializable{
             Map<String, Object> map = Arrays.stream(licenseUpperLimitStr.split("-"))
                     .map(e -> e.split(":"))
                     .collect(Collectors.toMap(e -> e[0], e -> e[1]));
-            Object memberCard = map.get("会员卡");
-            Object serviceCard = map.get("服务号");
-            Object weChat = map.get("小程序");
-            Object store = map.get("门店");
+            Object memberCard = map.get(LicenseUtils.MEMBER_CARD_LICENSE_NAME);
+            Object serviceCard = map.get(LicenseUtils.SERVICE_CARD_LICENSE_NAME);
+            Object weChat = map.get(LicenseUtils.WECHAT_LICENSE_NAME);
+            Object store = map.get(LicenseUtils.STORE_LICENSE_NAME);
+            //商品license，用于前端license扩容的时候判断：商品数量不变,不提交商品license数据给接口
+            Object goods = map.get(LicenseUtils.GOODS_LICENSE_NAME);
+            setGoodsCount(goods == null ? 0 : (Integer) goods);
+
             return (memberCard == null ? "0" : memberCard.toString()) + "-"
                     + (serviceCard == null ? "0" : serviceCard.toString()) + "-"
                     + (weChat == null ? "0" : weChat.toString()) + "-"
@@ -184,4 +194,13 @@ public class EnterpriseListDTO implements Serializable{
     public void setIsInitComplete(Integer isInitComplete) {
         this.isInitComplete = isInitComplete;
     }
+
+    public Integer getGoodsCount() {
+        return goodsCount;
+    }
+
+    public EnterpriseListDTO setGoodsCount(Integer goodsCount) {
+        this.goodsCount = goodsCount;
+        return this;
+    }
 }

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/utils/LicenseUtils.java

+package com.gic.enterprise.utils;
+
+public class LicenseUtils {
+
+    public static final String GOODS_LICENSE_NAME = "商品数量";
+    public static final String MEMBER_CARD_LICENSE_NAME = "会员卡";
+    public static final String SERVICE_CARD_LICENSE_NAME = "服务号";
+    public static final String WECHAT_LICENSE_NAME = "小程序";
+    public static final String STORE_LICENSE_NAME = "门店";
+
+    public static boolean isGoodsLicense(String licenseName) {
+        return GOODS_LICENSE_NAME.equals(licenseName);
+    }
+}

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/DataWechatMemberConfigService.java

@@ -17,6 +17,8 @@ public interface DataWechatMemberConfigService {
     
*/
     Integer saveWechatMemberConfig(DataWechatMemberConfigDTO dto);
 
+    Integer editWechatMemberConfig(DataWechatMemberConfigDTO dto);
+
     /**
      *
      * @Title: getByMemberCardId


gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/DataWechatMemberConfigServiceImpl.java

@@ -28,6 +28,13 @@ public class DataWechatMemberConfigServiceImpl implements DataWechatMemberConfig
     }
 
     @Override
+    public Integer editWechatMemberConfig(DataWechatMemberConfigDTO dto) {
+        TabDataWechatMemberConfig record = EntityUtil.changeEntityNew(TabDataWechatMemberConfig.class, dto);
+        record.setUpdateTime(new Date());
+        return tabDataWechatMemberConfigMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
     public TabDataWechatMemberConfig getByMemberCardId(Integer enterpriseId, String memberCardId) {
         return tabDataWechatMemberConfigMapper.getByMemberCardId(enterpriseId, memberCardId);
     }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/EnterpriseApiServiceImpl.java

@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 import com.gic.enterprise.constant.BillingAuditStatusEnum;
+import com.gic.enterprise.utils.LicenseUtils;
 import com.gic.marketing.process.api.service.sms.SmsSendApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -427,6 +428,13 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
     public ServiceResponse<MarketServiceDTO> buyForGicForNew(BuyForGicQO basicParams) {
         MarketServiceDTO marketServiceDTO = new MarketServiceDTO();
 
+        List<TabEnterpriseResourceRel> businessFront = enterpriseResourceRelService.getByEnterpriseId(basicParams.getEnterpriseId().intValue());
+        //是否有商品管理权限
+        boolean hasGoodsAuth = false;
+        if (CollectionUtils.isNotEmpty(businessFront)) {
+            hasGoodsAuth = businessFront.stream().anyMatch(e -> "goods".equals(e.getResourceCode()) && e.getResourceSwitch().intValue() == 1);
+        }
+
         List<com.gic.enterprise.dto.market.OrderBuyLicenseDTO> orderBuyLicenseDTOList = basicParams.getLicenseList();
         List<OrderBuyLicenseDTO> licenseListParams = EntityUtil.changeEntityListNew(OrderBuyLicenseDTO.class,
                 orderBuyLicenseDTOList);
@@ -478,6 +486,12 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
                 } else if (serviceType == 2) {
                     //license
                     LicenseDTO license = EntityUtil.changeEntityNew(LicenseDTO.class, orderItem);
+                    //没有商品权限
+                    if (!hasGoodsAuth) {
+                        if (LicenseUtils.GOODS_LICENSE_NAME.equals(orderItem.getServeName())) {
+                            continue;
+                        }
+                    }
                     license.setSkuId(long2String(orderItem.getSkuId()));
                     license.setServeId(long2String(orderItem.getServeId()));
                     licenseList.add(license);