超省新代驾
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
puzhibing
2023-06-01 aad87bdfab3ef685a27b3540b1114b36059c8cc7 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java


@@ -22,10 +22,7 @@


import io.swagger.annotations.ApiOperation;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.ResponseBody;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.multipart.MultipartFile;




import javax.servlet.http.HttpServletRequest;


@@ -112,7 +109,7 @@




    @ResponseBody


    @PostMapping("/base/appUser/queryNearbyDrivers")


//    @ServiceLog(name = "获取附近的司机", url = "/base/appUser/queryNearbyDrivers")


    @ServiceLog(name = "获取附近的司机", url = "/base/appUser/queryNearbyDrivers")


    @ApiOperation(value = "获取附近的司机", tags = {"用户端-首页"}, notes = "")


    @ApiImplicitParams({


            @ApiImplicitParam(value = "经度", name = "lon", required = true, dataType = "string"),


@@ -314,25 +311,16 @@


    @ResponseBody


    @PostMapping("/base/appUser/rechargeBalanceCallback")


//    @ServiceLog(name = "余额充值回调", url = "/base/appUser/rechargeBalanceCallback")


    public void rechargeBalanceCallback(HttpServletRequest request, HttpServletResponse response){


    public void rechargeBalanceCallback(@RequestBody InterfaceResponse interfaceResponse, HttpServletResponse response){


        try {


            String code = request.getParameter("code");


            String version = request.getParameter("version");


            String msg = request.getParameter("msg");


            String date = request.getParameter("date");


            String result = request.getParameter("result");


            String sign = request.getParameter("sign");


            InterfaceResponse interfaceResponse = new InterfaceResponse();


            interfaceResponse.setCode(code);


            interfaceResponse.setVersion(version);


            interfaceResponse.setMsg(msg);


            interfaceResponse.setDate(date);


            interfaceResponse.setResult(result);


            interfaceResponse.setSign(sign);


            // 验签


            boolean verify = RSASignature.validate(interfaceResponse.content(), interfaceResponse.getSign());


            if (verify) {//验签成功业务处理逻辑


                JSONObject jsonObject = JSON.parseObject(result);


                if(!"0000".equals(interfaceResponse.getCode())){


                    System.err.println("充值回调异常：" + interfaceResponse.getMsg());


                    return;


                }


                JSONObject jsonObject = JSON.parseObject(interfaceResponse.getResult());


                String merOrderId = jsonObject.getString("merOrderId");


                String orderId = jsonObject.getString("parameter1");


                appUserService.rechargeBalanceCallback(orderId, merOrderId);


@@ -553,7 +541,7 @@


            phone = phone.indexOf("+86") < 0 ? "+86" + phone : phone;


            String value = redisUtil.getValue(phone);


            if(ToolUtil.isEmpty(value) || !value.equals(code)){


                resultUtil = ResultUtil.error("验证码无效");


                return ResponseWarpper.success(ResultUtil.error("验证码无效"));


            }


            redisUtil.remove(phone);


            return ResponseWarpper.success(resultUtil);