commit commit

src/main/java/com/example/afrishop_v3/controllers/OrderController.java

@@ -4,6 +4,7 @@ import com.example.afrishop_v3.base.Result;
 import com.example.afrishop_v3.base.StateConstant;
 import com.example.afrishop_v3.enums.OrderStatusEnum;
 import com.example.afrishop_v3.enums.ResultCodeEnum;
+import com.example.afrishop_v3.inter_face.OrderCount;
 import com.example.afrishop_v3.models.*;
 import com.example.afrishop_v3.repository.*;
 import com.example.afrishop_v3.security.services.AuthenticationUser;
@@ -277,9 +278,11 @@ public class OrderController extends Controller {
                                    @RequestParam(value = "sort", defaultValue = "desc") String sort,
                                    @RequestParam(value = "name", required = false) String name
     ) {
-        Page<TbCfOrder> list = repository.findAllByUserId(user.userId(), PageRequest.of(pageNum, pageSize, sort(sort)));
-
-        return new Result<>(list);
+        TbCfUserInfo user = this.user.user();
+        Page<OrderCount> list = repository.findAllByUserId(user.getUserId(), user, PageRequest.of(pageNum, pageSize, sort(sort)));
+        list.forEach(v->v.getOrder().setCommentCount(v.getCommented()));
+        Page<TbCfOrder> map = list.map(OrderCount::getOrder);
+        return new Result<>(map);
     }
 
 

src/main/java/com/example/afrishop_v3/inter_face/OrderCount.java

+package com.example.afrishop_v3.inter_face;
+
+import com.example.afrishop_v3.models.TbCfOrder;
+
+public interface OrderCount {
+    public TbCfOrder getOrder();
+    public Integer getCommented();
+}

src/main/java/com/example/afrishop_v3/models/TbCfOrder.java

@@ -165,6 +165,9 @@ public class TbCfOrder {
     @Transient
     private TbCfExpressTemplate defaultTemplate;
 
+    @Transient
+    private Integer commentCount;
+
     public TbCfOrder() {
         this.orderStatus = OrderStatusEnum.PENDING_PAY.getValue();
         this.enableFlag = StateConstant.VALID;
@@ -173,6 +176,10 @@ public class TbCfOrder {
     }
 
 
+    public void setCommentCount(Integer commentCount) {
+        this.commentCount = commentCount;
+    }
+
     @OneToMany(mappedBy = "orderId", cascade = CascadeType.ALL)
     private List<TbCfItemOrderR> itemOrderList = new ArrayList<>();
 

src/main/java/com/example/afrishop_v3/repository/TbCfOrderRepository.java

 package com.example.afrishop_v3.repository;
 
+import com.example.afrishop_v3.inter_face.OrderCount;
 import com.example.afrishop_v3.models.TbCfOrder;
+import com.example.afrishop_v3.models.TbCfUserInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
@@ -11,7 +13,8 @@ import java.util.Date;
 import java.util.List;
 
 public interface TbCfOrderRepository extends PagingAndSortingRepository<TbCfOrder,String> {
-    Page<TbCfOrder> findAllByUserId(String userId, Pageable pageable);
+    @Query("select a as order,(select count(x) from TbCfItemComment x where x.orderId=a.orderId and x.user=:user) as commented from #{#entityName} a where a.userId=:userId")
+    Page<OrderCount> findAllByUserId(@Param("userId") String userId, @Param("user") TbCfUserInfo user, Pageable pageable);
 //    @Query(value = "select a from #{#entityName} a where :now >  DATE_SUB(a.orderTime,interval -1 day) and order_status=10")
 //    List<TbCfOrder> getTimeoutOrders(@Param("now") Date date);