购物车商品业务优化

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

@@ -4,6 +4,7 @@ import com.chelvc.cloud.maintain.copier.MerchantCopier;
 import com.chelvc.cloud.maintain.vo.MerchantDetailVO;
 import com.chelvc.cloud.maintain.vo.SimpleMerchantVO;
 import com.chelvc.cloud.vehicle.api.dto.MerchantBalanceDetailDTO;
+import com.chelvc.cloud.vehicle.api.dto.MerchantDetailDTO;
 import com.chelvc.cloud.vehicle.api.param.LocationQueryParam;
 import com.chelvc.cloud.vehicle.api.param.MerchantQueryParam;
 import com.chelvc.cloud.vehicle.api.param.QueryMerchantBalanceParam;
@@ -62,9 +63,9 @@ public class MerchantController {
      * @return 商家详情
      */
     @GetMapping("/merchant/{id}")
-    public MerchantDetailVO getMerchantDetail(@PathVariable("id") @Min(value = 1, message = "商家ID不能小于1") Long id,
-                                              @Valid LocationQueryParam param) {
-        return MerchantCopier.INSTANCE.copying(this.merchantService.getMerchantDetail(id, param));
+    public MerchantDetailDTO getMerchantDetail(@PathVariable("id") @Min(value = 1, message = "商家ID不能小于1") Long id,
+                                               @Valid LocationQueryParam param) {
+        return this.merchantService.getMerchantDetail(id, param);
     }
 
     /**

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

@@ -69,4 +69,9 @@ public class MerchantVO implements Serializable {
      * 轮播图列表
      */
     private List<File> banners;
+
+    /**
+     * 商家是否被收藏
+     */
+    private boolean favorites = false;
 }