bug修改

liujie

昨天 ea1868377e45a89c552021944fd42ed24ad45ae1

bug修改

 cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java

@@ -92,6 +92,8 @@
                } else {
                    indexOfUserBenefirVo.setVipEndTime("");
                }
            }else{
                indexOfUserBenefirVo.setVipEndTime("");
            }
            return ResultUtil.success(indexOfUserBenefirVo);
        } catch (Exception e) {

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java

@@ -770,7 +770,7 @@
        benefirVo.setUserName(appUser.getName());
        benefirVo.setWpCoin(ToolUtil.isEmpty(appUser.getPlayPaiCoins()) ? 0 : appUser.getPlayPaiCoins());
        benefirVo.setUserIntegral(ToolUtil.isEmpty(appUser.getIntegral()) ? 0 : appUser.getIntegral());
        if (appUser.getIsVip() == 1) {
        if (appUser.getIsVip()!=null&& appUser.getIsVip() == 1) {
            benefirVo.setIsMember("年度会员");
        } else {
            benefirVo.setIsMember("普通用户");

 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java

@@ -852,7 +852,8 @@
        }
        List<UserCoupon> userCoupons = new ArrayList<>();
        if (ids.size() > 0) {
            userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId).in("couponId", ids));
            userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId).in("couponId", ids)
                    .ne("status",3));
        }
        if (pointsMerchandises.size() > 0) {
            for (UserPointsMerchandise pointsMerchandise : pointsMerchandises) {

 cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java

@@ -375,6 +375,13 @@
        List<VipDetail> list = vipDetailService.lambdaQuery().eq(VipDetail::getVipPaymentId, id).list();
        for (VipDetail vipDetail : list) {
            vipDetail.setStatus(3);
            if (vipDetail.getType()==1){
                // 将优惠券修改为过期
                UserCoupon userCoupon = userCouponService.getById(vipDetail.getUserCouponId());
                userCoupon.setUserId(null);
                userCoupon.setStatus(3);
                userCouponService.updateById(userCoupon);
            }
        }
        vipDetailService.updateBatchById(list);
    }

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java

@@ -277,6 +277,9 @@
                    if (userCoupon.getStatus() == 2) {
                        packageResp.setUseStatus(2);
                    }
                    if (userCoupon.getStatus() == 3) {
                        packageResp.setUseStatus(3);
                    }
                    respList.add(packageResp);
                }
                if (null != req.getCouponType()) {

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java

@@ -60,9 +60,6 @@
    private StudentHonorClient studentHonorClient;





    /**
     * 获取参赛人员名次信息
     * @param entrantRank
@@ -224,10 +221,6 @@
            }
            mapList.add(map);
        }






//        if(worldCupRank.getSort() == 1){
@@ -1051,8 +1044,7 @@
    @Override
    public List<WorldCupCodeListVo> getWorldCupCodeListId(Integer worldCupId) {
        List<WorldCupCompetitor> worldCupCompetitors = this.baseMapper.selectList(new LambdaQueryWrapper<WorldCupCompetitor>().eq(WorldCupCompetitor::getWorldCupId, worldCupId)
                        .and(w->w.isNull(WorldCupCompetitor::getEndTime).or(s->s.le(WorldCupCompetitor::getStartTime, new Date()).ge(WorldCupCompetitor::getEndTime, new Date()))))
             ;
                .and(w -> w.isNull(WorldCupCompetitor::getEndTime).or(s -> s.le(WorldCupCompetitor::getStartTime, new Date()).ge(WorldCupCompetitor::getEndTime, new Date()))));
        List<WorldCupCodeListVo> worldCupCodeListVos = new ArrayList<>();

        // worldCupCompetitors 通过code分组

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java

@@ -236,7 +236,9 @@
            map.put("space_id", tGame.getSiteId() + "");
            map.put("red_sutu_id", tGame.getRed());
            map.put("blue_sutu_id", tGame.getBlue());
            map.put("api_url", "https://online.daowepark.com:443/communityWorldCup/base/worldCup/endWorldCupCallback");
//            map.put("api_url", "https://online.daowepark.com:443/communityWorldCup/base/worldCup/endWorldCupCallback");
            map.put("api_url", "http://221.182.45.100:1234/communityWorldCup/base/worldCup/endWorldCupCallback");

            map.put("custom", jsonObject.toJSONString());

            String s = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/quickStart", map);