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

admin

2019-09-23 0392154afd78f314386c2e6669ead9a2c89c79b4

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

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java

@@ -374,6 +374,7 @@
     * @param extract

     * @param session

     */

    //TODO 转账逻辑需要改变，固定IP

    @Transactional

    private void extractByZhiFuBao(Extract extract, AdminUser adminUser) {

        LogHelper.userErrorInfo("提现:开始通过提现-"+extract.getId());

@@ -384,7 +385,7 @@
        String uuid = UUID.randomUUID().toString().replace("-", "");

        String appName = Constant.systemCommonConfig.getProjectChineseName();

        JSONObject json = new JSONObject();

        json.put("out_biz_no", uuid);

        json.put("out_biz_no", uuid);//最长长度64位，支持英文，下划线，数字

        json.put("payee_type", "ALIPAY_LOGONID");

        json.put("payee_account", extract.getAccount());

        json.put("amount", extract.getMoney());


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java

@@ -55,14 +55,12 @@
    @Lazy

    @Resource

    private IntegralTaskClassService integralTaskClassService;

	


    @Resource

    private UserOtherMsgNotificationService userOtherMsgNotificationService;

	


    @Resource

    private ConfigService configService;

	
	


    @Override

    public Integer getTotalGoldCoin(long uid, Long cid, Integer dateType) {

@@ -149,7 +147,6 @@
        return listRecord;

    }



	
    @Override

    public List<IntegralTaskRecord> getSign7DaysRecord(long uid, Long cid) {

        List<IntegralTaskRecord> listRecord = new ArrayList<IntegralTaskRecord>();

@@ -165,8 +162,8 @@
                    }

                    date = createTime;

                    listRecord.add(record);

					
                    if(listRecord.size() >= 7)



                    if (listRecord.size() >= 7)

                        break;

                }

            }

@@ -175,7 +172,7 @@
        }

        return listRecord;

    }

	


    @Override

    public List<IntegralTaskRecord> listNotReceived(int count, long uid) {

        return integralTaskRecordMapper.listNotReceived(count, uid);

@@ -190,7 +187,7 @@
    }



    @Override

    @Transactional(rollbackFor=Exception.class)

    @Transactional(rollbackFor = Exception.class)

    public Integer receiveGoldCoinALL(Long uid) throws IntegralTaskRecordException {

        UserInfoExtra userInfoExtra = userInfoExtraService.getByUidForUpdate(uid);

        if (userInfoExtra == null)

@@ -205,21 +202,15 @@
            if (addDetail(uid, record))

                totalGoldCoin += record.getGoldCoin();

        }

		
        Integer goldCoin = userInfoExtra.getGoldCoin();

        if (goldCoin == null)

            goldCoin = 0;



        goldCoin = goldCoin + totalGoldCoin;

		
        // 更新金币

        userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), goldCoin);

		
        return goldCoin;

        userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), totalGoldCoin);



        return (userInfoExtra.getGoldCoin()==null?0:userInfoExtra.getGoldCoin()) + totalGoldCoin;

    }



    @Override	
    @Transactional(rollbackFor=Exception.class)

    @Override

    @Transactional(rollbackFor = Exception.class)

    public Integer receiveGoldCoin(Long uid, Set<Long> idList) throws IntegralTaskRecordException {

        if (idList == null || idList.size() == 0) {

            throw new IntegralTaskRecordException(1, "id为空");

@@ -229,32 +220,26 @@
        if (userInfoExtra == null) {

            throw new IntegralTaskRecordException(1, "用户信息不全");

        }

 


        Integer totalGoldCoin = 0;

        for (Long id : idList) {

            IntegralTaskRecord record = integralTaskRecordMapper.selectByPrimaryKey(id);

            if (record == null)

                continue;

			


            // 已领取

            Integer state = record.getState();

            if (state != null && state == 1) 
            if (state != null && state == 1)

                continue;

			


            if (addDetail(uid, record))

                totalGoldCoin += record.getGoldCoin();

        }

		
        Integer goldCoin = userInfoExtra.getGoldCoin();

        if (goldCoin == null)

            goldCoin = 0;



        goldCoin = goldCoin + totalGoldCoin;

		
        // 更新金币

        userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), goldCoin);

        userInfoExtraService.updateGoldCoin(userInfoExtra.getId(), totalGoldCoin);



        return goldCoin;

        return totalGoldCoin+(userInfoExtra.getGoldCoin()==null?0:userInfoExtra.getGoldCoin());

    }



    @Transactional

