Merge branch '3.8' into 3.9

# Conflicts:
#	src/main/java/com/gogirl/infrastructure/schedule/Schedule.java

src/main/java/com/gogirl/application/market/coupon/impl/MarketServiceImpl.java

@@ -1046,6 +1046,7 @@ public class MarketServiceImpl implements MarketService {
 
         //查询订单聚合
         OrderManage orderManage = orderManageMapper.selectById(orderId);
+
         List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, orderId));
         orderManage.setListOrderServer(orderServeList);
 
@@ -1144,8 +1145,8 @@ public class MarketServiceImpl implements MarketService {
         }
 
         //卡券之前删除订单服务和卡券关联
-        couponOrderRelevanceService.remove(new LambdaQueryWrapper<CouponOrderRelevance>()
-                .eq(CouponOrderRelevance::getOrderId, orderId));
+        couponOrderRelevanceService.remove(new LambdaQueryWrapper<CouponOrderRelevance>().eq(CouponOrderRelevance::getOrderId, orderId));
+
 
         //3、外部券
         if (ListUtil.isNotEmpty(outerCouponCustomerRelevanceServiceList)) {
@@ -1214,6 +1215,7 @@ public class MarketServiceImpl implements MarketService {
 
                     });
         }
+
         //4、内部券
         if (ListUtil.isNotEmpty(innerCouponCustomerRelevanceServiceList)) {
 
@@ -1313,6 +1315,7 @@ public class MarketServiceImpl implements MarketService {
                     .collect(Collectors.toList());
             freeInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
 
+
             //6、普通内部券
             List<CouponCustomerRelevance> normalInnerCouponCustomerRelevanceServiceList = innerCouponCustomerRelevanceServiceList
                     .stream()
@@ -1343,7 +1346,11 @@ public class MarketServiceImpl implements MarketService {
             if (freeInnerCouponCustomerRelevanceServiceList.size() > 1) {
                 throw new RRException("免单券券只能用一张");
             }
+
+
         }
+
+
         orderManageMapper.updateById(orderManage);
         orderServeService.updateBatchById(orderServeList);
     }

src/main/java/com/gogirl/application/order/mall/impl/MallOrderServiceImpl.java

@@ -23,6 +23,7 @@ import com.gogirl.infrastructure.mapper.order.mall.MallOrderMapper;
 import com.gogirl.infrastructure.mapper.order.mall.MallOrderTechnicianMapper;
 import com.gogirl.infrastructure.mapper.product.mall.MallProductMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
+import com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper;
 import com.gogirl.infrastructure.mapper.user.customer.CustomerMapper;
 import com.gogirl.infrastructure.util.SessionUtils;
 import com.gogirl.shared.market.ListMallOrderRequest;
@@ -59,6 +60,7 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
     private final CustomerMapper customerMapper;
     private final MallOrderTechnicianMapper mallOrderTechnicianMapper;
     private final StoreManageMapper storeManageMapper;
+    private final StoreTechnicianMapper storeTechnicianMapper;
 
     /**
      * domain service
@@ -163,6 +165,10 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
         if (ListUtil.isEmpty(request.getTechnicianIdList())) {
             throw new RRException("美甲师列表为空");
         }
+        StoreTechnician storeTechnician = storeTechnicianMapper.selectById(SessionUtils.getTechnicianId());
+        if (!storeTechnician.getJobs().contains("店长")) {
+            throw new RRException("权限不够修改推荐人");
+        }
 
         mallOrderTechnicianMapper.delete(new LambdaQueryWrapper<MallOrderTechnician>()
                 .eq(MallOrderTechnician::getMallOrderId, request.getMallOrderId()));
@@ -407,11 +413,11 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
 
             wrapper.eq(MallOrder::getSelfTakeDepartmentId, SessionUtils.getTechnicianToken().getDepartmentId());
 
-            List<StoreManage> storeManageList = storeManageMapper.selectList(new LambdaQueryWrapper<StoreManage>()
-                    .eq(StoreManage::getMasterUserId, SessionUtils.getTechnicianId()));
-            if (ListUtil.isNotEmpty(storeManageList)) {
-                throw new RRException("权限不够查看订单列表");
-            }
+//            List<StoreManage> storeManageList = storeManageMapper.selectList(new LambdaQueryWrapper<StoreManage>()
+//                    .eq(StoreManage::getMasterUserId, SessionUtils.getTechnicianId()));
+//            if (ListUtil.isNotEmpty(storeManageList)) {
+//                throw new RRException("权限不够查看订单列表");
+//            }
         }
 
         if (SessionUtils.getSourceFrom().equals(SessionUtils.customer)) {

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

@@ -359,7 +359,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                 orderServe.setCommentStatus(orderServeParam.getCommentStatus());
                 //订单服务备注
                 orderServe.setRemark(orderServeParam.getRemark());
-
+                orderServe.setOwnProduceId(orderServeParam.getOwnProduceId());
                 //更新订单详情时校验自带款式是否设置
                 if (orderServe.getIsOwnProduce().equals(1)) {
                     if (orderServe.getOwnProduceId() == null) {
@@ -368,10 +368,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                     orderServe.setIsOwnProduce(1);
                     orderServe.setOwnProduce(ownProduceMapper.selectById(orderServe.getOwnProduceId()));
                 }
-//                else {
-//                    orderServe.setIsOwnProduce(2);
-//                    orderServe.setOwnProduceId(null);
-//                }
 
                 orderServe.calcPriceAndTimeLength();
                 orderServeMapper.updateById(orderServe);

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

@@ -1033,7 +1033,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     }
                     //如果主服务已经结单 不能再添加辅助服务
                     if (mainScheduleServe != null && mainScheduleServe.getStatus() == 3) {
-                        throw new RRException("不能再为已完成的服务添加辅助服务")
+                        throw new RRException("不能再为已完成的服务添加辅助服务");
                     }
                 });
 
@@ -1438,11 +1438,11 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         BaseServe baseServe = baseServeMapper.selectById(serveId);
         BaseScheduledType baseScheduledType = baseScheduledTypeMapper.selectById(baseServe.getSchTypeId());
 
-        String schTypeName = baseScheduledType.getName();
+        String schTypeName = baseScheduledType == null ? "" : baseScheduledType.getName();
         String serveName = baseServe.getName();
 
-        List<String> technicianServeName = Lists.newArrayList("日式女士基础修手", "日式女士精致修手", "日式女士基础修脚", "日式男士基础修手", "日式男士修脚", "精细日式卸甲（手部）", "精细日式卸甲（脚部）", "高级会员免费卸甲（手部）", "高级会员免费卸甲（脚部）", "特级会员免费修手", "贵族会员免费手部基础护理", "手部滋润深沉护理", "脚部滋润深沉护理");
-        List<String> customerServeName = Lists.newArrayList("贵族会员免费手部基础护理", "手部滋润深沉护理", "脚部滋润深沉护理");
+        List<String> technicianServeName = Lists.newArrayList("日式女士基础修手", "日式女士精致修手", "日式女士基础修脚", "日式男士基础修手", "日式男士修脚", "精细日式卸甲（手部）", "精细日式卸甲（脚部）", "高级会员免费卸甲（手部）", "高级会员免费卸甲（脚部）", "特级会员免费修手", "贵族会员免费手部基础护理", "手部滋润深层护理", "脚部滋润深层护理");
+        List<String> customerServeName = Lists.newArrayList("贵族会员免费手部基础护理", "手部滋润深层护理", "脚部滋润深层护理");
 
         List<String> schTypeNameList = Lists.newArrayList("美甲 ( 手 )", "美睫", "美甲 ( 脚 )");
         if (schTypeNameList.contains(schTypeName) || technicianServeName.contains(serveName)) {

src/main/java/com/gogirl/application/store/career/impl/TechScoreRulesServiceImpl.java

@@ -74,7 +74,7 @@ public class TechScoreRulesServiceImpl extends ServiceImpl<TechScoreRulesMapper,
             throw new RRException("未获取到美甲师评分信息");
         }
 
-        AchievementsPersonaResult achievementsPersonaResult = result.getData().getItems().stream().findAny().orElseThrow(NullPointerException::new);
+        AchievementsPersonaResult achievementsPersonaResult = result.getData().getItems().stream().findAny().orElseThrow(() -> new RRException("未查询到美甲师评分，请联系后台管理员"));
 
         TechScoreResp techScoreResp = new TechScoreResp();
         techScoreResp.setTechScore(achievementsPersonaResult.getMonth_score().doubleValue());

src/main/java/com/gogirl/application/xcx/IScheduleLogService.java

+package com.gogirl.application.xcx;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gogirl.domain.xcx.ScheduleLog;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-08
+ */
+public interface IScheduleLogService extends IService<ScheduleLog> {
+
+}

src/main/java/com/gogirl/application/xcx/impl/ScheduleLogServiceImpl.java

+package com.gogirl.application.xcx.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gogirl.application.xcx.IScheduleLogService;
+import com.gogirl.domain.xcx.ScheduleLog;
+import com.gogirl.infrastructure.mapper.xcx.ScheduleLogMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-08
+ */
+@Service
+public class ScheduleLogServiceImpl extends ServiceImpl<ScheduleLogMapper, ScheduleLog> implements IScheduleLogService {
+
+}

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

 package com.gogirl.domain.product.serve;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,11 +20,14 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="BaseScheduledType对象", description="预约分类 （用于检测冲突，同种类型的服务不可在同一天内预约多次）")
