From c12b6ec43f6c79426d6f2337f903d3c0a225e9a5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 二月 2019 10:39:01 +0800
Subject: [PATCH] 订单错误信息捕捉修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
index bd3ac09..a409971 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -10,9 +10,6 @@
 
 import javax.annotation.Resource;
 
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
 import org.hibernate.HibernateException;
 import org.hibernate.Query;
 import org.hibernate.SQLQuery;
@@ -32,10 +29,14 @@
 import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
 import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;
 import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 
 @Service
 public class ThreeSaleSerivceImpl implements ThreeSaleSerivce {
@@ -60,6 +61,11 @@
 	
 	@Resource
 	private UserInviteMsgNotificationService userInviteMsgNotificationService;
+	
+	@Resource
+	private  MsgInviteDetailService msgInviteDetailService;
+	
+	
 
 	public UserInfo getBoss(final long uid) {
 		return (UserInfo) dao.excute(new HibernateCallback<UserInfo>() {
@@ -113,6 +119,16 @@
 			threeSale.setWorker(inviteeUser);
 			threeSaleMapper.insertSelective(threeSale);
 			
+			List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), inviteeUser.getId());
+			if (listExpire != null && listExpire.size() > 0) {
+				// 鍒犻櫎澶辨晥
+				for (ThreeSale saleExpire: listExpire) {
+					msgInviteDetailService.deleteByThreeSale(saleExpire);
+				}
+				// 鍒犻櫎宸插け鏁堝叧绯�
+				threeSaleMapper.deleteExpireRecord(inviter.getId(), inviteeUser.getId());
+			}
+			
 			//鍒涘缓閫氱煡
 			userInviteMsgNotificationService.inviteScan(inviter.getId(), threeSale);
 			
@@ -142,6 +158,20 @@
 						threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
 						threeSale.setWorker(invitee);
 						threeSaleMapper.insertSelective(threeSale);
+						
+						// 鍒犻櫎宸插け鏁堝叧绯�
+						threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());
+						
+						List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), invitee.getId());
+						if (listExpire != null && listExpire.size() > 0) {
+							// 鍒犻櫎鍘嗗彶閫氱煡
+							for (ThreeSale saleExpire: listExpire) {
+								msgInviteDetailService.deleteByThreeSale(saleExpire);
+							}
+							// 鍒犻櫎宸插け鏁堝叧绯�
+							threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());
+						}
+						
 						userInviteMsgNotificationService.inviteScan(inviter.getId(), threeSale);
 						// threeSaleSerivce.bind(invitee, inviter);
 
@@ -624,7 +654,22 @@
 			threeSale.setCreateTime(java.lang.System.currentTimeMillis());
 			threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
 			threeSaleMapper.insertSelective(threeSale);
+			
+			
 		}
+		
+		List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), invitee.getId());
+		if (listExpire != null && listExpire.size() > 0) {
+			// 鍒犻櫎鍘嗗彶閫氱煡
+			for (ThreeSale saleExpire: listExpire) {
+				msgInviteDetailService.deleteByThreeSale(saleExpire);
+			}
+			// 鍒犻櫎宸插け鏁堝叧绯�
+			threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());
+		}
+		
+		// 閭�璇锋秷鎭�
+		userInviteMsgNotificationService.inviteSuccess(inviter.getId(), threeSale);
 
 	}
 	

--
Gitblit v1.8.0