修改bug

Pu Zhibing

5 天以前 5d43619275aec081d878602813fa42255c17e5ff

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java

@@ -56,6 +56,9 @@
    
    @Autowired
    private IDriverService driverService;

    @Autowired
    private IRegionService regionService;
    
    @Autowired
    private HttpServletRequest request;
@@ -353,10 +356,15 @@
            }
            UserInfo userInfo = userInfoService.selectById(uid);



            // 是否需要绑定司机
            TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", userInfo.getRegistAreaCode()).ge("startTime", new Date()).lt("endTime", new Date()).last(" limit 1"));
            TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", userInfo.getRegistAreaCode()).le("startTime", new Date()).ge("endTime", new Date()).last(" limit 1"));
            System.out.println("111232"+tDriverPromotionActivity);
            if(tDriverPromotionActivity!=null){
                System.out.println("11111");
                if(userInfo.getBindDriverId()==null || userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
                    System.out.println("222222");
                    Integer bindingDays = tDriverPromotionActivity.getBindingDays();
                    // 当前时间+绑定天数
                    Date endTime = DateUtils.addDays(new Date(), bindingDays);
@@ -365,6 +373,21 @@
                    userInfo.setBindDate(new Date());
                    userInfoService.updateById(userInfo);
                }
            }else {
                Region code = regionService.selectOne(new EntityWrapper<Region>().eq("code", userInfo.getRegistAreaCode()));
                Region region = regionService.selectById(code.getParentId());
                TDriverPromotionActivity tDriverPromotionActivity1 = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("cityCode", region.getCode()).le("startTime", new Date()).ge("endTime", new Date()).last(" limit 1"));
                if(tDriverPromotionActivity1!=null) {
                    if (userInfo.getBindDriverId() == null || userInfo.getBindExpireDate().getTime() <= System.currentTimeMillis()) {
                        Integer bindingDays = tDriverPromotionActivity1.getBindingDays();
                        // 当前时间+绑定天数
                        Date endTime = DateUtils.addDays(new Date(), bindingDays);
                        userInfo.setBindDriverId(driverId);
                        userInfo.setBindExpireDate(endTime);
                        userInfo.setBindDate(new Date());
                        userInfoService.updateById(userInfo);
                    }
                }

            }
            return ResultUtil.success();