客照显示过滤

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

@@ -516,6 +516,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
     @Override
     public void recordOrderServeData(OrderServe param) {
+
         if (param == null || param.getId() == null) {
             throw new RRException("orderServeId不能为空");
         }
@@ -613,6 +614,16 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         if (StringUtils.isNotEmpty(orderRecord.getPicturePath())) {
             orderRecord.setIsGuestPhoto(1);
         }
+        OrderServe orderServe = orderServeMapper.selectById(param.getId());
+        if (orderServe.getOrderRecordCondition() == 1) {
+            orderRecord.setIsCustomerShow(1);
+        }
+        if (orderServe.getOrderRecordCondition() == 2) {
+            orderRecord.setIsCustomerShow(2);
+        }
+        if (orderServe.getOrderRecordCondition() == 3) {
+            throw new RRException("无接口调用权限");
+        }
         orderRecordService.saveOrUpdate(orderRecord);
 
     }

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

@@ -14,10 +14,7 @@ import com.gogirl.application.user.customer.CustomerService;
 import com.gogirl.domain.market.discount.LeisureDiscountConfig;
 import com.gogirl.domain.order.serve.*;
 import com.gogirl.domain.product.purchase.PurchaseSku;
-import com.gogirl.domain.product.serve.BaseProduce;
-import com.gogirl.domain.product.serve.BaseServe;
-import com.gogirl.domain.product.serve.BaseType;
-import com.gogirl.domain.product.serve.TechnicianServe;
+import com.gogirl.domain.product.serve.*;
 import com.gogirl.domain.store.oa.TakeLeaveEvent;
 import com.gogirl.domain.store.store.StoreClassesTechnician;
 import com.gogirl.domain.store.store.StoreManage;
@@ -34,10 +31,7 @@ import com.gogirl.infrastructure.mapper.order.serve.OwnProduceMapper;
 import com.gogirl.infrastructure.mapper.order.serve.ScheduleManageMapper;
 import com.gogirl.infrastructure.mapper.order.serve.ScheduleServeMapper;
 import com.gogirl.infrastructure.mapper.product.purchase.PurchaseSkuMapper;
-import com.gogirl.infrastructure.mapper.product.serve.BaseProduceMapper;
-import com.gogirl.infrastructure.mapper.product.serve.BaseServeMapper;
-import com.gogirl.infrastructure.mapper.product.serve.ProducePromotionTimeMapper;
-import com.gogirl.infrastructure.mapper.product.serve.TechnicianServeMapper;
+import com.gogirl.infrastructure.mapper.product.serve.*;
 import com.gogirl.infrastructure.mapper.store.oa.TakeLeaveEventMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper;
@@ -82,6 +76,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
     private final OrderManageMapper orderManageMapper;
     private final StoreManageMapper storeManageMapper;
     private final OwnProduceMapper ownProduceMapper;
+    private final BaseScheduledTypeMapper baseScheduledTypeMapper;
 
 
     private final StoreClassesTechnicianService storeClassesTechnicianService;
@@ -1148,8 +1143,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         BaseServe baseServe = baseServeMapper.selectById(leisureScheduleServeResp.getServeId());
         LocalDateTime startTime = leisureScheduleServeResp.getDateTime();
         LocalDateTime endTime = startTime.plusMinutes(baseServe.getServiceDuration()).plusMinutes(60);
-        List<StoreTechnician> storeTechnicianList = this.queryLeisureTechnician(leisureScheduleServeResp.getDepartmentId(), baseServe.getId(), startTime, endTime);
-        return storeTechnicianList;
+        return this.queryLeisureTechnician(leisureScheduleServeResp.getDepartmentId(), baseServe.getId(), startTime, endTime);
     }
 
     private final ProducePromotionTimeMapper producePromotionTimeMapper;
@@ -1361,10 +1355,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                             scheduleServe.setOwnProduce(ownProduceMapper.selectById(scheduleServeCommand.getOwnProduceId()));
                         }
                     }
-//                    else {
-//                        scheduleServe.setIsOwnProduce(2);
-//                        scheduleServe.setOwnProduceId(null);
-//                    }
 
                     //款式做法
                     scheduleServe.setExplain(baseServe.getExplain());
@@ -1521,7 +1511,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                         //自带款式
                         .ownProduceId(scheduleServeVar.getOwnProduceId())
                         .isOwnProduce(scheduleServeVar.getIsOwnProduce())
-
+                        .orderRecordCondition(this.orderRecordCondition(scheduleServeVar.getServeId()))
                         .build();
 
                 if (StringUtils.isNotEmpty(scheduleServeVar.getTechnicianIds())) {
@@ -1608,4 +1598,33 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         }
 
     }