+@ApiModel(value = "BaseScheduledType对象", description = "预约分类 （用于检测冲突，同种类型的服务不可在同一天内预约多次）")
 public class BaseScheduledType implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
     private String name;
 
     private String shortCode;

src/main/java/com/gogirl/domain/store/training/TrainingStartClass.java

@@ -40,6 +40,7 @@ public class TrainingStartClass implements Serializable {
     @TableField(exist = false)
     private TrainingCourse trainingCourse;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("结束时间")
     private LocalDateTime endTime;
 

src/main/java/com/gogirl/domain/xcx/ScheduleLog.java

+package com.gogirl.domain.xcx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.sql.Blob;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ScheduleLog对象", description="")
+public class ScheduleLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Blob json;
+
+    private Integer technicianId;
+
+    private Integer customerId;
+
+    @ApiModelProperty(value = "类型 1-用户提交预约 2-用户修改预约 3-美甲师提交预约 4-美甲师修改预约")
+    private Integer type;
+
+
+}

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

@@ -3,7 +3,6 @@ package com.gogirl.infrastructure.mapper.store.store;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gogirl.domain.store.store.StoreTechnician;
-import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Date;
 import java.util.List;
@@ -20,4 +19,6 @@ public interface StoreTechnicianMapper extends BaseMapper<StoreTechnician> {
     int insertTechnicianManage(StoreTechnician storeTechnician);
 
     List<StoreTechnician> queryDayTechnicianClasses(Integer departmentId, Date day);
+
+    void syncTechnicianJobs();
 }

