new

saicLogistics/src/main/java/com/fuzamei/mapper/CargoConsignMapper.xml

@@ -79,7 +79,7 @@
 		on 
 			o.status_id=s.status_id
 		<where>
-			o.carrier_id=#{carrierId}
+			o.carrier_id=#{userId}
 			<if test="orderId!=null">
 				and o.order_id=#{orderId}
 			</if>

saicLogistics/src/main/java/com/fuzamei/util/ValidationUtil.java

@@ -939,6 +939,92 @@ public class ValidationUtil {
 		}
 	}
 	
+	/**
+	 * 
+	* @Title: checkNullString
+	* @Description: TODO(检测字符串是否为null，否则就报错，如果传入格式要求还要符合传入的格式要求，不然也报错)
+	* @param @param obj
+	* @param @param patterns    设定文件
+	* @return void    返回类型
+	* @author ylx
+	* @date 2018年1月29日 上午11:43:30
+	* @throws
+	 */
+	public static final void checkNullString(Object obj,String...patterns){
+		try {
+			String str=String.class.cast(obj);
+			if(null==str) throw new RuntimeException("字符串不能为null");
+			if(patterns.length!=0){//格式校验
+				for (String pattern : patterns) {
+					if(str.matches(pattern)){
+						return;
+					}
+				}
+				throw new RuntimeException("与指定格式不符");
+			}
+		} catch (Exception e) {
+			throw new RuntimeException(e.getMessage());
+		}
+	}
+	
+	/**
+	 * 
+	* @Title: checkEmptyString
+	* @Description: TODO(检测字符串是否为null/""，否则就报错，如果传入格式要求还要符合传入的格式要求，不然也报错)
+	* @param @param obj
+	* @param @param patterns    设定文件
+	* @return void    返回类型
+	* @author ylx
+	* @date 2018年1月29日 上午11:43:30
+	* @throws
+	 */
+	public static final void checkEmptyString(Object obj,String...patterns){
+		try {
+			String str=String.class.cast(obj);
+			if(null==str) throw new RuntimeException("字符串不能为null");
+			if("".equals(str)) throw new RuntimeException("字符串内容不能为空");
+			if(patterns.length!=0){//格式校验
+				for (String pattern : patterns) {
+					if(str.matches(pattern)){
+						return;
+					}
+				}
+				throw new RuntimeException("与指定格式不符");
+			}
+		} catch (Exception e) {
+			throw new RuntimeException(e.getMessage());
+		}
+	}
+
+	/**
+	 * 
+	* @Title: checkBlankString
+	* @Description: TODO(检测字符串是否为null/""/"  "，否则就报错，如果传入格式要求还要符合传入的格式要求，不然也报错)
+	* @param @param obj
+	* @param @param patterns    设定文件
+	* @return void    返回类型
+	* @author ylx
+	* @date 2018年1月29日 上午11:43:30
+	* @throws
+	 */
+	public static final void checkBlankString(Object obj,String...patterns){
+		try {
+			String str=String.class.cast(obj);
+			if(null==str) throw new RuntimeException("字符串不能为null");
+			if("".equals(str.trim())) throw new RuntimeException("字符串内容不能为空");
+			if(patterns.length!=0){//格式校验
+				for (String pattern : patterns) {
+					if(str.matches(pattern)){
+						return;
+					}
+				}
+				throw new RuntimeException("与指定格式不符");
+			}
+		} catch (Exception e) {
+			throw new RuntimeException(e.getMessage());
+		}
+	}
+	
 	
 	public static void main(String[] args) {
 		System.out.println(checkAndAssignNullIntegerIfIsBlank(" "));

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

@@ -46,9 +46,8 @@ public class OrdersIssueAction {
 	private static final Integer ROWNUM=Integer.parseInt(ReadConfUtil.getProperty("rowNum"));
 	
 	public static final String ORDER_ID_PATTERN=RegexConstant.ORDER_ID;
-	public static void main(String[] args) {
-		System.out.println("\\d{8}");
-	}
+
+
 	/**
 	 * 
 	* @Title: queryOrdersByPlanner
@@ -177,6 +176,7 @@ public class OrdersIssueAction {
 		try {
 			orderService.checkIfHasTheSameId(ValidationUtil.checkAndAssignInt(param.getOrderId(),ORDER_ID_PATTERN));
 			UserDetail userDetail = userAuthoricationService.queryUserDetail(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.PLANNER);//检测当前操作用户权限
+			ValidationUtil.checkBlankString(param.getPartNo());
 			List<UserDetail> users = userDetail.getUsers();
 			int supplierId = ValidationUtil.checkAndAssignInt(param.getSupplierId());
 			boolean flag=false;
@@ -188,7 +188,7 @@ public class OrdersIssueAction {
 			}
 			if(!flag) throw new RuntimeException("查无此供应商");
 			boxService.checkIfHasTheBoxNo(ValidationUtil.checkBlankAndAssignString(param.getBoxNo()));//检测箱号是否存在
-			ValidationUtil.checkAndAssignInt(param.getInboxQty());
+			ValidationUtil.checkMinAndAssignInt(param.getInboxQty(),0);
 			ordersIssueService.addOrder(param);//生成新订单
 			return JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS, null);
 		} catch (Exception e) {

saicLogistics/src/test/java/com/fuzamei/web/CargoConsignActionTest.java

@@ -16,7 +16,7 @@ public class CargoConsignActionTest extends BaseJunit4Test{
 	@Test//测试【供应商】查询订单功能
 	public void test01(){
 		Param param=new Param();
-		param.setUserId(9004);
+		param.setUserId(9003);
 		param.setPage(1);
 		param.setOrderId(100000001);
 		param.setBoxNo(null);
@@ -33,11 +33,11 @@ public class CargoConsignActionTest extends BaseJunit4Test{
 		Param param=new Param();
 		param.setUserId(9007);
 		param.setPage(1);
-		param.setOrderId(100000001);
-		param.setBoxNo("sadasa");
+		param.setOrderId(null);
+		param.setBoxNo(null);
 		param.setStatusId(null);
 		param.setStartTime(null);
-		param.setEndTime(1516955480353L);
+		param.setEndTime(null);
 		Map<String, Object> result = cargoConsignAction.queryOrdersByCarrier(param);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);

saicLogistics/src/test/java/com/fuzamei/web/CargoDeliverActionTest.java

@@ -17,7 +17,7 @@ public class CargoDeliverActionTest extends BaseJunit4Test{
 	@Test//测试【供应商】查询订单功能
 	public void test01(){
 		Param param=new Param();
-		param.setUserId(9007);
+		param.setUserId(9008);
 		param.setPage(1);
 		param.setOrderId(100000001);
 		param.setCarNo("浙A9819Y");
@@ -34,7 +34,7 @@ public class CargoDeliverActionTest extends BaseJunit4Test{
 	public void test02(){
 		Param param=new Param();
 		param.setUserId(9007);
-		param.setOrderId(100000003);
+		param.setOrderId(100000001);
 		Map<String, Object> result = cargoDeliverAction.orderTracking(param);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);

saicLogistics/src/test/java/com/fuzamei/web/OperationHistoryActionTest.java

@@ -17,7 +17,7 @@ public class OperationHistoryActionTest extends BaseJunit4Test{
 	public void test01(){
 		Param param=new Param();
 		param.setUserId(1001);
-		param.setPage(2);
+		param.setPage(-1);
 		param.setStartTime(null);
 		param.setEndTime(null);
 		Map<String, Object> result = operationHistoryAction.queryOperationHistory(param);

saicLogistics/src/test/java/com/fuzamei/web/OrdersIssueActionTest.java

@@ -38,7 +38,7 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 	public void test02(){
 		Param param=new Param();
 		param.setUserId(9001);
-		param.setPage(1);
+		param.setPage(-1);
 //		param.setSupplierName("chb供应商");
 		param.setBoxNo(null);
 		param.setStartTime(null);
@@ -52,7 +52,7 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 	public void test03(){
 		Param param=new Param();
 		param.setUserId(9003);
-		param.setPage(1);
+		param.setPage(-1);
 		param.setOrderId(null);
 		param.setBoxNo(null);
 		param.setStatusId(null);
@@ -75,7 +75,7 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 	@Test//测试显示所有箱号
 	public void test05(){
 		Param param=new Param();
-		param.setUserId(9002);
+		param.setUserId(9001);
 		Map<String, Object> result = ordersIssueAction.showAllBoxNo(param);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);