Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

食谱计划生成优化

Browse Source
This commit is contained in:
xiezhijun
2021-06-21 18:38:23 +08:00
parent 81453e91ab
commit b98e56c11e
4 changed files with 49 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
View File

@ -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;

2
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
View File

@ -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");
/**
* 查询食谱计划

2
stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
View File

@ -113,6 +113,7 @@
<if test="status != null ">and status = #{status}</if>
<if test="payTypeId != null ">and pay_type_id = #{payTypeId}</if>
<if test="preSaleId != null ">and pre_sale_id = #{preSaleId}</if>
<if test="pushPreSaleId != null ">and push_pre_sale_id = #{pushPreSaleId}</if>
<if test="onSaleId != null">
and on_sale_id = #{onSaleId}
</if>
@ -167,6 +168,7 @@
<if test="phone != null and phone != ''">and sc.phone = #{phone}</if>
<if test="status != null ">and status = #{status}</if>
<if test="payTypeId != null ">and pay_type_id = #{payTypeId}</if>
<if test="pushPreSaleId != null ">and push_pre_sale_id = #{pushPreSaleId}</if>
<if test="onSaleId != null">
and on_sale_id = #{onSaleId}
</if>