用户端修改 推广功能

liujie

6 天以前 9828db9febf4ad5cb0b79a72eedca6922b466104

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

@@ -26,6 +26,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.InputStream;
import java.util.Date;
@@ -39,30 +40,29 @@
@RestController
@RequestMapping("")
public class UserInfoController {

    
    @Autowired
    private IUserInfoService userInfoService;

    
    @Autowired
    private IVerifiedService verifiedService;

    
    @Autowired
    private ISmsrecordService smsrecordService;
    
    @Autowired
    private RedisTemplate redisTemplate;

    @Resource
    private RedisTemplate<String, Object> redisTemplate;
    
    @Autowired
    private WeChatUtil weChatUtil;

    
    @Autowired
    private IDriverService driverService;

    
    @Autowired
    private HttpServletRequest request;



    
    
    /**
     * 获取短信验证码
     * @param phone
@@ -106,10 +106,11 @@
            @ApiImplicitParam(value = "ip地址", name = "registIp", required = false, dataType = "String"),
            @ApiImplicitParam(value = "登录端口-小程序传Applets", name = "loginType", required = false, dataType = "String"),
            @ApiImplicitParam(value = "当前定位区县行政编号", name = "registAreaCode", required = false, dataType = "String"),
            @ApiImplicitParam(value = "司机id", name = "driverId", required = false, dataType = "int"),
    })
    public ResultUtil<LoginWarpper> captchaLogin(String phone, String code, String registIp, String registAreaCode,String loginType,String jsCode){
    public ResultUtil<LoginWarpper> captchaLogin(String phone, String code, String registIp, String registAreaCode,String loginType,String jsCode,Integer driverId){
        try {
            return userInfoService.captchaLogin(phone, code, registIp, registAreaCode,loginType);
            return userInfoService.captchaLogin(phone, code, registIp, registAreaCode,loginType,driverId);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();