From 86df207c37502cce1b2043e1c7c0486459eef1d6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 三月 2025 19:58:45 +0800
Subject: [PATCH] 党员、诉求评论基础代码
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
index 7865e95..abf5287 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
@@ -144,7 +144,7 @@
if(StringUtils.isEmpty(vimVO.getState()))
{
- return R.fail("商品上下架状态不能为空");
+ vimVO.setState("1");
}
if(StringUtils.isEmpty(vimVO.getCommunityId()))
@@ -197,10 +197,11 @@
@RequestParam(value = "userName", required = false) String userName,
@RequestParam(value = "communityId", required = false) String communityId,
@RequestParam(value = "userId", required = false) String userId,
- @RequestParam(value = "orderType", required = false) String orderType)
+ @RequestParam(value = "orderType", required = false) String orderType,
+ @RequestParam(value = "merchantId", required = false) String merchantId)
{
return vceService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
- condition,userName,communityId,userId,orderType);
+ condition,userName,communityId,userId,orderType,merchantId);
}
/**
--
Gitblit v1.7.1