商品列表

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

@@ -17,4 +17,7 @@ public class StoneConstant {
     //已用积分
     public static final String USE_SCORE = "useScore";
 
+    //限购
+    public static final String ITEM_LIMIT = ITEM.concat("limit:");
+
 }

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

@@ -19,5 +19,5 @@ import java.util.List;
 public interface IStoneScoreOrderService {
     ResponseDto<String> order(String itemId, Integer number);
 
-    ResponseDto<PageInfo<List<StoneOrderListVo>>> orderList(Integer page);
+    PageInfo<List<StoneOrderListVo>> orderList(Integer page);
 }

liquidnet-bus-config/liquidnet-config/liquidnet-service-stone.yml

@@ -121,32 +121,10 @@ global-auth:
     - ${liquidnet.info.context}/webjars/**
     - ${liquidnet.info.context}/swagger-resources/**
     - ${liquidnet.info.context}/v2/api-docs*
-    - ${liquidnet.info.context}/station/login
-    - ${liquidnet.info.context}/station/login/sms
     #    -
-    - ${liquidnet.info.context}/partner/buyNotice/**
-    - ${liquidnet.info.context}/partner/checkUser/**
-    - ${liquidnet.info.context}/partner/checkUser/performance/**
-    - ${liquidnet.info.context}/partner/ticket/**
-    - ${liquidnet.info.context}/partner/times/**
-    - ${liquidnet.info.context}/partner/performance/**
-    # banner
-    - ${liquidnet.info.context}/banners/**
-    - ${liquidnet.info.context}/order/checkOrderTime
-    - ${liquidnet.info.context}/order/syncOrder
-    # 退款回掉
-    - ${liquidnet.info.context}/refund/callback
-    # 演出
-    - ${liquidnet.info.context}/performance/localList
-    - ${liquidnet.info.context}/performance/noticeList
-    - ${liquidnet.info.context}/performance/roadList/**
-    - ${liquidnet.info.context}/performance/recommendList
-    - ${liquidnet.info.context}/performance/exclusiveList
-    - ${liquidnet.info.context}/performance/search
-    - ${liquidnet.info.context}/performance/list
-    - ${liquidnet.info.context}/performance/calendar
-    - ${liquidnet.info.context}/performance/calendarPerformances
-    - ${liquidnet.info.context}/performance/*
+    - ${liquidnet.info.context}/item/**
+
+
 
 # -----------------------------------------------------------
 

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

+package com.liquidnet.service.stone.config;
+
+import com.liquidnet.common.web.config.WebMvcConfig;
+import com.liquidnet.common.web.filter.GlobalAuthorityInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+
+@Configuration
+public class StoneWebMvcConfig extends WebMvcConfig {
+    @Autowired
+    GlobalAuthorityInterceptor globalAuthorityInterceptor;
+
+    @Override
+    protected void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+        super.addInterceptors(registry);
+    }
+}

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

@@ -47,11 +47,12 @@ public class StoneScoreItemsServiceImpl implements IStoneScoreItemsService {
         List<StoneScoreItems> voList;
         HashMap<String, Object> info = mongoUtils.itemListPage(page, size);
         try {
-            voList = (List<StoneScoreItems>) info.get("total");
+            voList = (List<StoneScoreItems>) info.get("data");
         } catch (Exception e) {
             voList = new ArrayList();
+            e.printStackTrace();
         }
-        long count = (long) info.get("data");
+        long count = (long) info.get("total");
 
 
         List<StoneItemListVo> returnVoList = ObjectUtils.getStoneItemListVoArrayList();

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

@@ -156,8 +156,8 @@ public class StoneScoreLogsServiceImpl implements IStoneScoreLogsService {
         } else {
             HashMap<String, Object> info = stoneMongoUtils.itemListPage(page, size);
             try {
-                voList = (List<StoneScoreLogs>) info.get("total");
-                count = (long) info.get("data");
+                voList = (List<StoneScoreLogs>) info.get("data");
+                count = (long) info.get("total");
             } catch (Exception e) {
                 voList = new ArrayList();
                 count = 0;

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

 package com.liquidnet.service.stone.service.impl;
 
 import com.github.pagehelper.PageInfo;
+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.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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -22,6 +30,7 @@ import java.util.List;
  * @since 2021-10-19
  */
 @Service
+@Slf4j
 public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
 
     @Autowired
