From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java |   56 ++++++++++++--------------------------------------------
 1 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
index eb9f9c4..f9c37e6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -4,6 +4,7 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -19,18 +20,14 @@
 import com.google.gson.Gson;
 import com.qcloud.cos.model.COSObjectSummary;
 import com.qcloud.cos.model.ObjectListing;
-import com.yeshi.fanli.dao.mybatis.AccountDetailsMapper;
 import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;
 import com.yeshi.fanli.dao.mybatis.BindingAccountMapper;
 import com.yeshi.fanli.dao.mybatis.MoneyRecordMapper;
-import com.yeshi.fanli.dao.mybatis.PidOrderMapper;
-import com.yeshi.fanli.dao.mybatis.ThreeSaleMapper;
 import com.yeshi.fanli.dao.mybatis.UserConnectHistoryMapper;
 import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
 import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;
 import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;
 import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
-import com.yeshi.fanli.entity.bus.user.AccountDetails;
 import com.yeshi.fanli.entity.bus.user.AccountMessage;
 import com.yeshi.fanli.entity.bus.user.BindingAccount;
 import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
@@ -44,10 +41,9 @@
 import com.yeshi.fanli.entity.bus.user.UserConnectHistory;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.bus.user.WeiXinUser;
-import com.yeshi.fanli.entity.taobao.PidOrder;
 import com.yeshi.fanli.exception.UserAccountException;
 import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
+import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
 import com.yeshi.fanli.service.inter.msg.UserAccountMsgNotificationService;
 import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
 import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
@@ -57,7 +53,6 @@
 import com.yeshi.fanli.util.FileUtil;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.factory.AccountDetailsFactory;
 import com.yeshi.fanli.util.factory.msg.MsgAccountDetailFactory;
 import com.yeshi.fanli.util.wx.WXLoginUtil;
 
@@ -76,9 +71,6 @@
 	private UserConnectHistoryMapper userConnectHistoryMapper;
 
 	@Resource
-	private AccountDetailsMapper accountDetailsMapper;
-
-	@Resource
 	private HongBaoMapper hongBaoMapper;
 
 	@Resource
@@ -88,13 +80,8 @@
 	private OrderItemMapper orderItemMapper;
 
 	@Resource
-	private ThreeSaleMapper threeSaleMapper;
+	private ThreeSaleSerivce threeSaleSerivce;
 
-	@Resource
-	private PidOrderMapper pidOrderMapper;
-
-	@Resource
-	private HongBaoService hongBaoService;
 
 	@Resource
 	private AccountMessageMapper accountMessageMapper;
