Merge remote-tracking branch 'origin/div' into div

admin

2019-11-13 221b5c8d0de3f6b17a00d543503a79c13b28ba12

Merge remote-tracking branch 'origin/div' into div

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

@@ -167,7 +167,7 @@
        for (int i = 0; i < listAD.size(); i++) {

            FloatAD floatAD = listAD.get(i);

            FloatADTypeEnum typeEnum = floatAD.getTypeEnum();

            if (typeEnum == FloatADTypeEnum.newUserRedPack && !redPackWinNewUserService.verifyHasReward(uid)) {

            if (typeEnum == FloatADTypeEnum.newUserRedPack && !redPackWinNewUserService.verifyHasReward(uid, acceptData.getDevice())) {

                listAD.remove(i);

                i--;

                continue;


 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinNewUserServiceImpl.java

@@ -11,16 +11,19 @@


import com.yeshi.fanli.dao.mongodb.redpack.RedPackWinNewUserDao;

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

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

import com.yeshi.fanli.entity.redpack.RedPackBalance;

import com.yeshi.fanli.entity.redpack.RedPackWinNewUser;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;

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

import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;

import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;

import com.yeshi.fanli.service.inter.redpack.RedPackWinNewUserService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

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

import com.yeshi.fanli.util.factory.RedPackDetailFactory;

import com.yeshi.fanli.vo.redpack.RedPackWinDetailVO;

@@ -43,12 +46,29 @@
    @Resource

    private UserMoneyMsgNotificationService userMoneyMsgNotificationService;

    

    @Resource

    private DeviceActiveService deviceActiveService;

	
    

    @Override

    public boolean verifyHasReward(Long uid) {

    public boolean verifyHasReward(Long uid, String device) {

        try {

            if (uid == null || uid <= 0) 
                return true; // 未登录弹出

            if (StringUtil.isNullOrEmpty(device) && (uid == null || uid <= 0)) 
                return false;

			
            if (uid == null || uid <= 0) {

                DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(device);

                if (deviceActive == null) 
                    return true; // 新设备弹出

				
                Date nowTime = new Date();

                Date createTime = deviceActive.getCreateTime();

                int days = DateUtil.daysBetween2(createTime, nowTime);

                if (days >= Constant.RED_PACK_NEW_USER_DAYS) {

                    return false; // 已经超出设置天数

                }

                return true; // 未超过时间

            }

            

            RedPackBalance redPackBalance = redPackBalanceService.selectByPrimaryKey(uid);

            if (redPackBalance != null && redPackBalance.getState() != null 

@@ -62,7 +82,7 @@
            Date nowTime = new Date();

            Date firstLoginTime = userInfoExtra.getFirstLoginTime();

            int days = DateUtil.daysBetween2(firstLoginTime, nowTime);

            if (days > Constant.RED_PACK_NEW_USER_DAYS)

            if (days >= Constant.RED_PACK_NEW_USER_DAYS)

                return false; // 已经超出设置天数

            

            RedPackWinNewUser redPackWin = redPackWinNewUserDao.getByUid(uid);


 fanli/src/main/java/com/yeshi/fanli/service/inter/redpack/RedPackWinNewUserService.java

@@ -17,7 +17,7 @@
     * @param uid

     * @return

     */

    public boolean verifyHasReward(Long uid);

    public boolean verifyHasReward(Long uid, String device);



    

    


 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java

@@ -441,17 +441,17 @@
            goodsInfo = loadYuShouInfo(goodsInfo, goods, null, params.getFanLiRate(), params.getShareRate());

        }



//        if (Constant.IS_TEST) {

//            // 添加标签

//            List<ClientTextStyleVO> labels = goodsInfo.getLabels();

//            if (labels == null) 
//                labels = new ArrayList<>();

//			
//            labels.add(new ClientTextStyleVO("预售", "#FF2B4E"));

//            labels.add(new ClientTextStyleVO("爆款", "#FF2B4E"));

//            labels.add(new ClientTextStyleVO("超级划算", "#FF2B4E"));

//            goodsInfo.setLabels(labels);

//        }

        if (Constant.IS_TEST) {

            // 添加标签

            List<ClientTextStyleVO> labels = goodsInfo.getLabels();

            if (labels == null) 
                labels = new ArrayList<>();

			
            labels.add(new ClientTextStyleVO("预售", "#FF2B4E"));

            labels.add(new ClientTextStyleVO("爆款", "#FF2B4E"));

            labels.add(new ClientTextStyleVO("超级划算", "#FF2B4E"));

            goodsInfo.setLabels(labels);

        }

        

        return goodsInfo;

    }


 fanli/src/test/java/org/fanli/dynamic/Test_InviteMaterialService.java

@@ -36,8 +36,8 @@
            buff.close();



            // 图片格式

            int startPic = 118;

            int endPic = 141;

            int startPic = 246;

            int endPic = 261;

            for (int i = 0; i < list.size(); i++) {

                String text = list.get(i);

                if (startPic > endPic) {


 fanli/src/test/java/org/fanli/redpack/Test_RedPackGiveRecordService.java

New file
@@ -0,0 +1,34 @@
package org.fanli.redpack;



import org.junit.Test;



import com.yeshi.fanli.service.inter.redpack.RedPackGiveRecordService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.util.BeanUtil; 


public class Test_RedPackGiveRecordService {



    @Test

    public void overdueByPrimaryKey() {

        try {

            RedPackGiveRecordService service = BeanUtil.getBean(RedPackGiveRecordService.class);

            service.overdueByPrimaryKey(51L);

            System.out.println("test");

        } catch (Exception e) {

            e.printStackTrace();

        }

    }

	
    @Test

    public void sendBackByGiveId() {

        try {

            UserSystemCouponService service = BeanUtil.getBean(UserSystemCouponService.class);

            service.sendBackByGiveId(83L);

            System.out.println("test");

        } catch (Exception e) {

            e.printStackTrace();

        }

    }

	
	
}


 fanli/src/test/java/org/fanli/redpack/Test_RedPackWinInviteService.java

New file
@@ -0,0 +1,37 @@
package org.fanli.redpack;



import org.junit.Test;



import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService;

import com.yeshi.fanli.util.BeanUtil; 


public class Test_RedPackWinInviteService {



	
//    @Test

    public void addBrandGoods() {

        try {

            RedPackWinInviteService service = BeanUtil.getBean(RedPackWinInviteService.class);

            service.orderArriveReward(4636763L, 1 ,"440456706868591243");

            System.out.println("test");

        } catch (Exception e) {

            e.printStackTrace();

        }

    }

	
	
    @Test

    public void inviteSucceedReward() {

        try {

            RedPackWinInviteService service = BeanUtil.getBean(RedPackWinInviteService.class);

            service.inviteSucceedReward(6196870L);

            System.out.println("test");

        } catch (Exception e) {

            e.printStackTrace();

        }

    }

	
	
	
	
}


 fanli/src/test/java/org/fanli/tlj/Test_IntegralTaskRecordService.java

New file
@@ -0,0 +1,54 @@
package org.fanli.tlj;



import java.math.BigDecimal;

import java.util.List;



import org.junit.Test;



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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;

import com.yeshi.fanli.util.BeanUtil;



//@Ignore

public class Test_IntegralTaskRecordService {



	
    @Test

    public void taoLiJinRecord() {

        try {

            UserMoneyExtraService taoLiJinService = BeanUtil.getBean(UserMoneyExtraService.class);

            IntegralTaskRecordService service = BeanUtil.getBean(IntegralTaskRecordService.class);

            BigDecimal zero = new BigDecimal(0);

			
            for (int i = 1; i <= 2000; i ++) {

                List<UserMoneyExtra> listValid = taoLiJinService.listValid(i, 100);

                if (listValid == null || listValid.isEmpty()) {

                    break;

                }

				
                for (UserMoneyExtra moneyExtra: listValid) {

                    try {

                        BigDecimal tlj = moneyExtra.getTlj();

                        BigDecimal tljSelf = moneyExtra.getTljSelf();

                        service.taoLiJinExchange(moneyExtra.getUid(), tljSelf.intValue(), tlj);

						
                        moneyExtra.setTlj(zero);

                        moneyExtra.setTljSelf(zero);

                        taoLiJinService.updateByPrimaryKeySelective(moneyExtra);

                    } catch (Exception e) {

                        e.printStackTrace();

                    }

                }

            }

			
        } catch (Exception e) {

            e.printStackTrace();

        }

    }

	
	
	
	


}