src/main/java/com/gogirl/infrastructure/mapper/xcx/ScheduleLogMapper.java

+package com.gogirl.infrastructure.mapper.xcx;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gogirl.domain.xcx.ScheduleLog;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-08
+ */
+public interface ScheduleLogMapper extends BaseMapper<ScheduleLog> {
+
+}

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

@@ -707,4 +707,14 @@ public class Schedule {
         log.info("同步开课状态结束  ");
 
     }
+
+    /**
+     * 每天凌晨3点同步美甲师jobs
+     */
+    @Scheduled(cron = "0 0 3 * * ?")
+    public void syncTechnicianJobs() {
+        log.info("每天凌晨3点同步美甲师jobs 开始");
+        storeTechnicianMapper.syncTechnicianJobs();
+        log.info("每天凌晨3点同步美甲师jobs 结束");
+    }
 }

src/main/java/com/gogirl/interfaces/xcx/ScheduleLogController.java

+package com.gogirl.interfaces.xcx;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-08
+ */
+@RestController
+@RequestMapping("/schedule-log")
+public class ScheduleLogController {
+
+}

src/main/resources/logback-spring.xml

@@ -26,7 +26,7 @@
             <!-- 按天回滚 daily -->
             <fileNamePattern>${LOG_HOME}/${contextName}-info.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 30天 -->
