Merge branch 'developer' of…

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

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

+package com.gic.enterprise.dto.data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class DataGenerationConfigDTO implements Serializable{
+
+    private static final long serialVersionUID = 6372096709629738302L;
+    /**
+     *
+     */
+    private Integer generationConfigId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 档位 1:第一档 2:第二档...
+     */
+    private Integer ageLevel;
+
+    /**
+     * 第一个区间符号 1:小于等于 2:小于 3:大于等于 4:大于
+     */
+    private Integer firstSign;
+
+    /**
+     * 第一个区间值
+     */
+    private Integer ageFirstValue;
+
+    /**
+     * 第二个区间符号 1:小于等于 2:小于 3:大于等于 4:大于不一定有值（第一档和最后一档没有值）
+     */
+    private Integer secondSign;
+
+    /**
+     * 第二个区间值，不一定有值（第一档和最后一档没有值）
+     */
+    private Integer ageSecondValue;
+
+    /**
+     * 展示名称
+     */
+    private Integer description;
+
+    /**
+     * 1:有效
+     */
+    private Integer status;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    public Integer getGenerationConfigId() {
+        return generationConfigId;
+    }
+
+    public DataGenerationConfigDTO setGenerationConfigId(Integer generationConfigId) {
+        this.generationConfigId = generationConfigId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public DataGenerationConfigDTO setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getAgeLevel() {
+        return ageLevel;
+    }
+
+    public DataGenerationConfigDTO setAgeLevel(Integer ageLevel) {
+        this.ageLevel = ageLevel;
+        return this;
+    }
+
+    public Integer getFirstSign() {
+        return firstSign;
+    }
+
+    public DataGenerationConfigDTO setFirstSign(Integer firstSign) {
+        this.firstSign = firstSign;
+        return this;
+    }
+
+    public Integer getAgeFirstValue() {
+        return ageFirstValue;
+    }
+
+    public DataGenerationConfigDTO setAgeFirstValue(Integer ageFirstValue) {
+        this.ageFirstValue = ageFirstValue;
+        return this;
+    }
+
+    public Integer getSecondSign() {
+        return secondSign;
+    }
+
+    public DataGenerationConfigDTO setSecondSign(Integer secondSign) {
+        this.secondSign = secondSign;
+        return this;
+    }
+
+    public Integer getAgeSecondValue() {
+        return ageSecondValue;
+    }
+
+    public DataGenerationConfigDTO setAgeSecondValue(Integer ageSecondValue) {
+        this.ageSecondValue = ageSecondValue;
+        return this;
+    }
+
+    public Integer getDescription() {
+        return description;
+    }
+
+    public DataGenerationConfigDTO setDescription(Integer description) {
+        this.description = description;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public DataGenerationConfigDTO setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public DataGenerationConfigDTO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public DataGenerationConfigDTO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}

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

@@ -28,14 +28,24 @@ public class DataMemberConsumeConfigDTO implements Serializable{
     private Integer memberConsumeCount;
 
     /**
-     * 最高单笔配置 1:最高ERP单笔应付』 2:『最高单笔销售应付』 3:『最高有效单笔应付』 4:『最高成交单笔应付』
+     * 默认订单粒度。最高单笔配置 1:最高ERP单笔应付』 2:『最高单笔销售应付』 3:『最高有效单笔应付』 4:『最高成交单笔应付』
      */
-    private Integer memberConsumeMax;
+    private Integer memberConsumeMaxDefault;
 
     /**
-     * 消费次数 1:消费单次数』2:『有效消费次数』
+     * 默认订单粒度。消费次数 1:消费单次数』2:『有效消费次数』
      */
-    private Integer memberConsumeTimes;
+    private Integer memberConsumeTimesDefault;
+
+    /**
+     * 订单粒度(统计到商品品牌)。最高单笔配置 1:最高ERP单笔应付』  2:『最高有效单笔应付』
+     */
+    private Integer memberConsumeMaxGoods;
+
+    /**
+     * 订单粒度(统计到商品品牌)。消费次数 1:消费单次数』'
+     */
+    private Integer memberConsumeTimesGoods;
 
     /**
      * 1:有效
@@ -79,21 +89,39 @@ public class DataMemberConsumeConfigDTO implements Serializable{
         return this;
     }
 
-    public Integer getMemberConsumeMax() {
-        return memberConsumeMax;
+    public Integer getMemberConsumeMaxDefault() {
+        return memberConsumeMaxDefault;
+    }
+
+    public DataMemberConsumeConfigDTO setMemberConsumeMaxDefault(Integer memberConsumeMaxDefault) {
+        this.memberConsumeMaxDefault = memberConsumeMaxDefault;
+        return this;
+    }
+
+    public Integer getMemberConsumeTimesDefault() {
+        return memberConsumeTimesDefault;
+    }
+
+    public DataMemberConsumeConfigDTO setMemberConsumeTimesDefault(Integer memberConsumeTimesDefault) {
+        this.memberConsumeTimesDefault = memberConsumeTimesDefault;
+        return this;
+    }
+
+    public Integer getMemberConsumeMaxGoods() {
+        return memberConsumeMaxGoods;
     }
 
-    public DataMemberConsumeConfigDTO setMemberConsumeMax(Integer memberConsumeMax) {
-        this.memberConsumeMax = memberConsumeMax;
+    public DataMemberConsumeConfigDTO setMemberConsumeMaxGoods(Integer memberConsumeMaxGoods) {
+        this.memberConsumeMaxGoods = memberConsumeMaxGoods;
         return this;
     }
 
-    public Integer getMemberConsumeTimes() {
-        return memberConsumeTimes;
+    public Integer getMemberConsumeTimesGoods() {
+        return memberConsumeTimesGoods;
     }
 
-    public DataMemberConsumeConfigDTO setMemberConsumeTimes(Integer memberConsumeTimes) {
-        this.memberConsumeTimes = memberConsumeTimes;
+    public DataMemberConsumeConfigDTO setMemberConsumeTimesGoods(Integer memberConsumeTimesGoods) {
+        this.memberConsumeTimesGoods = memberConsumeTimesGoods;
         return this;
     }
 

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

@@ -22,6 +22,16 @@ public interface DataConfigApiService {
     ServiceResponse<DataMemberConsumeConfigDTO> getMemberConsumeConfigByEnterpriseId(Integer enterpriseId);
 
     /**
+     * 新增商户初始化会员消费配置
+     * @Title: initMemberConsumeConfig

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

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

+    
*/
+    ServiceResponse<Void> initMemberConsumeConfig(Integer enterpriseId);
+
+    /**
      * 新增
      * @Title: configActuallyPaid

      * @Description:

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

+package com.gic.enterprise.entity;
+
+import java.util.Date;
+
+/**
+ * tab_data_generation_config
+ */
+public class TabDataGenerationConfig {
+    /**
+     * 
+     */
+    private Integer generationConfigId;
+
+    /**
+     * 
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 档位 1:第一档 2:第二档...
+     */
+    private Integer ageLevel;
+
+    /**
+     * 第一个区间符号 1:小于等于 2:小于 3:大于等于 4:大于
+     */
+    private Integer firstSign;
+
+    /**
+     * 第一个区间值
+     */
+    private Integer ageFirstValue;
+
+    /**
+     * 第二个区间符号 1:小于等于 2:小于 3:大于等于 4:大于不一定有值（第一档和最后一档没有值）
+     */
+    private Integer secondSign;
+
+    /**
+     * 第二个区间值，不一定有值（第一档和最后一档没有值）
+     */
+    private Integer ageSecondValue;
+
+    /**
+     * 展示名称
+     */
+    private Integer description;
+
+    /**
+     * 1:有效
+     */
+    private Integer status;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    public Integer getGenerationConfigId() {
+        return generationConfigId;
+    }
+
+    public TabDataGenerationConfig setGenerationConfigId(Integer generationConfigId) {
+        this.generationConfigId = generationConfigId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public TabDataGenerationConfig setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getAgeLevel() {
+        return ageLevel;
+    }
+
+    public TabDataGenerationConfig setAgeLevel(Integer ageLevel) {
+        this.ageLevel = ageLevel;
+        return this;
+    }
+
+    public Integer getFirstSign() {
+        return firstSign;
+    }
+
+    public TabDataGenerationConfig setFirstSign(Integer firstSign) {
+        this.firstSign = firstSign;
+        return this;
+    }
+
+    public Integer getAgeFirstValue() {
+        return ageFirstValue;
+    }
+
+    public TabDataGenerationConfig setAgeFirstValue(Integer ageFirstValue) {
+        this.ageFirstValue = ageFirstValue;
+        return this;
+    }
+
+    public Integer getSecondSign() {
+        return secondSign;
+    }
+
+    public TabDataGenerationConfig setSecondSign(Integer secondSign) {
+        this.secondSign = secondSign;
+        return this;
+    }
+
+    public Integer getAgeSecondValue() {
+        return ageSecondValue;
+    }
+
+    public TabDataGenerationConfig setAgeSecondValue(Integer ageSecondValue) {
+        this.ageSecondValue = ageSecondValue;
+        return this;
+    }
+
+    public Integer getDescription() {
+        return description;
+    }
+
+    public TabDataGenerationConfig setDescription(Integer description) {
+        this.description = description;
+        return this;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public TabDataGenerationConfig setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public TabDataGenerationConfig setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public TabDataGenerationConfig setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}
\ No newline at end of file

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

@@ -22,14 +22,24 @@ public class TabDataMemberConsumeConfig {
     private Integer memberConsumeCount;
 
     /**
-     * 最高单笔配置 1:最高ERP单笔应付』 2:『最高单笔销售应付』 3:『最高有效单笔应付』 4:『最高成交单笔应付』
+     * 默认订单粒度。最高单笔配置 1:最高ERP单笔应付』 2:『最高单笔销售应付』 3:『最高有效单笔应付』 4:『最高成交单笔应付』
      */
-    private Integer memberConsumeMax;
+    private Integer memberConsumeMaxDefault;
 
     /**
-     * 消费次数 1:消费单次数』2:『有效消费次数』
+     * 默认订单粒度。消费次数 1:消费单次数』2:『有效消费次数』
      */
-    private Integer memberConsumeTimes;
+    private Integer memberConsumeTimesDefault;
+
+    /**
+     * 订单粒度(统计到商品品牌)。最高单笔配置 1:最高ERP单笔应付』  2:『最高有效单笔应付』
+     */
+    private Integer memberConsumeMaxGoods;
+
+    /**
+     * 订单粒度(统计到商品品牌)。消费次数 1:消费单次数』'
+     */
+    private Integer memberConsumeTimesGoods;
 
     /**
      * 1:有效
@@ -73,21 +83,39 @@ public class TabDataMemberConsumeConfig {
         return this;
     }
 
-    public Integer getMemberConsumeMax() {
-        return memberConsumeMax;
+    public Integer getMemberConsumeMaxDefault() {
+        return memberConsumeMaxDefault;
+    }
+
+    public TabDataMemberConsumeConfig setMemberConsumeMaxDefault(Integer memberConsumeMaxDefault) {
+        this.memberConsumeMaxDefault = memberConsumeMaxDefault;
+        return this;
+    }
+
+    public Integer getMemberConsumeTimesDefault() {
+        return memberConsumeTimesDefault;
+    }
+
+    public TabDataMemberConsumeConfig setMemberConsumeTimesDefault(Integer memberConsumeTimesDefault) {
+        this.memberConsumeTimesDefault = memberConsumeTimesDefault;
+        return this;
+    }
+
+    public Integer getMemberConsumeMaxGoods() {
+        return memberConsumeMaxGoods;
     }
 
-    public TabDataMemberConsumeConfig setMemberConsumeMax(Integer memberConsumeMax) {
-        this.memberConsumeMax = memberConsumeMax;
+    public TabDataMemberConsumeConfig setMemberConsumeMaxGoods(Integer memberConsumeMaxGoods) {
+        this.memberConsumeMaxGoods = memberConsumeMaxGoods;
         return this;
     }
 
-    public Integer getMemberConsumeTimes() {
-        return memberConsumeTimes;
+    public Integer getMemberConsumeTimesGoods() {
+        return memberConsumeTimesGoods;
     }
 
-    public TabDataMemberConsumeConfig setMemberConsumeTimes(Integer memberConsumeTimes) {
-        this.memberConsumeTimes = memberConsumeTimes;
+    public TabDataMemberConsumeConfig setMemberConsumeTimesGoods(Integer memberConsumeTimesGoods) {
+        this.memberConsumeTimesGoods = memberConsumeTimesGoods;
         return this;
     }
 

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

+package com.gic.enterprise.service;
+
+import com.gic.enterprise.dto.data.DataGenerationConfigDTO;
+import com.gic.enterprise.entity.TabDataGenerationConfig;
+
+import java.util.List;
+
+public interface DataGenerationConfigService {
+    /**
+     * 新增年龄段配置
+     * @Title: saveGenerationConfig

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

+     * @return  void

+    
*/
+    void saveGenerationConfig(DataGenerationConfigDTO dto);
+
+    /**
+     * 逻辑删除
+     * @Title: deleteGenerationConfig

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param ageLevel
档位
+     * @return  void

+    
*/
+    void deleteGenerationConfig(Integer enterpriseId, Integer ageLevel);
+
+    /**
+     * 查询年龄段配置数据
+     * @Title: listGenerationByEnterpriseId

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

+     * @return  java.util.List<com.gic.enterprise.entity.TabDataGenerationConfig>

+    
*/
+    List<TabDataGenerationConfig> listGenerationByEnterpriseId(Integer enterpriseId);
+}

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

+package com.gic.enterprise.service.impl;
+
+public class DataGenerationConfigServiceImpl {
+}

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

@@ -53,13 +53,23 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
     public ServiceResponse<DataMemberConsumeConfigDTO> getMemberConsumeConfigByEnterpriseId(Integer enterpriseId) {
         TabDataMemberConsumeConfig record = dataMemberConsumeConfigService.getByEnterpriseId(enterpriseId);
         if (record == null) {
-            //还未配置，新增
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "还未配置会员消费规则");
+            TabDataMemberConsumeConfig defaultRecord = dataMemberConsumeConfigService.getByEnterpriseId(-1);
+            return ServiceResponse.success(EntityUtil.changeEntityNew(DataMemberConsumeConfigDTO.class, defaultRecord));
         }
         return ServiceResponse.success(EntityUtil.changeEntityNew(DataMemberConsumeConfigDTO.class, record));
     }
 
     @Override
+    public ServiceResponse<Void> initMemberConsumeConfig(Integer enterpriseId) {
+        TabDataMemberConsumeConfig defaultRecord = dataMemberConsumeConfigService.getByEnterpriseId(-1);
+        DataMemberConsumeConfigDTO dto = EntityUtil.changeEntityNew(DataMemberConsumeConfigDTO.class, defaultRecord);
+        dto.setMemberConsumeConfigId(null);
+        dto.setEnterpriseId(enterpriseId);
+        configMemberConsume(dto);
+        return ServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse<Void> configActuallyPaid(List<DataActuallyPaidConfigDTO> dtoList) {
         if (CollectionUtils.isEmpty(dtoList)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "实付配置内容为空");

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

@@ -144,6 +144,8 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
         //初始化计费中心账户
         billingAccountService.createBillingAccount(enterpriseId);
 
+        //数据配置：会员消费配置
+        dataConfigApiService.initMemberConsumeConfig(enterpriseId);
         //数据配置：实付配置默认数据
         dataConfigApiService.initActuallyPaidData(enterpriseId);
         //数据配置：单效取值配置默认数据

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/chart/BillingInternationSmsRecord.java

@@ -12,7 +12,7 @@ import com.gic.enterprise.qo.HomeStatisticsQO;
 import com.gic.enterprise.service.BillingInternationalSmsRecordService;
 
 /**
- * 余额支付消费明细
+ * 海外短信消费明细
  * @ClassName: BillingAccountBalanceRecord

  * @Description: 

  * @author guojuxing


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

@@ -416,6 +416,7 @@
     from tab_billing_international_sms_record
     where status = 1
     and enterprise_id = #{enterpriseId}
+    and pay_type = 4
     <if test="startTime != null">
       and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}
     </if>
@@ -430,6 +431,7 @@
     from tab_billing_international_sms_record
     where status = 1
     and enterprise_id = #{enterpriseId}
+    and pay_type = 4
     <if test="dateType == 1 ">
       and date_format(deduction_time,'%Y-%m') = date_format(now(),'%Y-%m')
     </if>

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

@@ -242,6 +242,7 @@
     from tab_billing_sms_package_record
     where status = 1
     and enterprise_id = #{enterpriseId}
+    and pay_type = 4
     <if test="startTime != null">
       and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}
     </if>
@@ -258,6 +259,7 @@
     from tab_billing_sms_package_record
     where status = 1
     and enterprise_id = #{enterpriseId}
+    and pay_type = 4
     <if test="dateType == 1 ">
       and date_format(deduction_time,'%Y-%m') = date_format(now(),'%Y-%m')
     </if>

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

@@ -399,6 +399,7 @@
     and cache_status = 1
     and database_status = 1
     and enterprise_id = #{enterpriseId}
+    and pay_type = 4
     <if test="startTime != null">
       and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}
     </if>
@@ -416,6 +417,7 @@
     and cache_status = 1
     and database_status = 1
     and enterprise_id = #{enterpriseId}
+    and pay_type = 4
     <if test="dateType == 1 ">
       and date_format(deduction_time,'%Y-%m') = date_format(now(),'%Y-%m')
     </if>

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

@@ -5,15 +5,17 @@
     <id column="member_consume_config_id" jdbcType="INTEGER" property="memberConsumeConfigId" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="member_consume_count" jdbcType="INTEGER" property="memberConsumeCount" />
-    <result column="member_consume_max" jdbcType="INTEGER" property="memberConsumeMax" />
-    <result column="member_consume_times" jdbcType="INTEGER" property="memberConsumeTimes" />
+    <result column="member_consume_max_default" jdbcType="INTEGER" property="memberConsumeMaxDefault" />
+    <result column="member_consume_times_default" jdbcType="INTEGER" property="memberConsumeTimesDefault" />
+    <result column="member_consume_max_goods" jdbcType="INTEGER" property="memberConsumeMaxGoods" />
+    <result column="member_consume_times_goods" jdbcType="INTEGER" property="memberConsumeTimesGoods" />
     <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">
-    member_consume_config_id, enterprise_id, member_consume_count, member_consume_max, 
-    member_consume_times, status, create_time, update_time
+    member_consume_config_id, enterprise_id, member_consume_count, member_consume_max_default, member_consume_times_default,
+    member_consume_max_goods, member_consume_times_goods, status, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -27,11 +29,13 @@
   </delete>
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabDataMemberConsumeConfig">
     insert into tab_data_member_consume_config (member_consume_config_id, enterprise_id, 
-      member_consume_count, member_consume_max, member_consume_times, 
+      member_consume_count, member_consume_max_default, member_consume_times_default,
+      member_consume_max_goods, member_consume_times_goods,
       status, create_time, update_time
       )
     values (#{memberConsumeConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
-      #{memberConsumeCount,jdbcType=INTEGER}, #{memberConsumeMax,jdbcType=INTEGER}, #{memberConsumeTimes,jdbcType=INTEGER}, 
+      #{memberConsumeCount,jdbcType=INTEGER}, #{memberConsumeMaxDefault,jdbcType=INTEGER}, #{memberConsumeTimesDefault,jdbcType=INTEGER},
+      #{memberConsumeMaxGoods,jdbcType=INTEGER}, #{memberConsumeTimesGoods,jdbcType=INTEGER},
       #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -47,11 +51,17 @@
       <if test="memberConsumeCount != null">
         member_consume_count,
       </if>
-      <if test="memberConsumeMax != null">
-        member_consume_max,
+      <if test="memberConsumeMaxDefault != null">
+        member_consume_max_default,
       </if>
-      <if test="memberConsumeTimes != null">
-        member_consume_times,
+      <if test="memberConsumeTimesDefault != null">
+        member_consume_times_default,
+      </if>
+      <if test="memberConsumeMaxGoods != null">
+        member_consume_max_goods,
+      </if>
+      <if test="memberConsumeTimesGoods != null">
+        member_consume_times_goods,
       </if>
       <if test="status != null">
         status,
@@ -73,11 +83,17 @@
       <if test="memberConsumeCount != null">
         #{memberConsumeCount,jdbcType=INTEGER},
       </if>
-      <if test="memberConsumeMax != null">
-        #{memberConsumeMax,jdbcType=INTEGER},
+      <if test="memberConsumeMaxDefault != null">
+        #{memberConsumeMaxDefault,jdbcType=INTEGER},
+      </if>
+      <if test="memberConsumeTimesDefault != null">
+        #{memberConsumeTimesDefault,jdbcType=INTEGER},
       </if>
-      <if test="memberConsumeTimes != null">
-        #{memberConsumeTimes,jdbcType=INTEGER},
+      <if test="memberConsumeMaxGoods != null">
+        #{memberConsumeMaxGoods,jdbcType=INTEGER},
+      </if>
+      <if test="memberConsumeTimesGoods != null">
+        #{memberConsumeTimesGoods,jdbcType=INTEGER},
       </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
@@ -99,11 +115,17 @@
       <if test="memberConsumeCount != null">
         member_consume_count = #{memberConsumeCount,jdbcType=INTEGER},
       </if>
-      <if test="memberConsumeMax != null">
-        member_consume_max = #{memberConsumeMax,jdbcType=INTEGER},
+      <if test="memberConsumeMaxDefault != null">
+        member_consume_max_default = #{memberConsumeMaxDefault,jdbcType=INTEGER},
+      </if>
+      <if test="memberConsumeTimesDefault != null">
+        member_consume_times_default = #{memberConsumeTimesDefault,jdbcType=INTEGER},
+      </if>
+      <if test="memberConsumeMaxGoods != null">
+        member_consume_max_goods = #{memberConsumeMaxGoods,jdbcType=INTEGER},
       </if>
-      <if test="memberConsumeTimes != null">
-        member_consume_times = #{memberConsumeTimes,jdbcType=INTEGER},
+      <if test="memberConsumeTimesGoods != null">
+        member_consume_times_goods = #{memberConsumeTimesGoods,jdbcType=INTEGER},
       </if>
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
@@ -121,8 +143,10 @@
     update tab_data_member_consume_config
     set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       member_consume_count = #{memberConsumeCount,jdbcType=INTEGER},
-      member_consume_max = #{memberConsumeMax,jdbcType=INTEGER},
-      member_consume_times = #{memberConsumeTimes,jdbcType=INTEGER},
+      member_consume_max_default = #{memberConsumeMaxDefault,jdbcType=INTEGER},
+      member_consume_times_default = #{memberConsumeTimesDefault,jdbcType=INTEGER},
+      member_consume_max_goods = #{memberConsumeMaxGoods,jdbcType=INTEGER},
+      member_consume_times_goods = #{memberConsumeTimesGoods,jdbcType=INTEGER},
       status = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}