浏览代码

fix 已发货实物订单可评价

zoujiajian 3 年之前
父节点
当前提交
203bfb484c

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/views/OrderDonUserCommentView.java

@@ -14,7 +14,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@SearchBean(tables = "(select id,user_id,goods_id,sku_id from order_don where status not in ('close','noPayment','refund') :condition:) o" +
+@SearchBean(tables = "(select id,user_id,goods_id,sku_id from order_don :condition:) o" +
 		" left join goods_don g on g.id = o.goods_id" +
 		" left join goods_don_sku sku on sku.id = o.sku_id" +
 		" left join order_comment oc on oc.order_id = o.id",

+ 7 - 2
netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderCommentFrontController.java

@@ -1,6 +1,7 @@
 package com.cyksj.web.controller.payment;
 
 import com.cyksj.common.annotation.NoSubmit;
+import com.cyksj.common.constant.Constant;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.request.OrderCommentReq;
@@ -19,7 +20,7 @@ import java.util.List;
 
 /*
  *项目名: netflix
- *文件名: OrderCommentController
+ *文件名: OrderCommentFrontController
  *创建者: JavaZou
  *创建时间:2023/7/28 13:42
  */
@@ -56,7 +57,11 @@ public class OrderCommentFrontController {
 		List<Long> userIds = userService.getRelationUserIdList(userId, null);
 		String userIdsStr = userIds.toString().replace("[", "(")
 				.replace("]", ")");
-		String conditionSql = String.format("and user_id in %s", userIdsStr);
+		String conditionSql = "where status not in ('close','noPayment','refund')";
+		if (Constant.realGoodsType.contains(type)) {
+			conditionSql = "where status = 'transport'";
+		}
+		conditionSql += String.format(" and user_id in %s", userIdsStr);
 		List<OrderDonUserCommentView> OrderDonUserCommentViews = beanSearcher.searchAll(OrderDonUserCommentView.class, MapUtils.builder()
 				.put("condition", conditionSql)
 				.field(OrderDonUserCommentView::getGoodsType, type).build());