commit commit

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

@@ -201,23 +201,23 @@ public class OrderController extends Controller {
                 return new Result<>(ResultCodeEnum.SERVICE_ERROR.getCode(), "Missing information !");
             TbCfStationItem stationItem = byId.get();
             //减库存 Inventory reduction
-            boolean success = subCount(itemId, itemNum);
-            if (!success) {
-                return new Result<>(v_code, "Goods in short stock!");
-            }
+//            boolean success = subCount(itemId, itemNum);
+//            if (!success) {
+//                return new Result<>(v_code, "Goods in short stock!");
+//            }
             allByUserId.add(getCart(stationItem, itemSku, itemNum, itemPrice));
 
         } else {
             System.out.println(Arrays.toString(tbCfOrder.getIds()));
             allByUserId = cartRepository.findAllByCartRecordIdIn(tbCfOrder.getIds());
-            for (TbCfCartRecordR cart : allByUserId) {
-                String id = cart.getItemId();
-                Integer num = cart.getItemNum();
-                boolean success = subCount(id, num);
-                if (!success) {
-                    return new Result<>(v_code, "Goods in short stock!");
-                }
-            }
+//            for (TbCfCartRecordR cart : allByUserId) {
+//                String id = cart.getItemId();
+//                Integer num = cart.getItemNum();
+//                boolean success = subCount(id, num);
+//                if (!success) {
+//                    return new Result<>(v_code, "Goods in short stock!");
+//                }
+//            }
         }
 
         String addressId = tbCfOrder.getDeliveryAddressId();
@@ -327,7 +327,14 @@ public class OrderController extends Controller {
                                    @RequestParam(value = "name", required = false) String name
     ) {
         TbCfUserInfo user = this.user.user();
-        Page<OrderCount> list = repository.findAllByUserId(user.getUserId(), user, PageRequest.of(pageNum, pageSize, sort(sort)));
+        Page<OrderCount> list;
+        PageRequest of = PageRequest.of(pageNum, pageSize, sort(sort));
+        String userId = user.getUserId();
+        if(orderStatus != null){
+            list = repository.findAllByUserIdWithStatus(userId,user,orderStatus,of);
+        }else
+        list = repository.findAllByUserId(userId, user, of);
+
         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/repository/TbCfOrderRepository.java

@@ -15,6 +15,8 @@ import java.util.List;
 public interface TbCfOrderRepository extends PagingAndSortingRepository<TbCfOrder,String> {
     @Query("select a as order, count(x) as commented from #{#entityName} a left join TbCfItemComment x on a.orderId=x.orderId and x.user=:user where a.userId=:userId group by a")
     Page<OrderCount> findAllByUserId(@Param("userId") String userId, @Param("user") TbCfUserInfo user, Pageable pageable);
+    @Query("select a as order, count(x) as commented from #{#entityName} a left join TbCfItemComment x on a.orderId=x.orderId and x.user=:user where a.userId=:userId and a.orderStatus=:status group by a")
+    Page<OrderCount> findAllByUserIdWithStatus(@Param("userId") String userId, @Param("user") TbCfUserInfo user,@Param("status") Integer orderStatus, 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);