zhangyang 2 жил өмнө
parent
commit
5e3d91c6b1

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/PoTetherController.java

@@ -169,8 +169,8 @@ public class PoTetherController extends BaseController
         }
 
         //清理所有套系的缓存数
-        //因为对于修改操作,用户是可以修改菜品的分类的,如果用户修改了菜品的分类,
-        // 那么原来分类下将少一个菜品,新的分类下将多一个菜品,这样的话,两个分类下的菜品列表数据都发生了变化。
+        //因为对于修改操作,用户是可以修改藏品的分类的,如果用户修改了藏品的分类,
+        // 那么原来分类下将少一个藏品,新的分类下将多一个藏品,这样的话,两个分类下的藏品列表数据都发生了变化。
 
         tetherVo.setUpdateBy(getUsername());
         tetherVo.setUpdateTime(new Date());

+ 14 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/PoTether.java

@@ -28,6 +28,11 @@ public class PoTether extends BaseEntity
      */
     private Integer sellStatus;
 
+    /**
+     * 是否可以线下交换
+     */
+    private Integer exchange;
+
     /**
      * 套系图片
      */
@@ -48,6 +53,14 @@ public class PoTether extends BaseEntity
 
     private String delFlag;
 
+    public void setExchange(Integer exchange) {
+        this.exchange = exchange;
+    }
+
+    public Integer getExchange() {
+        return exchange;
+    }
+
     public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
@@ -135,6 +148,7 @@ public class PoTether extends BaseEntity
                 .append("sellStatus",getSellStatus())
                 .append("delFlag",getDelFlag())
                 .append("image",getImage())
+                .append("exchange",getExchange())
                 .toString();
     }
 }

+ 9 - 1
ruoyi-system/src/main/resources/mapper/system/PoTetherMapper.xml

@@ -18,6 +18,7 @@
         <result property="sellStatus" column="sell_status"/>
         <result property="delFlag" column="del_flag"/>
         <result property="image"    column="image"    />
+        <result property="exchange" column="exchange"/>
     </resultMap>
 
     <resultMap type="PoCollection" id="PoCollectionResult">
@@ -42,7 +43,7 @@
     </resultMap>
 
     <sql id="selectPoTetherVo">
-        select tether_id, tether_name, show_time, create_by, create_time, update_by, update_time, total, status, remark ,sell_status,del_flag,image from po_tether
+        select tether_id, tether_name, show_time, create_by, create_time, update_by, update_time, total, status, remark ,sell_status,del_flag,image,exchange from po_tether
     </sql>
 
 <!--在售-->
@@ -54,6 +55,7 @@
             <if test="total != null "> and total = #{total}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="image != null and image != '' ">and image = #{image}</if>
+            <if test="exchange != null">and exchange = #{exchange}</if>
             and del_flag = '0'
             and sell_status = 0
         </where>
@@ -84,6 +86,7 @@
             <if test="total != null "> and total = #{total}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="image != null and image != '' ">and image = #{image}</if>
+            <if test="exchange != null">and exchange = #{exchange}</if>
             and del_flag = '0'
             and sell_status = 1
         </where>
@@ -98,6 +101,7 @@
             <if test="total != null "> and total = #{total}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="image != null and image != '' ">and image = #{image}</if>
+            <if test="exchange != null">and exchange = #{exchange}</if>
             and del_flag = '0'
             and sell_status = 2
         </where>
@@ -112,6 +116,7 @@
             <if test="total != null "> and total = #{total}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="image != null and image != '' ">and image = #{image}</if>
+            <if test="exchange != null">and exchange = #{exchange}</if>
             and del_flag = '0'
         </where>
 
@@ -150,6 +155,7 @@
             <if test="remark != null">remark,</if>
             <if test="sellStatus != null">sell_status,</if>
             <if test="image != null and image != ''">image,</if>
+            <if test="exchange != null">exchange,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tetherName != null">#{tetherName},</if>
@@ -163,6 +169,7 @@
             <if test="remark != null">#{remark},</if>
             <if test="sellStatus != null">#{sellStatus},</if>
             <if test="image != null and image != ''">#{image},</if>
+            <if test="exchange != null ">#{exchange},</if>
         </trim>
     </insert>
 
@@ -180,6 +187,7 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="sellStatus != null">sell_status = #{sellStatus},</if>
             <if test="image != null and image != ''">image = #{image},</if>
+            <if test="exchange != null">exchange = #{exchange},</if>
         </trim>
         where tether_id = #{tetherId}
     </update>