商品列表

liquidnet-bus-api/liquidnet-service-stone-api/src/main/java/com/liquidnet/service/stone/constant/StoneConstant.java

@@ -9,6 +9,8 @@ public class StoneConstant {
     public static final String ITEM=CTX.concat("item:");
     //logsList 积分日志列表
     public static final String LOGS_LIST=ITEM.concat("logs:list:");
+    //orderList 积分订单列表
+    public static final String ORDER_LIST=ITEM.concat("order:list:");
 
     //剩余库存
     public static final String SURPLUS_GENERAL = "surplusGeneral";

liquidnet-bus-api/liquidnet-service-stone-api/src/main/java/com/liquidnet/service/stone/vo/StoneLogsListVo.java

@@ -23,19 +23,19 @@ public class StoneLogsListVo implements Serializable, Cloneable {
     /**
      * 积分物品封面图
      */
-    @ApiModelProperty(value = "积分物品封面图", example = "http://xxxxx.png")
+    @ApiModelProperty(value = "积分", example = "10")
     private Integer score;
 
     /**
      * 积分物品名称
      */
-    @ApiModelProperty(value = "积分物品名称", example = "测试券")
+    @ApiModelProperty(value = "内容", example = "购买商品")
     private String content;
 
     /**
      * 目标类型[1-券|1x-商品维度|2x-演出维度]
      */
-    @ApiModelProperty(value = "目标类型[1-券|1x-商品维度|2x-演出维度]", example = "1")
+    @ApiModelProperty(value = "创建时间", example = "2021-12-12 12:00:01")
     private String createdAt;
 
     private static final StoneLogsListVo obj = new StoneLogsListVo();

liquidnet-bus-api/liquidnet-service-stone-api/src/main/java/com/liquidnet/service/stone/vo/StoneOrderListVo.java

 package com.liquidnet.service.stone.vo;
 
 import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.service.stone.entity.StoneScoreItems;
 import com.liquidnet.service.stone.entity.StoneScoreOrder;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,7 +8,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 @Data
 @ApiModel
@@ -54,18 +52,4 @@ public class StoneOrderListVo implements Serializable, Cloneable {
             return new StoneOrderListVo();
         }
     }
-
-    public StoneOrderListVo copy(StoneScoreOrder source, String img) {
-        if (null == source) return this;
-        this.setOrderId(source.getItemId());
-        this.setImg(img);
-        this.setTargetTitle(source.getTargetTitle());
-        this.setNumber(source.getNumber());
-        this.setScore(source.getScore().intValue());
-        this.setPrice(source.getPrice());
-        this.setStatus(source.getStatus());
-        this.setOrderCode(source.getOrderCode());
-        this.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getCreatedAt()));
-        return this;
-    }
 }

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/service/impl/StoneScoreOrderServiceImpl.java

@@ -5,12 +5,9 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.stone.entity.StoneScoreItems;
-import com.liquidnet.service.stone.entity.StoneScoreLogs;
 import com.liquidnet.service.stone.service.IStoneScoreOrderService;
-import com.liquidnet.service.stone.util.ObjectUtils;
+import com.liquidnet.service.stone.util.StoneMongoUtils;
 import com.liquidnet.service.stone.util.StoneRedisUtils;
-import com.liquidnet.service.stone.vo.StoneItemListVo;
-import com.liquidnet.service.stone.vo.StoneLogsListVo;
 import com.liquidnet.service.stone.vo.StoneOrderListVo;
 import com.liquidnet.service.stone.vo.StoneScoreItemVo;
 import lombok.extern.slf4j.Slf4j;
@@ -35,6 +32,8 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
 
     @Autowired
     StoneRedisUtils stoneRedisUtils;
