Merge branch 'developer' of…

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

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

@@ -313,8 +313,13 @@ public class AppletWechatMenuApiServiceImpl implements AppletWechatMenuApiServic
                 button.setUrl("www.baidu.com");
                 button.setAppid(menu.getMenuUrlPara());
                 LOGGER.info("小程序类型的menuCode:{}", menu.getMenuCode());
-                //todo 从menuCode中解析
-                button.setPagepath("test");
+                if (StringUtils.isBlank(menu.getMenuCode())) {
+                    button.setPagepath("www.baidu.com");
+                } else {
+                    JSONObject json = (JSONObject) JSONObject.parse(menu.getMenuCode());
+                    //从menuCode中解析
+                    button.setPagepath(json.getString("url"));
+                }
             default:
         }
     }

gic-platform-enterprise-web/pom.xml

@@ -27,6 +27,8 @@
         <gic-log-api>4.0-SNAPSHOT</gic-log-api>
         <gic-marketing-api>4.0-SNAPSHOT</gic-marketing-api>
         <gic-member-config-api>4.0-SNAPSHOT</gic-member-config-api>
+        <gic-mall-share-api>4.0-SNAPSHOT</gic-mall-share-api>
+        <gic-mall-api>4.0-SNAPSHOT</gic-mall-api>
     </properties>
 
     <dependencies>
@@ -187,6 +189,16 @@
             <artifactId>gic-open-platform-api</artifactId>
             <version>${gic-open-platform-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-mall-api</artifactId>
+            <version>${gic-mall-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-mall-share-api</artifactId>
+            <version>${gic-mall-share-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -3,9 +3,15 @@ package com.gic.enterprise.web.controller;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.dto.LinkDTO;
+import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.service.LinkApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
+import com.gic.mall.api.dto.activity.ActivityDTO;
+import com.gic.mall.api.dto.activity.MallActivityPageSerchDTO;
+import com.gic.mall.api.service.MallActivityThemeApiService;
+import com.gic.mall.share.api.dto.shop.ShopDTO;
+import com.gic.mall.share.api.service.ShopApiService;
 import com.gic.member.config.api.dto.AppletCardRelationDTO;
 import com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO;
 import com.gic.member.config.api.service.AppletsConfigApiService;
@@ -32,6 +38,10 @@ public class LinkController {
     private AppletsConfigApiService appletsConfigApiService;
     @Autowired
     private ServiceConfigApiService serviceConfigApiService;
+    @Autowired
+    private ShopApiService shopApiService;
+    @Autowired
+    private MallActivityThemeApiService mallActivityThemeApiService;
 
     @RequestMapping("/list-link-data")
     public RestResponse listLinkData(Integer parentId) {
@@ -57,4 +67,22 @@ public class LinkController {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
+    @RequestMapping("/list-mall-activity")
+    public RestResponse listMallActivity(String appletId) {
+        ServiceResponse<AppletsConfigSimpleOutputDTO> appletResp = appletsConfigApiService.selectAppletsConfigIdByAppId(appletId, UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (!appletResp.isSuccess() || appletResp.getResult() == null) {
+            return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有对应的小程序");
+        }
+        ServiceResponse<ShopDTO> shopResp = shopApiService.getShopByAppletId(appletResp.getResult().getAppletConfigId(), UserDetailUtils.getUserDetail().getEnterpriseId(), 1);
+        if (!shopResp.isSuccess() || shopResp.getResult() == null) {
+            return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有对应的店铺");
+        }
+        MallActivityPageSerchDTO serchDTO = new MallActivityPageSerchDTO();
+        serchDTO.setShopId(shopResp.getResult().getId());
+        serchDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        serchDTO.setStatus(4);
+        ServiceResponse<List<ActivityDTO>> serviceResponse = mallActivityThemeApiService.listActivity(serchDTO);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
 }

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

@@ -116,4 +116,6 @@
 
     <dubbo:reference interface="com.gic.open.api.service.AppTokenApiService" id="appTokenApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.open.api.service.ApplicationApiService" id="applicationApiService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="shopApiService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.mall.api.service.MallActivityThemeApiService" id="mallActivityThemeApiService" timeout="6000"/>
 </beans>