wuxw лет назад: 3
Родитель
Сommit
60a75b7343

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/couponRuleCpps/CouponRuleCppsDto.java

@@ -24,6 +24,7 @@ public class CouponRuleCppsDto extends PageDto implements Serializable {
     private String toTypeName;
     private String communityId;
     private String[] ruleIds;
+    private String remark;
 
 
     private Date createTime;
@@ -119,4 +120,12 @@ public class CouponRuleCppsDto extends PageDto implements Serializable {
     public void setToTypeName(String toTypeName) {
         this.toTypeName = toTypeName;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

+ 7 - 0
java110-bean/src/main/java/com/java110/po/couponPropertyPool/CouponPropertyPoolPo.java

@@ -38,6 +38,7 @@ public class CouponPropertyPoolPo implements Serializable {
     private String communityId;
     private String stock;
     private String fromId;
+    private String remark;
 
     public String getCouponName() {
         return couponName;
@@ -127,5 +128,11 @@ public class CouponPropertyPoolPo implements Serializable {
         this.fromId = fromId;
     }
 
+    public String getRemark() {
+        return remark;
+    }
 
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

+ 6 - 3
java110-db/src/main/resources/mapper/acct/CouponPropertyPoolV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存优惠券信息 add by wuxw 2018-07-03 -->
     <insert id="saveCouponPropertyPoolInfo" parameterType="Map">
         insert into coupon_property_pool(
-        coupon_name,to_type,from_type,validity_day,cpp_id,community_name,state,community_id,stock,from_id
+        coupon_name,to_type,from_type,validity_day,cpp_id,community_name,state,community_id,stock,from_id,remark
         ) values (
-        #{couponName},#{toType},#{fromType},#{validityDay},#{cppId},#{communityName},#{state},#{communityId},#{stock},#{fromId}
+        #{couponName},#{toType},#{fromType},#{validityDay},#{cppId},#{communityName},#{state},#{communityId},#{stock},#{fromId},#{remark}
         )
     </insert>
 
@@ -20,7 +20,7 @@
         select t.coupon_name,t.coupon_name couponName,t.to_type,t.to_type toType,t.from_type,t.from_type
         fromType,t.validity_day,t.validity_day validityDay,t.cpp_id,t.cpp_id cppId,t.community_name,t.community_name
         communityName,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id
-        communityId,t.stock,t.from_id,t.from_id fromId,td.name fromTypeName,td1.`name` toTypeName,t.create_time createTime
+        communityId,t.stock,t.from_id,t.from_id fromId,td.name fromTypeName,td1.`name` toTypeName,t.create_time createTime,t.remark
         from coupon_property_pool t
         left join t_dict td on td.status_cd = t.from_type and td.table_name = 'coupon_property_pool' and td.table_columns = 'from_type'
         left join t_dict td1 on td1.status_cd = t.to_type and td1.table_name = 'coupon_property_pool' and td1.table_columns = 'to_type'
@@ -99,6 +99,9 @@
         <if test="fromId !=null and fromId != ''">
             , t.from_id= #{fromId}
         </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
         where 1=1
         <if test="cppId !=null and cppId != ''">
             and t.cpp_id= #{cppId}

+ 2 - 1
java110-db/src/main/resources/mapper/acct/CouponRuleCppsV1ServiceDaoImplMapper.xml

@@ -19,7 +19,8 @@
     <select id="getCouponRuleCppsInfo" parameterType="Map" resultType="Map">
 
         select t.quantity,t.crc_id,t.crc_id crcId,t.cpp_id,t.cpp_id cppId,t.status_cd,t.status_cd
-        statusCd,t.rule_id,t.rule_id ruleId,t.community_id,t.community_id communityId,cpp.coupon_name couponName,cr.rule_name ruleName,td.`name` toTypeName
+        statusCd,t.rule_id,t.rule_id ruleId,t.community_id,t.community_id communityId,cpp.coupon_name couponName,cr.rule_name ruleName,td.`name` toTypeName,
+        cpp.remark
         from coupon_rule_cpps t
         left join coupon_property_pool cpp on t.cpp_id = cpp.cpp_id and cpp.status_cd = '0'
         left join t_dict td on td.status_cd = cpp.to_type and td.table_name = 'coupon_property_pool' and td.table_columns = 'to_type'