套系上架bug修复

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

@@ -12,14 +12,7 @@ import com.ruoyi.post.service.IPostCollectionService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -126,15 +119,19 @@ public class PostSeriesController extends BaseController {
      */
     @ApiOperation("套系上链")
     @PreAuthorize("@ss.hasPermi('system:series:list')")
-    @PutMapping("/onchain")
-    public AjaxResult OnChain(@RequestBody int seriesId) {
-        long lseriesId=seriesId;
-        PostSeries postSeries = postSeriesService.selectPostSeriesBySeriesId(lseriesId);
-        System.out.println(postSeries);
-        if (postSeries.getExchangeFlag().equals('0')) {
+    @GetMapping(value = "/onchain/{seriesId}")
+    public AjaxResult OnChain(@PathVariable("seriesId") Long seriesId) {
+        PostSeries postSeries = postSeriesService.selectPostSeriesBySeriesId(seriesId);
+        if (postSeries == null) {
+            return AjaxResult.error("套系为空");
+        }
+        System.out.println(postSeries.getExchangeFlag());
+        int exchangeFlag = Integer.parseInt(postSeries.getExchangeFlag());
+        if (exchangeFlag==1) {
             return AjaxResult.error("不可重复上链");
         }
-        return toAjax(postSeriesService.OnChain(postSeries));
+        postSeriesService.OnChain(postSeries);
+        return toAjax(1);
     }
 
     /**
@@ -167,7 +164,7 @@ public class PostSeriesController extends BaseController {
     @Log(title = "邮贝套系信息; ", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@RequestBody PostSeries postSeries) {
-        if (postSeries.getExchangeFlag().equals('0')) {
+        if (postSeries.getExchangeFlag().equals("1")) {
             return AjaxResult.error("新增套系消息" + postSeries.getSeriesName() + "失败，套系已经上链");
         }
 
@@ -206,12 +203,10 @@ public class PostSeriesController extends BaseController {
     @PutMapping("/edit")
     public AjaxResult edit(@RequestBody PostSeries postSeries) {
         //只能进行时间的后面修改
-
-        if (postSeries.getExchangeFlag().equals('0')) {
+        if (postSeries.getExchangeFlag().equals("1")) {
             return AjaxResult.error("修改套系消息" + postSeries.getSeriesName() + "失败，套系已经上链");
         }
 
-
         if (UserConstants.NOT_UNIQUE.equals(postSeriesService.checkSeriesNameUnique(postSeries))) {
             return AjaxResult.error("修改消息" + postSeries.getSeriesName() + "失败，套系已经存在");
         }
@@ -244,8 +239,13 @@ public class PostSeriesController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] seriesIds) {
 
         for (int i = 0; i < seriesIds.length; i++) {
+
             PostSeries postSeries = postSeriesService.selectPostSeriesBySeriesId(seriesIds[i]);
-            if (postSeries.getExchangeFlag().equals('0')) {
+            if (postSeries == null) {
+                return AjaxResult.error("套系内容为空");
+            }
+
+            if (postSeries.getExchangeFlag().equals("1")) {
                 return AjaxResult.error("删除套系消息" + postSeries.getSeriesName() + "失败，套系已经上链");
             }
         }

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

@@ -10,7 +10,7 @@
         <result property="seriesImage" column="series_image"/>
         <result property="collectionCounts" column="collection_counts"/>
         <result property="status" column="status"/>
-        <result property="exchangeStatus" column="exchange_status"/>
+        <result property="exchangeFlag" column="exchange_flag"/>
         <result property="startTime" column="start_time"/>
         <result property="endTime" column="end_time"/>
         <result property="delFlag" column="del_flag"/>
@@ -20,28 +20,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
     </resultMap>
-
-    <resultMap type="PostCollection" id="PostCollectionResult">
-        <result property="collectionId" column="collection_id"/>
-        <result property="collectionName" column="collection_name"/>
-        <result property="collectionImage" column="collection_image"/>
-        <result property="collectionDetails" column="collection_details"/>
-        <result property="collection3dimage" column="collection_3dimage"/>
-        <result property="publisherName" column="publisher_name"/>
-        <result property="collectionPrice" column="collection_price"/>
-        <result property="collectionCounts" column="collection_counts"/>
-        <result property="collectionStatus" column="collection_status"/>
-        <result property="exchangeStatus" column="exchange_status"/>
-        <result property="startTime" column="start_time"/>
-        <result property="endTime" column="end_time"/>
-        <result property="seriesName" column="series_name"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remark" column="remark"/>
-    </resultMap>
+    
 
     <sql id="selectPostSeriesVo">
         select series_id,
@@ -49,7 +28,7 @@
                cast(series_image as char) as series_image,
                collection_counts,
                status,
-               exchange_status,
+               exchange_flag,
                start_time,
                end_time,
                del_flag
@@ -64,7 +43,7 @@
         <if test="seriesImage != null  and seriesImage != ''">and series_image = #{seriesImage}</if>
         <if test="collectionCounts != null ">and collection_counts = #{collectionCounts}</if>
         <if test="status != null  and status != ''">and status = #{status}</if>
-        <if test="exchangeStatus != null  and exchangeStatus != ''">and exchange_status = #{exchangeStatus}</if>
+        <if test="exchangeFlag != null  and exchangeFlag != ''">and exchange_flag = #{exchangeFlag}</if>
         <if test="startTime != null ">and start_time = #{startTime}</if>
         <if test="endTime != null ">and end_time = #{endTime}</if>
     </select>
@@ -76,7 +55,7 @@
         <if test="seriesImage != null  and seriesImage != ''">and series_image = #{seriesImage}</if>
         <if test="collectionCounts != null ">and collection_counts = #{collectionCounts}</if>
         <if test="status != null  and status != ''">and status = #{status}</if>
-        <if test="exchangeStatus != null  and exchangeStatus != ''">and exchange_status = #{exchangeStatus}</if>
+        <if test="exchangeFlag != null  and exchangeFlag != ''">and exchange_flag = #{exchangeFlag}</if>
         <if test="startTime != null ">and start_time = #{startTime}</if>
         <if test="endTime != null ">and end_time = #{endTime}</if>
     </select>
@@ -88,7 +67,7 @@
         <if test="seriesImage != null  and seriesImage != ''">and series_image = #{seriesImage}</if>
         <if test="collectionCounts != null ">and collection_counts = #{collectionCounts}</if>
         <if test="status != null  and status != ''">and status = #{status}</if>
-        <if test="exchangeStatus != null  and exchangeStatus != ''">and exchange_status = #{exchangeStatus}</if>
+        <if test="exchangeFlag != null  and exchangeFlag != ''">and exchange_flag = #{exchangeFlag}</if>
         <if test="startTime != null ">and start_time = #{startTime}</if>
         <if test="endTime != null ">and end_time = #{endTime}</if>
     </select>
@@ -100,7 +79,7 @@
         <if test="seriesImage != null  and seriesImage != ''">and series_image = #{seriesImage}</if>
         <if test="collectionCounts != null ">and collection_counts = #{collectionCounts}</if>
         <if test="status != null  and status != ''">and status = #{status}</if>
-        <if test="exchangeStatus != null  and exchangeStatus != ''">and exchange_status = #{exchangeStatus}</if>
+        <if test="exchangeFlag != null  and exchangeFlag != ''">and exchange_flag = #{exchangeFlag}</if>
         <if test="startTime != null ">and start_time = #{startTime}</if>
         <if test="endTime != null ">and end_time = #{endTime}</if>
     </select>
@@ -118,7 +97,7 @@
             <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="exchangeFlag != null and exchangeFlag != ''">exchange_flag,</if>
             <if test="startTime != null">start_time,</if>
             <if test="endTime != null">end_time,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -133,7 +112,7 @@
             <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="exchangeFlag != null and exchangeFlag != ''">#{exchangeFlag},</if>
             <if test="startTime != null">#{startTime},</if>
             <if test="endTime != null">#{endTime},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -166,7 +145,7 @@
             <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="exchangeFlag != null and exchangeFlag != ''">exchange_flag = #{exchangeFlag},</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>