协议

yujian

2020-06-30 b2dea899c4ec0c038bf8e87f045b4905c8581e72

协议

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java

@@ -6,6 +6,7 @@
import java.text.ParseException;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.List;



@@ -25,18 +26,17 @@
import com.google.gson.JsonSerializer;

import com.yeshi.fanli.dto.user.UserInviteLevelEnum;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;

import com.yeshi.fanli.entity.bus.user.SMSHistory;

import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

import com.yeshi.fanli.entity.bus.user.vip.TearcherInfo;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;

import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;

import com.yeshi.fanli.entity.order.OrderMoneyDailyCount;

import com.yeshi.fanli.entity.push.DeviceActive;

import com.yeshi.fanli.entity.shop.BanLiShopOrder;

import com.yeshi.fanli.entity.system.BusinessSystem;

@@ -51,7 +51,9 @@
import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.money.UserMoneyService;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoV2Service;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderMoneyDailyCountService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.push.DeviceActiveService;

import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;

@@ -88,7 +90,6 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

import com.yeshi.fanli.util.user.UserLevelUtil;

@@ -223,6 +224,14 @@
    @Resource

    private UserVIPPreInfoService userVIPPreInfoService;



	
    @Resource

    private HongBaoV2Service hongBaoV2Service;

	
    @Resource

    private OrderMoneyDailyCountService orderMoneyDailyCountService;



	
    /**

     * 新版登录 V1.5.3

     * 

@@ -927,4 +936,75 @@
        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("注销成功"));

    }

    

	
    /**

     * 注销账户数据

     * @param acceptData

     * @param callback

     * @param uid

     * @param out

     */

    @RequestMapping("getAccountData")

    public void getAccountData(AcceptData acceptData, String callback, Long uid, PrintWriter out) {

        if (uid == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户未登录"));

            return;

        }

		
        UserInfo user = userInfoService.getUserById(uid);

        if (user == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户不存在"));

            return;

        }

		
        Date minDate = null;

        Date maxDate = null;

        long timeStamp = System.currentTimeMillis();

        Calendar calendar = Calendar.getInstance();

        calendar.setTimeInMillis(timeStamp);

		
        // 全部未到账

        minDate = new Date(0);

        maxDate = new Date(timeStamp);

        BigDecimal totalMoney = hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate);

        if (totalMoney == null) 
            totalMoney = BigDecimal.ZERO;

        totalMoney = totalMoney.add(user.getMyHongBao());

		
        // 本月预估

        maxDate = new Date(timeStamp);

        calendar = Calendar.getInstance();

        minDate = new Date(TimeUtil.convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));

        calendar.add(Calendar.MONTH, -1);

        BigDecimal monthMoney = getMoney(orderMoneyDailyCountService.query(uid, minDate, maxDate));

		
        // 上月预估

        maxDate = new Date(TimeUtil

                .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));

        calendar.add(Calendar.MONTH, -1);

        minDate = new Date(TimeUtil

                .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));

        BigDecimal lastMoney = getMoney(orderMoneyDailyCountService.query(uid, minDate, maxDate));

		
        JSONObject data = new JSONObject();

        data.put("totalMoney", totalMoney.setScale(2, BigDecimal.ROUND_DOWN));

        data.put("monthMoney", monthMoney.setScale(2, BigDecimal.ROUND_DOWN));

        data.put("lastMoney", lastMoney.setScale(2, BigDecimal.ROUND_DOWN));

        data.put("link", configService.get(ConfigKeyEnum.accountLogoutProtocolLink.getKey()));

        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

    }

	
    private BigDecimal getMoney(List<OrderMoneyDailyCount> list) {

        BigDecimal money = BigDecimal.ZERO;

        BigDecimal hundred = BigDecimal.valueOf(100);

        if (list != null && list.size() > 0) {

            for (OrderMoneyDailyCount dailyCount : list) {

                if (dailyCount.getIncome() != null)

                    money = money.add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred));

                if (dailyCount.getIncomeTeam() != null)

                    money = money.add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred));

            }

        }

        return money;

    }

}