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

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

@@ -15,6 +15,9 @@ import java.util.Date;
  **/
 public class CouponRuleCppsDto extends PageDto implements Serializable {
 
+    public static final String FREQUENCY_ONCE = "100301"; // 赠送一次
+    public static final String FREQUENCY_MONTH = "1003012"; // 每月赠送一次
+
     private String quantity;
     private String crcId;
     private String cppId;
@@ -25,6 +28,7 @@ public class CouponRuleCppsDto extends PageDto implements Serializable {
     private String communityId;
     private String[] ruleIds;
     private String remark;
+    private String giftFrequency;
 
 
     private Date createTime;
@@ -128,4 +132,12 @@ public class CouponRuleCppsDto extends PageDto implements Serializable {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getGiftFrequency() {
+        return giftFrequency;
+    }
+
+    public void setGiftFrequency(String giftFrequency) {
+        this.giftFrequency = giftFrequency;
+    }
 }

+ 37 - 19
java110-bean/src/main/java/com/java110/po/couponRuleCpps/CouponRuleCppsPo.java

@@ -16,7 +16,7 @@
 package com.java110.po.couponRuleCpps;
 
 import java.io.Serializable;
-import java.util.Date;
+
 /**
  * 类表述: Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2022-11-22 01:37:00 mail: 928255095@qq.com
@@ -28,48 +28,66 @@ import java.util.Date;
 public class CouponRuleCppsPo implements Serializable {
 
     private String quantity;
-private String crcId;
-private String cppId;
-private String statusCd = "0";
-private String ruleId;
-private String communityId;
-public String getQuantity() {
+    private String crcId;
+    private String cppId;
+    private String statusCd = "0";
+    private String ruleId;
+    private String communityId;
+    private String giftFrequency;
+
+    public String getQuantity() {
         return quantity;
     }
-public void setQuantity(String quantity) {
+
+    public void setQuantity(String quantity) {
         this.quantity = quantity;
     }
-public String getCrcId() {
+
+    public String getCrcId() {
         return crcId;
     }
-public void setCrcId(String crcId) {
+
+    public void setCrcId(String crcId) {
         this.crcId = crcId;
     }
-public String getCppId() {
+
+    public String getCppId() {
         return cppId;
     }
-public void setCppId(String cppId) {
+
+    public void setCppId(String cppId) {
         this.cppId = cppId;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getRuleId() {
+
+    public String getRuleId() {
         return ruleId;
     }
-public void setRuleId(String ruleId) {
+
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
+    public String getGiftFrequency() {
+        return giftFrequency;
+    }
 
-
+    public void setGiftFrequency(String giftFrequency) {
+        this.giftFrequency = giftFrequency;
+    }
 }

+ 15 - 5
java110-db/src/main/resources/mapper/acct/CouponRuleCppsV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存规则优惠券信息 add by wuxw 2018-07-03 -->
     <insert id="saveCouponRuleCppsInfo" parameterType="Map">
         insert into coupon_rule_cpps(
-        quantity,crc_id,cpp_id,rule_id,community_id
+        quantity,crc_id,cpp_id,rule_id,community_id,gift_frequency
         ) values (
-        #{quantity},#{crcId},#{cppId},#{ruleId},#{communityId}
+        #{quantity},#{crcId},#{cppId},#{ruleId},#{communityId},#{giftFrequency}
         )
     </insert>
 
@@ -20,7 +20,7 @@
 
         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,
-        cpp.remark
+        cpp.remark,t.gift_frequency giftFrequency
         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'
@@ -35,6 +35,9 @@
         <if test="cppId !=null and cppId != ''">
             and t.cpp_id= #{cppId}
         </if>
+        <if test="giftFrequency !=null and giftFrequency != ''">
+            and t.gift_frequency= #{giftFrequency}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
@@ -73,10 +76,14 @@
         <if test="ruleId !=null and ruleId != ''">
             , t.rule_id= #{ruleId}
         </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
+
+        <if test="giftFrequency !=null and giftFrequency != ''">
+            , t.gift_frequency= #{giftFrequency}
         </if>
         where 1=1
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
         <if test="crcId !=null and crcId != ''">
             and t.crc_id= #{crcId}
         </if>
@@ -103,6 +110,9 @@
         <if test="ruleId !=null and ruleId != ''">
             and t.rule_id= #{ruleId}
         </if>
+        <if test="giftFrequency !=null and giftFrequency != ''">
+            and t.gift_frequency= #{giftFrequency}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>