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 | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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 54a8082..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
@@ -1,11 +1,14 @@
package com.panzhihua.service_dangjian.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.partybuilding.NewFightIntegral;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingOrderVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_dangjian.dao.NewFightShoppingOrderDao;
import com.panzhihua.service_dangjian.entity.ComActIntegralUser;
@@ -32,6 +35,9 @@
@Resource
private ComActIntegralUsersService integralUsersService;
+
+ @Resource
+ private UserService userService;
@Override
public R getList(int pageNum,int pageSize,String userId,String goodsId,String orderNumber,
@@ -71,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());
}
@@ -115,6 +120,25 @@
integral.setRemark("商家兑换商品");
integral.setMerchantId(item.getMerchantId());
integral.setIntegralNum(item.getPalyMoney());
+
+
+
+ SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(Long.valueOf(item.getUserId()));
+ sysUserNoticeVO.setType(4);
+ sysUserNoticeVO.setTitle("商家兑换成功");
+ sysUserNoticeVO.setBusinessType(14);
+ sysUserNoticeVO.setBusinessTitle(item.getRemark());
+ sysUserNoticeVO
+ .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));
+ }
}
integralUsersService.upIntegral(integral);
--
Gitblit v1.7.1