商家端系统通知

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

@@ -1,19 +1,18 @@
 package com.chelvc.cloud.maintain.controller;
 
-import java.util.List;
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-
 import com.chelvc.cloud.maintain.copier.CommentCopier;
 import com.chelvc.cloud.maintain.vo.CommentVO;
+import com.chelvc.cloud.vehicle.api.param.AddGoodsCommentParam;
 import com.chelvc.cloud.vehicle.api.param.CommentQueryParam;
 import com.chelvc.cloud.vehicle.api.service.CommentService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
+import com.chelvc.framework.base.context.SessionContextHolder;
 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.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 商品评价接口
@@ -32,13 +31,27 @@ public class CommentController {
      * 获取商品评价列表
      *
      * @param goodsId 商品ID
+     * @param parentId   父级评论id
+     * @param merchantId   商户id
      * @param param   查询参数
      * @return 商品评价列表
      */
     @GetMapping("/goods/{goodsId}/comments")
     public List<CommentVO> listGoodsComments(
-            @PathVariable("goodsId") @Min(value = 1, message = "商品ID不能小于1") Long goodsId,
+            @PathVariable("goodsId") Long goodsId,
+            @PathVariable("parentId") Long parentId,
+            @PathVariable("merchantId") Long merchantId,
             @Valid CommentQueryParam param) {
-        return CommentCopier.INSTANCE.copying(this.commentService.listGoodsComments(goodsId, param));
+        return CommentCopier.INSTANCE.copying(this.commentService.listGoodsComments(goodsId, parentId, merchantId, param));
+    }
+
+    /**
+     * 新增商品评价
+     *
+     * @param param   新增参数
+     */
+    @PostMapping("/goods/comments/add")
+    public void addGoodsComments(@Validated @RequestBody AddGoodsCommentParam param) {
+        this.commentService.addGoodsComments(param, SessionContextHolder.getId());
     }
 }

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

@@ -65,6 +65,26 @@ public class InformController {
         return informService.getNewInform(SessionContextHolder.getId());
     }
 
+    /**
+     * (商家端)查看是否有系统新消息
+     *
+     */
+    @GetMapping("/merchant/new/inform")
+    public NewMerchantInformDTO getMerchantNewInform() {
+        return informService.getMerchantNewInform(SessionContextHolder.getId());
+    }
+
+    /**
+     * (商家端)获取订单退款申请列表
+     *
+     * @param paging 分页信息
+     * @return 用户的订单列表
+     */
+    @GetMapping("/order/return/apply")
+    public Pagination<OmsOrderReturnApplyDTO> listOrderReturnApply(@Valid Paging paging) {
+        return informService.listOrderReturnApply(SessionContextHolder.getId(), paging);
+    }
+
     /**
      * 获取用户的支付通知列表
      *

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

@@ -1,8 +1,11 @@
 package com.chelvc.cloud.maintain.controller;
+
 import com.chelvc.cloud.vehicle.api.dto.ConfirmOrderResultDTO;
 import com.chelvc.cloud.vehicle.api.dto.OmsOrderDTO;
+import com.chelvc.cloud.vehicle.api.dto.OmsOrderReturnApplyDTO;
 import com.chelvc.cloud.vehicle.api.param.OmsOrderModifyParam;
 import com.chelvc.cloud.vehicle.api.param.OrderPagingParam;
+import com.chelvc.cloud.vehicle.api.service.IOmsOrderReturnApplyService;
 import com.chelvc.cloud.vehicle.api.service.IOmsOrderService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.common.model.Pagination;
@@ -30,6 +33,9 @@ public class OmsOrderController {
     @DubboReference
     private IOmsOrderService omsOrderService;
 
+    @DubboReference
+    private IOmsOrderReturnApplyService iOmsOrderReturnApplyService;
+
     /**
      * 根据购物车信息生成确认单信息
      * @param orderParam
@@ -89,4 +95,14 @@ public class OmsOrderController {
                            Integer payType) {
         this.omsOrderService.paySuccess(id,payType);
     }
+
+    /**
+     * 查看退款订单信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/getOrderReturnApplyInfo")
+    public OmsOrderReturnApplyDTO getOrderReturnApplyInfo(@PathVariable("id") Long id) {
+        return this.iOmsOrderReturnApplyService.getOrderReturnApplyInfo(id);
+    }
 }