From 2a9d6a842666d7aae86fdcccf0da13f6842b991b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 27 Nov 2023 16:36:43 +0800
Subject: [PATCH] 匹配
---
src/main/java/cc/mrbird/febs/mall/entity/MallProductBuyRecord.java | 1 +
src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java | 1 +
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 7 +++----
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallProductBuyRecord.java b/src/main/java/cc/mrbird/febs/mall/entity/MallProductBuyRecord.java
index 20ae956..8d52fbe 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallProductBuyRecord.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallProductBuyRecord.java
@@ -20,6 +20,7 @@
private Date orderTime;//匹配时间
private Date payTime;//支付时间
private String nftImg;//支付凭证
+ private String buyOrderNo;//编号
private Integer type;//支付类型 1：微信 2：支付宝 3：银行转账 4：USDT转账
@TableField(exist = false)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java
index 32b8fdb..b4e3807 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java
@@ -283,6 +283,7 @@
mallProductBuyRecord.setMemberId(mallProductSell.getMemberId());
mallProductBuyRecord.setSellRecordId(mallProductSellRecord.getId());
mallProductBuyRecord.setPickNftCnt(pickNftCnt);
+ mallProductBuyRecord.setBuyOrderNo(mallProductBuy.getOrderNo());
mallProductBuyRecord.setState(ProductEnum.PRODUCT_MATE_STATE_WAIT_PAY.getValue());
mallProductBuyRecord.setOrderTime(orderTime);
mallProductBuyRecordMapper.insert(mallProductBuyRecord);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
index dc5377d..f8cdaf0 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -1218,11 +1218,10 @@
BigDecimal nftCntTotalBuy = mallProductBuyRecords.stream().map(MallProductBuyRecord::getPickNftCnt).reduce(BigDecimal.ZERO, BigDecimal::add);
MallProductBuy mallProductBuy = mallProductBuyMapper.selectById(buyId);
if(nftCntTotalBuy.compareTo(mallProductBuy.getNftTotal()) >= 0){
- return;
+ mallProductBuy.setState(ProductEnum.PRODUCT_BUY_SUCCESS.getValue());
+ mallProductBuy.setPayTime(DateUtil.date());
+ mallProductBuyMapper.updateById(mallProductBuy);
}
- mallProductBuy.setState(ProductEnum.PRODUCT_BUY_SUCCESS.getValue());
- mallProductBuy.setPayTime(DateUtil.date());
- mallProductBuyMapper.updateById(mallProductBuy);
}
}
--
Gitblit v1.9.1