From 63fae3904d7da86e15182bb8cd32b82f83114b08 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 29 八月 2023 18:12:59 +0800
Subject: [PATCH] 修改积分兑换订单列表报错
---
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java | 9 +++++++--
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java | 10 ++++++++--
2 files changed, 15 insertions(+), 4 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 3ab62fc..dfff322 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
@@ -89,10 +89,16 @@
@RequestParam(value = "orderNumber", required = false) String orderNumber,
@RequestParam(value = "goodsName", required = false) String goodsName,
@RequestParam(value = "condition", required = false) String condition,
- @RequestParam(value = "userName", required = false) String userName)
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "communityId", required = false) String communityId)
{
+
+ if(StringUtils.isEmpty(communityId))
+ {
+ communityId=getCommunityId()+"";
+ }
return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
- condition,userName,null,getLoginUserInfo().getUserId()+"","1");
+ condition,userName,communityId,getLoginUserInfo().getUserId()+"","1");
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java
index bc9f4aa..59fe314 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java
@@ -102,10 +102,15 @@
@RequestParam(value = "orderNumber", required = false) String orderNumber,
@RequestParam(value = "goodsName", required = false) String goodsName,
@RequestParam(value = "condition", required = false) String condition,
- @RequestParam(value = "userName", required = false) String userName)
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "communityId", required = false) String communityId)
{
+ if(StringUtils.isEmpty(communityId))
+ {
+ communityId=getCommunityId()+"";
+ }
return merchantService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
- condition,userName,getCommunityId()+"",null,"1");
+ condition,userName,communityId,null,"1");
}
/**
--
Gitblit v1.7.1