@@ -198,7 +185,7 @@
 				if (lastUser == null) {
 					if (userInfo != null) {
 						// 浣垮垎閿�鍏崇郴鐢熸晥
-						threeSaleMapper.effectThreeSale(userInfo.getId());
+						threeSaleSerivce.effective(userInfo);
 						// 鏇存柊澶村儚涓庢樀绉�
 						UserInfo updateUserInfo = new UserInfo(userInfo.getId());
 						updateUserInfo.setNickName(weiXinUser.getNickname());
@@ -274,7 +261,7 @@
 							session.removeAttribute("LAST_LOGIN_USER");
 
 							// 浣垮垎閿�鍏崇郴鐢熸晥
-							threeSaleMapper.effectThreeSale(userInfo.getId());
+							threeSaleSerivce.effective(userInfo);
 
 							return new LoginResult(LoginResult.TYPE_NORMAL, userInfo);
 						} else {// 涓や釜璐﹀彿鎷ユ湁涓嶅悓鐨刄ID
@@ -288,7 +275,7 @@
 							result.setLessUser(lastUser);
 
 							// 浣垮垎閿�鍏崇郴鐢熸晥
-							threeSaleMapper.effectThreeSale(userInfo.getId());
+							threeSaleSerivce.effective(userInfo);
 							return result;
 						}
 
@@ -499,9 +486,9 @@
 		if (!StringUtil.isNullOrEmpty(mainUser.getPhone()) && !StringUtil.isNullOrEmpty(lessUser.getPhone()))
 			throw new UserAccountException(9, "涓や釜璐﹀彿閮界粦瀹氫簡鎵嬫満鍙风爜锛岃瑙g粦鍏朵腑涓�涓�");
 
-		if (lessUser.getMyHongBao().compareTo(new BigDecimal("20")) >= 0
-				&& mainUser.getMyHongBao().compareTo(new BigDecimal("20")) > 0)
-			throw new UserAccountException(10, String.format("璐︽埛ID:%s 鐨勮祫閲戣秴杩�20鍏冿紝涓轰繚璇佽祫閲戝畨鍏ㄨ鑱旂郴瀹㈡湇鎵撻��", lessUser.getId() + ""));
+		if (lessUser.getMyHongBao().compareTo(new BigDecimal("10")) >= 0
+				&& mainUser.getMyHongBao().compareTo(new BigDecimal("10")) > 0)
+			throw new UserAccountException(10, String.format("璐︽埛ID:%s 鐨勮祫閲戣秴杩�10鍏冿紝涓轰繚璇佽祫閲戝畨鍏ㄨ鑱旂郴瀹㈡湇鎵撻��", lessUser.getId() + ""));
 
 		// 鍒ゅ畾鏄惁缁戝畾浜嗗悓涓�鏀粯瀹�
 		List<BindingAccount> mainUserAccountList = bindingAccountMapper.selectByUid(mainUser.getId());
@@ -577,15 +564,7 @@
 		// 鏈�2涓垨鑰�2涓互涓婄殑鏂颁汉绾㈠寘
 		if (addCount - subCount > 1) {
 			// 鎵i櫎涓�涓柊浜虹孩鍖�
-			AccountDetails accountDetails = new AccountDetails();
-			accountDetails.setCreateTime(TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
-			accountDetails.setExtract(null);
-			accountDetails.setMoney("-" + list.get(1).getMoney().toString());
-			accountDetails.setOrderItem(null);
-			accountDetails.setTitle(" 璐﹀彿鍚堝苟鎵i櫎閲嶅鏂颁汉绾㈠寘");
-			accountDetails.setType(AccountDetailsFactory.TUIKUAN);
-			accountDetails.setUserInfo(mainUser);
-			accountDetailsMapper.insertSelective(accountDetails);
+			// TODO 鎵i櫎鏂颁汉绾㈠寘鎿嶄綔
 
 			AccountMessage accountMessage = new AccountMessage();
 			accountMessage.setContent(" 璐﹀彿鍚堝苟鎵i櫎閲嶅鏂颁汉绾㈠寘" + list.get(1).getMoney().toString() + "鍏�");
@@ -749,9 +728,6 @@
 			updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName() + user.getId());
 			userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);
 		}
-
-		// 娣诲姞鏂颁汉绾㈠寘
-		hongBaoService.setNewUserHongBaoMyBatis(user, 1);
 	}
 
 	@Override
@@ -901,8 +877,7 @@
 		// 澶囦唤鐢ㄦ埛淇℃伅
 		UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
 
-		// 澶囦唤璧勯噾鏄庣粏
-		List<AccountDetails> accountDetailsList = accountDetailsMapper.selectByUid(uid);
+		// TODO 澶囦唤璧勯噾鏄庣粏
 		// 澶囦唤绾㈠寘淇℃伅
 		List<HongBao> hongBaoList = hongBaoMapper.selectByUid(uid);
 		// 澶囦唤璁㈠崟锛屽瓙璁㈠崟淇℃伅
@@ -910,10 +885,8 @@
 		List<OrderItem> orderItemList = orderItemMapper.selectByUid(uid);
 
 		// 澶囦唤閭�璇峰叧绯�
-		List<ThreeSale> threeSaleList = threeSaleMapper.selectByUid(uid);
+		List<ThreeSale> threeSaleList = new ArrayList<>();
 
-		// 澶囦唤鍒嗕韩璧�
-		List<PidOrder> pidOrderList = pidOrderMapper.selectByUid(uid);
 
 		FileWriter fw = null;
 		try {
@@ -922,9 +895,6 @@
 
 			fw.write("#UserInfo" + "\r\n");
 			fw.write(JsonUtil.getSimpleGsonWithDate().toJson(user) + "\r\n");
-
-			fw.write("#AccountDetails" + "\r\n");
-			fw.write(JsonUtil.getSimpleGsonWithDate().toJson(accountDetailsList) + "\r\n");
 
 			fw.write("#HongBao" + "\r\n");
 			fw.write(JsonUtil.getSimpleGsonWithDate().toJson(hongBaoList) + "\r\n");
@@ -938,8 +908,6 @@
 			fw.write("#ThreeSale" + "\r\n");
 			fw.write(JsonUtil.getSimpleGsonWithDate().toJson(threeSaleList) + "\r\n");
 
-			fw.write("#PidOrder" + "\r\n");
-			fw.write(JsonUtil.getSimpleGsonWithDate().toJson(pidOrderList) + "\r\n");
 
 			fw.close();
 

--
Gitblit v1.8.0