|
|
@@ -10,6 +10,7 @@ import com.sqx.modules.utils.excel.ExcelData;
|
|
|
import com.sqx.modules.utils.excel.ExportExcelUtils;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+import io.swagger.annotations.ApiParam;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
@@ -40,7 +41,8 @@ public class OrderController extends AbstractController {
|
|
|
@ApiOperation("条件查询所有订单(管理端)")
|
|
|
@GetMapping(value = "selectAllOrderAdmin")
|
|
|
public Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
|
|
|
- String orderNumber, Integer orderType,String shopName,String riderPhone, String startTime, String endTime){
|
|
|
+ String orderNumber,
|
|
|
+ @ApiParam("1上门 2骑手配送 3商家配送 不传查所有") Integer orderType, String shopName, String riderPhone, String startTime, String endTime){
|
|
|
return appOrderService.selectAllOrderAdmin(page, limit, status, phone, shopId, userName, orderNumber, orderType,shopName,riderPhone,startTime,endTime);
|
|
|
}
|
|
|
|