Browse Source

开发新老客户逻辑

anderx 5 months ago
parent
commit
5c76a940ab

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -2295,7 +2295,7 @@
         where buyer_id = #{buyerId}
         and process_status > 0
         <if test="type==0">
-            and sign_time &lt; #{signTime}
+            and sign_time &lt;= #{signTime}
         </if>
         <if test="type==1">
             and sign_time &gt; #{signTime}

+ 3 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -229,7 +229,9 @@ public interface OrderNewService {
 
 	void orderNewListDownload(InputOrderNewListBo in, HttpServletResponse response);
 
-	void pushOrderPublicReleaseCount(TOrderNew e);
+    void pushNewSignUser(TOrderNew t2);
+
+    void pushOrderPublicReleaseCount(TOrderNew e);
 
 	List<TOrderNew> selectGetAll();
 

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -217,6 +217,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		}
 		Admin admin=adminMapper.selectFinanceAdminByOrderDep(t.getOrderDep());
 		orderNewService.financeCountOrderUnauditedSubtraction(t,1);
+		orderNewService.pushNewSignUser(t);
 		return c;
 	}
 	public void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,TOrderNewBo o,String adminId,Integer approval){

+ 16 - 5
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

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