From b98e56c11e15f32a5a9d21d82315d9f16c0410dc Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Mon, 21 Jun 2021 18:38:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E8=B0=B1=E8=AE=A1=E5=88=92=E7=94=9F?=
=?UTF-8?q?=E6=88=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/SysOrderServiceImpl.java | 38 ++++++++++---------
.../impl/SysRecipesPlanServiceImpl.java | 2 +-
.../mapper/custom/SysOrderMapper.xml | 2 +
stdiet-ui/src/views/custom/order/index.vue | 30 ++++++++++++---
4 files changed, 49 insertions(+), 23 deletions(-)
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
index f7fd404c5..7cd5b91bd 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
@@ -379,24 +379,28 @@ public class SysOrderServiceImpl implements ISysOrderService {
//判断是否提成单，拆分单中的副单，体验单,定金单
if(sysOrder.getStartTime() == null || sysOrder.getAfterSaleCommissOrder().intValue() == 1 || sysOrder.getMainOrderId().intValue() != 0 ||
"2".equals(sysOrder.getOrderType()) || !isNeedByOrderMoneyType(sysOrder)){
- continue;
- }
- //判断前一个订单的结束时间是否大于第二个订单的
- if(lastServerEndTime != null && ChronoUnit.DAYS.between(lastServerEndTime, DateUtils.dateToLocalDate(sysOrder.getStartTime())) <= 0){
- newStartTime = lastServerEndTime.plusDays(1);
- //本月第一天
- LocalDate monthStart = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
- //旧的开始时间和新的开始时间都要需要大于本月第一天
- if(sysOrder.getCommissStartTime() != null && ChronoUnit.DAYS.between(monthStart, DateUtils.dateToLocalDate(sysOrder.getCommissStartTime())) >= 0 && ChronoUnit.DAYS.between(monthStart, newStartTime) >= 0){
- sysOrder.setCommissStartTime(DateUtils.localDateToDate(newStartTime));
+ //设置服务到期时间
+ setOrderServerEndDate(sysOrder);
+ sysOrder.setUpdateTime(new Date());
+ row = updateSysOrder(sysOrder);
+ }else {
+ //判断前一个订单的结束时间是否大于第二个订单的
+ if (lastServerEndTime != null && ChronoUnit.DAYS.between(lastServerEndTime, DateUtils.dateToLocalDate(sysOrder.getStartTime())) <= 0) {
+ newStartTime = lastServerEndTime.plusDays(1);
+ //本月第一天
+ LocalDate monthStart = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
+ //旧的开始时间和新的开始时间都要需要大于本月第一天
+ if (sysOrder.getCommissStartTime() != null && ChronoUnit.DAYS.between(monthStart, DateUtils.dateToLocalDate(sysOrder.getCommissStartTime())) >= 0 && ChronoUnit.DAYS.between(monthStart, newStartTime) >= 0) {
+ sysOrder.setCommissStartTime(DateUtils.localDateToDate(newStartTime));
+ }
+ sysOrder.setStartTime(DateUtils.localDateToDate(newStartTime));
}
- sysOrder.setStartTime(DateUtils.localDateToDate(newStartTime));
+ //设置服务到期时间
+ setOrderServerEndDate(sysOrder);
+ sysOrder.setUpdateTime(new Date());
+ row = updateSysOrder(sysOrder);
+ lastServerEndTime = DateUtils.dateToLocalDate(sysOrder.getServerEndTime());
}
- //设置服务到期时间
- setOrderServerEndDate(sysOrder);
- sysOrder.setUpdateTime(new Date());
- row = updateSysOrder(sysOrder);
- lastServerEndTime = DateUtils.dateToLocalDate(sysOrder.getServerEndTime());
}
//异步更新食谱计划
sysRecipesPlanService.regenerateRecipesPlan(cusId);
@@ -404,7 +408,7 @@ public class SysOrderServiceImpl implements ISysOrderService {
return row;
}
- //定金单或尾款单是否需要生成食谱计划，2021-01-12修改为6月11日之后成交的订单只生成定金单计划
+ //定金单或尾款单是否需要生成食谱计划，2021-01-12修改为6月1日之后成交的订单只生成定金单计划
private boolean isNeedByOrderMoneyType(SysOrder sysOrder){
if("0".equals(sysOrder.getOrderMoneyType())){
return true;
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
index 58b09b2f8..9776978e6 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
@@ -45,7 +45,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
private SysRecipesMapper sysRecipesMapper;
//2021-06-11之后（大于等于）成交的订单，只生成定金单食谱计划，不生成尾款食谱计划，之前成交的订单还是保持之前逻辑
- public static final LocalDate newVersionPlanStartDate = DateUtils.stringToLocalDate("2021-06-11", "yyyy-MM-dd");
+ public static final LocalDate newVersionPlanStartDate = DateUtils.stringToLocalDate("2021-06-01", "yyyy-MM-dd");
/**
* 查询食谱计划
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
index 7ff8d86ec..73c8bec76 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
@@ -113,6 +113,7 @@
and status = #{status}
and pay_type_id = #{payTypeId}
and pre_sale_id = #{preSaleId}
+ and push_pre_sale_id = #{pushPreSaleId}
and on_sale_id = #{onSaleId}
@@ -167,6 +168,7 @@
and sc.phone = #{phone}
and status = #{status}
and pay_type_id = #{payTypeId}
+ and push_pre_sale_id = #{pushPreSaleId}
and on_sale_id = #{onSaleId}
diff --git a/stdiet-ui/src/views/custom/order/index.vue b/stdiet-ui/src/views/custom/order/index.vue
index d8d1ba943..0814b0da4 100644
--- a/stdiet-ui/src/views/custom/order/index.vue
+++ b/stdiet-ui/src/views/custom/order/index.vue
@@ -88,6 +88,25 @@
+
+
+
+
+
+
+
+
-
+
-
-
-
+
-
+