Commit 62a2ad4f authored by 张永's avatar 张永

111

parent 2cdf494e
...@@ -28,6 +28,7 @@ import com.egolm.common.bean.Rjx; ...@@ -28,6 +28,7 @@ import com.egolm.common.bean.Rjx;
import com.egolm.common.jdbc.Page; import com.egolm.common.jdbc.Page;
import com.egolm.shop.api.service.OrderService; import com.egolm.shop.api.service.OrderService;
import com.egolm.shop.bean.RespObject; import com.egolm.shop.bean.RespObject;
import com.egolm.shop.common.XException;
import com.egolm.shop.common.utils.XmlUtil; import com.egolm.shop.common.utils.XmlUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -137,6 +138,8 @@ public class OrderController { ...@@ -137,6 +138,8 @@ public class OrderController {
}) })
@RequestMapping(value = "/getOrderDetail",method=RequestMethod.GET) @RequestMapping(value = "/getOrderDetail",method=RequestMethod.GET)
public String getOrderDetail(String salesOrderId, String langID, Integer index, Integer limit) { public String getOrderDetail(String salesOrderId, String langID, Integer index, Integer limit) {
XException.assertNotBlank(salesOrderId, "单号不能为空");
return orderService.getOrderDetail(salesOrderId); return orderService.getOrderDetail(salesOrderId);
} }
...@@ -148,6 +151,7 @@ public class OrderController { ...@@ -148,6 +151,7 @@ public class OrderController {
}) })
@RequestMapping(value = "/getSubOrderList",method=RequestMethod.GET) @RequestMapping(value = "/getSubOrderList",method=RequestMethod.GET)
public String getSubOrderList(String salesOrderId) { public String getSubOrderList(String salesOrderId) {
XException.assertNotBlank(salesOrderId, "单号不能为空");
return orderService.queryOrderDetailList(salesOrderId); return orderService.queryOrderDetailList(salesOrderId);
} }
...@@ -159,6 +163,7 @@ public class OrderController { ...@@ -159,6 +163,7 @@ public class OrderController {
}) })
@RequestMapping(value = "/getSubOrderDetail",method=RequestMethod.GET) @RequestMapping(value = "/getSubOrderDetail",method=RequestMethod.GET)
public String getSubOrderDetail(String subOrderID) { public String getSubOrderDetail(String subOrderID) {
XException.assertNotBlank(subOrderID, "单号不能为空");
return orderService.getSubOrderDetail(subOrderID); return orderService.getSubOrderDetail(subOrderID);
} }
...@@ -170,6 +175,7 @@ public class OrderController { ...@@ -170,6 +175,7 @@ public class OrderController {
}) })
@RequestMapping(value = "/getDeliverSubDetail",method=RequestMethod.GET) @RequestMapping(value = "/getDeliverSubDetail",method=RequestMethod.GET)
public String getDeliverSubDetail(String aocOrderID) { public String getDeliverSubDetail(String aocOrderID) {
XException.assertNotBlank(aocOrderID, "单号不能为空");
List<Map<String, Object>> list = orderService.getDeliverSubDetail(aocOrderID); List<Map<String, Object>> list = orderService.getDeliverSubDetail(aocOrderID);
return Rjx.jsonOk().setData(list).toJson(); return Rjx.jsonOk().setData(list).toJson();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment