数字会员配置

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

@@ -39,6 +39,11 @@ public class DataWechatMemberConfigDTO implements Serializable{
     private String relateWechat;
 
     /**
+     * 是否操作过。如果操作过，则会员组那边我不会在刷新到数据库
+     */
+    private Integer validSave;
+
+    /**
      * 1:有效
      */
     private Integer status;
@@ -124,4 +129,13 @@ public class DataWechatMemberConfigDTO implements Serializable{
         this.updateTime = updateTime;
         return this;
     }
+
+    public Integer getValidSave() {
+        return validSave;
+    }
+
+    public DataWechatMemberConfigDTO setValidSave(Integer validSave) {
+        this.validSave = validSave;
+        return this;
+    }
 }

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

@@ -6,6 +6,10 @@ import com.gic.enterprise.dto.data.*;
 import java.util.List;
 
 public interface DataConfigApiService {
+
+    ServiceResponse<Void> configWechatMember(DataWechatMemberConfigDTO dto);
+
+    ServiceResponse<List<DataWechatMemberConfigDTO>> listWechatMemberConfig(Integer enterpriseId);
     /**
      * 会员消费配置
      * @Title: configMemberConsumeConfig


gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataWechatMemberConfig.java

@@ -32,6 +32,11 @@ public class TabDataWechatMemberConfig {
     private String relateWechat;
 
     /**
+     * 是否操作过。如果操作过，则会员组那边我不会在刷新到数据库
+     */
+    private Integer validSave;
+
+    /**
      * 1:有效
      */
     private Integer status;
@@ -117,4 +122,13 @@ public class TabDataWechatMemberConfig {
         this.updateTime = updateTime;
         return this;
     }
+
+    public Integer getValidSave() {
+        return validSave;
+    }
+
+    public TabDataWechatMemberConfig setValidSave(Integer validSave) {
+        this.validSave = validSave;
+        return this;
+    }
 }
\ No newline at end of file

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

 package com.gic.enterprise.service.outer.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.gic.enterprise.dto.data.*;
 import com.gic.enterprise.entity.*;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,6 +31,29 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
     private DataGenerationConfigService dataGenerationConfigService;
 
     @Override
+    public ServiceResponse<Void> configWechatMember(DataWechatMemberConfigDTO dto) {
+        String memberCardId = dto.getMemberCardArea();
+        if (StringUtils.isBlank(memberCardId)) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "会员卡域不能为空");
+        }
+        TabDataWechatMemberConfig result = dataWechatMemberConfigService.getByMemberCardId(dto.getEnterpriseId(), memberCardId);
+        if (result == null) {
+            dataWechatMemberConfigService.saveWechatMemberConfig(dto);
+        } else {
+            dto.setWechatMemberConfigId(result.getWechatMemberConfigId());
+            dataWechatMemberConfigService.editWechatMemberConfig(dto);
+        }
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<List<DataWechatMemberConfigDTO>> listWechatMemberConfig(Integer enterpriseId) {
+        return ServiceResponse.success(Optional
+                .ofNullable(EntityUtil.changeEntityListNew(DataWechatMemberConfigDTO.class, dataWechatMemberConfigService
+                        .listByEnterpriseId(enterpriseId))).orElse(Collections.EMPTY_LIST));
+    }
+
+    @Override
     public ServiceResponse<Integer> configMemberConsume(DataMemberConsumeConfigDTO dto) {
         if (dto.getEnterpriseId() == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID不能为空");

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

@@ -7,12 +7,13 @@
     <result column="member_card_area" jdbcType="VARCHAR" property="memberCardArea" />
     <result column="relate_service" jdbcType="VARCHAR" property="relateService" />
     <result column="relate_wechat" jdbcType="VARCHAR" property="relateWechat" />
+    <result column="valid_save" jdbcType="INTEGER" property="validSave" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    wechat_member_config_id, enterprise_id, member_card_area, relate_service, relate_wechat, 
+    wechat_member_config_id, enterprise_id, member_card_area, relate_service, relate_wechat, valid_save,
     status, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -27,11 +28,11 @@
   </delete>
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabDataWechatMemberConfig" useGeneratedKeys="true" keyProperty="wechatMemberConfigId">
     insert into tab_data_wechat_member_config (wechat_member_config_id, enterprise_id, 
-      member_card_area, relate_service, relate_wechat, 
+      member_card_area, relate_service, relate_wechat, valid_save,
       status, create_time, update_time
       )
     values (#{wechatMemberConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
-      #{memberCardArea,jdbcType=VARCHAR}, #{relateService,jdbcType=VARCHAR}, #{relateWechat,jdbcType=VARCHAR}, 
+      #{memberCardArea,jdbcType=VARCHAR}, #{relateService,jdbcType=VARCHAR}, #{relateWechat,jdbcType=VARCHAR}, #{validSave,jdbcType=INTEGER},
       #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -53,6 +54,9 @@
       <if test="relateWechat != null">
         relate_wechat,
       </if>
+      <if test="validSave != null">
+        valid_save,
+      </if>
       <if test="status != null">
         status,
       </if>
@@ -79,6 +83,9 @@
       <if test="relateWechat != null">
         #{relateWechat,jdbcType=VARCHAR},
       </if>
+      <if test="validSave != null">
+        #{valid_save,jdbcType=INTEGER},
+      </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
@@ -105,6 +112,9 @@
       <if test="relateWechat != null">
         relate_wechat = #{relateWechat,jdbcType=VARCHAR},
       </if>
+      <if test="validSave != null">
+        valid_save = #{validSave,jdbcType=INTEGER},
+      </if>
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
       </if>
@@ -123,6 +133,7 @@
       member_card_area = #{memberCardArea,jdbcType=VARCHAR},
       relate_service = #{relateService,jdbcType=VARCHAR},
       relate_wechat = #{relateWechat,jdbcType=VARCHAR},
+      valid_save = #{validSave,jdbcType=INTEGER},
       status = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}

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

@@ -5,6 +5,8 @@ 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.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +30,41 @@ public class DataConfigController {
 
     @Autowired
     private DataConfigApiService dataConfigApiService;
+    @Autowired
+    private AppletsConfigApiService appletsConfigApiService;
+    @Autowired
+    private ServiceConfigApiService serviceConfigApiService;
+
+
+    @RequestMapping("list-all-applet")
+    public RestResponse listAllApplet() {
+        return ResultControllerUtils.commonResult(appletsConfigApiService
+                .listValidAppletConfigAppId(UserDetailUtils.getUserDetail().getEnterpriseId()));
+    }
+
+    @RequestMapping("list-all-service")
+    public RestResponse listAllService() {
+        return ResultControllerUtils.commonResult(serviceConfigApiService
+                .listValidServiceConfigAppId(UserDetailUtils.getUserDetail().getEnterpriseId()));
+    }
+
+    @RequestMapping("config-wechat-member")
+    public RestResponse configWechatMember(DataWechatMemberConfigDTO dto) {
+        return ResultControllerUtils.commonResult(dataConfigApiService
+                .configWechatMember(dto));
+    }
+
+    @RequestMapping("refresh-wechat-member-config")
+    public RestResponse refreshWechatMemberConfig() {
+        //todo
+        return null;
+    }
+
+    @RequestMapping("list-wechat-member-config")
+    public RestResponse listWechatMemberConfig() {
+        return ResultControllerUtils.commonResult(dataConfigApiService
+                .listWechatMemberConfig(UserDetailUtils.getUserDetail().getEnterpriseId()));
+    }
 
     @RequestMapping("/config-member-consume")
     public RestResponse configMemberConsume(DataMemberConsumeConfigDTO dto) {