From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingOrderApi.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingOrderApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingOrderApi.java
index 5f60e22..f8b2be3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingOrderApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingOrderApi.java
@@ -11,7 +11,7 @@
@Slf4j
-@Api(tags = {"社区动态/随手拍/微心愿/社区活动"})
+@Api(tags = {"新增双争双评"})
@RestController
@RequestMapping("/NewFightOrder")
public class NewFightShoppingOrderApi
@@ -28,16 +28,18 @@
@GetMapping("/orderGetList")
public R orderGetList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
- @RequestParam(value = "userId", required = false)String userId,
- @RequestParam(value = "goodsId", required = false)String goodsId,
- @RequestParam(value = "orderNumber", required = false)String orderNumber,
- @RequestParam(value = "goodName", required = false)String goodName,
- @RequestParam(value = "name", required = false)String name,
- @RequestParam(value = "cancelType", required = false)String cancelType,
- @RequestParam(value = "communityId", required = false)String communityId)
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "goodsId", required = false) String goodsId,
+ @RequestParam(value = "orderNumber", required = false) String orderNumber,
+ @RequestParam(value = "goodName", required = false) String goodName,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "cancelType", required = false) String cancelType,
+ @RequestParam(value = "communityId", required = false) String communityId,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "orderType", required = false) String orderType)
{
return orderService.getList(pageNum,pageSize,userId,goodsId,orderNumber,
- goodName,name,cancelType,communityId);
+ goodName,name,cancelType,communityId,merchantId,orderType);
}
/**
--
Gitblit v1.7.1