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/EnterpriseApiServiceImpl.java

@@ -165,9 +165,7 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
         }
         //会员组接口初始化
         ServiceResponse<Void> memberInitResult = memberInitApiService.configInit(enterpriseId);
-        if (!memberInitResult.isSuccess()) {
-            LOGGER.warn(memberInitResult.getMessage());
-        }
+        LOGGER.warn("新增商户-会员组接口初始化结果:{}", JSONObject.toJSONString(memberInitResult));
 
         return ServiceResponse.success(enterpriseId);
     }

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

 package com.gic.enterprise.web.controller;
 
+import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.dto.LinkDTO;
@@ -7,8 +8,9 @@ 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.enterprise.web.vo.ActivityThemeVO;
 import com.gic.mall.api.dto.activity.MallActivityPageSerchDTO;
+import com.gic.mall.api.dto.activity.MallActivityThemeDTO;
 import com.gic.mall.api.service.MallActivityThemeApiService;
 import com.gic.mall.share.api.dto.shop.ShopDTO;
 import com.gic.mall.share.api.service.ShopApiService;
@@ -20,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -73,6 +76,7 @@ public class LinkController {
         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(), "没有对应的店铺");
@@ -81,8 +85,22 @@ public class LinkController {
         serchDTO.setShopId(shopResp.getResult().getId());
         serchDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
         serchDTO.setStatus(4);
-        ServiceResponse<List<ActivityDTO>> serviceResponse = mallActivityThemeApiService.listActivity(serchDTO);
-        return ResultControllerUtils.commonResult(serviceResponse);
+        serchDTO.setPageNum(1);
+        serchDTO.setPageSize(200);
+        ServiceResponse<Page<MallActivityThemeDTO>> serviceResponse = mallActivityThemeApiService.pageActivityTheme(serchDTO);
+        if (serviceResponse.isSuccess()) {
+            List<MallActivityThemeDTO> themeDTOList = serviceResponse.getResult().getResult();
+            List<ActivityThemeVO> resultList = new ArrayList<>();
+            for (MallActivityThemeDTO mallActivityThemeDTO : themeDTOList) {
+                ActivityThemeVO themeVO = new ActivityThemeVO();
+                themeVO.setId(mallActivityThemeDTO.getId());
+                themeVO.setActivityName(mallActivityThemeDTO.getThemeName());
+                resultList.add(themeVO);
+            }
+            return RestResponse.success(resultList);
+        } else {
+            return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        }
     }
 
 }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/ActivityThemeVO.java

+package com.gic.enterprise.web.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-04-09 15:51
+ */
+public class ActivityThemeVO implements Serializable {
+    private static final long serialVersionUID = 8153540107794836903L;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+    private String activityName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getActivityName() {
+        return activityName;
+    }
+
+    public void setActivityName(String activityName) {
+        this.activityName = activityName;
+    }
+}

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseSmsController.java

@@ -8,6 +8,7 @@ import com.gic.enterprise.dto.EnterpriseInitDTO;
 import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.service.EnterpriseApiService;
 import com.gic.enterprise.service.EnterpriseInitApiService;
+import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.marketing.api.dto.sms.EnterpriseSmsSignDTO;
 import com.gic.marketing.api.dto.sms.SmsApplicationDTO;
 import com.gic.operation.web.vo.EnterpriseSmsSignVO;
@@ -86,18 +87,18 @@ public class EnterpriseSmsController {
 
     @RequestMapping("/get-sms")
     public RestResponse getSms(Long signId) {
-        return ResultControllerUtils.commonResultOne(smsOuterApiService.getSmsSignByid(signId), EnterpriseSmsSignVO.class);
+        return ResultControllerUtils.commonResultOne(smsOuterApiService.getSmsSignByid(UserDetailUtils.getUserDetail().getEnterpriseId(), signId), EnterpriseSmsSignVO.class);
     }
 
     @RequestMapping("/edit-sms")
     public RestResponse editSms(Long signId, String smsSignId, String smsSignText, int useType) {
         return ResultControllerUtils
-                .commonResult(smsOuterApiService.editEnterpriseSmsSign(signId, smsSignId, smsSignText, useType));
+                .commonResult(smsOuterApiService.editEnterpriseSmsSign(UserDetailUtils.getUserDetail().getEnterpriseId(), signId, smsSignId, smsSignText, useType));
     }
 
     @RequestMapping("/delete-sms")
     public RestResponse deleteSms(Long signId, Integer enterpriseId) {
-        ServiceResponse<Void> smsResult = smsOuterApiService.delEnterpriseSmsSign(signId);
+        ServiceResponse<Void> smsResult = smsOuterApiService.delEnterpriseSmsSign(UserDetailUtils.getUserDetail().getEnterpriseId(), signId);
         if (smsResult.isSuccess()) {
             ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
             if (enterpriseResult.isSuccess()) {