UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -219,7 +219,7 @@ tradeTerminalInfo.setMac(macAddress.toString()); ZLUserInfo userInfo1 = ZhengLianUtil.getUserInfo(driverRide.getEmpId().toString(), tradeTerminalInfo); if(null != userInfo){ if(null != userInfo1){ driverRide.setCustId(userInfo1.getCustId()); driverRide.setAccOpenFlag(userInfo1.getAccOpenFlag()); driverRideService.updateById(driverRide); UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java
@@ -965,6 +965,9 @@ request1.setCustomerId(userInfo.getOnconUUID()); request1.setOrderNo("SF" + orderRide1.getId()); ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request1); if(travelItineraryList.getList().isEmpty()){ return; } TravelItinerary travelItinerary = travelItineraryList.getList().get(0); if(travelItinerary.getStatus() != 7 || Arrays.asList(3, 11).contains(travelItinerary.getOrderStatus())){ GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest(); @@ -1061,14 +1064,28 @@ //todo 推送 /*司机接单给用户发送消息*/ OrderRide orderRide=orderRideService.selectOne(new EntityWrapper<OrderRide>().eq("travelId",orderId)); if(orderRide!=null) { pushUtil.pushOrderState(1, orderRide.getUserId(), orderRide.getId(), 8, 6, null); } // if(orderRide!=null) { // pushUtil.pushOrderState(1, orderRide.getUserId(), orderRide.getId(), 8, 6, null); // } //取消乘客订单 if(orderRide!=null && orderRide.getState()!=6){ orderRide.setTuiMoney(orderRide.getMoney()); orderRideService.updateById(orderRide); userCancelTuik(orderRide); // orderRide.setTuiMoney(orderRide.getMoney()); // orderRideService.updateById(orderRide); // userCancelTuik(orderRide); orderRide.setState(2); orderRide.setTravelId(null); orderRide.setDriverId(null); orderRideService.updateAllColumnById(orderRide); if(null != orderRide.getZttravelId()){ //中台修改订单状态 ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest(); request.setOrderId(orderRide.getZttravelId()); request.setStatus(getState(orderRide.getState())); if (null != orderRide.getDriverId()) { request.setDriverId(driverRide.getEmpId().toString()); } OrderUtil.modifyTravelItinerary(request); } } return ResultUtil.success(""); UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -17,6 +17,7 @@ import com.stylefeng.guns.modular.system.service.*; import com.stylefeng.guns.modular.system.util.*; import com.stylefeng.guns.modular.system.util.qianyuntong.AESUtils; import com.stylefeng.guns.modular.system.util.qianyuntong.QianYunTongConfig; import com.stylefeng.guns.modular.system.util.qianyuntong.SMSUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil; import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTUserInfo; @@ -124,6 +125,9 @@ @Autowired private PayMoneyUtil payMoneyUtil; @Autowired private QianYunTongConfig qianYunTongConfig; @@ -343,7 +347,10 @@ request.setEncryptType("aesbase64"); request.setPassword(AESUtils.encryptBase64("123456")); request.setNickname(nickName); RegisterViaMobile register = UserUtil.registerViaMobile(request); request.setAppid(qianYunTongConfig.getAppid()); // request.setVerify_code("@&^%~%"); // request.setVerify_code_type("0"); RegisterViaMobile register = UserUtil.registerViaMobileNoCode(request); if (!"0".equals(register.getStatus())) { return ResultUtil.error(register.getDesc()); } @@ -683,7 +690,10 @@ request.setEncryptType("aesbase64"); request.setPassword(AESUtils.encryptBase64("123456")); request.setNickname(nickName); RegisterViaMobile register = UserUtil.registerViaMobile(request); request.setAppid(qianYunTongConfig.getAppid()); // request.setVerify_code("@&^%~%"); // request.setVerify_code_type("0"); RegisterViaMobile register = UserUtil.registerViaMobileNoCode(request); if (!"0".equals(register.getStatus())) { return ResultUtil.error(register.getDesc()); } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
@@ -19,6 +19,10 @@ */ private String appkey; /** * appid */ private String appid; /** * 私钥地址 */ private String privateKeyPath; @@ -157,9 +161,18 @@ this.secretKey = secretKey; } public String getAppid() { return appid; } public void setAppid(String appid) { this.appid = appid; } public QianYunTongConfig getQianYunTongConfig() { if("dev".equals(activeProfile)){ this.appkey = "10001104"; this.appId = "yx_8vlsvdfxgtcufjx8"; this.privateKeyPath = "E:\\项目文档\\黔云通\\private_key_test.pem"; this.userName = "xiaofei"; this.status = "1"; @@ -173,6 +186,7 @@ } if("test".equals(activeProfile)){ this.setAppkey("10001104"); this.appid = "yx_8vlsvdfxgtcufjx8"; this.setPrivateKeyPath("/etraffic/server/private_key_test.pem"); this.setUserName("xiaofei"); this.setStatus("1"); @@ -186,6 +200,7 @@ } if("prod".equals(activeProfile)){ this.setAppkey("10001104"); this.appid = "yx_mdkrc2i9jcyvaggi"; this.setPrivateKeyPath("/etraffic/server/private_key.pem"); this.setUserName("xiwang"); this.setStatus("1"); UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
@@ -180,6 +180,52 @@ } return jsonObject.getObject("object", RegisterViaMobile.class); } /** * 根据手机号注册用户 * * @param request * @return */ public static RegisterViaMobile registerViaMobileNoCode(RegisterViaMobileRequest request) { //请求路径 String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/m1_register_via_mobile"; //私钥文件 String skprivateKeyFile = qianYunTongConfig.getPrivateKeyPath(); //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密 String appKey = qianYunTongConfig.getAppkey();//appkey Map<String, String> headers = new HashMap<>(); headers.put("Content-Type", "application/json"); Map<String, Object> contentMap = new HashMap<String, Object>(); Date nowdate = new Date(); SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss"); String timeStamp = date.format(nowdate); String messageId = UUID.randomUUID().toString().replaceAll("-", ""); contentMap.put(SystemParameterNames.getAppKey(), appKey); contentMap.put(SystemParameterNames.getMessage_id(), messageId); contentMap.put(SystemParameterNames.getUserName(), qianYunTongConfig.getUserName()); contentMap.put(SystemParameterNames.getStatus(), qianYunTongConfig.getStatus()); contentMap.put("content", new Gson().toJson(request)); log.info("【根据手机号注册用户】请求地址:" + url); log.info("【根据手机号注册用户】请求参数:" + JSON.toJSONString(contentMap)); String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap); log.info("【根据手机号注册用户】请求结果:" + result); JSONObject jsonObject = JSON.parseObject(result); String retCode = jsonObject.getString("retCode"); if (!"0".equals(retCode)) { log.error("【根据手机号注册用户】请求失败:" + result); throw new RuntimeException("【根据手机号注册用户】请求失败:" + result); } JSONObject object = jsonObject.getJSONObject("object"); String status = object.getString("status"); if (!"0".equals(status)) { log.error("【根据手机号注册用户】失败:" + object.toJSONString()); throw new RuntimeException("【根据手机号注册用户】失败:" + object.toJSONString()); } return jsonObject.getObject("object", RegisterViaMobile.class); } /** UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/RegisterViaMobileRequest.java
@@ -13,6 +13,9 @@ */ private String mobile; /** */ private String appid; /** * 客户端appid */ private String appId;
