店铺端商品操作及审核日志

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

@@ -121,7 +121,9 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
     public int insertFsStoreProduct(FsStoreProductScrm fsStoreProduct)
     {
         fsStoreProduct.setCreateTime(DateUtils.getNowDate());
-        return fsStoreProductMapper.insertFsStoreProduct(fsStoreProduct);
+        fsStoreProductMapper.insertFsStoreProduct(fsStoreProduct);
+        storeAuditLogUtil.addOperLog(fsStoreProduct.getProductId());
+        return 1;
     }
 
     /**
@@ -134,6 +136,11 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
     public int updateFsStoreProduct(FsStoreProductScrm fsStoreProduct)
     {
         fsStoreProduct.setUpdateTime(DateUtils.getNowDate());
+        storeAuditLogUtil.addOperLog(fsStoreProduct.getProductId());
+        //对已上架的商品进行修改需要重新审核
+        if(1 == fsStoreProduct.getIsShow() && "1".equals(fsStoreProduct.getIsAudit())){
+            fsStoreProduct.setIsAudit("0");
+        }
         return fsStoreProductMapper.updateFsStoreProduct(fsStoreProduct);
     }
 
@@ -313,6 +320,10 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
         product.setCompanyIds(param.getCompanyIds());
         product.setVideo(param.getVideo());
         if(param.getProductId() != null){
+            //对已上架的商品进行修改需要重新审核
+            if(1 == product.getIsShow() && "1".equals(product.getIsAudit())){
+                product.setIsAudit("0");
+            }
             fsStoreProductMapper.updateFsStoreProduct(product);
         }
         else{

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

@@ -89,6 +89,10 @@ public class FsStoreScrmServiceImpl implements IFsStoreScrmService
     {
         fsStore.setUpdateTime(DateUtils.getNowDate());
         storeAuditLogUtil.addOperLog(fsStore.getStoreId());
+        //更新，信息，时间等，后台重新审核
+        if(1 == fsStore.getIsAudit()){
+            fsStore.setIsAudit(0);
+        }
         return fsStoreMapper.updateFsStore(fsStore);
     }
 

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

@@ -118,7 +118,6 @@ public TableDataInfo list(FsStoreProductListSParam fsStoreProduct)
     @PutMapping
     public AjaxResult edit(@RequestBody FsStoreProductScrm fsStoreProduct)
     {
-
         return toAjax(fsStoreProductService.updateFsStoreProduct(fsStoreProduct));
     }
 
@@ -175,8 +174,8 @@ public TableDataInfo list(FsStoreProductListSParam fsStoreProduct)
 
 
 
-    @Log(title = "商品", businessType = BusinessType.INSERT, businessTypeExpression = "#param.getProductId()>0? T(com.fs.common.enums.BusinessType).UPDATE: T(com.fs.common.enums.BusinessType).INSERT"
-            , isStoreLog = true, logParamExpression = "#param.getProductId()>0? new String[]{'商品','修改商品'}: new String[]{'商品','新增商品'}")
+    @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)
     {