merge: 代码合并

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreProductScrm.java

@@ -185,8 +185,6 @@ public class FsStoreProductScrm extends BaseEntity
     /** 指定企业 */
     private String companyIds;
 
-    private Long storeId;
-
     /**
      * 商品图片
      */

fs-service/src/main/java/com/fs/hisStore/param/FsStoreProductAddEditParam.java

@@ -149,6 +149,4 @@ public class FsStoreProductAddEditParam implements Serializable
         // 指定企业
     private String companyIds;
 
-    private Long storeId;
-
 }

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

@@ -144,7 +144,7 @@ public class FsStoreScrmServiceImpl implements IFsStoreScrmService
         fsStoreScrm.setPassword(storeMD5PasswordEncoder.encode("123456"));
         fsStoreScrm.setUpdateTime(DateUtils.getNowDate());
         return fsStoreMapper.updateFsStore(fsStoreScrm);
-        }
+    }
     public List<FsStoreScrmVO> selectFsStoreListByIds(List<Integer> storeIds) {
         return fsStoreMapper.selectFsStoreListByIds(storeIds);
     }

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

@@ -66,7 +66,7 @@ public TableDataInfo list(FsStoreProductListSParam fsStoreProduct)
     @GetMapping("/export")
     public AjaxResult export(FsStoreProductScrm fsStoreProduct)
     {
-        fsStoreProduct.setStoreId(UserUtil.getLoginUserStoreID());
+        fsStoreProduct.setStoreId(String.valueOf(UserUtil.getLoginUserStoreID()));
         List<FsStoreProductScrm> list = fsStoreProductService.selectFsStoreProductList(fsStoreProduct);
         ExcelUtil<FsStoreProductScrm> util = new ExcelUtil<FsStoreProductScrm>(FsStoreProductScrm.class);
         return util.exportExcel(list, "商品数据");
@@ -95,7 +95,7 @@ public TableDataInfo list(FsStoreProductListSParam fsStoreProduct)
     @PostMapping("/price/{price}")
     public AjaxResult editPrice(@RequestBody FsStoreProductScrm fsStoreProduct, @PathVariable("price")Integer price)
     {
-        fsStoreProduct.setStoreId(UserUtil.getLoginUserStoreID());
+        fsStoreProduct.setStoreId(String.valueOf(UserUtil.getLoginUserStoreID()));
         return toAjax(fsStoreProductService.updateFsStoreProductPrice(fsStoreProduct,price));
     }
     /**
@@ -106,7 +106,7 @@ public TableDataInfo list(FsStoreProductListSParam fsStoreProduct)
     @PostMapping
     public AjaxResult add(@RequestBody FsStoreProductScrm fsStoreProduct)
     {
-        fsStoreProduct.setStoreId(UserUtil.getLoginUserStoreID());
+        fsStoreProduct.setStoreId(String.valueOf(UserUtil.getLoginUserStoreID()));
         return toAjax(fsStoreProductService.insertFsStoreProduct(fsStoreProduct));
     }
 
@@ -149,7 +149,7 @@ public TableDataInfo list(FsStoreProductListSParam fsStoreProduct)
     @PostMapping(value = "/genFormatAttr/{productId}")
     public ResponseEntity genFormatAttr(@PathVariable Long productId, @RequestBody String jsonStr){
 
-        return new ResponseEntity<>(fsStoreProductService.getFormatAttr(productId,jsonStr), HttpStatus.OK);
+        return new ResponseEntity<>(fsStoreProductService.getFormatAttr(productId,jsonStr,null), HttpStatus.OK);
     }
     /**
      * 获取商品详细信息
@@ -180,7 +180,7 @@ public TableDataInfo list(FsStoreProductListSParam fsStoreProduct)
     @PostMapping(value = "/addOrEdit")
     public R addOrEdit(@RequestBody FsStoreProductAddEditParam fsStoreProduct)
     {
-        fsStoreProduct.setStoreId(UserUtil.getLoginUserStoreID());
+        fsStoreProduct.setStoreId(String.valueOf(UserUtil.getLoginUserStoreID()));
 
         return fsStoreProductService.addOrEdit(fsStoreProduct);
     }