查询微盟微商城的版本和到期时间

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

+package com.gic.enterprise.dto.wm;
+
+import java.io.Serializable;
+
+/**
+ * 微盟店铺订单配置
+ * @ClassName: WmOrderConfigDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/4/30 4:09 PM

+ */
+public class WmGoodsConfigDTO implements Serializable{
+
+    private static final long serialVersionUID = 3273511512953006504L;
+    /**
+     * 微盟商品属性ID long类型
+     */
+    private String wmGoodsBrand;
+
+    public String getWmGoodsBrand() {
+        return wmGoodsBrand;
+    }
+
+    public WmGoodsConfigDTO setWmGoodsBrand(String wmGoodsBrand) {
+        this.wmGoodsBrand = wmGoodsBrand;
+        return this;
+    }
+}

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/WmStoreApiService.java

@@ -6,6 +6,7 @@ import com.gic.enterprise.dto.WmMemberCardConfigDTO;
 import com.gic.enterprise.dto.WmOrderConfigDTO;
 import com.gic.enterprise.dto.WmStoreDTO;
 import com.gic.enterprise.dto.wm.WmCouponDTO;
+import com.gic.enterprise.dto.wm.WmGoodsConfigDTO;
 import com.gic.enterprise.dto.wm.WmStoreConfigDTO;
 import com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO;
 import com.gic.enterprise.qo.wm.CouponConfigQO;
