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

!241 去除@JsonIgnore注解，会导致get方法取不到值

Browse Source 
Merge pull request !241 from 德仔/xzj
This commit is contained in:
德仔 2021-05-11 14:24:57 +08:00 committed by Gitee
commit 96274e3abc
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderPause.java
View File

@ -26,10 +26,10 @@ public class SysOrderPause {
/** /**
* 订单id * 订单id
*/ */
@JsonIgnore //@JsonIgnore
private Long orderId; private Long orderId;
@JsonIgnore //@JsonIgnore
private Long cusId; private Long cusId;
private String outId; private String outId;

4
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java
View File

@ -731,7 +731,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
} }
//更新服务结束时间 //更新服务结束时间
if(ChronoUnit.DAYS.between(realEndDate,serverEndDate) > 0){ if(ChronoUnit.DAYS.between(realEndDate,serverEndDate) > 0){
serverEndDate = realEndDate; //serverEndDate = realEndDate;
} }
return getEveryYearMonthPauseDay(list, serverStartDate, serverEndDate); return getEveryYearMonthPauseDay(list, serverStartDate, serverEndDate);
} }
@ -759,7 +759,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
pauseStartDate = serverStartDate; pauseStartDate = serverStartDate;
} }
if(ChronoUnit.DAYS.between(serverEndDate, pauseEndDate) > 0){ if(ChronoUnit.DAYS.between(serverEndDate, pauseEndDate) > 0){
pauseEndDate = serverEndDate; //pauseEndDate = serverEndDate;
} }
//根据暂停记录获取该条记录在每年每月的暂停天数 //根据暂停记录获取该条记录在每年每月的暂停天数
Map<String, Integer> orderYearMonthPauseDay = getEveryYearMonthDayCount(pauseStartDate, pauseEndDate, null); Map<String, Integer> orderYearMonthPauseDay = getEveryYearMonthDayCount(pauseStartDate, pauseEndDate, null);

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

@ -237,11 +237,6 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
long differDay = ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()), serverStartDate); long differDay = ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()), serverStartDate);
//检查之前食谱的结束时间和目前该订单的开始时间是否连续 //检查之前食谱的结束时间和目前该订单的开始时间是否连续
if(differDay <= 1){ if(differDay <= 1){
/*if(differDay <= 0){
serverStartDate = DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()).plusDays(1);
//更新该订单的开始时间
sysOrderService.updateOrderStartTime(sysOrder, serverStartDate);1 7 1 3 2
}*/
//判断前一个订单食谱是否满七天，不满则需要接上 //判断前一个订单食谱是否满七天，不满则需要接上
int differNum = beforeOrderLastPlan.getEndNumDay() - beforeOrderLastPlan.getStartNumDay(); int differNum = beforeOrderLastPlan.getEndNumDay() - beforeOrderLastPlan.getStartNumDay();
@ -328,9 +323,9 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
if (ChronoUnit.DAYS.between(pauseStartDate, planStartDate) > 0) { if (ChronoUnit.DAYS.between(pauseStartDate, planStartDate) > 0) {
pauseStartDate = planStartDate; pauseStartDate = planStartDate;
} }
if (ChronoUnit.DAYS.between(planEndDate, pauseEndDate) > 0) { /*if (ChronoUnit.DAYS.between(planEndDate, pauseEndDate) > 0) {
pauseEndDate = planEndDate; pauseEndDate = planEndDate;
} }*/
//判断暂停记录是否从食谱计划开始时间开始的 //判断暂停记录是否从食谱计划开始时间开始的
if (ChronoUnit.DAYS.between(pauseStartDate, planStartDate) == 0) { if (ChronoUnit.DAYS.between(pauseStartDate, planStartDate) == 0) {
planStartDate = pauseEndDate.plusDays(1); planStartDate = pauseEndDate.plusDays(1);