update

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

@@ -181,7 +181,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                             .achievement(baseProduce.getCurrentPrice())
                             .serveDuration(baseProduce.getServiceDuration());
 
-                    ProducePromotionTime producePromotionTime = producePromotionTimeMapper.selectOne(new LambdaQueryWrapper<ProducePromotionTime>().eq(ProducePromotionTime::getProduceId, orderServeParam.getProduceId()));
+                    ProducePromotionTime producePromotionTime = producePromotionTimeMapper
+                            .queryByProduceId(orderServeParam.getProduceId(),
+                                    orderServeParam.getStartTime().toString());
                     //如果款式有活动价格
                     if (producePromotionTime != null && producePromotionTime.isPromotion()) {
                         builder.producePromotionTimeId(producePromotionTime.getId());
@@ -276,7 +278,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                     //服务时长=款式时长
                     orderServe.setServeDuration(baseProduce.getServiceDuration());
 
-                    ProducePromotionTime producePromotionTime = producePromotionTimeMapper.selectOne(new LambdaQueryWrapper<ProducePromotionTime>().eq(ProducePromotionTime::getProduceId, orderServeParam.getProduceId()));
+                    ProducePromotionTime producePromotionTime = producePromotionTimeMapper.queryByProduceId(
+                            orderServeParam.getProduceId(),
+                            orderServeParam.getStartTime().toString());
                     //如果款式有活动价格
                     if (producePromotionTime != null && producePromotionTime.isPromotion()) {
                         orderServe.setProducePromotionTimeId(producePromotionTime.getId());
@@ -685,17 +689,10 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         orderManage.setStatus(OrderManage.STATUS_FINISHED);
         //订单已完成
         orderManageMapper.updateById(orderManage);
-
-        //如果全部项评论了
-        if (orderServeList.stream().noneMatch(orderServe -> orderServe.getCommentStatus().equals(OrderServe.COMMENT_STATUS_NO))) {
-
-            orderManage.setStatus(OrderManage.STATUS_FINISHED);
         Coupon coupon = couponService.getOne(new LambdaQueryWrapper<Coupon>().eq(Coupon::getName, "评价礼券"));
         if (coupon != null) {
             couponService.sendCoupon(coupon.getId(), orderManage.getOrderUser());
         }
-            orderManageMapper.updateById(orderManage);
-        }
         return orderServeList;
     }
 

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

@@ -1204,7 +1204,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                         //款式时间
                         scheduleServe.setLengthTime(baseProduce.getServiceDuration());
 
-                        ProducePromotionTime producePromotionTime = producePromotionTimeMapper.selectOne(new LambdaQueryWrapper<ProducePromotionTime>().eq(ProducePromotionTime::getProduceId, scheduleServe.getProduceId()));
+                        ProducePromotionTime producePromotionTime = producePromotionTimeMapper.queryByProduceId(
+                                scheduleServe.getProduceId(),
+                                scheduleServe.getStartTime().toString()
+                        );
                         //如果款式有活动价格
                         if (producePromotionTime != null && producePromotionTime.isPromotion()) {
                             scheduleServe.setProducePromotionTimeId(producePromotionTime.getId());

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

 package com.gogirl.application.product.serve.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gogirl.application.product.serve.BaseServeService;
 import com.gogirl.domain.market.discount.LeisureDiscountConfig;
+import com.gogirl.domain.order.serve.ProducePromotionTime;
 import com.gogirl.domain.product.serve.BaseServe;
 import com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigMapper;
 import com.gogirl.infrastructure.mapper.product.serve.BaseServeMapper;
+import com.gogirl.infrastructure.mapper.product.serve.ProducePromotionTimeMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -26,6 +29,8 @@ public class BaseServeServiceImpl extends ServiceImpl<BaseServeMapper, BaseServe
         return baseServeMapper.listServeForPage(param, serveIdList);
     }
 
+    private final ProducePromotionTimeMapper producePromotionTimeMapper;
+
     @Override
     public BaseServe getAggregate(Integer id, LocalDateTime date, Integer departmentId) {
         BaseServe baseServe = baseServeMapper.getAggregate(id);
@@ -37,6 +42,8 @@ public class BaseServeServiceImpl extends ServiceImpl<BaseServeMapper, BaseServe
             if (leisureDiscountConfig != null)
                 baseServe.setDiscountRate(leisureDiscountConfig.getDiscountRate());
         }
+
+//        producePromotionTimeMapper.select
         return baseServe;
     }
 }

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

@@ -78,4 +78,7 @@ public class BaseProduce implements Serializable {
     private Integer salesNum;
 
     private Integer serveTypeId;
+
+    @TableField(exist = false)
+    private BigDecimal promotionPrice;
 }

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

@@ -2,8 +2,10 @@ package com.gogirl.infrastructure.mapper.product.serve;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gogirl.domain.order.serve.ProducePromotionTime;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 
 public interface ProducePromotionTimeMapper extends BaseMapper<ProducePromotionTime> {
+
+    ProducePromotionTime queryByProduceId(@Param("produceId") Integer produceId, @Param("localDateTime") String localDateTime);
 }

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

@@ -45,7 +45,7 @@ public class ServeController {
     public JsonResult<BaseServe> getServeDetail(@RequestParam Integer id,
                                                 @RequestParam(required = false)
                                                 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss", iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime date,
-                                                @RequestParam Integer departmentId) {
+                                                @RequestParam(required = false) Integer departmentId) {
 
         BaseServe baseServe = baseServeService.getAggregate(id, date, departmentId);
         return JsonResult.success(baseServe);
@@ -95,7 +95,7 @@ public class ServeController {
     public JsonResult<BaseServe> techGetServeDetail(@RequestParam Integer id,
                                                     @RequestParam(required = false)
                                                     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss", iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime date,
-                                                    @RequestParam Integer departmentId) {
+                                                    @RequestParam(required = false) Integer departmentId) {
         BaseServe baseServe = baseServeService.getAggregate(id, date, departmentId);
         return JsonResult.success(baseServe);
     }

src/main/resources/mapper/product/ProducePromotionTimeMapper.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.ProducePromotionTimeMapper">
+    <select id="queryByProduceId" resultType="com.gogirl.domain.order.serve.ProducePromotionTime">
+        SELECT *
+        from produce_promotion_time
+        where produce_id = #{produceId}
+          and start_time &lt;= #{localDateTime}
+          and end_time &gt;= #{localDateTime}
+    </select>
+</mapper>
\ No newline at end of file