From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 22 ++--------------------
1 files changed, 2 insertions(+), 20 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 2e9c12c..a7b3c57 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
@@ -20,7 +20,6 @@
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;
@@ -30,7 +29,6 @@
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;
@@ -58,7 +56,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;
@@ -75,9 +72,6 @@
@Resource
private UserConnectHistoryMapper userConnectHistoryMapper;
-
- @Resource
- private AccountDetailsMapper accountDetailsMapper;
@Resource
private HongBaoMapper hongBaoMapper;
@@ -578,15 +572,7 @@
// 鏈�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);
+ // TODO 鎵ｉ櫎鏂颁汉绾㈠寘鎿嶄綔
AccountMessage accountMessage = new AccountMessage();
accountMessage.setContent(" 璐﹀彿鍚堝苟鎵ｉ櫎閲嶅鏂颁汉绾㈠寘" + list.get(1).getMoney().toString() + "鍏�");
@@ -902,8 +888,7 @@
// 澶囦唤鐢ㄦ埛淇℃伅
UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
- // 澶囦唤璧勯噾鏄庣粏
- List<AccountDetails> accountDetailsList = accountDetailsMapper.selectByUid(uid);
+ // TODO 澶囦唤璧勯噾鏄庣粏
// 澶囦唤绾㈠寘淇℃伅
List<HongBao> hongBaoList = hongBaoMapper.selectByUid(uid);
// 澶囦唤璁㈠崟锛屽瓙璁㈠崟淇℃伅
@@ -923,9 +908,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");
--
Gitblit v1.8.0