From cf1a9fd8a407dc2e26edd59f571a5370bf8fd657 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 21 九月 2023 16:14:15 +0800
Subject: [PATCH] 历史版本可用性设定解锁逻辑修改

---
 src/main/java/com/whyc/service/ProductHistoryService.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/whyc/service/ProductHistoryService.java b/src/main/java/com/whyc/service/ProductHistoryService.java
index 7388964..9d8c580 100644
--- a/src/main/java/com/whyc/service/ProductHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductHistoryService.java
@@ -89,13 +89,23 @@
         wrapper.eq("parent_code",parentCode);
         wrapper.eq("custom_code",customCode);
         int flag=0;
+        //鏌ュ嚭鏈�鏂颁笂浼犵殑鐗堟湰
+        QueryWrapper qhisWrapper=new QueryWrapper();
+        qhisWrapper.eq("parent_code",parentCode);
+        qhisWrapper.eq("custom_code",customCode);
+        qhisWrapper.eq("enabled",-1);
+        ProductHistory pHistory=mapper.selectOne(qhisWrapper);
         if(enabled==1){
             //鍏堝皢鎵�鏈夌殑閿佸畾
             wrapper.set("enabled",0);
             flag=mapper.update(null,wrapper);
-            //鍐嶅皢閫変腑鐨勮涓哄彲鐢�
-            wrapper.eq("version",version);
-            wrapper.set("enabled",1);
+            //鍐嶅皢閫変腑鐨勮涓哄彲鐢�(鏈�鏂颁笂浼犵殑鎵緀nabled=-1)
+            if(version==-1){
+                wrapper.eq("enabled",-1);
+            }else{
+                wrapper.eq("version",version);
+                wrapper.set("enabled",1);
+            }
             flag=mapper.update(null,wrapper);
             if(flag>0){
                 QueryWrapper qWrapper=new QueryWrapper();
@@ -104,8 +114,6 @@
                 //1.鏌ヨ褰撳墠product涓殑淇℃伅
                 Product product=productMapper.selectOne(qWrapper);
                 //2.灏嗛�変腑鐨勭増鏈殑鍘嗗彶淇℃伅鏌ヨ鍑烘潵
-                qWrapper.eq("version",version);
-                ProductHistory pHistory=mapper.selectOne(qWrapper);
                 //3:prodcut涓垹闄ゆ棫鐨勪骇鍝佷俊鎭�
                 UpdateWrapper deleteWrapper=new UpdateWrapper();
                 deleteWrapper.eq("parent_code",parentCode);

--
Gitblit v1.9.1