update

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/ScheduleManageServiceImpl.java

@@ -985,7 +985,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     }
                     //如果主服务已经结单 不能再添加辅助服务
                     if (mainScheduleServe != null && mainScheduleServe.getStatus() == 3) {
-                        throw new RRException("不能再为已完成的服务添加辅助服务")
+                        throw new RRException("不能再为已完成的服务添加辅助服务");
                     }
                 });
 

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/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>