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

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

@@ -29,6 +29,7 @@ public class CouponRuleCppsDto extends PageDto implements Serializable {
     private String[] ruleIds;
     private String remark;
     private String giftFrequency;
+    private String giftFrequencyName;
 
 
     private Date createTime;
@@ -140,4 +141,12 @@ public class CouponRuleCppsDto extends PageDto implements Serializable {
     public void setGiftFrequency(String giftFrequency) {
         this.giftFrequency = giftFrequency;
     }
+
+    public String getGiftFrequencyName() {
+        return giftFrequencyName;
+    }
+
+    public void setGiftFrequencyName(String giftFrequencyName) {
+        this.giftFrequencyName = giftFrequencyName;
+    }
 }

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

@@ -20,11 +20,13 @@
 
         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,t.gift_frequency giftFrequency
+        cpp.remark,t.gift_frequency giftFrequency,td1.name giftFrequencyName
         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'
         left join coupon_rule cr on t.rule_id = cr.rule_id and cr.status_cd = '0'
+        left join t_dict td1 on td1.status_cd = t.gift_frequency and td1.table_name = 'coupon_rule_cpps' and td1.table_columns = 'gift_frequency'
+
         where 1 =1
         <if test="quantity !=null and quantity != ''">
             and t.quantity= #{quantity}