DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.modular.account.service.ITEnterpriseWithdrawalService; @@ -137,14 +138,13 @@ types=2; // return ResultUtil.error("您提交的申请正在处理中"); } //获取支付金额 // Double aDouble = orderService.queryReassignMoney(reassign.getOrderId(), reassign.getOrderType()); // reassign.setMoney(aDouble); // reassign.setOriginalDriverId(uid); // reassign.setOriginalCarId(driver.getCarId()); // reassign.setInsertTime(new Date()); // this.insert(reassign); Double aDouble = orderService.queryReassignMoney(reassign.getOrderId(), reassign.getOrderType()); reassign.setMoney(aDouble); reassign.setOriginalDriverId(uid); reassign.setOriginalCarId(driver.getCarId()); reassign.setInsertTime(new Date()); this.insert(reassign); // systemNoticeService.addSystemNotice(2, "您的改派申请已成功提交，我们会尽快为你处理！", uid, 1); //开始支付 @@ -284,6 +284,7 @@ Driver driver = driverService.selectById(uid); //修改改派通知状态 switch (reassign.getOrderType()) { case 1: OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(reassign.getOrderId()); orderPrivateCar.setState(orderPrivateCar.getOldState()); @@ -322,6 +323,7 @@ OrderUtil.modifyTravelItinerary(request1); break; } reassignMapper.delete(new EntityWrapper<Reassign>().eq("orderId",reassign.getOrderId()).eq("orderType",reassign.getOrderType())); return ResultUtil.success(); }
@@ -58,8 +58,8 @@ this.merchNo = "B00000871"; this.encrpNo = "1055490595"; this.signNo = "1066348524"; this.cer = "C:\\Users\\39373\\Desktop\\黔云通\\UAT-demo-公用\\1055490595.cer"; this.sm2 = "C:\\Users\\39373\\Desktop\\黔云通\\UAT-demo-公用\\871_111111.sm2"; this.cer = "C:\\Users\\Admin\\Desktop\\qyt\\1055490595.cer"; this.sm2 = "C:\\Users\\Admin\\Desktop\\qyt\\871_111111.sm2"; this.password = "111111"; } if("test".equals(activeProfile)){ MessagePushTravel/src/main/java/com/sinata/push/controller/NettyController.java
@@ -27,15 +27,15 @@ */ @ResponseBody @PostMapping("/sendMsgToClient") public String sendMsgToClient(Integer id, Integer type, String msg){ public String sendMsgToClient(Integer id, Integer type, String msg,String bussinessType){ System.out.println("推送参数：" + id + "---" + type + "---" + msg); if(type == 1){//用户端 ChannelHandlerContext channel = NettyChannelMap.getData("Applets" + id);//小程序 ChannelHandlerContext channel = NettyChannelMap.getData(bussinessType+":Applets" + id);//小程序 if(null != channel){ NettyWebSocketController.sendMsgToClient(channel, msg); return JSON.toJSONString(ResultUtil.success()); } channel = NettyChannelMap.getData("USER" + id); channel = NettyChannelMap.getData(bussinessType+":USER" + id); if(null != channel){ NettyServerController.sendMsgToClient(channel, msg); return JSON.toJSONString(ResultUtil.success()); @@ -46,7 +46,7 @@ if(type == 2){//司机端 System.out.println("长链接实例：" + JSON.toJSONString(NettyChannelMap.map)); ChannelHandlerContext channel = NettyChannelMap.getData("DRIVER" + id); ChannelHandlerContext channel = NettyChannelMap.getData(bussinessType+":DRIVER" + id); if(null != channel){ NettyServerController.sendMsgToClient(channel, msg); return JSON.toJSONString(ResultUtil.success()); MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java
@@ -8,9 +8,9 @@ /** * 业务网关接口地址 */ String zuul = "http://192.168.110.111:5000"; String zuul = "http://192.168.110.85:5000"; /** * 业务网关接口地址 */ String aj_zuul = "http://192.168.110.111:5000"; String aj_zuul = "http://192.168.110.106:3002"; } MessagePushTravel/src/main/java/com/sinata/push/util/applets/NettyWebSocketController.java
@@ -79,7 +79,7 @@ String token = jsonCon.getString("token"); String userId1 = jsonCon.getString("userId"); String businessType = jsonCon.getString("businessType");//1：打车，2=代驾 String business = "1".equals(businessType) ? "dache" : "daijia"; String business = "2".equals(businessType) ? "daijia" : "dache"; if (StringUtil.isNotEmpty(userId1)) { //确保账号在单个设备上登录 if (StringUtil.isNotEmpty(token)) { MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java
@@ -96,7 +96,7 @@ String device = jsonCon.getString("device"); String version = jsonCon.getString("version"); String businessType = jsonCon.getString("businessType");//1：打车，2=代驾 String business = "1".equals(businessType) ? "dache" : "daijia"; String business = "2".equals(businessType) ? "daijia" : "dache"; if(StringUtil.isNotEmpty(userId1)){ //判断用户或者司机长连接 @@ -169,7 +169,7 @@ if(method.equals(Method.location)){ Integer driverId = jsonCon.getInteger("driverId"); String businessType = jsonCon.getString("businessType");//1：打车，2=代驾 String business = "1".equals(businessType) ? "dache" : "daijia"; String business = "2".equals(businessType) || null==businessType ? "daijia" : "dache"; String fluid_control = redisUtil.getValue(business + ":location_" + driverId); if(!StringUtils.hasLength(fluid_control)){
