new

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/OrdersIssueServiceImpl.java

@@ -88,7 +88,7 @@ public class OrdersIssueServiceImpl implements OrdersIssueService {
 		@SuppressWarnings("unchecked")
 		Map<String,Object> map = JSON.parseObject(sign, Map.class);
 		String hash = (String) map.get("sid");
-		Long currentTime = System.currentTimeMillis();
+		Long currentTime = params.getRequireTime();
 		//插入【订单表】
 		params.setPlannerId(params.getUserId());
 		params.setRequireTime(currentTime);

saicLogistics/src/main/java/com/fuzamei/web/OrdersIssueAction.java

@@ -176,6 +176,31 @@ public class OrdersIssueAction {
 		}
 	}
 	
+	/**
+	 * 
+	* @Title: generateOrderId
+	* @Description: TODO(给前端生成一个订单id号)
+	* @param @param params
+	* @param @return    设定文件
+	* @return Map<String,Object>    返回类型
+	* @author ylx
+	* @date 2018年2月5日 下午3:06:09
+	* @throws
+	 */
+	@RequestMapping(value="/generateOrderId",method=RequestMethod.POST)
+	public Map<String, Object> generateOrderId(@RequestBody Params params){
+		try {
+			String userId = req.getHeader("Authorization").split("&")[1];
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.SUPPLIER);
+			String orderId = new SimpleDateFormat("yyMMdd").format(new Date())+RandomUtil.getRandomDigits(3);
+			return JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS, orderId);
+		} catch (Exception e) {
+			return JSONUtil.getJsonMap(500, false, HintMSG.OPERATION_FAIL+":"+e.getMessage(), null);
+		}
+		
+	}
+	
+	
 	/**
 	 * 
 	* @Title: addOrder
@@ -199,8 +224,9 @@ public class OrdersIssueAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			ValidationUtil.checkBlankAndAssignString(params.getSign());//前端签名非空校验
-			params.setOrderId(ValidationUtil.checkAndAssignInt(new SimpleDateFormat("yyMMdd").format(new Date())+RandomUtil.getRandomDigits(3)));
-			orderService.checkIfHasTheSameId(ValidationUtil.checkAndAssignInt(params.getOrderId(),ORDER_ID_PATTERN));
+			ValidationUtil.checkAndAssignInt(params.getOrderId(),RegexConstant.ORDER_ID);
+			ValidationUtil.checkAndAssignLong(params.getRequireTime());//======================================>>TODO这里的时间如何保证和前端一致？
+			orderService.checkIfHasTheSameId(params.getOrderId());
 			params.setUserId(Integer.parseInt(userId));
 			UserDetail userDetail = userAuthoricationService.queryUserDetail(ValidationUtil.checkAndAssignInt(userId), Role.PLANNER);//检测当前操作用户权限
 			String partNo = ValidationUtil.checkBlankAndAssignString(params.getPartNo());