Kaynağa Gözat

优化优惠卷领取,优化充值记录

goods20 4 ay önce
ebeveyn
işleme
25809abf98

+ 12 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/recovery/domain/dto/RecSaleInfoDto.java

@@ -52,6 +52,8 @@ public class RecSaleInfoDto {
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updateDate;
 
+    private Character topUp;
+
     public void setSaleName(String saleName)
     {
         this.saleName = saleName;
@@ -139,6 +141,14 @@ public class RecSaleInfoDto {
         this.durationOfTheActivity = durationOfTheActivity;
     }
 
+    public Character getTopUp() {
+        return topUp;
+    }
+
+    public void setTopUp(Character topUp) {
+        this.topUp = topUp;
+    }
+
     @Override
     public String toString() {
         return "RecSaleInfoDto{" +
@@ -149,9 +159,10 @@ public class RecSaleInfoDto {
                 ", catalog='" + catalog + '\'' +
                 ", images='" + images + '\'' +
                 ", activityTime=" + activityTime +
-                ", durationOfTheActivity='" + durationOfTheActivity + '\'' +
+                ", durationOfTheActivity=" + durationOfTheActivity +
                 ", createDate=" + createDate +
                 ", updateDate=" + updateDate +
+                ", topUp=" + topUp +
                 '}';
     }
 }

+ 2 - 2
ruoyi-system/src/main/resources/mapper/system/RecSaleInfoMapper.xml

@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="info.images != null">#{info.images},</if>
             <if test="info.eventStartTime != null">#{info.eventStartTime},</if>
             <if test="info.endTimeOfActivity != null">#{info.endTimeOfActivity},</if>
-            <if test="info.topUp != null">#{topUp},</if>
+            <if test="info.topUp != null">#{info.topUp},</if>
          </trim>
     </insert>
 
@@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createDate != null">create_date = #{createDate},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateDate != null">update_date = #{updateDate},</if>
-            <if test="catalog != null">update_date = #{catalog},</if>
+            <if test="catalog != null">catalog = #{catalog},</if>
             <if test="images != null">images = #{images},</if>
             <if test="eventStartTime != null">event_start_time = #{eventStartTime},</if>
             <if test="endTimeOfActivity != null">end_time_of_activity = #{endTimeOfActivity},</if>