Explorar o código

客户等级设置

MS-QJVSRANLTYEO\Administrator %!s(int64=4) %!d(string=hai) anos
pai
achega
8e3b7efc94

+ 15 - 1
Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/domain/CustomerGradeSetting.java

@@ -11,7 +11,7 @@ import com.yijia.common.core.domain.BaseEntity;
  * 客户优惠等级设置对象 customer_grade_setting
  * 
  * @author yijia
- * @date 2021-01-08
+ * @date 2021-01-12
  */
 public class CustomerGradeSetting extends BaseEntity
 {
@@ -77,6 +77,10 @@ public class CustomerGradeSetting extends BaseEntity
     @Excel(name = "到期扣除成长值")
     private String deductionGrowthValue;
 
+    /** 会员条件 */
+    @Excel(name = "会员条件")
+    private String memberCondit;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -212,6 +216,15 @@ public class CustomerGradeSetting extends BaseEntity
     {
         return deductionGrowthValue;
     }
+    public void setMemberCondit(String memberCondit) 
+    {
+        this.memberCondit = memberCondit;
+    }
+
+    public String getMemberCondit() 
+    {
+        return memberCondit;
+    }
 
     @Override
     public String toString() {
@@ -231,6 +244,7 @@ public class CustomerGradeSetting extends BaseEntity
             .append("growthValue", getGrowthValue())
             .append("date", getDate())
             .append("deductionGrowthValue", getDeductionGrowthValue())
+            .append("memberCondit", getMemberCondit())
             .toString();
     }
 }

+ 6 - 1
Yijia-SaaS/yijia-customer/src/main/resources/mapper/customer/CustomerGradeSettingMapper.xml

@@ -20,10 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="growthValue"    column="growth_value"    />
         <result property="date"    column="date"    />
         <result property="deductionGrowthValue"    column="deduction_growth_value"    />
+        <result property="memberCondit"    column="member_condit"    />
     </resultMap>
 
     <sql id="selectCustomerGradeSettingVo">
-        select id, grade, discount_way, gasoil_discount_litre, dieseloil_discount_litre, grade_type, gasoil_consume, gasoil_growth_value, dieseloil_consume, dieseloil_growth_value, member_recharge, member_growth_value, growth_value, date, deduction_growth_value from customer_grade_setting
+        select id, grade, discount_way, gasoil_discount_litre, dieseloil_discount_litre, grade_type, gasoil_consume, gasoil_growth_value, dieseloil_consume, dieseloil_growth_value, member_recharge, member_growth_value, growth_value, date, deduction_growth_value, member_condit from customer_grade_setting
     </sql>
 
     <select id="selectCustomerGradeSettingList" parameterType="CustomerGradeSetting" resultMap="CustomerGradeSettingResult">
@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="growthValue != null  and growthValue != ''"> and growth_value = #{growthValue}</if>
             <if test="date != null "> and date = #{date}</if>
             <if test="deductionGrowthValue != null  and deductionGrowthValue != ''"> and deduction_growth_value = #{deductionGrowthValue}</if>
+            <if test="memberCondit != null  and memberCondit != ''"> and member_condit = #{memberCondit}</if>
         </where>
     </select>
     
@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="growthValue != null">growth_value,</if>
             <if test="date != null">date,</if>
             <if test="deductionGrowthValue != null">deduction_growth_value,</if>
+            <if test="memberCondit != null">member_condit,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="grade != null">#{grade},</if>
@@ -84,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="growthValue != null">#{growthValue},</if>
             <if test="date != null">#{date},</if>
             <if test="deductionGrowthValue != null">#{deductionGrowthValue},</if>
+            <if test="memberCondit != null">#{memberCondit},</if>
          </trim>
     </insert>
 
@@ -104,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="growthValue != null">growth_value = #{growthValue},</if>
             <if test="date != null">date = #{date},</if>
             <if test="deductionGrowthValue != null">deduction_growth_value = #{deductionGrowthValue},</if>
+            <if test="memberCondit != null">member_condit = #{memberCondit},</if>
         </trim>
         where id = #{id}
     </update>