new

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

@@ -11,6 +11,7 @@
 			o.inbox_qty,
 			o.send_time,
 			o.update_time,
+			o.status_id,
 			s.status_name
 		from 
 			orders o
@@ -24,7 +25,6 @@
 			o.carrier_id=u.user_id
 		<where>
 			o.supplier_id=#{userId}
-			and o.status_id not in (1)
 			<if test="orderId!=null">
 				and o.order_id=#{orderId}
 			</if>
@@ -49,7 +49,6 @@
 			orders
 		<where>
 			supplier_id=#{userId}
-			and o.status_id not in (1)
 			<if test="orderId!=null">
 				and order_id=#{orderId}
 			</if>
@@ -82,7 +81,6 @@
 			o.status_id=s.status_id
 		<where>
 			o.carrier_id=#{userId}
-			and o.status_id not in (1,2)
 			<if test="orderId!=null">
 				and o.order_id=#{orderId}
 			</if>
@@ -107,7 +105,6 @@
 			orders
 		<where>
 			carrier_id=#{userId}
-			and o.status_id not in (1,2)
 			<if test="orderId!=null">
 				and order_id=#{orderId}
 			</if>

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

@@ -3,6 +3,6 @@
 <mapper namespace = "com.fuzamei.mapperInterface.StatusMapper">
 	
 	<select id="queryAllStatusInformation" resultType="Status">
-		select * from status
+		select status_id,status_name from status
 	</select>
 </mapper>

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

@@ -150,6 +150,7 @@ public class CargoConsignAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.CARRIER);
+			params.setUserId(Integer.parseInt(userId));
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			ValidationUtil.checkBlankAndAssignString(params.getCarNo());//车牌号校验
 			if(order==null) throw new RuntimeException("订单不存在");
@@ -180,6 +181,7 @@ public class CargoConsignAction {
 	public Map<String, Object> showAllCarriersUnderSupplier(@RequestBody Params params){
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
+			params.setUserId(Integer.parseInt(userId));
 			userAuthoricationService.queryUserDetail(ValidationUtil.checkAndAssignInt(userId), Role.SUPPLIER);
 			params.setRoleName(Role.CARRIER);
 			List<UserDetail> carrierList = userAuthoricationService.showAllCarriersUnderSupplier(params);
@@ -232,6 +234,7 @@ public class CargoConsignAction {
 	public Map<String, Object> orderTracking(@RequestBody Params params){
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
+			params.setUserId(Integer.parseInt(userId));
 			UserDetail userDetail = userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId),Role.CARRIER,Role.SUPPLIER);//检测当前操作用户权限
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(Role.SUPPLIER.equals(userDetail.getRoleName())){

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

@@ -62,6 +62,7 @@ public class CargoDeliverAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.CARRIER);
+			params.setUserId(Integer.parseInt(userId));
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
 			int rowNum = ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 1);
 			Long startTime=ValidationUtil.checkAndAssignDefaultLong(params.getStartTime(), 0L);
@@ -97,6 +98,7 @@ public class CargoDeliverAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId),Role.CARRIER);//检测当前操作用户权限
+			params.setUserId(Integer.parseInt(userId));
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(!params.getUserId().equals(order.getCarrierId())) throw new RuntimeException("无权查看");
 			params.setOrder(order);

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

@@ -63,6 +63,7 @@ public class CargoTallyAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.STOCKER);
+			params.setUserId(Integer.parseInt(userId));
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
 			int rowNum = ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 1);
 			Long startTime=ValidationUtil.checkAndAssignDefaultLong(params.getStartTime(), 0L);
@@ -98,6 +99,7 @@ public class CargoTallyAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.STOCKER);
+			params.setUserId(Integer.parseInt(userId));
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(order==null) throw new RuntimeException("订单不存在");
 			if(!Statuses.DELIVERING.equals(order.getStatusId())) throw new RuntimeException("非法操作");
@@ -129,6 +131,7 @@ public class CargoTallyAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.STOCKER);
+			params.setUserId(Integer.parseInt(userId));
 			ValidationUtil.checkRangeAndAssignInt(params.getConfirmId(), 0, 1);//确认id只能是0和1
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(order==null) throw new RuntimeException("订单不存在");
@@ -159,6 +162,7 @@ public class CargoTallyAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId),Role.STOCKER);//检测当前操作用户权限
+			params.setUserId(Integer.parseInt(userId));
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(!params.getUserId().equals(order.getReceiverId())) throw new RuntimeException("无权查看");
 			params.setOrder(order);

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

@@ -81,6 +81,7 @@ public class OrdersIssueAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.PLANNER);
+			params.setUserId(Integer.parseInt(userId));
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
 			int rowNum = ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 1);
 			Long startTime=ValidationUtil.checkAndAssignDefaultLong(params.getStartTime(), 0L);
@@ -121,6 +122,7 @@ public class OrdersIssueAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.SUPPLIER);
+			params.setUserId(Integer.parseInt(userId));
 			int page = ValidationUtil.checkMinAndAssignInt(params.getPage(), 1);
 			int rowNum = ValidationUtil.checkMinAndAssignInt(params.getRowNum(), 1);
 			Long startTime=ValidationUtil.checkAndAssignDefaultLong(params.getStartTime(), 0L);
@@ -157,6 +159,7 @@ public class OrdersIssueAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.SUPPLIER);
+			params.setUserId(Integer.parseInt(userId));
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(params.getCarrierId()), Role.CARRIER);
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(order==null) throw new RuntimeException("订单不存在");
@@ -192,6 +195,7 @@ public class OrdersIssueAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			orderService.checkIfHasTheSameId(ValidationUtil.checkAndAssignInt(params.getOrderId(),ORDER_ID_PATTERN));
+			params.setUserId(Integer.parseInt(userId));
 			UserDetail userDetail = userAuthoricationService.queryUserDetail(ValidationUtil.checkAndAssignInt(userId), Role.PLANNER);//检测当前操作用户权限
 			ValidationUtil.checkBlankString(params.getPartNo());
 			List<UserDetail> users = userDetail.getUsers();
@@ -308,6 +312,7 @@ public class OrdersIssueAction {
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			UserDetail userDetail = userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId),Role.PLANNER,Role.SUPPLIER);//检测当前操作用户权限
+			params.setUserId(Integer.parseInt(userId));
 			Orders order = orderService.queryFullOrderByOrderId(ValidationUtil.checkAndAssignInt(params.getOrderId()));
 			if(Role.PLANNER.equals(userDetail.getRoleName())){
 				if(!params.getUserId().equals(order.getPlannerId())) throw new RuntimeException(HintMSG.NO_AUTH);

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

@@ -1,5 +1,6 @@
 package com.fuzamei.web;
 
+import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
@@ -8,10 +9,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.baseTest.BaseJunit4Test;
 import com.fuzamei.entity.Params;
+import com.fuzamei.entity.Status;
+import com.fuzamei.service.StatusService;
 
 public class CargoConsignActionTest extends BaseJunit4Test{
 	@Autowired
 	private CargoConsignAction cargoConsignAction;
+	@Autowired
+	private StatusService statusService;
 	
 	@Test//测试【供应商】查询订单功能
 	public void test01(){
@@ -73,4 +78,10 @@ public class CargoConsignActionTest extends BaseJunit4Test{
 		System.out.println(jsonString);
 	}
 	
+	@Test//查看所有状态id
+	public void test06(){
+		List<Status> statusList = statusService.queryAllStatusInformation();
+		String jsonString = JSON.toJSONString(statusList,true);
+		System.out.println(jsonString);
+	}
 }