mapper 修改

pom.xml

@@ -232,11 +232,11 @@
             <version>3.0.7</version>
         </dependency>
 
-        <!--        <dependency>-->
-        <!--            <groupId>org.freemarker</groupId>-->
-        <!--            <artifactId>freemarker</artifactId>-->
-        <!--            <version>2.3.9</version>-->
-        <!--        </dependency>-->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <!--                    <version>2.3.9</version>-->
+        </dependency>
 
 
         <dependency>

src/main/java/com/gogirl/application/product/serve/BaseProduceService.java

@@ -34,13 +34,15 @@ public interface BaseProduceService extends IService<BaseProduce> {
     /**
      * 分页查询款式列表
      *
+     *
+     * @param featuresId
      * @param featuresId  款式特性id
-     * @param serveTypeId
+     * @param colorSystemId
      * @param pageNum
      * @param pageSize
      * @return
      */
-    IPage<BaseProduce> queryProducePage(Integer featuresId, Integer serveTypeId, Integer pageNum, Integer pageSize);
+    IPage<BaseProduce> queryProducePage(Integer featuresId, Integer serveTypeId , Integer colorSystemId, Integer pageNum, Integer pageSize);
 
     /**
      * 点赞款式

src/main/java/com/gogirl/application/product/serve/IColorSystemProductMapService.java

+package com.gogirl.application.product.serve;
+
+import com.gogirl.domain.product.serve.ColorSystemProductMap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-09
+ */
+public interface IColorSystemProductMapService extends IService<ColorSystemProductMap> {
+
+}

src/main/java/com/gogirl/application/product/serve/IColorSystemService.java

+package com.gogirl.application.product.serve;
+
+import com.gogirl.domain.product.serve.ColorSystem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 色系 服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-09
+ */
+public interface IColorSystemService extends IService<ColorSystem> {
+
+}

src/main/java/com/gogirl/application/product/serve/impl/BaseProduceServiceImpl.java

@@ -46,7 +46,7 @@ public class BaseProduceServiceImpl extends ServiceImpl<BaseProduceMapper, BaseP
     }
 
     @Override
-    public IPage<BaseProduce> queryProducePage(Integer featuresId, Integer serveTypeId, Integer pageNum, Integer pageSize) {
+    public IPage<BaseProduce> queryProducePage(Integer featuresId, Integer serveTypeId, Integer colorSystemId, Integer pageNum, Integer pageSize) {
         BaseFeatures baseFeatures = baseFeaturesMapper.selectById(featuresId);
         IPage<BaseProduce> page = new Page<>(pageNum, pageSize);
         //排序条件 1-saleNum 2-index_sort

src/main/java/com/gogirl/application/product/serve/impl/ColorSystemProductMapServiceImpl.java

+package com.gogirl.application.product.serve.impl;
+
+import com.gogirl.domain.product.serve.ColorSystemProductMap;
+import com.gogirl.infrastructure.mapper.product.serve.ColorSystemProductMapMapper;
+import com.gogirl.application.product.serve.IColorSystemProductMapService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-09
+ */
+@Service
+public class ColorSystemProductMapServiceImpl extends ServiceImpl<ColorSystemProductMapMapper, ColorSystemProductMap> implements IColorSystemProductMapService {
+
+}

src/main/java/com/gogirl/application/product/serve/impl/ColorSystemServiceImpl.java

+package com.gogirl.application.product.serve.impl;
+
+import com.gogirl.domain.product.serve.ColorSystem;
+import com.gogirl.infrastructure.mapper.product.serve.ColorSystemMapper;
+import com.gogirl.application.product.serve.IColorSystemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 色系 服务实现类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-09
+ */
+@Service
+public class ColorSystemServiceImpl extends ServiceImpl<ColorSystemMapper, ColorSystem> implements IColorSystemService {
+
+}

src/main/java/com/gogirl/domain/product/serve/ColorSystem.java

+package com.gogirl.domain.product.serve;
+
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 色系
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ColorSystem对象", description="色系")
+public class ColorSystem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String name;
+
+
+}

src/main/java/com/gogirl/domain/product/serve/ColorSystemProductMap.java

+package com.gogirl.domain.product.serve;
+
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ColorSystemProductMap对象", description="")
+public class ColorSystemProductMap implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "色系id")
+    private Integer colorSystemId;
+
+    @ApiModelProperty(value = "款式id")
+    private Integer productId;
+
+
+}

src/main/java/com/gogirl/infrastructure/mapper/product/serve/ColorSystemMapper.java

