修改返回值

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/AreaController.java

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.model.Area;
 import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.common.util.PageParam;
+import com.yami.shop.common.util.R;
 import com.yami.shop.service.AreaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/BrandController.java

@@ -9,7 +9,7 @@
  */
 
 package com.yami.shop.platform.controller;
-
+import com.yami.shop.common.util.R;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/CategoryController.java

@@ -9,7 +9,7 @@
  */
 
 package com.yami.shop.platform.controller;
-
+import com.yami.shop.common.util.R;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -91,9 +91,9 @@ public class CategoryController {
 //		category.setShopId(Constant.PLATFORM_SHOP_ID);
 		Category categoryDB = categoryService.getById(category.getCategoryId());
 		if (Objects.equals(categoryDB.getParentId(), Constant.CATEGORY_ID) && !Objects.equals(category.getParentId(), Constant.CATEGORY_ID)){
-			return R.fail("一级分类不能改为二级分类");
+			return R.FAIL("一级分类不能改为二级分类");
 		}else if(Objects.equals(category.getParentId(), Constant.CATEGORY_ID) && !Objects.equals(categoryDB.getParentId(), Constant.CATEGORY_ID)){
-			return R.fail("二级分类不能改为一级分类");
+			return R.FAIL("二级分类不能改为一级分类");
 		}
 		category.setGrade(getGradeByParentId(category.getParentId()));
 		category.setOldCategoryName(categoryDB.getCategoryName());
@@ -109,11 +109,11 @@ public class CategoryController {
 	@PreAuthorize("@pms.hasPermission('prod:category:delete')")
 	public R<String> delete(@PathVariable("categoryId") Long categoryId){
 		if (categoryService.count(new LambdaQueryWrapper<Category>().eq(Category::getParentId,categoryId)) >0) {
-			return R.fail("请删除子分类，再删除该分类");
+			return R.FAIL("请删除子分类，再删除该分类");
 		}
 		int categoryProdCount = productService.count(new LambdaQueryWrapper<Product>().eq(Product::getCategoryId, categoryId).ne(Product::getStatus, -1));
 		if (categoryProdCount>0){
-			return R.fail("该分类下还有商品，请先删除该分类下的商品");
+			return R.FAIL("该分类下还有商品，请先删除该分类下的商品");
 		}
 		Category category = categoryService.getById(categoryId);
 		categoryService.deleteCategroy(category);

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/DeliveryController.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
-
+import com.yami.shop.common.util.R;
 
 /**
  * 物流公司

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/FeiEYunController.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-
+import com.yami.shop.common.util.R;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/platform/fey" )

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/FileController.java

@@ -31,7 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.util.Date;
 import java.util.Objects;
-
+import com.yami.shop.common.util.R;
 /**
  * 文件上传 controller
  * @author lgh
@@ -49,7 +49,7 @@ public class FileController {
 	@PostMapping("/upload/element")
 	public R<String> uploadElementFile(@RequestParam("file") MultipartFile file) throws IOException{
 		if(file.isEmpty()){
-            return R.fail("文件不能为空");
+            return R.FAIL("文件不能为空");
         }
 		String fileName = attachFileService.uploadFile(file.getBytes(),file.getOriginalFilename());
         return R.SUCCESS(fileName);
@@ -58,7 +58,7 @@ public class FileController {
 	@PostMapping("/upload/img")
 	public R<String> uploadImg(@RequestParam("file") MultipartFile file) throws IOException{
 		if(file.isEmpty()){
-			return R.fail("文件不能为空");
+			return R.FAIL("文件不能为空");
 		}
 		AttachFile attachFile = new AttachFile();
 		attachFile.setFileType(FileUtil.extName(file.getOriginalFilename()));

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/FreightFeeReductionController.java

@@ -16,6 +16,8 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import com.yami.shop.common.util.R;
+
 /**
  * @author wy
  */
@@ -29,13 +31,15 @@ public class FreightFeeReductionController {
     @ApiOperation("添加/编辑")
     @PostMapping("/addOrUpdate")
     public R<Void> addOrUpdate(@RequestBody FreightFeeReductionParam param) {
-        return freightFeeReductionService.addOrUpdate(param);
+        freightFeeReductionService.addOrUpdate(param);
+        return R.SUCCESS();
     }
 
     @ApiOperation("查看")
     @GetMapping("/get/{id}")
     public R<FreightFeeReduction> get(@PathVariable("id") Integer id) {
-        return freightFeeReductionService.get(id);
+        freightFeeReductionService.get(id);
+        return R.SUCCESS();
     }
 
     @ApiOperation("列表")

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/HotSearchController.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
-
+import com.yami.shop.common.util.R;
 /**
  *
  * @author lgh on 2019/03/27.

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/IndexImgController.java

@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.Objects;
-
+import com.yami.shop.common.util.R;
 /**
  * @author lgh on 2018/11/26.
  */

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/KeywordController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
-
+import com.yami.shop.common.util.R;
 /**
  * @author wy
  */
@@ -29,7 +29,8 @@ public class KeywordController {
     @ApiOperation("添加编辑")
     @PostMapping("/addOrUpdate")
     public R<Void> addOrUpdate(@RequestBody KeywordParam keywordParam) {
-        return keywordService.addOrUpdate(keywordParam);
+         keywordService.addOrUpdate(keywordParam);
+         return R.SUCCESS();
     }
 
     @ApiOperation("列表")

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/NoticeController.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Date;
-
+import com.yami.shop.common.util.R;
 /**
  * 公告管理
  *

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/OrderController.java

@@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
-
+import com.yami.shop.common.util.R;
 /**
  * @author lgh on 2018/09/15.
  */

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/OrderRefundController.java

@@ -11,7 +11,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-
+import com.yami.shop.common.util.R;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/platform/orderRefund")

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/ProductController.java

@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Objects;
-
+import com.yami.shop.common.util.R;
 
 /**
  * 商品列表、商品发布controller

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/QnhController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
-
+import com.yami.shop.common.util.R;
 /**
  * @author wy
  */
@@ -28,7 +28,7 @@ public class QnhController {
     @ApiOperation("查询所有门店")
     @PostMapping("/getStores")
     public R<List<StoreListVo>> getStores(@RequestBody StoreDto dto) {
-        return qnhService.getStores(dto);
+        return R.SUCCESS(qnhService.getStores(dto));
     }
 
     @ApiOperation("查询门店详情")
@@ -36,36 +36,36 @@ public class QnhController {
     public R<StoreDetailVo> queryStore(@RequestParam("regionCode") String regionCode,
                                                           @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
                                                           @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize) {
-        return qnhService.queryStore(regionCode, pageNo, pageSize);
+        return R.SUCCESS(qnhService.queryStore(regionCode, pageNo, pageSize));
     }
 
     @ApiOperation("查询门店商品列表")
     @PostMapping("/itemQuery")
     public R<GoodsItemPageVo> itemQuery(@RequestBody ItemQueryDto dto) {
-        return qnhService.itemQuery(dto);
+        return R.SUCCESS(qnhService.itemQuery(dto));
     }
 
     @ApiOperation("下单")
     @PostMapping("/addOrder")
     public R<String> addOrder(@RequestBody OrderDto dto) {
-        return qnhService.addOrder(dto);
+        return R.SUCCESS(qnhService.addOrder(dto));
     }
 
     @ApiOperation("syncShop")
     @GetMapping("/syncShop")
     public R<Void> syncShop() {
-        return qnhService.syncShop(null);
+        return R.SUCCESS(qnhService.syncShop(null));
     }
 
     @ApiOperation("syncGoods")
     @GetMapping("/syncGoods")
     public R<Void> syncGoods() {
-        return qnhService.syncGoods(null);
+        return R.SUCCESS(qnhService.syncGoods(null));
     }
 
     @ApiOperation("获取门店")
     @GetMapping("/getDetailShop")
     public R<Map<String,String>> getDetailShop(@RequestParam(value = "name", required = false) String name) {
-        return qnhService.getDetailShop(name);
+        return R.SUCCESS(qnhService.getDetailShop(name));
     }
 }

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/ScoreProductController.java

@@ -22,6 +22,7 @@ import com.yami.shop.bean.param.ProductScoreParam;
 import com.yami.shop.common.config.Constant;
 import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.common.util.PageParam;
+import com.yami.shop.common.util.R;
 import com.yami.shop.service.*;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/ShopAuditingController.java

@@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.Objects;
-
+import com.yami.shop.common.util.R;
 
 /**
  * 商家审核信息

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/ShopDetailController.java

@@ -39,7 +39,7 @@ import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
-
+import com.yami.shop.common.util.R;
 
 /**
  * 商家详细信息

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/ShopWalletController.java

@@ -22,7 +22,7 @@ import lombok.AllArgsConstructor;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yami.shop.common.util.PageParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
+import com.yami.shop.common.util.R;
 
 /**
  * 商家钱包信息

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/ShopWithdrawCashController.java

@@ -25,7 +25,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-
+import com.yami.shop.common.util.R;
 
 /**
  * 商家提现申请信息

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/SkuController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-
+import com.yami.shop.common.util.R;
 @RestController
 @RequestMapping("/platform/sku")
 @AllArgsConstructor

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/SpecController.java

@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
-
+import com.yami.shop.common.util.R;
 /**
  * 规格管理
  *

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/StatisticsOrderController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-
+import com.yami.shop.common.util.R;
 /**
  * @author lhd on 2019/10/19.
  */

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/UserAddrController.java

@@ -34,7 +34,7 @@ import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
-
+import com.yami.shop.common.util.R;
 
 /**
  * 用户地址管理

yami-shop-service/src/main/java/com/yami/shop/service/IQnhService.java

@@ -9,7 +9,6 @@ import com.yami.shop.bean.vo.GoodsItemPageVo;
 import com.yami.shop.bean.vo.GoodsItemVo;
 import com.yami.shop.bean.vo.StoreDetailVo;
 import com.yami.shop.bean.vo.StoreListVo;
-import org.springframework.http.ResponseEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -19,22 +18,22 @@ import java.util.Map;
  */
 public interface IQnhService {
 
-    ResponseEntity<List<StoreListVo>> getStores(StoreDto dto);
+    List<StoreListVo> getStores(StoreDto dto);
 
-    ResponseEntity<StoreDetailVo> queryStore(String regionCode, Integer pageNo, Integer pageSize);
+    StoreDetailVo queryStore(String regionCode, Integer pageNo, Integer pageSize);
 
-    ResponseEntity<GoodsItemPageVo> itemQuery(ItemQueryDto dto);
+    GoodsItemPageVo itemQuery(ItemQueryDto dto);
 
 
-    ResponseEntity<String> addOrder(OrderDto dto);
+    String addOrder(OrderDto dto);
 
-    ResponseEntity<Void> syncShop(List<StoreListVo> storeListVos);
+    Void syncShop(List<StoreListVo> storeListVos);
 
-    ResponseEntity<Void> syncGoods(List<GoodsItemVo> goodsItemVos);
+    Void syncGoods(List<GoodsItemVo> goodsItemVos);
 
-    ResponseEntity<Map<String, String>> getDetailShop(String name);
+    Map<String, String> getDetailShop(String name);
 
-    ResponseEntity<String> dataUpdate(QnhPushParam qnhPushParam);
+    String dataUpdate(QnhPushParam qnhPushParam);
 
     void synchronizedInfo();
 

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/HBGoodsService.java

@@ -38,7 +38,7 @@ import static com.yami.shop.common.util.HttpUtil.post;
 @Service
 @AllArgsConstructor
 @Transactional(readOnly = true)
-public class GoodsService implements IGoodsService {
+public class HBGoodsService implements IGoodsService {
     private final HBSignUtil hbSignUtil;
     private final ProductMapper productMapper;
     private final SkuMapper skuMapper;