修复商品编辑后没有进入审核列表

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductScrmController.java

@@ -110,6 +110,25 @@ public class FsStoreProductScrmController extends BaseController {
         return R.ok();
     }
 
+    @PreAuthorize("@ss.hasPermi('store:storeProduct:add')")
+    @Log(title = "商品管理", businessType = BusinessType.INSERT, businessTypeExpression = "#p0.getProductId()>0? T(com.fs.common.enums.BusinessType).UPDATE: T(com.fs.common.enums.BusinessType).INSERT"
+            , isStoreLog = true, logParamExpression = "#p0.getProductId()>0? new String[]{'商品','修改商品'}: new String[]{'商品','新增商品'}")
+    @PostMapping(value = "/addOrEdit")
+    public R addOrEdit(@RequestBody FsStoreProductAddEditParam fsStoreProduct) {
+        if (ObjectUtils.isNotNull(fsStoreProduct.getIsShow())) {
+            if (fsStoreProduct.getIsShow() == 1) {
+                logger.info("商品上架：{}", fsStoreProduct.getProductName() + new Date());
+            }
+        }
+
+        if (ObjectUtils.isNotNull(fsStoreProduct.getIsDisplay())) {
+            if (fsStoreProduct.getIsDisplay() == 1) {
+                logger.info("商品前端展示：{}", fsStoreProduct.getProductName() + new Date());
+            }
+        }
+        return fsStoreProductService.addOrEdit(fsStoreProduct);
+    }
+
     @PreAuthorize("@ss.hasPermi('store:storeProduct:list')")
     @PostMapping("/batchAudit")
     @Log(title = "商品审核", businessType = BusinessType.AUDIT, isStoreLog = true, logParam = {"商品", "批量审核商品信息"},
@@ -192,26 +211,6 @@ public class FsStoreProductScrmController extends BaseController {
         return R.ok().put("data", product).put("attrs", attrs);
     }
 
-    @PreAuthorize("@ss.hasPermi('store:storeProduct:add')")
-    @Log(title = "商品管理", businessType = BusinessType.INSERT, businessTypeExpression = "#p0.getProductId()>0? T(com.fs.common.enums.BusinessType).UPDATE: T(com.fs.common.enums.BusinessType).INSERT"
-            , isStoreLog = true, logParamExpression = "#p0.getProductId()>0? new String[]{'商品','修改商品'}: new String[]{'商品','新增商品'}")
-    @PostMapping(value = "/addOrEdit")
-    public R addOrEdit(@RequestBody FsStoreProductAddEditParam fsStoreProduct) {
-        if (ObjectUtils.isNotNull(fsStoreProduct.getIsShow())) {
-            if (fsStoreProduct.getIsShow() == 1) {
-                logger.info("商品上架：{}", fsStoreProduct.getProductName() + new Date());
-            }
-        }
-
-        if (ObjectUtils.isNotNull(fsStoreProduct.getIsDisplay())) {
-            if (fsStoreProduct.getIsDisplay() == 1) {
-                logger.info("商品前端展示：{}", fsStoreProduct.getProductName() + new Date());
-            }
-        }
-        return fsStoreProductService.addOrEdit(fsStoreProduct);
-    }
-
-
     /**
      * 删除商品
      */

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java

@@ -505,8 +505,8 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
             } catch (IllegalAccessException e) {
                 log.error("获取diff出错", e);
             }
-            //避免重复审核时第一次审核结果为不通过，第二次申请重新上架导致无法在审核列表中查询到
-            if(oldFsStoreProduct.getIsAudit() != null && "2".equals(oldFsStoreProduct.getIsAudit())){
+            //只要是编辑，都待审核，通过审核sql 去处理audit和show字段。
+            if(oldFsStoreProduct.getIsAudit() != null){
                 product.setIsAudit("0");
             }
             fsStoreProductMapper.updateFsStoreProduct(product);