@@ -389,85 +374,83 @@
    public List<IntegralTaskRecord> listByUidAndTaskId(Long uid, Long taskId, int page, int count) {

        return integralTaskRecordMapper.listByUidAndTaskId(uid, taskId, (page - 1) * count, count);

    }

	
	


    @Async()

    @Override

    public void firstRebateOrderRewardBoss(Long uid, Long originUid, String beizu) {

        if (uid == null || originUid == null)

            return;

		


        String reward = configService.get("first_order_reward_boss");

        if (StringUtil.isNullOrEmpty(reward)) 
        if (StringUtil.isNullOrEmpty(reward))

            return;

        firstOrderReward(uid, originUid, Integer.parseInt(reward), "一", beizu);

    }

	


    @Async()

    @Override

    public void firstRebateOrderRewardBossSuper(Long uid, Long originUid, String beizu) {

        if (uid == null || originUid == null)

            return;

		


        String reward = configService.get("first_order_reward_boss_super");

        if (StringUtil.isNullOrEmpty(reward)) 
        if (StringUtil.isNullOrEmpty(reward))

            return;

        firstOrderReward(uid, originUid, Integer.parseInt(reward), "二", beizu);

    }

	
	


    @Async()

    @Override

    public void firstShareOrderReward(Long uid, String beizu) {

        if(uid == null)

        if (uid == null)

            return;

		


        String reward = configService.get("first_share_order_reward");

        if (StringUtil.isNullOrEmpty(reward)) 
        if (StringUtil.isNullOrEmpty(reward))

            return;

        firstOrderReward(uid, null, Integer.parseInt(reward), null, beizu);

    }

	
	


    @Async()

    @Override

    public void firstSharerOrderRewardBoss(Long uid, Long originUid, String beizu) {

        if (uid == null || originUid == null)

            return;

		


        String reward = configService.get("first_share_order_reward_boss");

        if (StringUtil.isNullOrEmpty(reward)) 
        if (StringUtil.isNullOrEmpty(reward))

            return;

        firstOrderReward(uid, originUid, Integer.parseInt(reward), "一", beizu);

    }

	
	


    /**

     * 队员首单奖励金币

     * 
     * @param uid

     * @param addGoldCoin

     * @param level 所属哪级队员

     * @param level

     *            所属哪级队员

     * @param beizu

     */

    private void firstOrderReward(Long uid, Long originUid, Integer addGoldCoin, String level, String beizu) {

        String uniqueKey = "firstOrder-"+ uid.toString();

        if (originUid != null) 
        String uniqueKey = "firstOrder-" + uid.toString();

        if (originUid != null)

            uniqueKey = uniqueKey + "-" + originUid;

		


        // 判断是否已领取

        IntegralDetail detailRecord = integralDetailService.getDetailByUniqueKey(uniqueKey);

        if (detailRecord != null)

            return;

		


        UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

        if (userInfoExtra == null) 
        if (userInfoExtra == null)

            return;

		


        Integer goldCoin = userInfoExtra.getGoldCoin();

        if (goldCoin == null)

            goldCoin = 0;

        goldCoin = goldCoin + addGoldCoin;

		


        try {

            UserInfoExtra extra = new UserInfoExtra();

            extra.setId(userInfoExtra.getId());

@@ -487,7 +470,7 @@
        detail.setUniqueKey(uniqueKey);

        detail.setCreateTime(new Date());

        integralDetailService.insertSelective(detail);

		


        // 消息

        MsgOtherRewardIntegralDTO msgOther = new MsgOtherRewardIntegralDTO();

        msgOther.setTitle("金币奖励");