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_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java
index a50b4dc..7525bc5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java
@@ -77,15 +77,14 @@
//判断是线上下单 还是商家线下下单 1线上 2线下
- if(StringUtils.equals("1",item.getOrderType()))
+ if(StringUtils.equals("2",item.getOrderType()))
{
- NewFightShopping goods=shoppingService.getDetails(item.getGoodsId());
- getMoney=Integer.valueOf(goods.getGoodPrice());
+ getMoney=Integer.valueOf(item.getPalyMoney());
}
else
{
- getMoney=Integer.valueOf(item.getPalyMoney());
-
+ NewFightShopping goods=shoppingService.getDetails(item.getGoodsId());
+ getMoney=Integer.valueOf(goods.getGoodPrice());
}
@@ -126,7 +125,7 @@
SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
sysUserNoticeVO.setUserId(Long.valueOf(item.getUserId()));
- sysUserNoticeVO.setType(1);
+ sysUserNoticeVO.setType(4);
sysUserNoticeVO.setTitle("商家兑换成功");
sysUserNoticeVO.setBusinessType(14);
sysUserNoticeVO.setBusinessTitle(item.getRemark());
@@ -134,11 +133,12 @@
.setBusinessContent(String.format("兑换商品%s", item.getRemark()));
sysUserNoticeVO.setStatus(0);
sysUserNoticeVO.setBusinessStatus(1);
+ sysUserNoticeVO.setBusinessId(Long.valueOf(item.getId()));
sysUserNoticeVO.setActivityType(4);
R r2 = userService.addNotice(sysUserNoticeVO);
-// if (R.isOk(r2)) {
-// log.info("新增兑换商品通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
-// }
+ if (R.isOk(r2)) {
+ log.info("新增兑换商品通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
}
integralUsersService.upIntegral(integral);
--
Gitblit v1.7.1