正式数据库修改

admin

2019-03-13 69bee82b81626b82b7f39f0e459e4f56b1699b51

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -20,17 +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.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,8 @@
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;

@@ -58,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;



@@ -77,9 +71,6 @@
   private UserConnectHistoryMapper userConnectHistoryMapper;



   @Resource

   private AccountDetailsMapper accountDetailsMapper;



   @Resource

   private HongBaoMapper hongBaoMapper;



   @Resource

@@ -91,11 +82,6 @@
   @Resource

   private ThreeSaleSerivce threeSaleSerivce;



   @Resource

   private PidOrderMapper pidOrderMapper;



   @Resource

   private HongBaoService hongBaoService;



   @Resource

   private AccountMessageMapper accountMessageMapper;

@@ -578,15 +564,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() + "元");

@@ -750,9 +728,6 @@
         updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName() + user.getId());

         userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);

      }



      // 添加新人红包

      hongBaoService.setNewUserHongBaoMyBatis(user, 1);

   }



   @Override

@@ -902,8 +877,7 @@
      // 备份用户信息

      UserInfo user = userInfoMapper.selectByPrimaryKey(uid);



      // 备份资金明细

      List<AccountDetails> accountDetailsList = accountDetailsMapper.selectByUid(uid);

      // TODO 备份资金明细

      // 备份红包信息

      List<HongBao> hongBaoList = hongBaoMapper.selectByUid(uid);

      // 备份订单，子订单信息

@@ -913,8 +887,6 @@
      // 备份邀请关系

      List<ThreeSale> threeSaleList = new ArrayList<>();



      // 备份分享赚

      List<PidOrder> pidOrderList = pidOrderMapper.selectByUid(uid);



      FileWriter fw = null;

      try {

@@ -923,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");

@@ -939,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();