@@ -30,6 +39,7 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
     @Override
     public ResponseDto<String> order(String itemId, Integer number) {
         //判断状态 库存
+        String uid = CurrentUtil.getCurrentUid();
         StoneScoreItems data = stoneRedisUtils.getItemData(itemId);
         if(data==null){
             return ResponseDto.failure("参数异常");
@@ -43,13 +53,53 @@ public class StoneScoreOrderServiceImpl implements IStoneScoreOrderService {
         }
 
         //获取积分
+        int needScore = data.getScore().intValue();
+        if(stoneRedisUtils.getUserScoreRest(uid)<needScore){
+            return ResponseDto.failure("剩余积分不足");
+        }
         //获取限购
+        int buyCount = stoneRedisUtils.getItemLimit(uid,itemId);
+        if((buyCount+number)>data.getLimitCount() && data.getLimitCount()>0){
+            return ResponseDto.failure("超出限购数量");
+        }
+        stoneRedisUtils.addItemLimit(uid,itemId,number);
         //下单
         return null;
     }
 
     @Override
-    public ResponseDto<PageInfo<List<StoneOrderListVo>>> orderList(Integer page) {
+    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;
     }
 }

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

@@ -75,7 +75,7 @@ public class StoneMongoUtils {
         // 排序 分页
         Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createdAt"));
         //条件
-        Query query = Query.query(Criteria.where("status").is(1).orOperator(Criteria.where("status").is(2).and("startTime").lt(now).and("endTime").gt(now)));
+        Query query = Query.query(Criteria.where("status").is(1));//.orOperator(Criteria.where("status").is(2).and("startTime").lt(now).and("endTime").gt(now)));
         // 查询总数
         long count = mongoTemplate.count(query, StoneScoreItems.class, StoneScoreItems.class.getSimpleName());
         query.with(pageable);

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

@@ -55,7 +55,7 @@ public class StoneRedisUtils {
     /**
      * 获取 用户积分 可用
      *
-     * @param uid  ID
+     * @param uid ID
      * @return
      */
     public Integer getUserScoreRest(String uid) {
@@ -71,7 +71,7 @@ public class StoneRedisUtils {
     /**
      * 获取 用户积分 可用
      *
-     * @param uid  ID
+     * @param uid ID
      * @return
      */
     public Integer getUserScoreUse(String uid) {
@@ -87,7 +87,7 @@ public class StoneRedisUtils {
     /**
      * 修改 用户积分 使用
      *
-     * @param uid  ID
+     * @param uid ID
      * @return
      */
     public Integer changeUserScoreUse(String uid, Integer general) {
@@ -104,7 +104,7 @@ public class StoneRedisUtils {
     /**
      * 修改 用户积分 剩余
      *
-     * @param uid  ID
+     * @param uid ID
      * @return
      */
     public Integer changeUserScoreRest(String uid, Integer general) {
@@ -174,12 +174,12 @@ public class StoneRedisUtils {
      *
      * @param data
      */
-    public void addLogsList(String uid,StoneScoreLogs data) {
+    public void addLogsList(String uid, StoneScoreLogs data) {
         String redisKey = StoneConstant.LOGS_LIST.concat(uid);
         Object obj = redisUtil.get(redisKey);
         List<StoneScoreLogs> dataList;
         if (obj == null) {
-            dataList = (List<StoneScoreLogs>) mongoUtils.logList(uid,1,40).get("data");
+            dataList = (List<StoneScoreLogs>) mongoUtils.logList(uid, 1, 40).get("data");
         } else {
             dataList = (List<StoneScoreLogs>) obj;
         }
@@ -200,7 +200,7 @@ public class StoneRedisUtils {
         String redisKey = StoneConstant.LOGS_LIST.concat(uid);
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {
-            return  (List<StoneScoreLogs>) mongoUtils.logList(uid,1,40).get("data");
+            return (List<StoneScoreLogs>) mongoUtils.logList(uid, 1, 40).get("data");
         } else {
             return (List<StoneScoreLogs>) obj;
         }
@@ -232,4 +232,30 @@ public class StoneRedisUtils {
         }
     }
 
+    /**
+     * 获取商品 购买数量
+     * @param uid
+     * @param itemId
+     * @return
+     */
+    public int getItemLimit(String uid, String itemId) {
+        String redisKey = StoneConstant.ITEM_LIMIT.concat(uid).concat(":" + itemId);
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return 0;
+        } else {
+            return (int) obj;
+        }
+    }
+
+    /**
+     * 添加商品 购买数量
+     * @param uid
+     * @param itemId
+     * @param number
+     */
+    public void addItemLimit(String uid, String itemId, Integer number) {
+        String redisKey = StoneConstant.ITEM_LIMIT.concat(uid).concat(":" + itemId);
+        redisUtil.incr(redisKey, number);
+    }
 }