From e3732fa01883aa7a93f7398e39b01b0009155b06 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期四, 14 三月 2019 09:46:36 +0800 Subject: [PATCH] 等级代码调整 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 67 --------------------------------- 1 files changed, 0 insertions(+), 67 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 a7b3c57..5861246 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 @@ -22,30 +22,22 @@ 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.PidOrderMapper; 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.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.ForbiddenUserIdentifyCodeService; @@ -74,9 +66,6 @@ private UserConnectHistoryMapper userConnectHistoryMapper; @Resource - private HongBaoMapper hongBaoMapper; - - @Resource private OrderMapper orderMapper; @Resource @@ -86,15 +75,7 @@ private ThreeSaleSerivce threeSaleSerivce; @Resource - private PidOrderMapper pidOrderMapper; - - @Resource - private HongBaoService hongBaoService; - - @Resource private AccountMessageMapper accountMessageMapper; - @Resource - private MoneyRecordMapper moneyRecordMapper; @Resource private SpreadUserImgService spreadUserImgService; @@ -559,42 +540,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) { - // 鎵i櫎涓�涓柊浜虹孩鍖� - // TODO 鎵i櫎鏂颁汉绾㈠寘鎿嶄綔 - - AccountMessage accountMessage = new AccountMessage(); - accountMessage.setContent(" 璐﹀彿鍚堝苟鎵i櫎閲嶅鏂颁汉绾㈠寘" + list.get(1).getMoney().toString() + "鍏�"); - accountMessage.setCreateTime(System.currentTimeMillis()); - accountMessage.setIsOpen(false); - accountMessage.setSystemMsgId(0); - accountMessage.setTitle(" 璐﹀彿鍚堝苟鎵i櫎閲嶅鏂颁汉绾㈠寘"); - 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, "璐﹀彿鍚堝苟鎵i櫎"); - - hongBaoMapper.insertSelective(hongBao); - - MoneyRecord moneyRecord = new MoneyRecord(mainUser, hongBao, list.get(1).getMoney(), "璐﹀彿鍚堝苟鎵i櫎閲嶅鏂颁汉绾㈠寘", "璐﹀彿鍚堝苟", - System.currentTimeMillis(), 2); - moneyRecordMapper.insertSelective(moneyRecord); - } userAccountMsgNotificationService.connectSuccess(mainUser.getId(), lessUser.getId()); } @@ -736,9 +683,6 @@ updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName() + user.getId()); userInfoMapper.updateByPrimaryKeySelective(updateUserInfo); } - - // 娣诲姞鏂颁汉绾㈠寘 - hongBaoService.setNewUserHongBaoMyBatis(user, 1); } @Override @@ -889,17 +833,12 @@ UserInfo user = userInfoMapper.selectByPrimaryKey(uid); // TODO 澶囦唤璧勯噾鏄庣粏 - // 澶囦唤绾㈠寘淇℃伅 - List<HongBao> hongBaoList = hongBaoMapper.selectByUid(uid); // 澶囦唤璁㈠崟锛屽瓙璁㈠崟淇℃伅 List<Order> orderList = orderMapper.selectByUid(uid); List<OrderItem> orderItemList = orderItemMapper.selectByUid(uid); // 澶囦唤閭�璇峰叧绯� List<ThreeSale> threeSaleList = new ArrayList<>(); - - // 澶囦唤鍒嗕韩璧� - List<PidOrder> pidOrderList = pidOrderMapper.selectByUid(uid); FileWriter fw = null; try { @@ -909,9 +848,6 @@ fw.write("#UserInfo" + "\r\n"); fw.write(JsonUtil.getSimpleGsonWithDate().toJson(user) + "\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"); @@ -920,9 +856,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