-            <maxHistory>3</maxHistory>
+            <maxHistory>7</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${CONSOLE_LOG_PATTERN}</pattern>
@@ -45,7 +45,7 @@
     <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>${LOG_HOME}/${contextName}-warn.%d{yyyy-MM-dd}.log</FileNamePattern>
-            <maxHistory>3</maxHistory>
+            <maxHistory>7</maxHistory>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>${CONSOLE_LOG_PATTERN}</pattern>
@@ -62,7 +62,7 @@
     <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>${LOG_HOME}/${contextName}-error.%d{yyyy-MM-dd}.log</FileNamePattern>
-            <maxHistory>3</maxHistory>
+            <maxHistory>7</maxHistory>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>${CONSOLE_LOG_PATTERN}</pattern>

src/main/resources/mapper/MallOrderTechnicianMapper.xml

@@ -12,9 +12,11 @@
         select t1.*
         from mall_order_technician t1
                  left join mall_order t2 on t1.mall_order_id = t2.id
+                 LEFT JOIN store_technician t3 on t1.technician_id = t3.id
         where t1.technician_id = #{param.technicianId}
           and t2.status = 4
           and FROM_UNIXTIME(t2.create_time / 1000, '%Y-%m') = #{param.date}
+          and t3.status = 1
     </select>
 
     <select id="queryTotalMallOrderAchievement" resultType="java.math.BigDecimal">
@@ -29,5 +31,6 @@
         <if test="departmentId != null ">
             and t2.department_id =#{departmentId}
         </if>
+        and t2.status =1
     </select>
 </mapper>

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

@@ -78,6 +78,12 @@
         </set>
 
     </update>
+    <update id="syncTechnicianJobs">
+        update store_technician t1
+            LEFT JOIN store_user t2 on t1.user_id = t2.id
+        set t1.jobs = t2.jobs
+        where t1.jobs != t2.jobs
+    </update>
 
     <insert id="insertTechnicianManage"
             parameterType="com.gogirl.domain.store.store.StoreTechnician">

src/main/resources/mapper/xcx/ScheduleLogMapper.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.xcx.ScheduleLogMapper">
+
+</mapper>

src/test/java/com/gogirl/CodeGenerator.java

 package com.gogirl;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
@@ -45,6 +46,8 @@ public class CodeGenerator {
         gc.setAuthor("robbendev");
         gc.setOpen(false);
         gc.setSwagger2(true);
+        gc.setIdType(IdType.AUTO);
+
         // 实体属性 Swagger2 注解
         mpg.setGlobalConfig(gc);
 
@@ -126,11 +129,9 @@ public class CodeGenerator {
 //        strategy.setSuperEntityClass("你自己的父类实体,没有就不用设置!");
         strategy.setEntityLombokModel(true);
         strategy.setRestControllerStyle(true);
-
         // 公共父类
 //        strategy.setSuperControllerClass("你自己的父类控制器,没有就不用设置!");
         // 写于父类中的公共字段
-        strategy.setSuperEntityColumns("id");
         strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
         strategy.setControllerMappingHyphenStyle(true);
         strategy.setTablePrefix(pc.getModuleName() + "_");