代码优化以及业务功能调整

src/main/java/com/chelvc/cloud/maintain/controller/CarouselImagesController.java

@@ -1,4 +1,5 @@
 package com.chelvc.cloud.maintain.controller;
+import com.chelvc.cloud.vehicle.api.dto.CarouselImagesDTO;
 import com.chelvc.cloud.vehicle.api.service.CarouselImagesService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -6,6 +7,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 轮播图接口
  *
@@ -25,8 +28,8 @@ public class CarouselImagesController {
      * @param
      */
     @GetMapping("/listCarouselImages/")
-    public void listCarouselImages() {
-        this.carouselImagesService.listCarouselImages();
+    public List<CarouselImagesDTO> listCarouselImages() {
+        return this.carouselImagesService.listCarouselImages();
     }
 
 

src/main/java/com/chelvc/cloud/maintain/controller/GoodsController.java

@@ -7,13 +7,16 @@ import javax.validation.constraints.Min;
 import com.chelvc.cloud.maintain.copier.GoodsCopier;
 import com.chelvc.cloud.maintain.vo.GoodsDetailVO;
 import com.chelvc.cloud.maintain.vo.SimpleGoodsVO;
+import com.chelvc.cloud.vehicle.api.dto.GoodsDetailDTO;
 import com.chelvc.cloud.vehicle.api.param.GoodsQueryParam;
+import com.chelvc.cloud.vehicle.api.service.FavoriteService;
 import com.chelvc.cloud.vehicle.api.service.GoodsService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -29,6 +32,9 @@ public class GoodsController {
     @DubboReference
     private GoodsService goodsService;
 
+    @DubboReference
+    private FavoriteService favoriteService;
+
     /**
      * 获取商品详情
      *
@@ -36,8 +42,8 @@ public class GoodsController {
      * @return 商品详情
      */
     @GetMapping("/goods/{id}")
-    public GoodsDetailVO getGoodsDetail(@PathVariable("id") @Min(value = 1, message = "商品ID不能小于1") Long id) {
-        return GoodsCopier.INSTANCE.copying(this.goodsService.getGoodsDetail(id));
+    public GoodsDetailDTO getGoodsDetail(@PathVariable("id") @Min(value = 1, message = "商品ID不能小于1") Long id) {
+        return this.goodsService.getGoodsDetail(id);
     }
 
     /**
@@ -53,4 +59,16 @@ public class GoodsController {
             @Valid GoodsQueryParam param) {
         return GoodsCopier.INSTANCE.copying(this.goodsService.listMerchantSimpleGoods(merchantId, param));
     }
+
+
+    /**
+     * 收藏商品信息
+     *
+     * @param id 商品ID
+     * @return 收藏ID
+     */
+    @PostMapping("/goods/{id}/favorite")
+    public Long addMerchantFavorite(@PathVariable("id") @Min(value = 1, message = "商家ID不能小于1") Long id) {
+        return this.favoriteService.addMerchantFavorite(id,"GOODS");
+    }
 }

src/main/java/com/chelvc/cloud/maintain/controller/MerchantController.java

@@ -75,7 +75,7 @@ public class MerchantController {
      */
     @PostMapping("/merchant/{id}/favorite")
     public Long addMerchantFavorite(@PathVariable("id") @Min(value = 1, message = "商家ID不能小于1") Long id) {
-        return this.favoriteService.addMerchantFavorite(id);
+        return this.favoriteService.addMerchantFavorite(id,"MERCHANT");
     }
 
     /**

src/main/java/com/chelvc/cloud/maintain/controller/OmsOrderController.java

@@ -14,6 +14,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
@@ -52,7 +53,7 @@ public class OmsOrderController {
      * @return
      */
     @PostMapping("/generateOrder")
-    public Map<String, Object>  generateOrder(@Valid  OmsOrderModifyParam orderParam) {
+    public Map<String, Object>  generateOrder(@RequestBody @Valid OmsOrderModifyParam orderParam) {
         Map<String, Object> result = omsOrderService.generateOrder(orderParam);
         return result;
     }

src/main/java/com/chelvc/cloud/maintain/vo/GoodsVO.java

@@ -30,6 +30,11 @@ public class GoodsVO implements Serializable {
      */
     private String name;
 
+    /**
+     * 商品Logo
+     */
+    private String logo;
+
     /**
      * 商品评分
      */

src/main/java/com/chelvc/cloud/maintain/vo/MerchantDetailVO.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.List;
 
 import com.chelvc.cloud.vehicle.api.constant.CategoryType;
+import com.chelvc.cloud.vehicle.api.dto.CategoryDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -33,5 +34,5 @@ public class MerchantDetailVO implements Serializable {
     /**
      * 分类类型列表
      */
-    private List<CategoryType> categories;
+    private List<CategoryDTO> categories;
 }