From 73acd2a65a5dbab4573ef2a93a258c0da177bcd3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 11:58:38 +0800
Subject: [PATCH] 普达物业公司权限处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java
index f1185b1..4c81f60 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java
@@ -58,16 +58,14 @@
private ComBatteryTradeOrderService tradeOrderService;
@Value("${min.app.isTest}")
private Boolean isTest;
- @Value("${min.app.isRefundTest}")
- private Boolean isRefundTest;
@Value("${min.app.appid}")
private String appid;
@Value("${min.app.payKey}")
private String payKey;
@Value("${min.app.mchId}")
private String mchId;
- @Value("${min.app.currencyNotifyUrl}")
- private String currencyNotifyUrl;
+// @Value("${min.app.currencyNotifyUrl}")
+// private String currencyNotifyUrl;
@Resource
private ComBatteryCommodityOrderCollageTeamMapper orderCollageTeamMapper;
@Resource
@@ -283,7 +281,7 @@
return R.fail("未查询到用户收货地址");
}
//查询用户信息
- SysUser user = userMapper.selectById(createOrderDto.getUserId());
+ SysUser user = userMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId,createOrderDto.getUserId()));
if (user == null) {
return R.fail("未查询到用户信息");
}
@@ -368,8 +366,8 @@
money = BigDecimal.valueOf(0.01);
}
// 调用wx支付
- result = WxPayUtils.getUnifiedorder(appid, mchId, payKey, currencyNotifyUrl + PayCpmstant.BATTERY_STORE_PAY_NOTIFY_URL
- , remark, openId, orderNo, money,null);
+// result = WxPayUtils.getUnifiedorder(appid, mchId, payKey, currencyNotifyUrl + PayCpmstant.BATTERY_STORE_PAY_NOTIFY_URL
+// , remark, openId, orderNo, money,null);
log.info("用户购买商品微信支付返回参数:" + result);
return result;
}
@@ -382,7 +380,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R syncCloseOrder() {
- log.info("定时器定时关闭超过30分钟未支付订单，并返回商品库存");
+ log.info("定时器定时关闭超过5分钟未支付订单，并返回商品库存");
Date nowDate = new Date();
//获取当前时间减30分钟时间
Date oldDate = DateUtils.addMinutes(nowDate, -5);
@@ -675,6 +673,11 @@
return orderBargain;
}
+ /**
+ * 创建秒杀订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
@Override
public R startSeckill(StartSeckillOrderDto orderDto) {
ComBatteryCommodityActivity commodityActivity = commodityActivityMapper.selectById(orderDto.getActivityId());
@@ -709,7 +712,7 @@
return R.fail("该商品库存不足，无法下单");
}
//查询用户信息
- SysUser user = userMapper.selectById(orderDto.getUserId());
+ SysUser user = userMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId,orderDto.getUserId()));
if(user == null){
return R.fail("未查询到用户信息");
}
@@ -722,6 +725,9 @@
ComBatteryCommodityOrder commodityOrder = getCreateActivityOrder(commodity,userAddress,user,commoditySpecs,orderDto,nowDate,commodityActivity);
Map<String,Object> resultMap = new HashMap<>(2);
if(this.baseMapper.insert(commodityOrder) > 0){
+ //更新活动商品库存
+ commodityActivity.setCommoditySaleNum(commodityActivity.getCommoditySaleNum() + orderDto.getCount());
+ commodityActivityMapper.updateById(commodityActivity);
//更新商品库存
commoditySpecs.setStock(commoditySpecs.getStock() - orderDto.getCount());
commoditySpecsMapper.updateById(commoditySpecs);
--
Gitblit v1.7.1