Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

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

@@ -199,6 +199,17 @@ public interface EnterpriseApiService {
     ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense(Integer enterpriseId);
 
     /**
+     * 获取商户的某个license具体数据
+     * @Title: getEnterpriseLicense

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param licenseCode

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.EnterpriseLicenseDTO>

+    
*/
+    ServiceResponse<EnterpriseLicenseDTO> getEnterpriseLicense(Integer enterpriseId, String licenseCode);
+
+    /**
      * 服务订购列表数据
      * @Title: listOrder

      * @Description:

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

@@ -6,7 +6,7 @@ public class LicenseUtils {
     public static final String MEMBER_CARD_LICENSE_CODE = "member_card";
     public static final String SERVICE_CARD_LICENSE_CODE = "wxfwh";
     public static final String WECHAT_LICENSE_CODE = "wxapp";
-    public static final String STORE_LICENSE_CODE = "165165";
+    public static final String STORE_LICENSE_CODE = "store";
 
     public static boolean isGoodsLicense(String licenseCode) {
         return GOODS_LICENSE_CODE.equals(licenseCode);

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

@@ -530,6 +530,7 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
     @Override
     public ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense(Integer enterpriseId) {
         ServiceResponse<List<ApplicationLicenseDTO>> hasBuyLicense = enterpriseLicenseApiService.listEnterpriseBuyLicense(Arrays.asList(enterpriseId));
+        LOGGER.info("商户ID：{}，license信息:{}", enterpriseId, JSON.toJSONString(hasBuyLicense));
         if (hasBuyLicense.isSuccess()) {
             List<ApplicationLicenseDTO> licenseList = hasBuyLicense.getResult();
             if (CollectionUtils.isNotEmpty(licenseList)) {
@@ -546,6 +547,18 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
     }
 
     @Override
+    public ServiceResponse<EnterpriseLicenseDTO> getEnterpriseLicense(Integer enterpriseId, String licenseCode) {
+        ServiceResponse<List<EnterpriseLicenseDTO>> result = listEnterpriseLicense(enterpriseId);
+        if (result.isSuccess()) {
+            List<EnterpriseLicenseDTO> list = result.getResult();
+            if (CollectionUtils.isNotEmpty(list)) {
+                return ServiceResponse.success(list.stream().filter(e -> e.getLicenseCode().equals(licenseCode)).collect(Collectors.toList()).get(0));
+            }
+        }
+        return ServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse<Page<OrderGicDTO>> listOrder(OrderServiceQO params) {
         Page<OrderGicDTO> resultPage = new Page<>();
 

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

@@ -81,7 +81,7 @@ public class WmStoreSyncController {
         BUSINESS_TIME_MAP.put("4", "周四");
         BUSINESS_TIME_MAP.put("5", "周五");
         BUSINESS_TIME_MAP.put("6", "周六");
-        BUSINESS_TIME_MAP.put("7", "周七");
+        BUSINESS_TIME_MAP.put("7", "周日");
     }
 
     @Autowired