From 1d733521bb56907723e63f33c480e4788281e964 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 06 九月 2023 11:04:03 +0800
Subject: [PATCH] 2修改商家订单列表
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
index 7e62fbb..6aa1022 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -106,12 +106,6 @@
{
communityId=getCommunityId()+"";
}
-
- if(StringUtils.isEmpty(merchantId))
- {
- return R.fail("商家id不能为空");
- }
-
return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
condition,userName,communityId,getUserId()+"",orderType,merchantId);
}
@@ -505,6 +499,12 @@
{
communityId=getCommunityId()+"";
}
+
+ if(StringUtils.isEmpty(merchantId))
+ {
+ return R.fail("商家id不能为空");
+ }
+
return communityService.WithdrawGetList(pageNum,pageSize,disposeType, merchantName,merchantId,communityId);
}
--
Gitblit v1.7.1