From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 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 fc94dde..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
@@ -86,11 +86,6 @@
- if(StringUtils.isEmpty(vimVO.getGoodNum()))
- {
- return R.fail("商品数量不能为空");
- }
-
int num= merchantService.insertVolunteer(vimVO);
if(num>0)
{
@@ -118,12 +113,6 @@
{
vimVO.setCommunityId(getCommunityId()+"");
}
-
- if(StringUtils.isEmpty(vimVO.getName()))
- {
- return R.fail("商品名称不能为空");
- }
-
if(StringUtils.isEmpty(vimVO.getIntegral()))
{
@@ -155,7 +144,7 @@
if(StringUtils.isEmpty(vimVO.getState()))
{
- return R.fail("商品上下架状态不能为空");
+ vimVO.setState("1");
}
if(StringUtils.isEmpty(vimVO.getCommunityId()))
@@ -208,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);
}
/**
@@ -307,4 +297,21 @@
}
+
+ /**
+ * 社区取消订单
+ * @param id
+ * @return
+ */
+ @GetMapping("/order/communityCancellation")
+ public R communityCancellation(@RequestParam("id") String id)
+ {
+ if(StringUtils.isEmpty(id))
+ {
+ return R.fail("订单id不能为空");
+ }
+ return vceService.communityCancellation(id);
+ }
+
+
}
--
Gitblit v1.7.1