Merge branch 'master' into 3.5

# Conflicts:
#	src/main/resources/application.yml

pom.xml

@@ -114,12 +114,6 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>3.15</version>
-        </dependency>
-
         <!--springboot websocket模块-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -217,19 +211,19 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <!--            <exclusions>-->
-            <!--                <exclusion>-->
-            <!--                    <groupId>org.springframework.boot</groupId>-->
-            <!--                    <artifactId>spring-boot-starter-tomcat</artifactId>-->
-            <!--                </exclusion>-->
-            <!--            </exclusions>-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
-        <!--                &lt;!&ndash;undertow servlet 容器&ndash;&gt;-->
-        <!--                <dependency>-->
-        <!--                    <groupId>org.springframework.boot</groupId>-->
-        <!--                    <artifactId>spring-boot-starter-undertow</artifactId>-->
-        <!--                </dependency>-->
+        <!--undertow servlet 容器-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
 
         <!--springboot自动配置-->
         <dependency>
@@ -271,6 +265,46 @@
     </dependencies>
 
 
+    <!--mvn clean package -Dmaven.test.skip=true -Pdev 表示打包开发环境 -->
+    <profiles>
+
+        <!-- 开发环境 -->
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+            </properties>
+        </profile>
+
+        <!-- 测试环境 -->
+        <profile>
+            <id>test</id>
+            <properties>
+                <spring.profiles.active>test</spring.profiles.active>
+            </properties>
+        </profile>
+
+        <!-- 预发布 -->
+        <profile>
+            <id>pre</id>
+            <properties>
+                <spring.profiles.active>pre</spring.profiles.active>
+            </properties>
+        </profile>
+
+        <!-- 生产环境 -->
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+            </properties>
+        </profile>
+    </profiles>
+
+
     <!-- build配置 -->
     <build>
         <plugins>
@@ -313,6 +347,34 @@
                 <configuration>
                 </configuration>
             </plugin>
+
+            <!-- docker的maven插件，官网：https://github.com/spotify/docker-maven-plugin -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.4.13</version>
+                <configuration>
+                    <!--镜像名称：镜像版本-->
+                    <imageName>${project.artifactId}:${project.version}</imageName>
+                    <!--基础镜像jdk1.8-->
+                    <baseImage>openjdk:8-jdk-alpine</baseImage>
+                    <!--镜像作者-->
+                    <maintainer>robbendev@gmail.com</maintainer>
+                    <!--切换到root目录-->
+                    <workdir>/root</workdir>
+                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
+                    <!--复制jar包到容器指定目录位置-->
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                    <dockerHost>http://134.175.167.230:2375</dockerHost>
+                </configuration>
+            </plugin>
+
         </plugins>
 
         <resources>

src/docker/dev.dockerfile

+FROM openjdk:8-jdk-alpine
+ADD ../../target/gogirl-miniapp-backend-0.0.1-SNAPSHOT.jar app.jar
+ENTRYPOINT ["java","-Dspring.profiles.active=dev","-Xms256m","-Xmx256m","-Xss2m","-jar","/app.jar"]

src/docker/prod.dockerfile

+FROM openjdk:8-jdk-alpine
+ADD ../../target/gogirl-miniapp-backend-0.0.1-SNAPSHOT.jar app.jar
+ENTRYPOINT ["java","-Dspring.profiles.active=prod","-Xms2048m","-Xmx2048m","-Xss2m","-jar","/app.jar"]

src/docker/test.dockerfile

+FROM openjdk:8-jdk-alpine
+ADD ../../target/gogirl-miniapp-backend-0.0.1-SNAPSHOT.jar /app.jar
+ENTRYPOINT ["java","-Dspring.profiles.active=test","-Xms2048m","-Xmx2048m","-Xss2m","-jar","/app.jar"]

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -593,7 +593,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
         List<OrderManage> orderManageList = orderManageMapper.selectList(new LambdaQueryWrapper<OrderManage>()
                 .eq(OrderManage::getDepartmentId, gogirlToken.getDepartmentId())
-                .eq(OrderManage::getOrderUser, customerId));
+                .eq(OrderManage::getOrderUser, customerId)
+                .orderByDesc(OrderManage::getCreateTime));
 
         //订单记录的图片
         for (OrderManage orderManage : orderManageList) {

src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

@@ -758,7 +758,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                         scheduleManageDTO.getScheduledUser(),
                         scheduleManageDTO.getArriveTime(),
                         baseServe.getSchTypeId(),
-                        scheduleServeCommand.getId());
+                        scheduleServeCommand.getServeId());
                 if (ListUtil.isNotEmpty(typeConflictScheduleServe)) {
                     throw new RRException("同类型服务一天只能预约一次");
                 }

src/main/java/com/gogirl/application/store/store/impl/StoreClassesTechnicianServiceImpl.java