+package com.gogirl.infrastructure.mapper.product.serve;
+
+import com.gogirl.domain.product.serve.ColorSystem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 色系 Mapper 接口
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-09
+ */
+public interface ColorSystemMapper extends BaseMapper<ColorSystem> {
+
+}

src/main/java/com/gogirl/infrastructure/mapper/product/serve/ColorSystemProductMapMapper.java

+package com.gogirl.infrastructure.mapper.product.serve;
+
+import com.gogirl.domain.product.serve.ColorSystemProductMap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-09
+ */
+public interface ColorSystemProductMapMapper extends BaseMapper<ColorSystemProductMap> {
+
+}

src/main/java/com/gogirl/interfaces/product/serve/ColorSystemController.java

+package com.gogirl.interfaces.product.serve;
+
+
+import com.gogirl.application.product.serve.IColorSystemService;
+import com.gogirl.domain.product.serve.ColorSystem;
+import com.gogirl.infrastructure.common.base.JsonResult;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 色系 前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-03-09
+ */
+@RestController
+@AllArgsConstructor
+public class ColorSystemController {
+
+    private final IColorSystemService colorSystemService;
+
+    @ApiOperation("查询所有款式色系")
+    @GetMapping("/customer/colorSystem/no_query")
+    public JsonResult<List<ColorSystem>> query() {
+        List<ColorSystem> list = colorSystemService.list();
+        return JsonResult.success(list);
+    }
+
+}

src/main/java/com/gogirl/interfaces/product/serve/ProduceController.java

 package com.gogirl.interfaces.product.serve;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.gogirl.application.product.serve.BaseProduceService;
 import com.gogirl.domain.product.serve.BaseProduce;
+import com.gogirl.domain.product.serve.BaseServe;
+import com.gogirl.domain.xcx.GogirlToken;
 import com.gogirl.dto.QueryProduceDetailRespDTO;
 import com.gogirl.infrastructure.common.base.JsonResult;
+import com.gogirl.infrastructure.util.SessionUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
 
 
 @Api(tags = {"预约服务款式接口"}, value = "预约服务款式接口")
