Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,67 @@
+package com.chelvc.cloud.maintain.controller;
+
+import com.chelvc.cloud.vehicle.api.dto.AttentionTotalDTO;
+import com.chelvc.cloud.vehicle.api.dto.AttentionUserDTO;
+import com.chelvc.cloud.vehicle.api.param.QueryAttentionParam;
+import com.chelvc.cloud.vehicle.api.service.AttentionService;
+import com.chelvc.framework.base.context.SessionContextHolder;
+import com.chelvc.framework.common.model.PagedDTO;
+import com.chelvc.framework.common.model.Pagination;
+import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 用户关注
+ * @PACKAGE_NAME: net.yeeu.collision.user.client.controller
+ * @NAME: AttentionController
+ * @USER: igl
+ * @DATE: 2023/8/14 9:55
+ */
+@Validated
+@RestController
+@RequestMapping("/client/attention")
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class AttentionController {
+
+  @DubboReference
+  private AttentionService attentionService;
+
+  /**
+   * 关注/取关用户
+   *
+   * @param targetUserId 目标用户标识
+   * @author igl
+   * @date 2023/2/25 19:42
+   * @apiNote 如果已关注，则会取消关注
+   */
+  @PostMapping("/concern")
+  public void concern(@RequestParam("targetUserId") Long targetUserId) {
+    attentionService.concern(SessionContextHolder.getId(), targetUserId);
+  }
+
+  /**
+   * 分页查看关注、粉丝、好友
+   *
+   * @param page
+   * @param param
+   * @author igl
+   * @date 2023/8/14 12:42
+   */
+  @GetMapping("/list")
+  public Pagination<AttentionUserDTO> page(PagedDTO page, @Validated QueryAttentionParam param) {
+    return attentionService.page(page, param, SessionContextHolder.getId());
+  }
+
+  /**
+   * 查看关注、粉丝、好友总数
+   * @author igl
+   * @date 2023/8/15 19:42
+   */
+  @GetMapping("/total")
+  public AttentionTotalDTO queryTotalByUserId(){
+    return attentionService.queryTotalByUserId(SessionContextHolder.getId());
+  }
+}

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

@@ -1,8 +1,10 @@
 package com.chelvc.cloud.maintain.controller;
 
+import com.chelvc.cloud.vehicle.api.constant.SystemInformType;
 import com.chelvc.cloud.vehicle.api.dto.*;
 import com.chelvc.cloud.vehicle.api.service.InformService;
 import com.chelvc.framework.base.context.SessionContextHolder;
+import com.chelvc.framework.base.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
 import lombok.RequiredArgsConstructor;
@@ -43,12 +45,15 @@ public class InformController {
     }
 
     /**
-     * 将新订单通知标识更改
+     * 将新系统通知标识未读改为已读
      *
      */
-    @PutMapping("/order/inform/flag")
-    public void changeUserOrderInformFlag() {
-        informService.changeUserOrderInformFlag(SessionContextHolder.getId());
+    @PutMapping("/system/inform/flag")
+    public void changeSystemInformFlag(SystemInformType type) {
+        if(type == null){
+            throw new ResourceUnavailableException("参数错误");
+        }
+        informService.changeSystemInformFlag(type, SessionContextHolder.getId());
     }
 
     /**
@@ -61,23 +66,34 @@ public class InformController {
     }
 
     /**
-     * 获取用户的支付通知列表
+     * (商家端)查看是否有系统新消息
+     *
+     */
+    @GetMapping("/merchant/new/inform")
+    public NewMerchantInformDTO getMerchantNewInform() {
+        return informService.getMerchantNewInform(SessionContextHolder.getId());
+    }
+
+    /**
+     * (商家端)获取订单退款申请列表
      *
      * @param paging 分页信息
      * @return 用户的订单列表
      */
-    @GetMapping("/pay/inform")
-    public Pagination<OmsOrderPayHistoryDTO> listUserPayInform(@Valid Paging paging) {
-        return informService.selectOmsOrderPayHistoryListByUserId(SessionContextHolder.getId(), paging);
+    @GetMapping("/order/return/apply")
+    public Pagination<OmsOrderReturnApplyIdsDTO> listOrderReturnApply(@Valid Paging paging) {
+        return informService.listOrderReturnApply(SessionContextHolder.getId(), paging);
     }
 
     /**
-     * 将新订单通知标识更改
+     * 获取用户的支付通知列表
      *
+     * @param paging 分页信息
+     * @return 用户的订单列表
      */
-    @PutMapping("/pay/inform/flag")
-    public void changeUserPayInformFlag() {
-        informService.changeUserPayInformFlag(SessionContextHolder.getId());
+    @GetMapping("/pay/inform")
+    public Pagination<OmsOrderDTO> listUserPayInform(@Valid Paging paging) {
+        return informService.selectOmsOrderPayHistoryListByUserId(SessionContextHolder.getId(), paging);
     }
 
     /**
@@ -91,15 +107,6 @@ public class InformController {
         return informService.selectEvaluateListByUserId(SessionContextHolder.getId(), paging);
     }
 
-    /**
-     * 将新点赞回复通知标识更改
-     *
-     */
-    @PutMapping("/evaluate/inform/flag")
-    public void changeEvaluateInformFlag() {
-        informService.changeEvaluateInformFlag(SessionContextHolder.getId());
-    }
-
     /**
      * 获取用户的评价通知列表
      *
@@ -111,15 +118,6 @@ public class InformController {
         return informService.selectCommentListByUserId(SessionContextHolder.getId(), paging);
     }
 
-    /**
-     * 将新评价通知标识更改
-     *
-     */
-    @PutMapping("/comment/inform/flag")
-    public void changeCommentInformFlag() {
-        informService.changeCommentInformFlag(SessionContextHolder.getId());
-    }
-
     /**
      * 获取用户的优惠券通知列表
      *
@@ -130,13 +128,4 @@ public class InformController {
     public Pagination<UserCouponDTO> listUserCouponInform(@Valid Paging paging) {
         return informService.selectUserCouponListByUserId(SessionContextHolder.getId(), paging);
     }
-
-    /**
-     * 将新优惠券通知标识更改
-     *
-     */
-    @PutMapping("/coupon/inform/flag")
-    public void changeUserCouponInformFlag() {
-        informService.changeUserCouponInformFlag(SessionContextHolder.getId());
-    }
 }

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);
+    }
 }

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

@@ -1,14 +1,13 @@
 package com.chelvc.cloud.maintain.vo;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.chelvc.cloud.vehicle.api.constant.ReserveStatus;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 预约记录信息
@@ -44,7 +43,6 @@ public class ReservationVO implements Serializable {
     /**
      * 约定时间
      */
-    @DateTimeFormat(pattern = "DATE_TIME")
     private Date appointTime;
 
     /**