套系上链

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

@@ -70,14 +70,19 @@ public class PostSeriesController extends BaseController
         //通过匹配查询出对应的藏品
        postCollection.setSeriesName(seriesName);
        List<PostCollection> postCollections = postCollectionService.selectPostCollectionList(postCollection);
-       if(postCollections.isEmpty()){
-           List<String> list=new ArrayList<String>();
-           list.add(("当前"+postSeries.getSeriesName()+"套系不含有任何藏品"));
-           return getDataTable(list);
-       }
        return getDataTable(postCollections);
     }
 
+    /**
+     * 产品上链，
+     * 不允许修改套系内藏品信息，也不允许新加藏品，
+     * 获取到该所含藏品的套系名然后找到该套系的exchang_flag 是否为1 如果为1则在套系修改添加处增加限制条件
+     *
+     * 不允许再次上链，不允许删除，允许修改套系信息，其中“时间”只允许修改截止时间，且只能可以像当前截止时间之后设置；
+     * 不允许二次上链，并且不能删除该套系
+     * 时间只允许修改截止时间 并且修改的时间只能是当前时间之后
+     *
+     */
 
     /**
      * 查询邮贝在售套系信息;
@@ -116,6 +121,17 @@ public class PostSeriesController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 上链功能;
+     */
+    @PreAuthorize("@ss.hasPermi('system:series:list')")
+    @PutMapping("/onchain/{seriesId}")
+    public  AjaxResult OnChain(@PathVariable("seriesId")Long seriesId, PostSeries postSeries)
+    {
+        postSeries = postSeriesService.selectPostSeriesBySeriesId(seriesId);
+       return toAjax(postSeriesService.OnChain(postSeries));
+    }
+
     /**
      * 导出邮贝套系信息; 
      */
@@ -222,14 +238,5 @@ public class PostSeriesController extends BaseController
         return toAjax(postSeriesService.deletePostSeriesBySeriesIds(seriesIds));
     }
 
-    /**
-     * 套系上链
-     */
-    @PreAuthorize("@ss.hasPermi('system:series:isUpLian')")
-    @Log(title = "邮贝套系信息; ", businessType = BusinessType.DELETE)
-    @PutMapping("/isUpLian")
-    public AjaxResult isUpLian(@RequestBody String seriesName)
-    {
-        return  toAjax(postSeriesService.isUpLian(seriesName));
-    }
+
 }

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

@@ -40,8 +40,8 @@ public class PostSeries extends BaseEntity
     @Excel(name = "套系兑换状态", readConverterExp = "0=可兑换,1=不可兑换")
     private String exchangeStatus;
 
-    /** 套系 是否上链 1 不能改  0 能改  */
-    @Excel(name = "套系上链状态", readConverterExp = "1=上链,2=不上链")
+    /** 套系状态(0 上链 1 未上链) */
+    @Excel(name = "套系状态(0 上链 1 未上链)")
     private String exchangeFlag;
 
     /** 展示时间初始 */
@@ -154,15 +154,11 @@ public class PostSeries extends BaseEntity
                 .append("seriesImage", getSeriesImage())
                 .append("collectionCounts", getCollectionCounts())
                 .append("status", getStatus())
+                .append("exchangeFlag",getExchangeFlag())
                 .append("exchangeStatus", getExchangeStatus())
                 .append("startTime", getStartTime())
                 .append("endTime", getEndTime())
                 .append("delFlag", getDelFlag())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
                 .toString();
     }
 }

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

@@ -98,12 +98,9 @@ public interface PostSeriesMapper
     public int  updatePostSeriesCollect(PostSeries postSeries);
 
     /**
-     * 修改邮贝套系藏品数量信息;
-     *
-     * @param  seriesName 邮贝套系信息;
-     * @return 结果
+     * 上链功能
+     * @param postSeries
+     * @return
      */
-    public int  exchangeSeriesFlagUpLock(String seriesName);
-
-
+    public int updatePostSeriesFlag(PostSeries postSeries);
 }

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

@@ -88,11 +88,11 @@ public interface IPostSeriesService
      */
     public String checkSeriesNameUnique(PostSeries postSeries);
 
-
     /**
-     *
-     *     上锁 不能修改  // 1 不能改  0 能改  藏品的exchangeflag
+     * 上链功能
+     * @param postSeries
+     * @return
      */
-    public  int isUpLian(String seriesName);
+    public int OnChain(PostSeries postSeries);
 
 }

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

@@ -135,6 +135,11 @@ public class PostSeriesServiceImpl implements IPostSeriesService
         return postSeriesMapper.deletePostSeriesBySeriesId(seriesId);
     }
 
+    /**
+     * 检验套系名称是否唯一
+     * @param postSeries
+     * @return
+     */
     @Override
     public String checkSeriesNameUnique(PostSeries postSeries) {
         Long SeriesId = StringUtils.isNull(postSeries.getSeriesId()) ? -1l : postSeries.getSeriesId();
@@ -145,8 +150,14 @@ public class PostSeriesServiceImpl implements IPostSeriesService
         return UserConstants.UNIQUE;
     }
 
+    /**
+     * 上链功能
+     * @param postSeries
+     * @return
+     */
     @Override
-    public int isUpLian(String seriesName) {
-        return  postSeriesMapper.exchangeSeriesFlagUpLock(seriesName);
+    public int OnChain(PostSeries postSeries) {
+        return postSeriesMapper.updatePostSeriesFlag(postSeries);
     }
+
 }

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

@@ -192,35 +192,14 @@
             #{seriesId}
         </foreach>
     </update>
+    <update id="updatePostSeriesFlag" parameterType="long">
+        update post_series set exchange_flag = '1'
+        where series_id = #{seriesId}
+    </update>
     <!-- 判断套系名字唯一   -->
     <select id="checkSeriesNameUnique" parameterType="String" resultMap="PostSeriesResult">
         select series_id, series_name
         from post_series
         where series_name = #{seriesName} limit 1
     </select>
-    <!--    上锁 不能修改  // 1 不能改  0 能改  藏品的exchangeflag -->
-    <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>
-<!--    &lt;!&ndash;    上锁 不能修改  // 1 不能改  0 能改  套系的exchangeflag  &ndash;&gt;-->
-<!--    <update id="exchangeSeriesFlagUpLock" parameterType="String" >-->
-<!--        update post_collection set exchange_flag = '1'-->
-<!--        where series_name = #{seriesName}-->
-<!--    </update>-->
 </mapper>