暂时提交

docu/dev_stone.sql

@@ -16,6 +16,7 @@ create table stone_score_items
 (
     mid        bigint unsigned auto_increment primary key,
     target_id   varchar(64) default '' comment '目标id',
+    target_title   varchar(64) default '' comment '目标名称',
     type   integer default 0 comment '目标类型[1-券|1x-商品维度|2x-演出维度]',
     img varchar(64) default '' comment '展示图',
     score decimal(8, 2) default 0 comment '所需积分',
@@ -25,7 +26,7 @@ create table stone_score_items
     limit_count int default 0 comment '限购数量[0-不限]',
     details longtext default NULL comment '商品详情',
     notice longtext default NULL comment '注意事项',
-    status int default 0 comment '状态[-1-删除|0-未上架|1-已上架|2-定时上架]',
+    status int default 0 comment '状态[-999-全部-1-删除|0-未上架|1-已上架|2-定时上架]',
     start_time datetime NULL  COMMENT '定时上架-时间',
     end_time datetime NULL  COMMENT '定时下架-时间',
     created_at datetime ,

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/pom.xml

@@ -38,6 +38,11 @@
             <artifactId>liquidnet-service-candy-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-stone-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
 
         <dependency>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/stone/service/IItemService.java

+package com.liquidnet.client.admin.zhengzai.stone.service;
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
+import com.liquidnet.service.stone.entity.StoneScoreItems;
+
+import java.util.List;
+
+public interface IItemService {
+
+    /**
+     * 积分商品列表
+     *
+     * @param title  名称
+     * @param status 状态[-999-全部|1-上架中|2-待上架|7-已下架]
+     * @param type   类型[1-券]
+     * @return
+     */
+    PageInfo<StoneScoreItems> ItemList(String title, Integer status, Integer type);
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/stone/service/IScoreService.java

+package com.liquidnet.client.admin.zhengzai.stone.service;
+
+public interface IScoreService {
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/stone/service/impl/ItemServiceImpl.java

+package com.liquidnet.client.admin.zhengzai.stone.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.zhengzai.stone.service.IItemService;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
+import com.liquidnet.service.stone.entity.StoneScoreItems;
+import com.liquidnet.service.stone.mapper.StoneScoreItemsMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Service
+@Slf4j
+public class ItemServiceImpl implements IItemService {
+
+    @Autowired
+    StoneScoreItemsMapper stoneScoreItemsMapper;
+
+    @Override
+    /**
+     * 积分商品列表
+     *
+     * @param title  名称
+     * @param status 状态[-999-全部|1-上架中|2-待上架|7-已下架]
+     * @param type   类型[1-券]
+     * @return
+     */
+    public PageInfo<StoneScoreItems> ItemList(String title, Integer status, Integer type) {
+        PageInfo<StoneScoreItems> pageInfo;
+        LocalDateTime now = LocalDateTime.now();
+        List<StoneScoreItems> newList = new ArrayList();
+        LambdaQueryWrapper<StoneScoreItems> queryWrapper = Wrappers.lambdaQuery(StoneScoreItems.class).ne(StoneScoreItems::getStatus, -1);
+        if (!(title == null || title.equals(""))) {
+            queryWrapper.like(StoneScoreItems::getTargetTitle, title);
+        }
+        if (status != -999) {
+            if (status == 2) {//待上架
+                queryWrapper.eq(StoneScoreItems::getStatus, 2).gt(StoneScoreItems::getStartTime, now);
+            } else if (status == 7) {//已下架
+                queryWrapper.eq(StoneScoreItems::getStatus, 2).lt(StoneScoreItems::getEndTime, now);
+            } else if (status == 1) {
+                queryWrapper.eq(StoneScoreItems::getStatus, 1).or().lt(StoneScoreItems::getStartTime, now).gt(StoneScoreItems::getEndTime, now);
+            }
+        }
+        if (type != -1) {
+            queryWrapper.eq(StoneScoreItems::getType, type);
+        }
+        List<StoneScoreItems> voList = stoneScoreItemsMapper.selectList(queryWrapper);
+        for (StoneScoreItems item : voList) {
+            if (item.getStatus() == 2) {
+                if (now.isAfter(item.getStartTime())) {//未上架
+                    item.setStatus(2);
+                } else if (now.isBefore(item.getEndTime())) {//已下架
+                    item.setStatus(7);
+                } else {
+                    item.setStatus(1);//上架中
+                }
+            }
+            newList.add(item);
+        }
+        pageInfo = new PageInfo(newList);
+        return pageInfo;
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/stone/service/impl/ScoreServiceImpl.java

+package com.liquidnet.client.admin.zhengzai.stone.service.impl;
+
+import com.liquidnet.client.admin.zhengzai.stone.service.IItemService;
+import com.liquidnet.client.admin.zhengzai.stone.service.IScoreService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+@Service
+@Slf4j
+public class ScoreServiceImpl implements IScoreService {
+
+
+}

liquidnet-bus-do/liquidnet-service-stone-do/src/main/java/com/liquidnet/service/stone/entity/StoneScoreItems.java

@@ -30,6 +30,11 @@ public class StoneScoreItems implements Serializable {
      */
     private String targetId;
 
+    /**
+     * 目标名称
+     */
+    private String targetTitle;
+
     /**
      * 目标类型[1-券|1x-商品维度|2x-演出维度]
      */
@@ -76,7 +81,7 @@ public class StoneScoreItems implements Serializable {
     private String notice;
 
     /**
-     * 状态[-1-删除|0-未上架|1-已上架|2-定时上架]
+     * 状态[-999-全部|-1-删除|0-未上架|1-已上架|2-定时上架]
      */
     private Integer status;