同步代码

src/main/java/com/diaoyun/zion/chinafrica/constant/KeyConstant.java

@@ -38,4 +38,5 @@ public class KeyConstant {
     public final static String SHOPIFY_TYPE = "shopify_item";
     //所有商品
     public final static String SHOPIFY_ITEMS_ALL = "shopify_item_all";
+
 }

src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfOrderController.java

@@ -49,17 +49,12 @@ public class TbCfOrderController {
      */
     @ApiOperation("获取用户订单 默认10条")
     @GetMapping
-    public Result<PageInfo> getUserOrderList(@ApiParam(value = "页数") @RequestParam(value = "pageNum", required = false) Integer pageNum,
-                                             @ApiParam(value = "每页大小") @RequestParam(value = "pageSize", required = false) Integer pageSize,
-                                             @ApiParam(value = "订单状态") @RequestParam(value = "orderStatus", required = false) Integer orderStatus,
-                                             @ApiParam(value = "订单状态") @RequestParam(value = "userId") String userId) {
-        if (pageNum == null) {
-            pageNum = 1;
-        }
-        if (pageSize == null) {
-            pageSize = 10;
-        }
-        return tbCfOrderService.getUserOrderList(pageNum, pageSize, orderStatus, userId);
+    public Result<PageInfo> getUserOrderList(@ApiParam(value = "页数") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @ApiParam(value = "每页大小") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                             @ApiParam(value = "订单状态") @RequestParam(value = "orderStatus", required = false) Integer orderStatus
+    ) {
+
+        return tbCfOrderService.getUserOrderList(pageNum, pageSize, orderStatus);
     }
 
     @ApiOperation("获取stripe公钥")

src/main/java/com/diaoyun/zion/chinafrica/service/TbCfOrderService.java

@@ -95,7 +95,7 @@ public interface TbCfOrderService {
      * @param orderStatus 订单状态 OrderStatusEnum
      * @return
      */
-     Result getUserOrderList(Integer pageNum, Integer pageSize,Integer orderStatus,String userId);
+     Result getUserOrderList(Integer pageNum, Integer pageSize,Integer orderStatus);
 
     /**
      * 取消订单

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java

@@ -196,15 +196,22 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
             afterPlaceOrder(tbCfOrderEntity.getOrderId(), tbCfCartItemDetailList, definiteOrder);
             result.setData(definiteOrder).setMessage(ResultCodeEnum.SUCCESS.getDesc());
         }
+
         return result;
     }
 
+
     @Override
-    public Result getUserOrderList(Integer pageNum, Integer pageSize, Integer orderStatus,String userId) {
+    public synchronized Result getUserOrderList(Integer pageNum, Integer pageSize, Integer orderStatus) {
         Result<PageInfo<TbCfOrderVo>> result = new Result<>();
         //获取用户
         String token = jwtTokenProvider.resolveToken(request);
         TbCfUserInfoVo tbCfUserInfoVo = tokenManager.validate(token);
+        PageInfo<TbCfOrderVo> pageInfos = (PageInfo<TbCfOrderVo>) orderRedisCache.get(KeyConstant.ORDER_DET + tbCfUserInfoVo.getUserId() + orderStatus);
+        if (pageInfos != null) {
+            result.setData(pageInfos);
+            return result;
+        }
         //订单数据
         List<TbCfOrderEntity> orderList = tbCfOrderDao.getUserOrderList(tbCfUserInfoVo.getUserId(), orderStatus);
         startPage(pageNum, pageSize);
@@ -232,6 +239,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
         PageInfo<TbCfOrderVo> returnPageInfo = new PageInfo<>();
         BeanUtils.copyProperties(pageInfo, returnPageInfo);
         returnPageInfo.setList(tbCfOrderVoList);
+        orderRedisCache.set(KeyConstant.ORDER_DET + tbCfUserInfoVo.getUserId() + orderStatus, returnPageInfo);
         result.setData(returnPageInfo);
         return result;
     }