|
@@ -6,12 +6,15 @@ import com.yonge.cooleshow.admin.dto.*;
|
|
|
import com.yonge.cooleshow.mbg.model.OmsOrder;
|
|
|
import com.yonge.cooleshow.admin.service.OmsOrderService;
|
|
|
import io.swagger.annotations.Api;
|
|
|
+import io.swagger.annotations.ApiImplicitParam;
|
|
|
+import io.swagger.annotations.ApiImplicitParams;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* 订单管理Controller
|
|
@@ -34,6 +37,19 @@ public class OmsOrderController {
|
|
|
return CommonResult.success(CommonPage.restPage(orderList));
|
|
|
}
|
|
|
|
|
|
+ @ApiOperation("远程查询订单成功的用户和时间信息")
|
|
|
+ @PostMapping(value = "/userOrderInfoList")
|
|
|
+ @ApiImplicitParams({
|
|
|
+ @ApiImplicitParam(name = "startTime", dataType = "LocalDateTime", value = "订单开始时间", required = true),
|
|
|
+ @ApiImplicitParam(name = "endTime", dataType = "LocalDateTime", value = "订单结束时间",required = true),
|
|
|
+ @ApiImplicitParam(name = "userIdList", dataType = "List", value = "用户id集合",required = true),
|
|
|
+ })
|
|
|
+ @ResponseBody
|
|
|
+ public CommonResult<List<Map<String,Object>>> userOrderInfoList(@RequestBody Map<String,Object> param) {
|
|
|
+ List<Map<String,Object>> orderList = orderService.userOrderInfoList(param);
|
|
|
+ return CommonResult.success(orderList);
|
|
|
+ }
|
|
|
+
|
|
|
@ApiOperation("批量发货")
|
|
|
@RequestMapping(value = "/update/delivery", method = RequestMethod.POST)
|
|
|
@ResponseBody
|