Browse Source

同天签单,都与上个签单时间计算,列如没有签单的情况都是新单

anderx 5 months ago
parent
commit
8a56c8ab6d

+ 8 - 10
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -671,27 +671,22 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		//最大年限设置3年
 		int max=365*3;
 		List<TOrderNew> tOrderNews = tOrderNewMapper.selectBuyerIdAndSignTime(t.getBuyerId(), t.getSignTime(), 0);
+		TOrderNew updater = new TOrderNew();
+		updater.setOrderNo(t.getOrderNo());
 		if (tOrderNews.size()>0){
 			TOrderNew tOrderNew = tOrderNews.get(tOrderNews.size() - 1);
-			if (tOrderNew.getOrderNo().equals(t.getOrderNo())){
-				if (tOrderNews.size()==1){
-					return;
-				}else {
-					tOrderNew = tOrderNews.get(tOrderNews.size() - 2);
-				}
-			}
 			Date signTime = tOrderNew.getSignTime();
 			long daysBetween = DateUtils.getDaysBetween(signTime,t.getSignTime());
 			System.out.println(daysBetween);
-			TOrderNew updater = new TOrderNew();
-			updater.setOrderNo(t.getOrderNo());
 			if (daysBetween<max){
 				updater.setNewSignUser(1);
 			}else {
 				updater.setNewSignUser(0);
 			}
-			tOrderNewMapper.update(updater);
+		}else {
+			updater.setNewSignUser(0);
 		}
+			tOrderNewMapper.update(updater);
 	}
 
 	private void pushApprovalType(TOrderNewWithBLOBs t) {
@@ -972,6 +967,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		tOrderNewMapper.update(t);
 		if (type==0){
 			t.setBuyerId(t2.getBuyerId());
+			t.setSignTime(t2.getSignTime());
 			pushNewSignUser(t);
 		}
 		return 1;
@@ -1491,6 +1487,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
 		if (orderStatus.equals(OrderNewState.QDSHJJ.getCode())) {
 			t.setBuyerId(t2.getBuyerId());
+			t.setSignTime(t2.getSignTime());
 			pushNewSignUser(t);
 		}
 		return 1;
@@ -1859,6 +1856,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		tOrderNewMapper.update(t);
 		if (confirm==3){
 			t.setBuyerId(t2.getBuyerId());
+			t.setSignTime(t2.getSignTime());
 			pushNewSignUser(t);
 		}
 		return 1;