Merge branch 'developer' into 'master'

Developer

See merge request !47

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

@@ -7,6 +7,16 @@ import java.util.List;
 
 public interface DataConfigApiService {
 
+    /**
+     * 监听memberChannelChangeMQ 会员卡添加通知
+     * @Title: monitorMemberCardNew

+     * @Description:
+    
* @author guojuxing
+     * @param params

+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

+    
*/
+    ServiceResponse<Void> monitorMemberCardNew(String params);
+
     ServiceResponse<Void> configWechatMember(DataWechatMemberConfigDTO dto);
 
     /**

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

@@ -3,20 +3,26 @@ package com.gic.enterprise.service.outer.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.gic.enterprise.dto.data.*;
-import com.gic.enterprise.entity.*;
+import com.gic.member.config.api.enums.ChannelChangeCodeEnum;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
+import com.gic.enterprise.dto.data.*;
+import com.gic.enterprise.entity.*;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.service.*;
+import com.gic.member.config.api.dto.ExecParamsDTO;
 
 @Service("dataConfigApiService")
 public class DataConfigApiServiceImpl implements DataConfigApiService {
+    private static final Logger LOGGER = LogManager.getLogger(DataConfigApiServiceImpl.class);
     @Autowired
     private DataMemberConsumeConfigService dataMemberConsumeConfigService;
     @Autowired
@@ -31,6 +37,19 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
     private DataGenerationConfigService dataGenerationConfigService;
 
     @Override
+    public ServiceResponse<Void> monitorMemberCardNew(String params) {
+        LOGGER.info("会员卡新增监听：{}", params);
+        ExecParamsDTO execParamsDTO = (ExecParamsDTO) JSON.parse(params);
+        if (ChannelChangeCodeEnum.CARD_CREAYE == execParamsDTO.getChannelChangeCodeEnum()) {
+            configWechatMember(new DataWechatMemberConfigDTO()
+                    .setEnterpriseId(execParamsDTO.getEnterpriseId())
+                    .setMemberCardArea(execParamsDTO.getCardConfigId().toString())
+                    .setValidRefresh(1));
+        }
+        return ServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse<Void> configWechatMember(DataWechatMemberConfigDTO dto) {
         String memberCardId = dto.getMemberCardArea();
         if (StringUtils.isBlank(memberCardId)) {

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

@@ -419,7 +419,7 @@ public class IndexModuleController {
             if (UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource() == null) {
                 authStoreIdList.add(-1);
             } else {
-                ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource().intValue());
+                ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource().intValue());
                 if(authResponse.isSuccess()){
                     authStoreIdList = authResponse.getResult();
                 }