门店不同价格 门店不同服务

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

@@ -35,8 +35,6 @@ import com.gogirl.infrastructure.common.util.SessionUtils;
 import com.gogirl.infrastructure.common.util.StringUtils;
 import com.gogirl.infrastructure.mapper.order.serve.*;
 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.BaseTypeMapper;
 import com.gogirl.infrastructure.mapper.product.serve.ProducePromotionTimeMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper;
@@ -68,12 +66,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
     @Resource
     private OrderServeMapper orderServeMapper;
     @Resource
-    private BaseServeMapper baseServeMapper;
-    @Resource
     private BaseTypeMapper baseTypeMapper;
     @Resource
-    private BaseProduceMapper baseProduceMapper;
-    @Resource
     private ScheduleManageMapper scheduleManageMapper;
     @Resource
     private CouponCustomerRelevanceService couponCustomerRelevanceService;
@@ -296,7 +290,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                 orderServe.setIsOwnProduce(baseServe.getIsOwnProduce());
 
                 if (orderServeParam.getProduceId() != null) {
-                    BaseProduce baseProduce = baseProduceMapper.selectById(orderServeParam.getProduceId());
+                    BaseProduce baseProduce = baseProduceService.getProduceForDetail(orderServeParam.getProduceId());
                     //款式原价
                     orderServe.setProduceBargainPrice(baseProduce.getBargainPrice());
                     //款式现价

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

@@ -37,7 +37,10 @@ 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.*;
+import com.gogirl.infrastructure.mapper.product.serve.BaseProduceMapper;
+import com.gogirl.infrastructure.mapper.product.serve.BaseScheduledTypeMapper;
+import com.gogirl.infrastructure.mapper.product.serve.ProducePromotionTimeMapper;
+import com.gogirl.infrastructure.mapper.product.serve.TechnicianServeMapper;
 import com.gogirl.infrastructure.mapper.store.oa.TakeLeaveEventMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreClassesTechnicianMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
@@ -73,7 +76,6 @@ import static com.gogirl.domain.order.serve.OrderServe.COMMENT_STATUS_NO;
 public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ScheduleManage> implements ScheduleManageService {
 
 
-    private final BaseServeMapper baseServeMapper;
     private final TechnicianServeMapper technicianServeMapper;
     private final TakeLeaveEventMapper takeLeaveEventMapper;
     private final LeisureDiscountConfigMapper leisureDiscountConfigMapper;
@@ -257,7 +259,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
             } else {
                 scheduleServeQuery.setLengthTimeForEndTime(baseProduceService.getProduceForDetail(scheduleServeQuery.getProduceId()).getServiceDuration());
             }
-            BaseServe baseServe = baseServeMapper.selectById(scheduleServeQuery.getServeId());
+            BaseServe baseServe = baseServeService.getAggregate(scheduleServeQuery.getServeId());
             scheduleServeQuery.setServePicturePath(baseServe.getPicturePath());
             scheduleServeQuery.setServeName(baseServe.getName());
         });
@@ -1133,7 +1135,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                         scheduleServe.setActualStartTime(scheduleServeCommand.getActualStartTime());
                     }
                     //查询服务
-                    BaseServe baseServe = baseServeMapper.selectById(scheduleServe.getServeId());
+                    BaseServe baseServe = baseServeService.getAggregate(scheduleServe.getServeId());
                     //查询服务类型
                     BaseType baseType = baseTypeService.getById(baseServe.getTypeId());
                     //服务数量
@@ -1479,7 +1481,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
      */
     private Integer orderRecordCondition(Integer serveId) {
 
-        BaseServe baseServe = baseServeMapper.selectById(serveId);
+        BaseServe baseServe = baseServeService.getAggregate(serveId);
         BaseScheduledType baseScheduledType = baseScheduledTypeMapper.selectById(baseServe.getSchTypeId());
 
         String schTypeName = baseScheduledType == null ? "" : baseScheduledType.getName();
@@ -1544,7 +1546,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
             /*1、校验同类型服务一天只能预约一次*/
             scheduleManage.getListScheduleServer().forEach(scheduleServe -> {
                 if (scheduleServe.getMainServeId() == null) {
-                    BaseServe baseServe = baseServeMapper.selectById(scheduleServe.getServeId());
+                    BaseServe baseServe = baseServeService.getAggregate(scheduleServe.getServeId());
                     List<ScheduleServe> typeConflictScheduleServe = scheduleServeMapper.selectConflictType(
                             scheduleManage.getScheduledUser(),
                             scheduleManage.getArriveTime(),

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

@@ -39,7 +39,7 @@ public class BaseProduce implements Serializable {
 
     @ApiModelProperty("图片")
     private String picturePath;
-    ;
+
     @ApiModelProperty("1-上线 2-下线")
     private String status;
 

src/main/resources/mapper/product/BaseProduceMapper.xml

@@ -108,6 +108,8 @@
         <if test="request.colorSystemId !=null ">
             left join color_system_product_map t3 on t1.id = t3.product_id
         </if>
+        left join base_serve t4 on t1.service_id = t4.id
+        left join store_shop_serve_relation t5 on t4.id =t5.serve_id
         where true
         <if test="request.sourceFrom !=null and request.sourceFrom == 'customer' ">
             and t1.has_index_show = 1
@@ -125,6 +127,7 @@
             and t1.service_id =#{request.serveId}
         </if>
         and t1.`status` =1
+        and t5.store_id = #{request.departmentId}
         <choose>
             <when test="request.sort == 1 ">
                 order by t1.sales_num desc

src/main/resources/mapper/product/BaseServeMapper.xml

@@ -166,6 +166,7 @@
         <if test="baseServe.labelId != null ">
             left join features_mapping t2 on t2.data_type=1 and t2.data_id=ser.id
         </if>
+        left join store_shop_serve_relation t3 on ser.id =t3.serve_id
         where ser.status = 1
         <if test="baseServe.type != null and baseServe.type != ''">
             and ser.type = #{baseServe.type}
@@ -174,7 +175,7 @@
             and t2.features_id = #{baseServe.labelId}
         </if>
         and has_purchase_show=1
-
+        and t3.store_id = #{baseServe.departmentId}
         order by purchase_show_index desc
     </select>
 </mapper>