From c9f28b430799cc8d40c7a7d99fd0f0eeecff6a5c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 14:26:10 +0800
Subject: [PATCH] 删除老版密码输入错误的相关代码
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 56 ++++++++++----------------------------------------------
1 files changed, 10 insertions(+), 46 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 a2f9f89..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
@@ -21,18 +21,12 @@
import com.qcloud.cos.model.COSObjectSummary;
import com.qcloud.cos.model.ObjectListing;
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.UserConnectHistoryMapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
-import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;
-import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
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.LoginResult;
-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;
@@ -41,6 +35,7 @@
import com.yeshi.fanli.log.LogHelper;
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;
@@ -61,25 +56,16 @@
private UserInfoMapper userInfoMapper;
@Resource
- private BindingAccountMapper bindingAccountMapper;
+ private BindingAccountService bindingAccountService;
@Resource
private UserConnectHistoryMapper userConnectHistoryMapper;
@Resource
- private OrderMapper orderMapper;
-
- @Resource
- private OrderItemMapper orderItemMapper;
-
- @Resource
private ThreeSaleSerivce threeSaleSerivce;
-
@Resource
private AccountMessageMapper accountMessageMapper;
- @Resource
- private MoneyRecordMapper moneyRecordMapper;
@Resource
private SpreadUserImgService spreadUserImgService;
@@ -484,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;
}
@@ -837,13 +812,9 @@
UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
// TODO 澶囦唤璧勯噾鏄庣粏
- // 澶囦唤璁㈠崟锛屽瓙璁㈠崟淇℃伅
- List<Order> orderList = orderMapper.selectByUid(uid);
- List<OrderItem> orderItemList = orderItemMapper.selectByUid(uid);
// 澶囦唤閭�璇峰叧绯�
List<ThreeSale> threeSaleList = new ArrayList<>();
-
FileWriter fw = null;
try {
@@ -853,15 +824,8 @@
fw.write("#UserInfo" + "\r\n");
fw.write(JsonUtil.getSimpleGsonWithDate().toJson(user) + "\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.close();
--
Gitblit v1.8.0