|
|
@@ -653,11 +653,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
//计算公出统计
|
|
|
pushOrderPublicReleaseCount(t2);
|
|
|
//处理新旧订单问题
|
|
|
- if (isSubmit==1)pushNewSignUser(t2);
|
|
|
+ if (isSubmit==1)pushNewSignUser(t);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
- private void pushNewSignUser(TOrderNew t2) {
|
|
|
+ @Override
|
|
|
+ public void pushNewSignUser(TOrderNew t2) {
|
|
|
//看有没有时间后的订单,有则先处理后订单
|
|
|
List<TOrderNew> tOrderNews = tOrderNewMapper.selectBuyerIdAndSignTime(t2.getBuyerId(), t2.getSignTime(), 1);
|
|
|
for (TOrderNew tOrderNew : tOrderNews) {
|
|
|
@@ -676,8 +677,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
long daysBetween = DateUtils.getDaysBetween(signTime,t.getSignTime());
|
|
|
System.out.println(daysBetween);
|
|
|
if (daysBetween<max){
|
|
|
- t.setNewSignUser(1);
|
|
|
- tOrderNewMapper.update(t);
|
|
|
+ TOrderNew updater = new TOrderNew();
|
|
|
+ updater.setOrderNo(t.getOrderNo());
|
|
|
+ updater.setNewSignUser(1);
|
|
|
+ tOrderNewMapper.update(updater);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -957,7 +960,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
addOrderLog(tl,reason);
|
|
|
pushGeneralSendNoticeAndEmail(aids, noticeType,order, TokenManager.getAdminId(),t2.getApproval());
|
|
|
- return tOrderNewMapper.update(t);
|
|
|
+ tOrderNewMapper.update(t);
|
|
|
+ if (type==0){
|
|
|
+ pushNewSignUser(t);
|
|
|
+ }
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -1472,6 +1479,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
|
|
|
pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
|
|
|
+ if (orderStatus.equals(OrderNewState.QDSHJJ.getCode())) {
|
|
|
+ pushNewSignUser(t);
|
|
|
+ }
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -2101,6 +2111,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),order, TokenManager.getAdminId(),t.getApproval());
|
|
|
tOrderNewMapper.update(t);
|
|
|
financeCountOrderUnauditedSubtraction(t,2);
|
|
|
+ pushNewSignUser(t);
|
|
|
return 1;
|
|
|
}
|
|
|
|