+    @Autowired
+    StoneMongoUtils stoneMongoUtils;
 
     @Override
     public ResponseDto<String> order(String itemId, Integer number) {
@@ -51,7 +50,6 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
         if(vo.getStatus()!=1){
             return ResponseDto.failure("该商品不可下单");
         }
-
         //获取积分
         int needScore = data.getScore().intValue();
         if(stoneRedisUtils.getUserScoreRest(uid)<needScore){
@@ -62,6 +60,7 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
         if((buyCount+number)>data.getLimitCount() && data.getLimitCount()>0){
             return ResponseDto.failure("超出限购数量");
         }
+        //增加限购
         stoneRedisUtils.addItemLimit(uid,itemId,number);
         //下单
         return null;
@@ -69,37 +68,30 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
 
     @Override
     public PageInfo<List<StoneOrderListVo>> orderList(Integer page) {
-//        String uid = CurrentUtil.getCurrentUid();
-//        PageInfo<List<StoneOrderListVo>> mPageInfo;
-//        int size = 40;
-//        if (page == null || page == 1 || page == 0) {
-//            page = 1;
-//        }
-//        List<StoneScoreLogs> voList;
-//        long count;
-//        if (page == 1) {
-//            voList = stoneRedisUtils.getLogsList(uid);
-//            count = voList.size();
-//        } else {
-//            HashMap<String, Object> info = stoneMongoUtils.itemListPage(page, size);
-//            try {
-//                voList = (List<StoneScoreLogs>) info.get("total");
-//                count = (long) info.get("data");
-//            } catch (Exception e) {
-//                voList = new ArrayList();
-//                count = 0;
-//            }
-//        }
-//        List<StoneLogsListVo> returnVoList = ObjectUtils.getStoneLogsListVoArrayList();
-//        for (int i = 0; i < voList.size(); i++) {
-//            StoneScoreLogs vo = voList.get(i);
-//            StoneLogsListVo returnVo = StoneLogsListVo.getNew().copy(vo);
-//            returnVoList.add(returnVo);
-//        }
-//        mPageInfo = new PageInfo(returnVoList);
-//        mPageInfo.setTotal(count);
-//        log.info(UserPathDto.setData("积分日志列表", "", voList));
-//        return mPageInfo;
-        return null;
+        String uid = CurrentUtil.getCurrentUid();
+        PageInfo<List<StoneOrderListVo>> mPageInfo;
+        int size = 40;
+        if (page == null || page == 1 || page == 0) {
+            page = 1;
+        }
+        List<StoneOrderListVo> voList;
+        long count;
+        if (page == 1) {
+            voList = stoneRedisUtils.getOrderList(uid);
+            count = voList.size();
+        } else {
+            HashMap<String, Object> info = stoneMongoUtils.orderList(uid,page, size);
+            try {
+                voList = (List<StoneOrderListVo>) info.get("total");
+                count = (long) info.get("data");
+            } catch (Exception e) {
+                voList = new ArrayList();
+                count = 0;
+            }
+        }
+        mPageInfo = new PageInfo(voList);
+        mPageInfo.setTotal(count);
+        log.info(UserPathDto.setData("积分订单列表", "", voList));
+        return mPageInfo;
     }
 }

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/util/ObjectUtils.java

@@ -2,12 +2,14 @@ package com.liquidnet.service.stone.util;
 
 import com.liquidnet.service.stone.vo.StoneItemListVo;
 import com.liquidnet.service.stone.vo.StoneLogsListVo;
+import com.liquidnet.service.stone.vo.StoneOrderListVo;
 
 import java.util.ArrayList;
 
 public class ObjectUtils {
     private static final ArrayList<StoneItemListVo> stoneItemListVoArrayList = new ArrayList<>();
     private static final ArrayList<StoneLogsListVo> stoneLogsListVoArrayList = new ArrayList<>();
+    private static final ArrayList<StoneOrderListVo> stoneOrderListVoArrayList = new ArrayList<>();
 
     public static ArrayList<StoneItemListVo> getStoneItemListVoArrayList() {
         return (ArrayList<StoneItemListVo>) stoneItemListVoArrayList.clone();
@@ -17,4 +19,8 @@ public class ObjectUtils {
         return (ArrayList<StoneLogsListVo>) stoneLogsListVoArrayList.clone();
     }
 
+    public static ArrayList<StoneOrderListVo> getStoneOrderListVoArrayList(){
+        return (ArrayList<StoneOrderListVo>) stoneOrderListVoArrayList.clone();
+    }
+
 }

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/util/StoneMongoUtils.java

@@ -4,6 +4,8 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.stone.entity.StoneScoreItems;
 import com.liquidnet.service.stone.entity.StoneScoreLogs;
+import com.liquidnet.service.stone.entity.StoneScoreOrder;
+import com.liquidnet.service.stone.vo.StoneOrderListVo;
 import com.liquidnet.service.stone.vo.StoneUserVo;
 import com.mongodb.client.result.UpdateResult;
 import org.bson.Document;
@@ -141,4 +143,27 @@ public class StoneMongoUtils {
         return info;
     }
 
+    /**
+     * 获取 用户订单 列表
+     * @param uid
+     * @param page
+     * @param size
+     * @return
+     */
+    public HashMap<String, Object> orderList(String uid,int page, int size) {
+        LocalDateTime now  = LocalDateTime.now();
+        HashMap<String, Object> info = CollectionUtil.mapStringObject();
+        // 排序 分页
+        Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createdAt"));
+        //条件
+        Query query = Query.query(Criteria.where("uid").is(uid));
+        // 查询总数
+        long count = mongoTemplate.count(query, StoneOrderListVo.class, StoneOrderListVo.class.getSimpleName());
+        query.with(pageable);
+        List<StoneOrderListVo> voList = mongoTemplate.find(query, StoneOrderListVo.class, StoneOrderListVo.class.getSimpleName());
+        info.put("total", count);
+        info.put("data", voList);
+        return info;
+    }
+
 }

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/util/StoneRedisUtils.java

@@ -4,6 +4,8 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.stone.constant.StoneConstant;
 import com.liquidnet.service.stone.entity.StoneScoreItems;
 import com.liquidnet.service.stone.entity.StoneScoreLogs;
+import com.liquidnet.service.stone.entity.StoneScoreOrder;
+import com.liquidnet.service.stone.vo.StoneOrderListVo;
 import com.liquidnet.service.stone.vo.StoneUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -258,4 +260,17 @@ public class StoneRedisUtils {
         String redisKey = StoneConstant.ITEM_LIMIT.concat(uid).concat(":" + itemId);
         redisUtil.incr(redisKey, number);
     }
+
+    /**
+     * 获取 订单 缓存list
+     */
+    public List<StoneOrderListVo> getOrderList(String uid) {
+        String redisKey = StoneConstant.LOGS_LIST.concat(uid);
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return (List<StoneOrderListVo>) mongoUtils.orderList(uid, 1, 40).get("data");
+        } else {
+            return (List<StoneOrderListVo>) obj;
+        }
+    }
 }