@@ -19,6 +26,56 @@ public class ProduceController {
 
     private final BaseProduceService baseProduceService;
 
+    @Deprecated
+    @GetMapping("/customer/serve/no_queryNewServePage")
+    @ApiOperation(value = "款式列表")
+    public JsonResult<PageInfo<BaseServe>> no_queryNewServePage(@RequestParam String token,
+                                                                @RequestParam(required = false) Integer labelId,
+                                                                @RequestParam(required = false) Integer serveLabelId,
+                                                                @RequestParam(required = false) Integer pageNum,
+                                                                @RequestParam(required = false) Integer pageSize) {
+
+        GogirlToken gogirlToken = SessionUtils.getCustomerToken();
+
+        if (labelId != null && labelId == -1) {
+            labelId = null;
+        }
+        //分页
+        if (pageNum != null && pageSize != null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        //是否登陆
+        Integer customerId = (gogirlToken != null && gogirlToken.getCustomerId() != null) ? gogirlToken.getCustomerId() : null;
+
+        long time = System.currentTimeMillis();
+        List<BaseProduce> listsBaseProduce = baseProduceService.queryNewServePage(customerId, labelId);
+        System.out.println("queryNewServePage db io time " + (+System.currentTimeMillis() - time));
+        List<BaseServe> lists = listsBaseProduce.stream()
+                .map(baseProduce -> {
+                    BaseServe item = baseProduce.getServe();
+                    baseProduce.setServe(null);
+                    item.setProduce(baseProduce);
+                    return item;
+                })
+                .collect(Collectors.toList());
+
+        return JsonResult.success(new PageInfo<>(lists));
+    }
+
+
+    @GetMapping("/customer/serve/no_queryProducePage")
+    @ApiOperation(value = "款式列表")
+    public JsonResult<IPage<BaseProduce>> queryProducePage(@RequestParam String token,
+                                                           @RequestParam(required = false) Integer labelId,
+                                                           @RequestParam(required = false) Integer serveTypeId,
+                                                           @RequestParam(required = false) Integer colorSystemId,
+                                                           @RequestParam(required = false, defaultValue = "1") Integer pageNum,
+                                                           @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+        IPage<BaseProduce> page = baseProduceService.queryProducePage(labelId, serveTypeId, colorSystemId, pageNum, pageSize);
+        return JsonResult.success(page);
+    }
+
+
     @ApiOperation(value = "查询款式详情", notes = "查询款式详情")
     @GetMapping("/customer/produce/queryProduceDetail")
     public JsonResult<BaseProduce> queryProduceDetail(Integer id) {
@@ -42,4 +99,13 @@ public class ProduceController {
     }
 
 
+    @PostMapping("/customer/serve/praiseProduce")
+    @ApiOperation(value = "款式点赞和取消点赞", notes = "款式点赞")
+    public JsonResult<Void> praiseProduce(@RequestHeader String token,
+                                          @RequestParam Integer produceId) {
+        baseProduceService.praiseProduce(produceId);
+        return JsonResult.success();
+    }
+
+
 }

src/main/java/com/gogirl/interfaces/product/serve/ServeController.java

@@ -40,62 +40,7 @@ public class ServeController {
     private final LeisureDiscountConfigMapper leisureDiscountConfigMapper;
     private final BaseServeMapper baseServeMapper;
 
-    @Deprecated
-    @GetMapping("/customer/serve/no_queryNewServePage")
-    @ApiOperation(value = "款式列表")
-    public JsonResult<PageInfo<BaseServe>> no_queryNewServePage(@RequestParam String token,
-                                                                @RequestParam(required = false) Integer labelId,
-                                                                @RequestParam(required = false) Integer serveLabelId,
-                                                                @RequestParam(required = false) Integer pageNum,
-                                                                @RequestParam(required = false) Integer pageSize) {
-
-        GogirlToken gogirlToken = tokenService.getByToken(token);
-
-        if (labelId != null && labelId == -1) {
-            labelId = null;
-        }
-        //分页
-        if (pageNum != null && pageSize != null) {
-            PageHelper.startPage(pageNum, pageSize);
-        }
-        //是否登陆
-        Integer customerId = (gogirlToken != null && gogirlToken.getCustomerId() != null) ? gogirlToken.getCustomerId() : null;
 
-        long time = System.currentTimeMillis();
-        List<BaseProduce> listsBaseProduce = baseProduceService.queryNewServePage(customerId, labelId);
-        System.out.println("queryNewServePage db io time " + (+System.currentTimeMillis() - time));
-        List<BaseServe> lists = listsBaseProduce.stream()
-                .map(baseProduce -> {
-                    BaseServe item = baseProduce.getServe();
-                    baseProduce.setServe(null);
-                    item.setProduce(baseProduce);
-                    return item;
-                })
-                .collect(Collectors.toList());
-
-        return JsonResult.success(new PageInfo<>(lists));
-    }
-
-
-    @GetMapping("/customer/serve/no_queryProducePage")
-    @ApiOperation(value = "款式列表")
-    public JsonResult<IPage<BaseProduce>> queryProducePage(@RequestParam String token,
-                                                           @RequestParam(required = false) Integer labelId,
-                                                           @RequestParam(required = false) Integer serveTypeId,
-                                                           @RequestParam(required = false, defaultValue = "1") Integer pageNum,
-                                                           @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
-        IPage<BaseProduce> page = baseProduceService.queryProducePage(labelId, serveTypeId, pageNum, pageSize);
-        return JsonResult.success(page);
-    }
-
-
-    @PostMapping("/customer/serve/praiseProduce")
-    @ApiOperation(value = "款式点赞和取消点赞", notes = "款式点赞")
-    public JsonResult<Void> praiseProduce(@RequestHeader String token,
-                                          @RequestParam Integer produceId) {
-        baseProduceService.praiseProduce(produceId);
-        return JsonResult.success();
-    }
 
     @ApiOperation(value = "查看服务详情")
     @GetMapping("/customer/serve/getServeDetail")

src/main/resources/application-pre.yml

@@ -30,6 +30,12 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
 
+  #redis配置
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    database: 0
+    password: "#!@#blt*nix4321"
 #项目属性
 gogirl:
   #充值回调地址

src/main/resources/application-prod.yml

@@ -31,6 +31,14 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
 
+  #redis配置
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    database: 0
+    password: "#!@#blt*nix4321"
+
+
 #项目属性
 gogirl:
   #充值回调地址

src/main/resources/application-test.yml

@@ -30,6 +30,14 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
 
+  #redis配置
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    database: 0
+    password: "#!@#blt*nix4321"
+
+
 #项目属性
 gogirl:
   #充值回调地址

src/main/resources/mapper/ColorSystemMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gogirl.infrastructure.mapper.product.serve.ColorSystemMapper">
+
+</mapper>

src/main/resources/mapper/ColorSystemProductMapMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gogirl.infrastructure.mapper.product.serve.ColorSystemProductMapMapper">
+
+</mapper>