导师微信调整

yujian

2020-04-27 adffbf437239d7d921f053746d9485e521ec57e0

导师微信调整

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

@@ -30,6 +30,7 @@
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.vip.TearcherInfo;

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

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

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

@@ -73,6 +74,7 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.invite.UserInviteService;

import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;

import com.yeshi.fanli.service.inter.user.vip.TearcherService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;

import com.yeshi.fanli.util.Constant;

@@ -207,6 +209,9 @@
    

    @Resource

    private CommonOrderService commonOrderService;

	
    @Resource

    private TearcherService tearcherService;

    

    

    /**

@@ -685,20 +690,13 @@
        json.put("saveMoney", saveMoney);

        json.put("earnMoney", earnMoney);

        

        json.put("tearcherTip", "我是你的导师，为你在省赚过程中解难答疑，对你一对一辅导，倾听你的需求总结并反馈给板栗快省官方运营团队，快来添加我吧。");

		
		
        String tearcherWX = "";

        String wxs = userVipConfigService.getValueByKey("tearcher_weixin_num");

        if (!StringUtil.isNullOrEmpty(wxs)) {

            String[] array = wxs.split(",");

            if (array != null && array.length > 0) {

                int pos = (int) (Math.random() * array.length);

                tearcherWX = array[pos];

            }

        TearcherInfo tearcherInfo = tearcherService.selectByUid(uid);

        if (tearcherInfo != null && !StringUtil.isNullOrEmpty(tearcherInfo.getWxID())) {

            tearcherWX = tearcherInfo.getWxID();

        }

		
        json.put("tearcherWX", tearcherWX);

        json.put("tearcherTip", "我是你的导师，为你在省赚过程中解难答疑，对你一对一辅导，倾听你的需求总结并反馈给板栗快省官方运营团队，快来添加我吧。");

        json.put("newerGongLue", configService.get(ConfigKeyEnum.newerGonglue.getKey()));

        

        // 已完成


 fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountOrderServiceImpl.java

@@ -134,12 +134,10 @@
            lastDate = TimeUtil.parse("2018-01-20");

        }



//        long min = DateUtil.dateDiffMin(lastDate, new Date());

//        if (min <= 10) { // 10分钟以内不统计

//            return;

//        }

		
        lastDate = TimeUtil.parse("2019-10-01");

        long min = DateUtil.dateDiffMin(lastDate, new Date());

        if (min <= 10) { // 10分钟以内不统计

            return;

        }

        

        Date today = new Date();

        int betweenDays = DateUtil.daysBetween2(lastDate, today);