修改bug

Pu Zhibing

2025-08-05 5d9b1aace5a7e02768ab2caf860db4ed095bb4d9

修改bug

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

@@ -3,13 +3,11 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.common.constant.JwtConstants;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.account.server.UserWithdrawalService;
import com.stylefeng.guns.modular.account.util.OssUploadUtil;
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.model.TDriverPromotionActivity;
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.model.UserWithdrawal;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.WeChatUtil;
@@ -60,6 +58,8 @@
    
    @Autowired
    private HttpServletRequest request;
    
    private String salt = "&a.s";

    @Autowired
    private TDriverPromotionActivityService driverPromotionActivityService;
@@ -860,4 +860,44 @@
            return ResultUtil.runErr();
        }
    }
    
    
    /**
     * 代驾系统添加用户接口
     * @param phone
     * @return
     */
    @ResponseBody
    @GetMapping("/base/user/addAppUser")
    public String addAppUser(String phone, String code, String areaCode){
        try {
            return userInfoService.addAppUser(phone, code, areaCode);
        }catch (Exception e){
            e.printStackTrace();
        }
        return null;
    }
    
    /**
     * 代驾系统验证短信验证码
     * @param phone
     * @param code
     * @param request
     * @return
     */
    @ResponseBody
    @PostMapping("/base/user/checkCaptcha")
    public Boolean checkCaptcha1(String phone, String code, HttpServletRequest request){
        try {
            String device = request.getHeader("device");
            if(ToolUtil.isEmpty(device)){
                return false;
            }
            boolean b = userInfoService.checkCaptcha(phone, code);
            return b;
        }catch (Exception e){
            e.printStackTrace();
            return false;
        }
    }
}

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -2230,7 +2230,7 @@
            }else{
                //拉起支付
                TradePayOff1Data tradePayOff1Data = new TradePayOff1Data();
                tradePayOff1Data.setPartnerPayId("PR" + orderPrivateCar.getId());
                tradePayOff1Data.setPartnerPayId(orderPrivateCar.getTravelId());
                tradePayOff1Data.setTotalFee(Double.valueOf(orderMoney * 100).intValue() + "");
                tradePayOff1Data.setRetUrl(path);
                tradePayOff1Data.setClientIp(ip);

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java

@@ -236,6 +236,11 @@
    ResultUtil reissueCoupon() throws Exception;

    ResultUtil<LoginWarpper> wxLoginIsBind(String jscode);


    
    /**
     * 代驾系统添加用户接口
     * @param phone
     * @return
     */
    String addAppUser(String phone, String code, String areaCode) throws Exception;
}

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java

@@ -1633,4 +1633,59 @@
        }
        return ResultUtil.success(loginWarpper);
    }
    
    
    @Override
    public String addAppUser(String phone, String code, String areaCode) throws Exception {
        UserInfo userInfo = userInfoMapper.queryByPhone(phone);
        String nickName = null;
        if (null == userInfo) {
            nickName = this.getDefaultName();
        } else {
            nickName = userInfo.getNickName();
        }
        //调中台接口查询用户
        List<QYTUserInfo> infoByPhone = UserUtil.getUserInfoByPhone(phone);
        String onconUUID = null;
        if (null == infoByPhone || infoByPhone.isEmpty()) {
            RegisterViaMobileRequest request = new RegisterViaMobileRequest();
            request.setMobile(phone);
            request.setEncryptType("aesbase64");
            request.setPassword(AESUtils.encryptBase64("123456"));
            request.setNickname(nickName);
            request.setVerify_code(code);
            request.setVerify_code_type("0");
            RegisterViaMobile register = UserUtil.registerViaMobile(request);
            if (!"0".equals(register.getStatus())) {
                return null;
            }
            onconUUID = register.getOnconUUID();
        }
    
        if (null == userInfo) {
            userInfo = new UserInfo();
            userInfo.setPhone(phone);
            userInfo.setPassWord(ShiroKit.md5("", salt));
            userInfo.setNickName(nickName);
            userInfo.setIsAuth(1);
            userInfo.setConsumption(0D);
            userInfo.setBalance(0D);
            userInfo.setState(1);
            if(null != onconUUID){
                userInfo.setOnconUUID(onconUUID);
            }
        
            //用户所属企业
            if(null != areaCode){
                Company query = companyCityService.query(areaCode);
                userInfo.setCompanyId(null != query ? query.getId() : 1);
                userInfo.setRegistAreaCode(areaCode);
            }else {
                userInfo.setCompanyId(1);
            }
        
            this.insert(userInfo);
        }
        return userInfo.getId().toString();
    }
}

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -1641,7 +1641,7 @@
            }else{
                //拉起支付
                TradePayOff1Data tradePayOff1Data = new TradePayOff1Data();
                tradePayOff1Data.setPartnerPayId("PR" + orderTaxi.getId());
                tradePayOff1Data.setPartnerPayId(orderTaxi.getTravelId());
                tradePayOff1Data.setTotalFee(Double.valueOf(orderMoney * 100).intValue() + "");
                tradePayOff1Data.setRetUrl(path);
                tradePayOff1Data.setClientIp(ip);

 UserQYTTravel/guns-admin/src/main/resources/application.yml

@@ -52,7 +52,7 @@
eureka:
  client:
    service-url: #注册中心地址
      defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
      defaultZone: http://sinata:sinata@192.168.110.111:8000/eureka #启用身份验证的方式连接
    register-with-eureka: true #在注册中心进行注册
    fetch-registry: true #从Eureka中获取注册信息。