From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerCreditsExchangeServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 bbac553..56ee325 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
@@ -118,6 +118,12 @@
// goodsService.updateById(vo);
// }
+ int num1=integral-Integer.valueOf(goods.getIntegral());
+ loginUserInfoVOR.setLoveIntegral(num1+"");
+ userService.putUser(loginUserInfoVOR);
+
+ item.setPalyIntegral(goods.getIntegral());
+
//增加积分明细记录
VolunteerIntegralRecordVO virvo=new VolunteerIntegralRecordVO();
@@ -128,11 +134,6 @@
virService.insertVolunteer(virvo);
- int num1=integral-Integer.valueOf(goods.getIntegral());
- loginUserInfoVOR.setLoveIntegral(num1+"");
- userService.putUser(loginUserInfoVOR);
-
- item.setPalyIntegral(goods.getIntegral());
//设置订单号
item.setOrderNumber(Snowflake.getId()+"");
int num= baseMapper.insertData(item);
--
Gitblit v1.7.1