From 50407890b791bb8ba0caf456360fe797bb524ce4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Feb 2023 11:50:10 +0800
Subject: [PATCH] 支付过期时间24小时， 增加返回商品规格的重量字段
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 1 +
src/main/java/cc/mrbird/febs/mall/vo/GoodsDetailsSkuVo.java | 3 +++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 4 ++--
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 5f9d624..357f1fe 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -225,8 +225,8 @@
orderInfo.setLatitude(address.getLatitude());
orderInfo.setLongitude(address.getLongitude());
this.baseMapper.updateById(orderInfo);
-
- agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L);
+ //过期时间修改成24小时
+ agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 24 * 60 * 60 * 1000L);
return orderInfo.getId();
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/GoodsDetailsSkuVo.java b/src/main/java/cc/mrbird/febs/mall/vo/GoodsDetailsSkuVo.java
index 4914a0c..c39f5b3 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/GoodsDetailsSkuVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/GoodsDetailsSkuVo.java
@@ -37,4 +37,7 @@
@ApiModelProperty(value = "样品，为空则代表不是样品")
private String sample;
+
+ @ApiModelProperty(value = "重量")
+ private BigDecimal goodsWeight;
}
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 5162606..2a12eac 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -58,6 +58,7 @@
c.original_price sku_original_price,
c.present_price sku_present_price,
c.style_id sku_style_id,
+ c.goods_weight goodsWeight,
c.goods_id sku_goods_id
from mall_goods a
left join mall_goods_style b on a.id = b.goods_id
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 190092e..a9d5efd 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -231,7 +231,7 @@
</select>
<select id="selectOrderInfoUpTime" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
- select * from mall_order_info where status=#{status} and now() > date_add(order_time,interval 15 minute)
+ select * from mall_order_info where status=#{status} and now() > date_add(order_time,interval 1440 minute)
</select>
<select id="selectCntDirectOrTeam" resultType="java.lang.Integer">
--
Gitblit v1.9.1