@@ -88,6 +89,16 @@ public interface WmStoreApiService {
     ServiceResponse<WmOrderConfigDTO> getOrderConfig(Integer wmMallStoreId);
 
     /**
+     * 商品品牌
+     * @Title: getGoodsConfig

+     * @Description:
+    
* @author guojuxing
+     * @param wmMallStoreId
微盟店铺ID
+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.wm.WmGoodsConfigDTO>

+    
*/
+    ServiceResponse<WmGoodsConfigDTO> getGoodsConfig(Integer wmMallStoreId);
+
+    /**
      * 根据微盟主账号查询配置
      * @Title: getWmStoreConfig

      * @Description:

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

@@ -6,6 +6,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.gic.enterprise.dto.wm.WmGoodsConfigDTO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -117,32 +118,43 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
 
     @Override
     public ServiceResponse<WmMemberCardConfigDTO> getMemberCardConfig(Integer wmMallStoreId) {
-        TabWmStore record = wmStoreService.getByWmMallStoreId(wmMallStoreId);
-        if (record == null) {
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "微盟商城店铺ID错误，查无数据");
+        ServiceResponse<TabWmStoreConfig> result = getWmConfig(wmMallStoreId, WmStoreConfigTypeEnum.MEMBER_CARD_CONFIG);
+        if (result.isSuccess()) {
+            return ServiceResponse.success(JSON.parseObject(result.getResult().getStoreConfigJson(), WmMemberCardConfigDTO.class));
         }
-        TabWmStoreConfig memberCardConfig = wmStoreConfigService.getWmStoreConfig(wmMallStoreId,
-                WmStoreConfigTypeEnum.MEMBER_CARD_CONFIG.getCode());
-        if (memberCardConfig == null) {
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(),
-                    "还未进行" + WmStoreConfigTypeEnum.MEMBER_CARD_CONFIG.getMessage());
-        }
-        return ServiceResponse.success(JSON.parseObject(memberCardConfig.getStoreConfigJson(), WmMemberCardConfigDTO.class));
+        return ServiceResponse.failure(result.getCode(), result.getMessage());
     }
 
     @Override
     public ServiceResponse<WmOrderConfigDTO> getOrderConfig(Integer wmMallStoreId) {
+        ServiceResponse<TabWmStoreConfig> result = getWmConfig(wmMallStoreId, WmStoreConfigTypeEnum.ORDER_CONFIG);
+        if (result.isSuccess()) {
+            return ServiceResponse.success(JSON.parseObject(result.getResult().getStoreConfigJson(), WmOrderConfigDTO.class));
+        }
+        return ServiceResponse.failure(result.getCode(), result.getMessage());
+    }
+
+    @Override
+    public ServiceResponse<WmGoodsConfigDTO> getGoodsConfig(Integer wmMallStoreId) {
+        ServiceResponse<TabWmStoreConfig> result = getWmConfig(wmMallStoreId, WmStoreConfigTypeEnum.GOODS_CONFIG);
+        if (result.isSuccess()) {
+            return ServiceResponse.success(JSON.parseObject(result.getResult().getStoreConfigJson(), WmGoodsConfigDTO.class));
+        }
+        return ServiceResponse.failure(result.getCode(), result.getMessage());
+    }
+
+    private ServiceResponse<TabWmStoreConfig> getWmConfig(Integer wmMallStoreId, WmStoreConfigTypeEnum typeEnum) {
         TabWmStore record = wmStoreService.getByWmMallStoreId(wmMallStoreId);
         if (record == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "微盟商城店铺ID错误，查无数据");
         }
-        TabWmStoreConfig orderConfig = wmStoreConfigService.getWmStoreConfig(wmMallStoreId,
-                WmStoreConfigTypeEnum.ORDER_CONFIG.getCode());
-        if (orderConfig == null) {
+        TabWmStoreConfig config = wmStoreConfigService.getWmStoreConfig(wmMallStoreId,
+               typeEnum.getCode());
+        if (config == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(),
-                    "还未进行" + WmStoreConfigTypeEnum.ORDER_CONFIG.getMessage());
+                    "还未进行" + typeEnum.getMessage());
         }
-        return ServiceResponse.success(JSON.parseObject(orderConfig.getStoreConfigJson(), WmOrderConfigDTO.class));
+        return ServiceResponse.success(config);
     }
 
     @Override

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java

@@ -10,6 +10,8 @@ import com.gic.enterprise.error.ErrorCode;
 import com.gic.goods.pump.api.service.WeiMobGoodsService;
 import com.gic.member.config.api.enums.OrderPointCalculationPartyEnum;
 import com.gic.member.config.api.service.OrderPointCalculationPartyApiService;
+import com.gic.open.api.dto.EnterpriseServeInfoDTO;
+import com.gic.open.api.service.EnterpriseLicenseApiService;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.weimob.api.service.*;
 import org.apache.commons.collections.CollectionUtils;
@@ -63,6 +65,8 @@ public class WmMallStoreController {
     private OrderPointCalculationPartyApiService orderPointCalculationPartyApiService;
     @Autowired
     private WeimobOrderService weimobOrderService;
+    @Autowired
+    private EnterpriseLicenseApiService enterpriseLicenseApiService;
 
     @RequestMapping("/save-wm-store")
     public RestResponse save(WmStoreDTO dto) {
@@ -224,6 +228,13 @@ public class WmMallStoreController {
                 .getCouponLogs(Long.valueOf(gicCouponId), sendType, currentPage, pageSize, searchStr), WeimobCouponErLogVO.class);
     }
 
+    @RequestMapping("/license")
+    public RestResponse license() {
+        ServiceResponse<EnterpriseServeInfoDTO> info = enterpriseLicenseApiService
+                .getServeInfo(UserDetailUtils.getUserDetail().getEnterpriseId(), "weimob");
+        return ResultControllerUtils.commonResult(info);
+    }
+
     /**
      * 删除卡券错误日志
      * @param couponErLogIds 卡券错误日志ID，英文逗号给开

gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml

@@ -137,4 +137,6 @@
 
     <dubbo:reference interface="com.gic.goods.pump.api.service.WeiMobGoodsService" id="weiMobGoodsService" timeout="60000" />
     <dubbo:reference interface="com.gic.member.config.api.service.OrderPointCalculationPartyApiService" id="orderPointCalculationPartyApiService" timeout="60000" />
+
+    <dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" retries="0"/>
 </beans>