|
|
@@ -3,6 +3,7 @@ package com.etotem.cfc.service;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.etotem.cfc.dto.ProductReviewRequest;
|
|
|
+import com.etotem.cfc.dto.ProductReviewResponse;
|
|
|
import com.etotem.cfc.entity.ProductOrder;
|
|
|
import com.etotem.cfc.entity.ProductReview;
|
|
|
import com.etotem.cfc.mapper.ProductOrderMapper;
|
|
|
@@ -20,12 +21,14 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
- * 普通商品评价服务实现(能力键 {@code shop.review.create} / {@code shop.review.my})。
|
|
|
+ * 普通商品评价服务实现(能力键 {@code shop.review.create} / {@code shop.review.detail} /
|
|
|
+ * {@code shop.review.my},R1 + R2 + R5)。
|
|
|
*
|
|
|
* <p>设计 {@code docs/superpowers/specs/2026-11-14-product-order-gap-arch-design.md} §3.1 R1 校验链:
|
|
|
* 订单存在 / {@code productType != 'activity'}(活动评价零污染)/ {@code status=completed} /
|
|
|
* {@code buyerId==userId}(评价人为下单人本人)/ {@code confirmTime >= now-90d}(Q4 窗口)/
|
|
|
- * {@link ProductReviewMapper#findByOrderId} 幂等(一单一评,表唯一键 {@code uk_order_id})。</p>
|
|
|
+ * {@link ProductReviewMapper#findByOrderId} 幂等(一单一评,表唯一键 {@code uk_order_id})。
|
|
|
+ * §3.1 R2:{@link #detail} 判定「去评价」按钮态(completed + 90 天窗口 + 未评)。</p>
|
|
|
*/
|
|
|
@Service
|
|
|
public class ProductReviewServiceImpl extends ServiceImpl<ProductReviewMapper, ProductReview>
|
|
|
@@ -38,7 +41,7 @@ public class ProductReviewServiceImpl extends ServiceImpl<ProductReviewMapper, P
|
|
|
private ProductReviewMapper reviewMapper;
|
|
|
|
|
|
@Resource
|
|
|
- private ProductOrderMapper productOrderMapper;
|
|
|
+ private ProductOrderMapper orderMapper;
|
|
|
|
|
|
@Override
|
|
|
@Transactional
|
|
|
@@ -61,7 +64,7 @@ public class ProductReviewServiceImpl extends ServiceImpl<ProductReviewMapper, P
|
|
|
Long orderId = request.getOrderId();
|
|
|
|
|
|
// 1) 订单存在
|
|
|
- ProductOrder order = productOrderMapper.selectById(orderId);
|
|
|
+ ProductOrder order = orderMapper.selectById(orderId);
|
|
|
if (order == null) {
|
|
|
throw new RuntimeException("订单不存在");
|
|
|
}
|
|
|
@@ -109,6 +112,47 @@ public class ProductReviewServiceImpl extends ServiceImpl<ProductReviewMapper, P
|
|
|
return "评价提交成功";
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public ProductReviewResponse detail(Long orderId, Long userId) {
|
|
|
+ // 入参守卫
|
|
|
+ if (orderId == null) {
|
|
|
+ throw new RuntimeException("订单ID不能为空");
|
|
|
+ }
|
|
|
+ // 订单存在
|
|
|
+ ProductOrder order = orderMapper.selectById(orderId);
|
|
|
+ if (order == null) {
|
|
|
+ throw new RuntimeException("订单不存在");
|
|
|
+ }
|
|
|
+ // 已评记录(未评为 null)
|
|
|
+ ProductReview review = reviewMapper.findByOrderId(orderId);
|
|
|
+
|
|
|
+ ProductReviewResponse resp = new ProductReviewResponse();
|
|
|
+ resp.setReview(review);
|
|
|
+ if (review != null) {
|
|
|
+ resp.setCanReview(false);
|
|
|
+ resp.setReviewHint("该订单已评价");
|
|
|
+ return resp;
|
|
|
+ }
|
|
|
+ if (!"completed".equals(order.getStatus())) {
|
|
|
+ resp.setCanReview(false);
|
|
|
+ resp.setReviewHint("订单完成后可评价");
|
|
|
+ return resp;
|
|
|
+ }
|
|
|
+ if ("activity".equals(order.getProductType())) {
|
|
|
+ resp.setCanReview(false);
|
|
|
+ resp.setReviewHint("活动订单暂不支持评价");
|
|
|
+ return resp;
|
|
|
+ }
|
|
|
+ if (!inReviewWindow(order.getConfirmTime())) {
|
|
|
+ resp.setCanReview(false);
|
|
|
+ resp.setReviewHint("确认收货后90天内可评价");
|
|
|
+ return resp;
|
|
|
+ }
|
|
|
+ resp.setCanReview(true);
|
|
|
+ resp.setReviewHint("");
|
|
|
+ return resp;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public Map<String, Object> my(Long userId, int page, int size) {
|
|
|
int pageNum = Math.max(page, 1);
|
|
|
@@ -116,8 +160,7 @@ public class ProductReviewServiceImpl extends ServiceImpl<ProductReviewMapper, P
|
|
|
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
|
|
|
- // 1) 我的评价列表:按 reviewer_id 查,review_at 倒序分页(只取首屏页规模,不做总数统计——
|
|
|
- // 小程序「我的评价」为简单列表,翻页按 offset 拉取即可)
|
|
|
+ // 1) 我的评价列表:按 reviewer_id 查,review_at 倒序分页
|
|
|
List<ProductReview> reviews = lambdaQuery()
|
|
|
.eq(ProductReview::getReviewerId, userId)
|
|
|
.orderByDesc(ProductReview::getReviewAt)
|
|
|
@@ -136,7 +179,7 @@ public class ProductReviewServiceImpl extends ServiceImpl<ProductReviewMapper, P
|
|
|
}
|
|
|
|
|
|
// selectBatchIds 不保序,按 findReviewableOrderIds 返回的 confirm_time 倒序顺序重组
|
|
|
- List<ProductOrder> fetched = productOrderMapper.selectBatchIds(reviewableOrderIds);
|
|
|
+ List<ProductOrder> fetched = orderMapper.selectBatchIds(reviewableOrderIds);
|
|
|
Map<Long, ProductOrder> byId = new HashMap<>();
|
|
|
if (fetched != null) {
|
|
|
for (ProductOrder o : fetched) {
|
|
|
@@ -154,4 +197,16 @@ public class ProductReviewServiceImpl extends ServiceImpl<ProductReviewMapper, P
|
|
|
result.put("reviewableCount", reviewableOrders.size());
|
|
|
return result;
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 90 天评价窗口判定:confirmTime 存在且 >= now - 90d。
|
|
|
+ */
|
|
|
+ private boolean inReviewWindow(Date confirmTime) {
|
|
|
+ if (confirmTime == null) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ Calendar cal = Calendar.getInstance();
|
|
|
+ cal.add(Calendar.DAY_OF_MONTH, -REVIEW_WINDOW_DAYS);
|
|
|
+ return !confirmTime.before(cal.getTime());
|
|
|
+ }
|
|
|
}
|