From 29e6855302b602f8dc3fac25c5e123d2646cf552 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 06 九月 2023 14:53:57 +0800
Subject: [PATCH] 新增社区商家模块系统配置
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java
index 7ebff49..b8eb376 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java
@@ -46,11 +46,11 @@
@Override
public R getList(int pageNum, int pageSize, String goodsId, String orderNumber,
String goodsName, String condition, String userName,String communityId,
- String userId,String orderType) {
+ String userId,String orderType,String merchantId) {
Page page=new Page<VolunteerCreditsExchange>(pageNum,pageSize);
return R.ok(baseMapper.getList(page,goodsId,orderNumber,goodsName,condition,
- userName,communityId,userId,orderType));
+ userName,communityId,userId,orderType,merchantId));
}
@Override
@@ -211,11 +211,12 @@
item.setCondition("3");
//设置订单号
- item.setOrderNumber(Snowflake.getId()+"");
+ String orderNum=Snowflake.getId()+"";
+ item.setOrderNumber(orderNum);
int num= baseMapper.insertData(item);
if(num>0)
{
- return R.ok();
+ return R.ok(orderNum);
}
return R.fail("操作失败");
}
@@ -228,15 +229,6 @@
return R.fail("参数不能为空");
}
- if(StringUtils.isEmpty(item.getNeedScore()))
- {
- return R.fail("所需积分不能为空");
- }
-
- if(StringUtils.isEmpty(item.getUserId()))
- {
- return R.fail("兑换用户id不能为空");
- }
int num= baseMapper.update(item);
if(num>0)
{
--
Gitblit v1.7.1