+
+    /**
+     * 能录入订单记录的条件
+     *
+     * @param serveId 服务id
+     * @return 1- 店员可以补全订单记录 用户可以查看客照
+     * 2-店员可以补全订单记录，用户不能查看客照
+     * 3-店员不用补全订单记录
+     */
+    private Integer orderRecordCondition(Integer serveId) {
+
+        BaseServe baseServe = baseServeMapper.selectById(serveId);
+        BaseScheduledType baseScheduledType = baseScheduledTypeMapper.selectById(baseServe.getSchTypeId());
+
+        String schTypeName = baseScheduledType.getName();
+        String serveName = baseServe.getName();
+
+        List<String> technicianServeName = Lists.newArrayList("日式女士基础修手", "日式女士精致修手", "日式女士基础修脚", "日式男士基础修手", "日式男士修脚", "精细日式卸甲（手部）", "精细日式卸甲（脚部）", "高级会员免费卸甲（手部）", "高级会员免费卸甲（脚部）", "特级会员免费修手", "贵族会员免费手部基础护理", "手部滋润深沉护理", "脚部滋润深沉护理");
+        List<String> customerServeName = Lists.newArrayList("贵族会员免费手部基础护理", "手部滋润深沉护理", "脚部滋润深沉护理");
+
+        List<String> schTypeNameList = Lists.newArrayList("美甲 ( 手 )", "美睫", "美甲 ( 脚 )");
+        if (schTypeNameList.contains(schTypeName) || technicianServeName.contains(serveName)) {
+            if (customerServeName.contains(serveName)) {
+                return 2;
+            }
+            return 1;
+        }
+        return 3;
+    }
 }

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

+package com.gogirl.application.product.serve;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gogirl.domain.product.serve.BaseScheduledType;
+
+/**
+ * <p>
+ * 预约分类 （用于检测冲突，同种类型的服务不可在同一天内预约多次） 服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-03
+ */
+public interface IBaseScheduledTypeService extends IService<BaseScheduledType> {
+
+}

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

+package com.gogirl.application.product.serve.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gogirl.application.product.serve.IBaseScheduledTypeService;
+import com.gogirl.domain.product.serve.BaseScheduledType;
+import com.gogirl.infrastructure.mapper.product.serve.BaseScheduledTypeMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 预约分类 （用于检测冲突，同种类型的服务不可在同一天内预约多次） 服务实现类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-03
+ */
+@Service
+public class BaseScheduledTypeServiceImpl extends ServiceImpl<BaseScheduledTypeMapper, BaseScheduledType> implements IBaseScheduledTypeService {
+
+}

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

@@ -108,8 +108,7 @@ public class CareerCmdServiceImpl implements CareerCmdService {
     @Transactional(timeout = 10000)
     public void submitFeedBack(SubmitFeedbackCommand cmd) {
 
-        TrainingStartClassLogTechnician trainingStartClassLogTechnician =
-                trainingStartClassLogTechnicianMapper.selectById(cmd.getTrainingStartClassLogTechnicianId());
+        TrainingStartClassLogTechnician trainingStartClassLogTechnician = trainingStartClassLogTechnicianMapper.selectById(cmd.getTrainingStartClassLogTechnicianId());
 
         trainingStartClassLogTechnician.setFeedback(cmd.getFeedBackJson());
         trainingStartClassLogTechnician.setCreateDate(new Date());

src/main/java/com/gogirl/domain/order/serve/OrderRecord.java

@@ -67,6 +67,9 @@ public class OrderRecord implements Serializable {
     @ApiModelProperty("是否有客照")
     private Integer isGuestPhoto;
 
+    @ApiModelProperty("用户端是否显示，1-是；2-否")
+    private Integer isCustomerShow;
+
     /**
      * 非数据库字段
      */

src/main/java/com/gogirl/domain/order/serve/OrderServe.java

@@ -256,6 +256,9 @@ public class OrderServe implements Serializable {
     @TableField(exist = false)
     private OwnProduce ownProduce;
 
+    @ApiModelProperty("订单录入条件 1-店员录入用户端显示 2-店员录入用户端不显示 3-不需要录入")
+    private Integer orderRecordCondition;
+
 
     public void addDiscountPrice(BigDecimal discountPrice) {
         this.discountPrice = this.discountPrice.add(discountPrice);
@@ -319,4 +322,4 @@ public class OrderServe implements Serializable {
     public void setAchievement(BigDecimal achievement) {
         this.achievement = achievement.max(BigDecimal.ZERO);
     }
-}
+}
\ No newline at end of file

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

+package com.gogirl.domain.product.serve;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 预约分类 （用于检测冲突，同种类型的服务不可在同一天内预约多次）
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="BaseScheduledType对象", description="预约分类 （用于检测冲突，同种类型的服务不可在同一天内预约多次）")
+public class BaseScheduledType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String name;
+
+    private String shortCode;
+
+
+}

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

+package com.gogirl.infrastructure.mapper.product.serve;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gogirl.domain.product.serve.BaseScheduledType;
+
+/**
+ * <p>
+ * 预约分类 （用于检测冲突，同种类型的服务不可在同一天内预约多次） Mapper 接口
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-03
+ */
+public interface BaseScheduledTypeMapper extends BaseMapper<BaseScheduledType> {
+
+}

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

+package com.gogirl.interfaces.product.serve;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 预约分类 （用于检测冲突，同种类型的服务不可在同一天内预约多次） 前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-07-03
+ */
+@RestController
+@RequestMapping("/base-scheduled-type")
+public class BaseScheduledTypeController {
+
+}

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

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

@@ -23,6 +23,7 @@
                  where t1.picture_path is not null
                    and t1.picture_path != ''
                    and t3.order_user = #{customerId}
+                   and t1.is_customer_show = 1
                  GROUP BY t1.picture_path
                  LIMIT #{index},#{offset}
              ) a