Skip to content

S
shop
Commit 3f701a24 authored by Quxl's avatar Quxl
Browse files
Options

x

parent a9739a90
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
src/main/java/com/egolm/shop/controller/DeliverController.java
View file @ 3f701a24
...@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.egolm.common.bean.Rjx; import com.egolm.common.bean.Rjx;
import com.egolm.shop.config.XException;
import com.egolm.shop.service.DeliverService; import com.egolm.shop.service.DeliverService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -25,7 +26,7 @@ public class DeliverController { ...@@ -25,7 +26,7 @@ public class DeliverController {
DeliverService deliverService; DeliverService deliverService;
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "subOrderId", dataType = "String", required = false), @ApiImplicitParam(paramType = "query", name = "subOrderId", dataType = "String", required = true),
@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), @ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"),
@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"), @ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"),
@ApiImplicitParam(paramType = "query", name = "sign", dataType = "String", required = true, value = "签名", defaultValue = ""), @ApiImplicitParam(paramType = "query", name = "sign", dataType = "String", required = true, value = "签名", defaultValue = ""),
...@@ -34,12 +35,13 @@ public class DeliverController { ...@@ -34,12 +35,13 @@ public class DeliverController {
@ApiOperation("查询送货单列表") @ApiOperation("查询送货单列表")
@GetMapping("getOrderDeliverSubList") @GetMapping("getOrderDeliverSubList")
public Object getOrderDeliverSubList(String subOrderId) { public Object getOrderDeliverSubList(String subOrderId) {
XException.assertNotBlank(subOrderId, "订单ID不能为空");
List<Map<String, Object>> list = deliverService.getOrderDeliverSubList(subOrderId); List<Map<String, Object>> list = deliverService.getOrderDeliverSubList(subOrderId);
return Rjx.jsonOk().setData(list); return Rjx.jsonOk().setData(list);
} }
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "subOrderId", dataType = "String", required = false), @ApiImplicitParam(paramType = "query", name = "subOrderId", dataType = "String", required = true),
@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), @ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"),
@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"), @ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"),
@ApiImplicitParam(paramType = "query", name = "sign", dataType = "String", required = true, value = "签名", defaultValue = ""), @ApiImplicitParam(paramType = "query", name = "sign", dataType = "String", required = true, value = "签名", defaultValue = ""),
...@@ -48,6 +50,7 @@ public class DeliverController { ...@@ -48,6 +50,7 @@ public class DeliverController {
@ApiOperation("查询送货单详情列表") @ApiOperation("查询送货单详情列表")
@GetMapping("getOrderDeliverSubDtlList") @GetMapping("getOrderDeliverSubDtlList")
public Object getOrderDeliverSubDtlList(String subOrderId) { public Object getOrderDeliverSubDtlList(String subOrderId) {
XException.assertNotBlank(subOrderId, "订单ID不能为空");
List<Map<String, Object>> list = deliverService.getOrderDeliverSubDtlList(subOrderId); List<Map<String, Object>> list = deliverService.getOrderDeliverSubDtlList(subOrderId);
return Rjx.jsonOk().setData(list); return Rjx.jsonOk().setData(list);
} }
......
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