From d4c0bf0a7cf69d58f87b07031aa6ba1ecfaa012b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 22 May 2024 10:41:34 +0800
Subject: [PATCH] 增加支付宝收款码
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java | 81 +++++++++++++++++++++++++++-------------
1 files changed, 54 insertions(+), 27 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java
index f177300..763df18 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeNewEnum;
import cc.mrbird.febs.common.enumerates.ProductEnum;
import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.*;
@@ -153,6 +154,8 @@
mallProductBuy.setMateState(ProductEnum.PRODUCT_BUY_MATE_STATE_FAIL.getValue());
mallProductBuy.setNftTotal(mallProductNft.getPriceNft());
mallProductBuy.setNftAva(mallProductNft.getPriceNft());
+ mallProductBuy.setCycle(mallProductNft.getCycle());
+ mallProductBuy.setProfit(mallProductNft.getProfit());
// mallProductBuy.setNftAva(BigDecimal.ZERO);
mallProductBuyMapper.insert(mallProductBuy);
//令牌 可用减少，冻结增加
@@ -209,7 +212,7 @@
DataDictionaryCustom fcmPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.FCM_PRICE.getType(),
DataDictionaryEnum.FCM_PRICE.getCode());
- BigDecimal fcmPrice = ObjectUtil.isEmpty(fcmPriceDic) ? new BigDecimal(2) : new BigDecimal(fcmPriceDic.getValue());
+ BigDecimal fcmPrice = ObjectUtil.isEmpty(fcmPriceDic) ? new BigDecimal(8) : new BigDecimal(fcmPriceDic.getValue());
//手续费
DataDictionaryCustom outFcmFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.OUT_FCM_FEE.getType(),
@@ -279,6 +282,11 @@
throw new FebsException("请输入正确的交易密码");
}
BigDecimal nftCnt = outNFTDto.getNftCnt();
+ BigDecimal remainder = nftCnt.remainder(BigDecimal.TEN);
+ if(remainder.compareTo(BigDecimal.ZERO) != 0){
+ throw new FebsException("数量需要为10的倍数");
+ }
+
DataDictionaryCustom nftMinDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.NFT_MIN.getType(),
DataDictionaryEnum.NFT_MIN.getCode());
@@ -568,6 +576,25 @@
mallProductSellRecord.setState(ProductEnum.PRODUCT_MATE_STATE_CONFIRM.getValue());
mallProductSellRecordMapper.updateById(mallProductSellRecord);
+ DataDictionaryCustom gsdInDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.FCM_GSD_IN.getType(),
+ DataDictionaryEnum.FCM_GSD_IN.getCode()
+ );
+ BigDecimal gsdInPercent = new BigDecimal(gsdInDic.getValue()).multiply(AppContants.BASIC_PERCENT);
+ BigDecimal gsdIn = gsdInPercent.multiply(mallProductSellRecord.getNftCnt()).setScale(2,BigDecimal.ROUND_DOWN);
+ MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
+ mallMemberAmount.setGsd(mallMemberAmount.getGsd().add(gsdIn));
+ mallMemberAmountMapper.updateGsdById(mallMemberAmount);
+
+ iMallMoneyFlowService.addMoneyFlow(
+ memberId,
+ gsdIn,
+ MoneyFlowTypeNewEnum.NFT_TRANS_GFD.getValue(),
+ null,
+ mallMember.getId(),
+ FlowTypeNewEnum.GSD.getValue(),
+ MoneyFlowTypeNewEnum.NFT_TRANS_GFD.getDescrition());
+
agentProducer.sendFcmOrderSellInsureMsg(sellRecordId);
return new FebsResponse().success();
}
@@ -649,34 +676,34 @@
Long memberId = LoginUserUtil.getLoginUser().getId();
List<ApiOrderRecordListVo> objects = new ArrayList<>();
apiOrderListDto.setMemberId(memberId);
-// DateTime nowTime = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date()));
-// DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-// DataDictionaryEnum.YU_YUE_START_TIME.getType(),
-// DataDictionaryEnum.YU_YUE_START_TIME.getCode()
-// );
-// DateTime startTime = DateUtil.parseTime(startTimeDic.getValue());
-// DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-// DataDictionaryEnum.YU_YUE_END_TIME.getType(),
-// DataDictionaryEnum.YU_YUE_END_TIME.getCode()
-// );
-// DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
-// if(nowTime.compareTo(startTime) >= 0 && nowTime.compareTo(endTime) <= 0){
-// IPage<ApiOrderRecordListVo> pageBuy = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
-// IPage<ApiOrderRecordListVo> apiOrderListVoIPageBuy = mallProductBuyRecordMapper.selectListInPage(pageBuy, apiOrderListDto);
-// if(CollUtil.isNotEmpty(apiOrderListVoIPageBuy.getRecords())){
-// for(ApiOrderRecordListVo apiOrderListVo : apiOrderListVoIPageBuy.getRecords()){
-// objects.add(apiOrderListVo);
-// }
-// }
-// }
-
- IPage<ApiOrderRecordListVo> pageBuy = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
- IPage<ApiOrderRecordListVo> apiOrderListVoIPageBuy = mallProductBuyRecordMapper.selectListInPage(pageBuy, apiOrderListDto);
- if(CollUtil.isNotEmpty(apiOrderListVoIPageBuy.getRecords())){
- for(ApiOrderRecordListVo apiOrderListVo : apiOrderListVoIPageBuy.getRecords()){
- objects.add(apiOrderListVo);
+ DateTime nowTime = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date()));
+ DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.YU_YUE_START_TIME.getType(),
+ DataDictionaryEnum.YU_YUE_START_TIME.getCode()
+ );
+ DateTime startTime = DateUtil.parseTime(startTimeDic.getValue());
+ DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.YU_YUE_END_TIME.getType(),
+ DataDictionaryEnum.YU_YUE_END_TIME.getCode()
+ );
+ DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
+ if(nowTime.compareTo(startTime) >= 0 && nowTime.compareTo(endTime) <= 0){
+ IPage<ApiOrderRecordListVo> pageBuy = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
+ IPage<ApiOrderRecordListVo> apiOrderListVoIPageBuy = mallProductBuyRecordMapper.selectListInPage(pageBuy, apiOrderListDto);
+ if(CollUtil.isNotEmpty(apiOrderListVoIPageBuy.getRecords())){
+ for(ApiOrderRecordListVo apiOrderListVo : apiOrderListVoIPageBuy.getRecords()){
+ objects.add(apiOrderListVo);
+ }
}
}
+
+// IPage<ApiOrderRecordListVo> pageBuy = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
+// IPage<ApiOrderRecordListVo> apiOrderListVoIPageBuy = mallProductBuyRecordMapper.selectListInPage(pageBuy, apiOrderListDto);
+// if(CollUtil.isNotEmpty(apiOrderListVoIPageBuy.getRecords())){
+// for(ApiOrderRecordListVo apiOrderListVo : apiOrderListVoIPageBuy.getRecords()){
+// objects.add(apiOrderListVo);
+// }
+// }
IPage<ApiOrderRecordListVo> pageSell = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
IPage<ApiOrderRecordListVo> apiOrderListVoIPageSell = mallProductSellRecordMapper.selectListInPage(pageSell, apiOrderListDto);
if(CollUtil.isNotEmpty(apiOrderListVoIPageSell.getRecords())){
--
Gitblit v1.9.1