去掉添加套系collectionCounts必要

ruoyi-admin/src/main/java/com/ruoyi/web/controller/post/PostCollectionController.java

@@ -80,7 +80,7 @@ public class PostCollectionController extends BaseController
     @PostMapping("/add")
     public AjaxResult add(@RequestBody PostCollection postCollection)
     {
-        if(postCollection.getDelFlag()=="1") {
+        if(postCollection.getExchangeFlag()=="1") {
             return AjaxResult.error("新增藏品"+postCollection.getCollectionName()+"失败，藏品已经上链，无法添加");
         }
         if(UserConstants.NOT_UNIQUE.equals(postCollectionService.checkName(postCollection)))
@@ -99,10 +99,13 @@ public class PostCollectionController extends BaseController
     @PutMapping("/edit")
     public AjaxResult edit(@RequestBody PostCollection postCollection)
     {
-        if(postCollection.getDelFlag()=="1") {
+        System.out.println(postCollection.getExchangeFlag());
+        System.out.println(postCollection.getExchangeFlag()=="1");
+        if(postCollection.getExchangeFlag()=="1") {
             return AjaxResult.error("新增藏品"+postCollection.getCollectionName()+"失败，藏品已经上链，无法修改");
+        }else {
+            return toAjax(postCollectionService.updatePostCollection(postCollection));
         }
-        return toAjax(postCollectionService.updatePostCollection(postCollection));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/post/PostSeriesController.java

@@ -185,9 +185,7 @@ public class PostSeriesController extends BaseController
     public AjaxResult edit(@RequestBody PostSeries postSeries)
     {
         //只能进行时间的后面修改
-//        if(postSeries.getDelFlag()=="1") {
-//
-//        }
+
         if(UserConstants.NOT_UNIQUE.equals(postSeriesService.checkSeriesNameUnique(postSeries)))
         {
             return AjaxResult.error("修改消息"+postSeries.getSeriesName()+"失败，套系已经存在");
@@ -230,13 +228,8 @@ public class PostSeriesController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:series:isUpLian')")
     @Log(title = "邮贝套系信息; ", businessType = BusinessType.DELETE)
     @PutMapping("/isUpLian")
-    public AjaxResult isUpLian(@RequestBody PostSeries postSeries)
+    public AjaxResult isUpLian(@RequestBody String seriesName)
     {
-        if(postSeries.getDelFlag() == "0") {
-            postSeries.setDelFlag("1");
-        }else {
-            return AjaxResult.error("套系信息"+postSeries.getSeriesName()+"失败，套系已经上链");
-        }
-        return toAjax(postSeriesService.isUpLian(postSeries));
+        return  toAjax(postSeriesService.isUpLian(seriesName));
     }
 }

ruoyi-post/src/main/java/com/ruoyi/post/domain/PostCollection.java

@@ -58,7 +58,7 @@ public class PostCollection extends BaseEntity
 
     /** 藏品的是否上链 */
     @Excel(name = "藏品的是否上链" , readConverterExp = "0=没上链,1=上链")
-    private Date exchangeFlag;
+    private String exchangeFlag;
 
     /** 售卖时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -77,7 +77,15 @@ public class PostCollection extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
-    public void setCollectionId(Long collectionId) 
+    public String getExchangeFlag() {
+        return exchangeFlag;
+    }
+
+    public void setExchangeFlag(String exchangeFlag) {
+        this.exchangeFlag = exchangeFlag;
+    }
+
+    public void setCollectionId(Long collectionId)
     {
         this.collectionId = collectionId;
     }

ruoyi-post/src/main/java/com/ruoyi/post/domain/PostSeries.java

@@ -57,9 +57,15 @@ public class PostSeries extends BaseEntity
     /** 删除标志（0代表存在 1代表删除） */
     private String delFlag;
 
+    public String getExchangeFlag() {
+        return exchangeFlag;
+    }
 
+    public void setExchangeFlag(String exchangeFlag) {
+        this.exchangeFlag = exchangeFlag;
+    }
 
-    public void setSeriesId(Long seriesId) 
+    public void setSeriesId(Long seriesId)
     {
         this.seriesId = seriesId;
     }

ruoyi-post/src/main/java/com/ruoyi/post/mapper/PostSeriesMapper.java

@@ -100,10 +100,10 @@ public interface PostSeriesMapper
     /**
      * 修改邮贝套系藏品数量信息;
      *
-     * @param  postSeries 邮贝套系信息;
+     * @param  seriesName 邮贝套系信息;
      * @return 结果
      */
-    public int  exchangeSeriesFlagUpLock(PostSeries postSeries);
+    public int  exchangeSeriesFlagUpLock(String seriesName);
 
 
 }

ruoyi-post/src/main/java/com/ruoyi/post/service/IPostSeriesService.java

@@ -93,6 +93,6 @@ public interface IPostSeriesService
      *
      *     上锁 不能修改  // 1 不能改  0 能改  藏品的exchangeflag
      */
-    public  int isUpLian(PostSeries postSeries);
+    public  int isUpLian(String seriesName);
 
 }

ruoyi-post/src/main/java/com/ruoyi/post/service/impl/PostSeriesServiceImpl.java

@@ -146,7 +146,7 @@ public class PostSeriesServiceImpl implements IPostSeriesService
     }
 
     @Override
-    public int isUpLian(PostSeries postSeries) {
-        return  postSeriesMapper.exchangeSeriesFlagUpLock(postSeries);
+    public int isUpLian(String seriesName) {
+        return  postSeriesMapper.exchangeSeriesFlagUpLock(seriesName);
     }
 }

ruoyi-post/src/main/resources/mapper/PostSeriesMapper.xml

@@ -112,12 +112,13 @@
         and series_id = #{seriesId}
     </select>
     <!--添加套系信息-->
+<!--             <if test="collectionCounts != null">#{collectionCounts},</if>  may be not need-->
     <insert id="insertPostSeries" parameterType="PostSeries" useGeneratedKeys="true" keyProperty="seriesId">
         insert into post_series
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="seriesName != null and seriesName != ''">series_name,</if>
             <if test="seriesImage != null">series_image,</if>
-            <if test="collectionCounts != null">collection_counts,</if>
+
             <if test="status != null and status != ''">status,</if>
             <if test="exchangeStatus != null and exchangeStatus != ''">exchange_status,</if>
             <if test="startTime != null">start_time,</if>
@@ -132,7 +133,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="seriesName != null and seriesName != ''">#{seriesName},</if>
             <if test="seriesImage != null">#{seriesImage},</if>
-            <if test="collectionCounts != null">#{collectionCounts},</if>
+
             <if test="status != null and status != ''">#{status},</if>
             <if test="exchangeStatus != null and exchangeStatus != ''">#{exchangeStatus},</if>
             <if test="startTime != null">#{startTime},</if>
@@ -199,7 +200,22 @@
         where series_name = #{seriesName} limit 1
     </select>
     <!--    上锁 不能修改  // 1 不能改  0 能改  藏品的exchangeflag -->
-    <update id="exchangeSeriesFlagUpLock" parameterType="PostSeries" >
+    <update id="exchangeSeriesFlagUpLock" parameterType="String" >
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="seriesName != null and seriesName != ''">series_name = #{seriesName},</if>
+            <if test="seriesImage != null">series_image = #{seriesImage},</if>
+            <if test="collectionCounts != null">collection_counts = #{collectionCounts},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="exchangeStatus != null and exchangeStatus != ''">exchange_status = #{exchangeStatus},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
         update post_series ,post_collection  set post_series.exchange_flag = '1' ,  post_collection.exchange_flag = '1'
         WHERE post_series.series_name = #{seriesName} AND post_collection.series_name = #{seriesName}
     </update>