From 4c1982646d38bdbc1c11a05b96db13a12259b50d Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 26 Jan 2024 19:39:01 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallMemberCouponMapper.xml | 3 ++-
src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java b/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java
index c442e39..dde27c1 100644
--- a/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java
@@ -187,6 +187,7 @@
orderInfo.setOrderNo(orderNo);
orderInfo.setOrderTime(new Date());
orderInfo.setMemberId(member.getId());
+ orderInfo.setPayTime(new Date());
orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
orderInfo.setOrderType(goods.getGoodsType());
orderInfo.setDeliveryType(2);
@@ -199,6 +200,7 @@
orderInfo.setAddress(address.getProvince()+address.getCity()+address.getArea() + address.getAddress());
orderInfo.setLatitude(address.getLatitude());
orderInfo.setLongitude(address.getLongitude());
+ mallOrderInfoMapper.insert(orderInfo);
MallOrderItem orderItem = new MallOrderItem();
if (goods.getGoodsType() == 2) {
@@ -220,10 +222,10 @@
orderItem.setOrderId(orderInfo.getId());
orderItem.setPrice(sku.getPresentPrice());
orderItem.setGoodsId(sku.getGoodsId());
- orderItem.setGoodsName(sku.getGoodsName());
+ orderItem.setGoodsName(goods.getGoodsName());
orderItem.setSkuId(sku.getId());
orderItem.setState(1);
- orderItem.setStyleName(sku.getStyleName());
+ orderItem.setStyleName(goods.getStyles().get(0).getName());
orderItem.setSkuName(sku.getSkuName());
orderItem.setSkuImage(sku.getSkuImage());
orderItem.setIsNormal(goods.getIsNormal());
@@ -231,7 +233,6 @@
}
record.setReceiveName(goods.getGoodsName());
- mallOrderInfoMapper.insert(orderInfo);
mallOrderItemMapper.insert(orderItem);
}
diff --git a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
index 41b4287..ecde786 100644
--- a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
@@ -6,7 +6,8 @@
select
a.*,
b.cost_amount costAmount,
- b.real_amount realAmount
+ b.real_amount realAmount,
+ b.type type
from mall_member_coupon a
INNER join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2
<where>
--
Gitblit v1.9.1