Merge branch 'developer' into 'master'

Developer

See merge request !43

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataWechatMemberConfigDTO.java

@@ -58,6 +58,13 @@ public class DataWechatMemberConfigDTO implements Serializable{
      */
     private Date updateTime;
 
+    /**
+     * 1:刷新保存 2：配置保存
+     */
+    private Integer validRefresh;
+
+    private String memberCardAreaName;
+
     public Integer getWechatMemberConfigId() {
         return wechatMemberConfigId;
     }
@@ -138,4 +145,22 @@ public class DataWechatMemberConfigDTO implements Serializable{
         this.validSave = validSave;
         return this;
     }
+
+    public Integer getValidRefresh() {
+        return validRefresh;
+    }
+
+    public DataWechatMemberConfigDTO setValidRefresh(Integer validRefresh) {
+        this.validRefresh = validRefresh;
+        return this;
+    }
+
+    public String getMemberCardAreaName() {
+        return memberCardAreaName;
+    }
+
+    public DataWechatMemberConfigDTO setMemberCardAreaName(String memberCardAreaName) {
+        this.memberCardAreaName = memberCardAreaName;
+        return this;
+    }
 }

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

@@ -98,6 +98,16 @@ public interface WmStoreApiService {
     ServiceResponse<WmGoodsConfigDTO> getGoodsConfig(Integer wmMallStoreId);
 
     /**
+     * 商品品牌配置信息
+     * @Title: getGoodsConfig

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

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

+    
*/
+    ServiceResponse<WmGoodsConfigDTO> getGoodsConfig(String wmStoreId);
+
+    /**
      * 会员卡域ID和企业查询的微盟店铺信息
      * @Title: getWmListByAppId

      * @Description:

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabWmStoreMapper.java

@@ -38,6 +38,8 @@ public interface TabWmStoreMapper {
      */
     TabWmStore selectByPrimaryKey(Integer wmMallStoreId);
 
+    TabWmStore getByWmStoreId(String wmStoreId);
+
     /**
      * 根据主键动态更新记录
      *

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/WmStoreService.java

@@ -50,6 +50,8 @@ public interface WmStoreService {
 
     TabWmStore getByWmMallStoreId(Integer wmMallStoreId);
 
+    TabWmStore getByWmStoreId(String wmStoreId);
+
     /**
      * 微盟主账号查询记录，因为主账号平台唯一
      * @Title: getByWmMainAccount


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

@@ -59,6 +59,11 @@ public class WmStoreServiceImpl implements WmStoreService{
     }
 
     @Override
+    public TabWmStore getByWmStoreId(String wmStoreId) {
+        return tabWmStoreMapper.getByWmStoreId(wmStoreId);
+    }
+
+    @Override
     public TabWmStore getByWmMainAccount(String wmMainAccount) {
         return tabWmStoreMapper.getByWmMainAccount(wmMainAccount);
     }

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

@@ -37,9 +37,24 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "会员卡域不能为空");
         }
         TabDataWechatMemberConfig result = dataWechatMemberConfigService.getByMemberCardId(dto.getEnterpriseId(), memberCardId);
+
+        //是否是刷新通道的保存
+        boolean isRefresh = dto.getValidRefresh() == 1;
+        if (isRefresh) {
+            dto.setValidSave(0);
+        } else {
+            dto.setValidSave(1);
+        }
         if (result == null) {
             dataWechatMemberConfigService.saveWechatMemberConfig(dto);
         } else {
+            if (isRefresh) {
+                if (result.getValidSave() == 1) {
+                    //配置过了，不允许编辑
+                    return ServiceResponse.success();
+                }
+            }
+            //配置过的
             dto.setWechatMemberConfigId(result.getWechatMemberConfigId());
             dataWechatMemberConfigService.editWechatMemberConfig(dto);
         }

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

@@ -151,6 +151,18 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
     }
 
     @Override
+    public ServiceResponse<WmGoodsConfigDTO> getGoodsConfig(String wmStoreId) {
+        if (StringUtil.isBlank(wmStoreId)) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数错误");
+        }
+        TabWmStore record = wmStoreService.getByWmStoreId(wmStoreId);
+        if (record == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数错误，查无数据");
+        }
+        return getGoodsConfig(record.getWmMallStoreId());
+    }
+
+    @Override
     public ServiceResponse<List<WmCouponPackageDTO>> getWmListByMemberCardAreaId(Integer enterpriseId, List<Long> memberCardAreaIdList) {
         if (CollectionUtils.isEmpty(memberCardAreaIdList)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "会员卡域ID为空");

gic-platform-enterprise-service/src/main/resources/mapper/TabWmStoreMapper.xml

@@ -254,4 +254,13 @@
     where wm_main_account = #{wmMainAccount}
     and status = 1
   </select>
+
+  <select id="getByWmStoreId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"></include>
+    from tab_wm_store
+    where wm_store_id = #{wmStoreId}
+    and status = 1
+    limit 1
+  </select>
 </mapper>
\ No newline at end of file

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

 package com.gic.enterprise.web.controller;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.gic.enterprise.dto.data.*;
-import com.gic.enterprise.web.vo.data.*;
-import com.gic.member.config.api.service.AppletsConfigApiService;
-import com.gic.member.config.api.service.ServiceConfigApiService;
+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;
@@ -15,13 +15,25 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.StringUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.download.utils.OperationResultUtils;
+import com.gic.enterprise.dto.data.*;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.service.DataConfigApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
+import com.gic.enterprise.web.vo.MemberCardVO;
+import com.gic.enterprise.web.vo.data.*;
+import com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO;
+import com.gic.member.config.api.dto.DigitalConfigDTO;
+import com.gic.member.config.api.dto.OwnerMemberCardDTO;
+import com.gic.member.config.api.dto.ServiceConfigSimpleOutputDTO;
+import com.gic.member.config.api.service.AppletsConfigApiService;
+import com.gic.member.config.api.service.EnterpriseConfigApiService;
+import com.gic.member.config.api.service.MemberCardApiService;
+import com.gic.member.config.api.service.ServiceConfigApiService;
 
 @RestController
 @RequestMapping("/data-config")
@@ -34,36 +46,118 @@ public class DataConfigController {
     private AppletsConfigApiService appletsConfigApiService;
     @Autowired
     private ServiceConfigApiService serviceConfigApiService;
+    @Autowired
+    private EnterpriseConfigApiService enterpriseConfigApiService;
+    @Autowired
+    private MemberCardApiService memberCardApiService;
 
 
     @RequestMapping("list-all-applet")
     public RestResponse listAllApplet() {
-        return ResultControllerUtils.commonResult(appletsConfigApiService
-                .listValidAppletConfigAppId(UserDetailUtils.getUserDetail().getEnterpriseId()));
+        ServiceResponse<List<AppletsConfigSimpleOutputDTO>> result = appletsConfigApiService
+                .listAppletConfigAppIdContainDel(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (result.isSuccess()) {
+            List<AppletsConfigSimpleOutputDTO> list = result.getResult();
+            if (CollectionUtils.isNotEmpty(list)) {
+                return RestResponse.success(list.stream()
+                        //3：正常 5：异常
+                        .filter(e -> e.getStatusFlag() != null && (e.getStatusFlag() == 3 || e.getStatusFlag() == 5))
+                        .collect(Collectors.toList()));
+            }
+        }
+        return ResultControllerUtils.commonResult(result);
     }
 
     @RequestMapping("list-all-service")
     public RestResponse listAllService() {
-        return ResultControllerUtils.commonResult(serviceConfigApiService
-                .listValidServiceConfigAppId(UserDetailUtils.getUserDetail().getEnterpriseId()));
+        ServiceResponse<List<ServiceConfigSimpleOutputDTO>> result = serviceConfigApiService
+                .listServiceConfigAppIdContainDel(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (result.isSuccess()) {
+            List<ServiceConfigSimpleOutputDTO> list = result.getResult();
+            if (CollectionUtils.isNotEmpty(list)) {
+                return RestResponse.success(list.stream()
+                        //3：正常 5：异常
+                        .filter(e -> e.getStatusFlag() != null && (e.getStatusFlag() == 3 || e.getStatusFlag() == 5))
+                        .collect(Collectors.toList()));
+            }
+        }
+        return ResultControllerUtils.commonResult(result);
+    }
+
+    @RequestMapping("/list-all-member-card")
+    public RestResponse listAllMemberCard() {
+        ServiceResponse<List<OwnerMemberCardDTO>> result = memberCardApiService.getAll(UserDetailUtils.getUserDetail().getEnterpriseId());
+        return ResultControllerUtils.commonResult(result, MemberCardVO.class);
     }
 
     @RequestMapping("config-wechat-member")
     public RestResponse configWechatMember(DataWechatMemberConfigDTO dto) {
+        dto.setValidRefresh(2);
+        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+        dto.setEnterpriseId(enterpriseId);
         return ResultControllerUtils.commonResult(dataConfigApiService
                 .configWechatMember(dto));
     }
 
     @RequestMapping("refresh-wechat-member-config")
     public RestResponse refreshWechatMemberConfig() {
-        //todo
-        return null;
+        //
+        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+        ServiceResponse<List<DigitalConfigDTO>> response = enterpriseConfigApiService
+                .getDigitalConfigByEnterpriseId(enterpriseId);
+        LOGGER.info("刷新数字会员配置:{}", JSON.toJSONString(response));
+        if (response.isSuccess()) {
+            List<DigitalConfigDTO> list = response.getResult();
+            if (CollectionUtils.isNotEmpty(list)) {
+                list.forEach(e -> {
+                    dataConfigApiService.configWechatMember(new DataWechatMemberConfigDTO()
+                            .setEnterpriseId(enterpriseId)
+                            .setMemberCardArea(e.getCardConfigId().toString())
+                            .setRelateService(listToString(e.getServiceIds()))
+                            .setRelateWechat(listToString(e.getAppletsIds()))
+                            .setValidRefresh(1));
+                });
+            }
+        }
+        return RestResponse.success();
+    }
+
+    private static String listToString(List<Long> ids) {
+        StringBuilder str = new StringBuilder();
+        if (CollectionUtils.isNotEmpty(ids)) {
+            for (Long temp : ids) {
+                str.append(temp.toString()).append(",");
+            }
+        }
+        int length = str.toString().length();
+        if (StringUtils.isNotBlank(str.toString())) {
+            return str.substring(0, length - 1);
+        }
+        return str.toString();
     }
 
     @RequestMapping("list-wechat-member-config")
     public RestResponse listWechatMemberConfig() {
-        return ResultControllerUtils.commonResult(dataConfigApiService
-                .listWechatMemberConfig(UserDetailUtils.getUserDetail().getEnterpriseId()));
+        ServiceResponse<List<DataWechatMemberConfigDTO>> response = dataConfigApiService
+                .listWechatMemberConfig(UserDetailUtils.getUserDetail().getEnterpriseId());
+
+        Map<String, String> memberCardMap = new HashMap<>(2);
+        ServiceResponse<List<OwnerMemberCardDTO>> result = memberCardApiService.getAll(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (result.isSuccess()) {
+            List<OwnerMemberCardDTO> memberCardList = result.getResult();
+            if (CollectionUtils.isNotEmpty(memberCardList)) {
+                memberCardMap = memberCardList.stream().collect(Collectors.toMap(e -> e.getCardConfigId().toString(), e -> e.getCardName()));
+            }
+        }
+        if (response.isSuccess()) {
+            List<DataWechatMemberConfigDTO> list = response.getResult();
+            if (CollectionUtils.isNotEmpty(list)) {
+                for (DataWechatMemberConfigDTO temp : list) {
+                    temp.setMemberCardAreaName(memberCardMap.get(temp.getMemberCardArea()));
+                }
+            }
+        }
+        return ResultControllerUtils.commonResult(response);
     }
 
     @RequestMapping("/config-member-consume")

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

@@ -140,4 +140,5 @@
     <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"/>
+    <dubbo:reference interface="com.gic.member.config.api.service.EnterpriseConfigApiService" id="enterpriseConfigApiService" timeout="6000" retries="0"/>
 </beans>