java/SuperSaveDriving.git

			@@ -3,7 +3,6 @@
			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONObject;
			import com.supersavedriving.driver.modular.system.model.DivisionRecord;
			import com.supersavedriving.driver.modular.system.model.Driver;
			import com.supersavedriving.driver.modular.system.model.Order;
			import com.supersavedriving.driver.modular.system.model.RechargeRecord;
			import com.supersavedriving.driver.modular.system.service.IDivisionRecordService;
			@@ -56,9 +55,6 @@

			@Autowired
			private IDriverService driverService;

			@Autowired
			private RongYunUtil rongYunUtil;

			@Autowired
			private IRechargeRecordService rechargeRecordService;

			@@ -1410,15 +1410,14 @@
			new Timer().schedule(new TimerTask() {
			@Override
			public void run() {
			Order order1 = OrderServiceImpl.this.selectById(orderId);
			if(order1.getState() == 107){
			completeCollection_(order1);
			try {
			OrderServiceImpl.this.setOrderStatus(uid, orderId, payType, 108);
			}catch (Exception e){
			e.printStackTrace();
			}
			}
			}, 60000);
			}


			return ResultUtil.success();
			}

			@@ -420,6 +420,18 @@
			return ResultUtil.error("您还有正在进行的订单");
			}

			String value = redisUtil.getValue("USER" + uid);
			if(ToolUtil.isEmpty(value)){
			redisUtil.setStrValue("USER" + uid, System.currentTimeMillis() + "", 60);
			}else{
			Long s = System.currentTimeMillis() - Long.valueOf(value);
			if(s.compareTo(60000L) < 0){//1分钟
			return ResultUtil.error("数据处理中");
			}
			redisUtil.setStrValue("USER" + uid, System.currentTimeMillis() + "", 60);
			}


			String startAddress = travelOrder.getStartAddress();
			startAddress = startAddress.replaceAll("& #40;", "(");
			startAddress = startAddress.replaceAll("& #41;", ")");

	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史