@@ -51,7 +51,7 @@ public class StoreClassesTechnicianServiceImpl extends ServiceImpl<StoreClassesT
 
     @Override
     public List<StoreClassesTechnician> listClassesTechnicianDetail(Integer userId, String days) {
-        return storeClassesTechnicianMapper.listClassesTechnicianDetail(userId, days);
+        return storeClassesTechnicianMapper.listClassesTechnicianDetail(userId, days, SessionUtils.getTechnicianToken().getDepartmentId());
     }
 
     @Override

src/main/java/com/gogirl/infrastructure/mapper/order/serve/ScheduleServeMapper.java

@@ -12,5 +12,5 @@ public interface ScheduleServeMapper extends BaseMapper<ScheduleServe> {
     List<ScheduleServe> selectConflictType(@Param("scheduledUser") Integer scheduledUser,
                                            @Param("days") Date days,
                                            @Param("schTypeId") Integer schTypeId,
-                                           @Param("scheduleServeId") Integer scheduleServeId);
+                                           @Param("serveId") Integer serveId);
 }

src/main/java/com/gogirl/infrastructure/mapper/store/store/StoreClassesTechnicianMapper.java

@@ -25,7 +25,7 @@ public interface StoreClassesTechnicianMapper extends BaseMapper<StoreClassesTec
 
     List<StoreClassesTechnician> listClassTimeByStartDate(@Param("startDate") String startDate, @Param("startTime") String startTime, @Param("departmentId") Integer departmentId);
 
-    List<StoreClassesTechnician> listClassesTechnicianDetail(@Param("userId") Integer userId, @Param("days") String days);
+    List<StoreClassesTechnician> listClassesTechnicianDetail(@Param("userId") Integer userId, @Param("days") String days, @Param("departmentId") Integer departmentId);
 
     List<StoreClassesTechnician> listClassesTechnicianDetailByDays(@Param("userId") Integer userId, @Param("days") String days);
 

src/main/java/com/gogirl/infrastructure/schedule/Schedule.java

@@ -304,7 +304,6 @@ public class Schedule {
         orderServeMapper.syncOrderServeTimes();
     }
 
-
     @Scheduled(cron = "0 0/1 * * * *")
     public void weekTest() {
         log.debug("同步闲时折扣周");

src/main/resources/application.yml

 spring:
   profiles:
-    active: prod
+    active: @spring.profiles.active@
   servlet:
     #文件上传最大容量
     multipart:

src/main/resources/mapper/order/ScheduleServeMapper.xml

@@ -13,8 +13,8 @@
         and TO_DAYS(t1.start_time) = TO_DAYS(#{days})
         and t1.main_serve_id is null
         and t2.`status` = 1
-        <if test="scheduleServeId!=null">
-            and t1.id != #{scheduleServeId}
+        <if test="serveId!=null">
+            and t1.serve_id != #{serveId}
         </if>
     </select>
 

src/main/resources/mapper/store/StoreClassesTechnicianMapper.xml

@@ -80,14 +80,17 @@
     </sql>
 
     <select id="listClassesTechnicianDetail" resultMap="classesTechnicianMap">
-        select
-        <include refid="storeClassesTechnicianSql"/>
-        from
-        store_classes_technician ct
-        where
-        user_id = #{userId}
-        and
-        date_format(days, '%Y-%m') = #{days}
+        SELECT *
+        FROM (
+                 SELECT ct.*
+                 FROM store_classes_technician ct
+                          LEFT JOIN store_classes sc ON ct.classes = sc.id
+                 WHERE ct.user_id = #{userId}
+                   AND date_format(ct.days, '%Y-%m') = #{days}
+                   and (sc.department_id = #{departmentId} or sc.department_id is null)
+                 ORDER BY ct.days, ct.classes DESC
+             ) t
+        GROUP BY days
     </select>
 
     <select id="listClassesTechnicianDetailByDays"

src/shell/dev-docker.sh

+docker build -f ../docker/dev.dockerfile -t gogirl-miniapp-backend-dev5443:3.5 . \
+&& docker run \
+-v /Users/huluobin/docker/gogirl-miniapp-backend/dev/log:/log \
+-p 5443:5443 \
+gogirl-miniapp-backend-dev5443:3.5
\ No newline at end of file

src/shell/prod-docker.sh

+docker build -f ../docker/prod.dockerfile -t gogirl-miniapp-backend-prod5444:3.5 . \
+&& docker run \
+-v /Users/huluobin/docker/gogirl-miniapp-backend/prod/log:/log \
+-p 5444:5444 \
+gogirl-miniapp-backend-prod5444:3.5
\ No newline at end of file

src/shell/test-docker.sh

+docker build -f ../docker/test.dockerfile -t gogirl-miniapp-backend-test5445:3.5 . \
+&& docker run \
+-v /Users/huluobin/docker/gogirl-miniapp-backend/test/log:/log \
+-p 5445:5445 \
+gogirl-miniapp-backend-test5445:3.5
\ No newline at end of file