Merge branch 'dev'

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

@@ -285,9 +285,8 @@ public class CartController extends Controller {
     }
 
     @GetMapping
-    public Result getItemCartList(@RequestParam(value = "pageNo", defaultValue = "0") Integer pageNo,
-                                  @RequestParam(value = "pageSize", defaultValue = "6") Integer pageSize) {
-        List<TbCfCartRecordR> list = repository.findAllByUserIdOrderByCreateTimeDesc(user.userId(), PageRequest.of(pageNo, pageSize));
+    public Result getItemCartList() {
+        List<TbCfCartRecordR> list = repository.findAllByUserIdOrderByCreateTimeDesc(user.userId());
 
         list.stream().forEach(cart -> {
             if (cart.isOutOfStock()) {

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

@@ -514,6 +514,12 @@ public class OrderController extends Controller {
     @Transactional // transaction for rollback if something failed
     public Result cancelOrder(@RequestParam("orderId") String orderId,
                               @RequestParam("reason") String reason) {
+        logger.info("reason:"+reason);
+
+        if ("Time out".equals(reason)) {
+            return new Result();
+        }
+
         Optional<TbCfOrder> byId = repository.findById(orderId);
 
         if (byId.isPresent()) {

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

@@ -21,7 +21,7 @@ public interface TbCfCartRecordRRepository extends PagingAndSortingRepository<Tb
     Optional<TbCfCartRecordR> findFirstByUserIdAndSourceItemIdAndItemSkuAndEnableFlag(String userId, String sourceItemId, String itemSku, Integer flag);
 
     @Query(value = "select a from #{#entityName} a left join TbCfStationItem x on a.itemId=x.itemId WHERE  a.userId=:userId and (x.enableFlag = 1 or x.enableFlag IS NULL)  and a.enableFlag=1 order by a.createTime desc")
-    List<TbCfCartRecordR> findAllByUserIdOrderByCreateTimeDesc(@Param("userId") String userId,Pageable pageable);
+    List<TbCfCartRecordR> findAllByUserIdOrderByCreateTimeDesc(@Param("userId") String userId);
 
     List<TbCfCartRecordR> findAllByCartRecordIdIn(String[] ids);