From f4fa74c0347e2e82a4df10d0a4a41fa6b45c9325 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 09:34:52 +0800
Subject: [PATCH] 专题对象 清理 hibernate引入
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 150 ++++++--------------------------------------------
1 files changed, 18 insertions(+), 132 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 4e3fad1..94f15bd 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,36 +20,22 @@
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;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
-import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.LoginResult;
-import com.yeshi.fanli.entity.bus.user.MoneyRecord;
-import com.yeshi.fanli.entity.bus.user.Order;
-import com.yeshi.fanli.entity.bus.user.OrderItem;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
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.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
@@ -57,7 +44,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;
@@ -70,36 +56,16 @@
private UserInfoMapper userInfoMapper;
@Resource
- private BindingAccountMapper bindingAccountMapper;
+ private BindingAccountService bindingAccountService;
@Resource
private UserConnectHistoryMapper userConnectHistoryMapper;
@Resource
- private AccountDetailsMapper accountDetailsMapper;
-
- @Resource
- private HongBaoMapper hongBaoMapper;
-
- @Resource
- private OrderMapper orderMapper;
-
- @Resource
- private OrderItemMapper orderItemMapper;
-
- @Resource
- private ThreeSaleMapper threeSaleMapper;
-
- @Resource
- private PidOrderMapper pidOrderMapper;
-
- @Resource
- private HongBaoService hongBaoService;
+ private ThreeSaleSerivce threeSaleSerivce;
@Resource
private AccountMessageMapper accountMessageMapper;
- @Resource
- private MoneyRecordMapper moneyRecordMapper;
@Resource
private SpreadUserImgService spreadUserImgService;
@@ -198,7 +164,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 +240,7 @@
session.removeAttribute("LAST_LOGIN_USER");
// 浣垮垎閿�鍏崇郴鐢熸晥
- threeSaleMapper.effectThreeSale(userInfo.getId());
+ threeSaleSerivce.effective(userInfo);
return new LoginResult(LoginResult.TYPE_NORMAL, userInfo);
} else {// 涓や釜璐﹀彿鎷ユ湁涓嶅悓鐨刄ID
@@ -288,7 +254,7 @@
result.setLessUser(lastUser);
// 浣垮垎閿�鍏崇郴鐢熸晥
- threeSaleMapper.effectThreeSale(userInfo.getId());
+ threeSaleSerivce.effective(userInfo);
return result;
}
@@ -504,27 +470,16 @@
throw new UserAccountException(10, String.format("璐︽埛ID:%s 鐨勮祫閲戣秴杩�10鍏冿紝涓轰繚璇佽祫閲戝畨鍏ㄨ鑱旂郴瀹㈡湇鎵撻��", lessUser.getId() + ""));
// 鍒ゅ畾鏄惁缁戝畾浜嗗悓涓�鏀粯瀹�
- List<BindingAccount> mainUserAccountList = bindingAccountMapper.selectByUid(mainUser.getId());
- if (mainUserAccountList != null)
- for (int i = 0; i < mainUserAccountList.size(); i++) {
- if (mainUserAccountList.get(i).getType() == BindingAccount.TYPE_WXPAY) {
- mainUserAccountList.remove(i);
- i--;
- }
- }
- List<BindingAccount> lessUserAccountList = bindingAccountMapper.selectByUid(lessUser.getId());
- if (lessUserAccountList != null)
- for (int i = 0; i < lessUserAccountList.size(); i++) {
- if (lessUserAccountList.get(i).getType() == BindingAccount.TYPE_WXPAY) {
- lessUserAccountList.remove(i);
- i--;
- }
- }
+ BindingAccount mainUserAccount = bindingAccountService.getBindingAccountByUidAndType(mainUser.getId(),
+ BindingAccount.TYPE_ALIPAY);
+
+ BindingAccount lessUserAccount = bindingAccountService.getBindingAccountByUidAndType(lessUser.getId(),
+ BindingAccount.TYPE_ALIPAY);
+
// 鏈変笉鍚岀殑鏀粯瀹濊处鍙�
boolean hasDiffrentAlipayAccount = false;
- if (mainUserAccountList != null && mainUserAccountList.size() > 0 && lessUserAccountList != null
- && lessUserAccountList.size() > 0) {
- if (!mainUserAccountList.get(0).getAccount().equalsIgnoreCase(lessUserAccountList.get(0).getAccount()))
+ if (mainUserAccount != null && lessUserAccount != null) {
+ if (!mainUserAccount.getAccount().equalsIgnoreCase(lessUserAccount.getAccount()))
hasDiffrentAlipayAccount = true;
}
@@ -564,50 +519,8 @@
userInfoMapper.connectUser(mainUser.getId(), lessUser.getId());
// 鏌ヨ鏄惁鏈夊浣欑殑鏂颁汉绾㈠寘
- List<HongBao> list = hongBaoMapper.selectByUidAndType(mainUser.getId(), HongBao.TYPE_XINREN);
int subCount = 0;
int addCount = 0;
- for (HongBao hb : list) {
- if (hb.getMoney().compareTo(new BigDecimal(0)) > 0)
- addCount++;
- if (hb.getMoney().compareTo(new BigDecimal(0)) < 0)
- subCount++;
- }
-
- // 鏈�2涓垨鑰�2涓互涓婄殑鏂颁汉绾㈠寘
- if (addCount - subCount > 1) {
- // 鎵ｉ櫎涓�涓柊浜虹孩鍖�
- 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(" 璐﹀彿鍚堝苟鎵ｉ櫎閲嶅鏂颁汉绾㈠寘");
- accountDetails.setType(AccountDetailsFactory.TUIKUAN);
- accountDetails.setUserInfo(mainUser);
- accountDetailsMapper.insertSelective(accountDetails);
-
- AccountMessage accountMessage = new AccountMessage();
- accountMessage.setContent(" 璐﹀彿鍚堝苟鎵ｉ櫎閲嶅鏂颁汉绾㈠寘" + list.get(1).getMoney().toString() + "鍏�");
- accountMessage.setCreateTime(System.currentTimeMillis());
- accountMessage.setIsOpen(false);
- accountMessage.setSystemMsgId(0);
- accountMessage.setTitle(" 璐﹀彿鍚堝苟鎵ｉ櫎閲嶅鏂颁汉绾㈠寘");
- accountMessage.setUserInfo(mainUser);
- accountMessageMapper.insertSelective(accountMessage);
-
- userInfoMapper.subHongBaoByUid(mainUser.getId(), list.get(1).getMoney());
-
- HongBao hongBao = new HongBao(mainUser, new BigDecimal(0).subtract(list.get(1).getMoney()), null,
- HongBao.TYPE_XINREN, HongBao.STATE_YILINGQU, System.currentTimeMillis(), System.currentTimeMillis(),
- System.currentTimeMillis(), null, "璐﹀彿鍚堝苟鎵ｉ櫎");
-
- hongBaoMapper.insertSelective(hongBao);
-
- MoneyRecord moneyRecord = new MoneyRecord(mainUser, hongBao, list.get(1).getMoney(), "璐﹀彿鍚堝苟鎵ｉ櫎閲嶅鏂颁汉绾㈠寘", "璐﹀彿鍚堝苟",
- System.currentTimeMillis(), 2);
- moneyRecordMapper.insertSelective(moneyRecord);
- }
userAccountMsgNotificationService.connectSuccess(mainUser.getId(), lessUser.getId());
}
@@ -749,9 +662,6 @@
updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName() + user.getId());
userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);
}
-
- // 娣诲姞鏂颁汉绾㈠寘
- hongBaoService.setNewUserHongBaoMyBatis(user, 1);
}
@Override
@@ -901,19 +811,10 @@
// 澶囦唤鐢ㄦ埛淇℃伅
UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
- // 澶囦唤璧勯噾鏄庣粏
- List<AccountDetails> accountDetailsList = accountDetailsMapper.selectByUid(uid);
- // 澶囦唤绾㈠寘淇℃伅
- List<HongBao> hongBaoList = hongBaoMapper.selectByUid(uid);
- // 澶囦唤璁㈠崟锛屽瓙璁㈠崟淇℃伅
- List<Order> orderList = orderMapper.selectByUid(uid);
- List<OrderItem> orderItemList = orderItemMapper.selectByUid(uid);
+ // TODO 澶囦唤璧勯噾鏄庣粏
// 澶囦唤閭�璇峰叧绯�
- List<ThreeSale> threeSaleList = threeSaleMapper.selectByUid(uid);
-
- // 澶囦唤鍒嗕韩璧�
- List<PidOrder> pidOrderList = pidOrderMapper.selectByUid(uid);
+ List<ThreeSale> threeSaleList = new ArrayList<>();
FileWriter fw = null;
try {
@@ -923,23 +824,8 @@
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");
-
- fw.write("#Order" + "\r\n");
- fw.write(JsonUtil.getSimpleGsonWithDate().toJson(orderList) + "\r\n");
-
- fw.write("#OrderItem" + "\r\n");
- fw.write(JsonUtil.getSimpleGsonWithDate().toJson(orderItemList) + "\r\n");
-
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