From 5061a16c2b9d5d5c22516b69460e04c3f1484dea Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 13 Dec 2023 16:49:46 +0800
Subject: [PATCH] 微信小程序配置
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 2 ++
src/main/java/cc/mrbird/febs/mall/vo/ApiOrderRecordListVo.java | 2 ++
src/main/resources/mapper/modules/MallProductBuyRecordMapper.xml | 1 +
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallProductServiceImpl.java | 13 ++++++-------
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java | 2 ++
src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java | 4 ++++
src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java | 3 +++
src/main/resources/mapper/modules/MallProductSellRecordMapper.xml | 1 +
src/main/java/cc/mrbird/febs/mall/dto/AdminGfaBasicSetDto.java | 2 ++
src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html | 13 ++++++++++++-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 7 +++++++
11 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
index 4f6b6e1..2e8fb3e 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
@@ -8,9 +8,11 @@
/**
* 预约开始时间
* 预约结束时间
+ * 支付后，确认倒计时的分钟数，60，为记录支付时间paytime开始计算60分钟的倒计时
*/
YU_YUE_START_TIME("YU_YUE_START_TIME","YU_YUE_START_TIME"),
YU_YUE_END_TIME("YU_YUE_END_TIME","YU_YUE_END_TIME"),
+ INSURE_END_MINUTE("INSURE_END_MINUTE","INSURE_END_MINUTE"),
/**
* NFT最小提现数量
* NFT手续费
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java
index fe62099..2d428d5 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java
@@ -211,6 +211,10 @@
DataDictionaryEnum.OUT_FCM_FEE.getType(),
DataDictionaryEnum.OUT_FCM_FEE.getCode(),
gfaBasicSetDto.getOutFcmFee());
+ commonService.updateDataDic(
+ DataDictionaryEnum.INSURE_END_MINUTE.getType(),
+ DataDictionaryEnum.INSURE_END_MINUTE.getCode(),
+ gfaBasicSetDto.getMinuteCnt());
// commonService.updateDataDic(
// DataDictionaryEnum.FCM_PRICE.getType(),
// DataDictionaryEnum.FCM_PRICE.getCode(),
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java
index edc9946..9c843dc 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java
@@ -187,6 +187,9 @@
gfaBasicSetDto.setNftMin(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.NFT_MIN.getType(),
DataDictionaryEnum.NFT_MIN.getCode()).getValue());
+ gfaBasicSetDto.setMinuteCnt(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.INSURE_END_MINUTE.getType(),
+ DataDictionaryEnum.INSURE_END_MINUTE.getCode()).getValue());
model.addAttribute("gfaBasicSet", gfaBasicSetDto);
return FebsUtil.view("modules/news/gfaBasicSet");
}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/AdminGfaBasicSetDto.java b/src/main/java/cc/mrbird/febs/mall/dto/AdminGfaBasicSetDto.java
index ba2b279..cd02bb5 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/AdminGfaBasicSetDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AdminGfaBasicSetDto.java
@@ -24,4 +24,6 @@
private String frozenFcmCnt;
+ private String minuteCnt;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 8f34ad8..937aa8f 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -275,6 +275,13 @@
BigDecimal memberFrozenFcmCnt = ObjectUtil.isEmpty(memberFrozenFcmCntDic) ? new BigDecimal(100) : new BigDecimal(memberFrozenFcmCntDic.getValue());
mallMemberVo.setUnfrozenCnt(memberFrozenFcmCnt);
+ DataDictionaryCustom insureMinuteDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.INSURE_END_MINUTE.getType(),
+ DataDictionaryEnum.INSURE_END_MINUTE.getCode()
+ );
+ Integer insureMinute = Integer.parseInt(ObjectUtil.isEmpty(insureMinuteDic) ? "60" : insureMinuteDic.getValue());
+ mallMemberVo.setMinuteCnt(insureMinute);
+
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
if (dic != null) {
mallMemberVo.setLevelName(dic.getDescription());
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 82b4dfb..42b7034 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
@@ -644,13 +644,12 @@
objects.add(apiOrderListVo);
}
}
-
- IPage<ApiOrderRecordListVo> pageSell = new Page<>(apiOrderListDto.getPageNum(), apiOrderListDto.getPageSize());
- IPage<ApiOrderRecordListVo> apiOrderListVoIPageSell = mallProductSellRecordMapper.selectListInPage(pageSell, apiOrderListDto);
- if(CollUtil.isNotEmpty(apiOrderListVoIPageSell.getRecords())){
- for(ApiOrderRecordListVo apiOrderListVo : apiOrderListVoIPageSell.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())){
+ for(ApiOrderRecordListVo apiOrderListVo : apiOrderListVoIPageSell.getRecords()){
+ objects.add(apiOrderListVo);
}
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderRecordListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderRecordListVo.java
index 45caa11..b98b85b 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderRecordListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderRecordListVo.java
@@ -16,6 +16,8 @@
private String orderNo;
@ApiModelProperty(value = "时间")
private Date createdTime;
+ @ApiModelProperty(value = "支付时间")
+ private Date payTime;
@ApiModelProperty(value = "数量")
private BigDecimal nftTotal;
@ApiModelProperty(value = "匹配状态0：失败 1：匹配中 2：待支付 3：已支付 4：对方已确认 5：已完成 6已投诉")
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index 95c1bff..13245f9 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -103,5 +103,7 @@
private Integer isFrozen;
@ApiModelProperty(value = "已排单")
private Integer pickCount;
+ @ApiModelProperty(value = "支付后，确认倒计时的分钟数，60，为paytime开始计算60分钟的倒计时")
+ private Integer minuteCnt;
}
diff --git a/src/main/resources/mapper/modules/MallProductBuyRecordMapper.xml b/src/main/resources/mapper/modules/MallProductBuyRecordMapper.xml
index 3dc5b24..36e22a5 100644
--- a/src/main/resources/mapper/modules/MallProductBuyRecordMapper.xml
+++ b/src/main/resources/mapper/modules/MallProductBuyRecordMapper.xml
@@ -45,6 +45,7 @@
select a.id,
b.order_no,
a.CREATED_TIME,
+ a.pay_time,
a.pick_nft_cnt as nftTotal,
a.state,
2 as orderType
diff --git a/src/main/resources/mapper/modules/MallProductSellRecordMapper.xml b/src/main/resources/mapper/modules/MallProductSellRecordMapper.xml
index 45a193a..615cad7 100644
--- a/src/main/resources/mapper/modules/MallProductSellRecordMapper.xml
+++ b/src/main/resources/mapper/modules/MallProductSellRecordMapper.xml
@@ -38,6 +38,7 @@
select a.id,
b.order_no,
a.CREATED_TIME,
+ a.pay_time,
a.nft_cnt as nftTotal,
a.state,
1 as orderType
diff --git a/src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html b/src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html
index 5a21792..389cef4 100644
--- a/src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html
+++ b/src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html
@@ -3,7 +3,7 @@
<form class="layui-form" action="" lay-filter="gfa-Basic-set-form">
<div class="layui-card">
<div class="layui-card-body">
- <blockquote class="layui-elem-quote blue-border">买卖单时间设置</blockquote>
+ <blockquote class="layui-elem-quote blue-border">买卖单（确认支付）时间设置</blockquote>
<div class="layui-form-item">
<div class="layui-col-lg6">
<label class="layui-form-label febs-form-item-require">开始时间：</label>
@@ -15,6 +15,16 @@
<label class="layui-form-label febs-form-item-require">结束时间：</label>
<div class="layui-input-block">
<input type="text" name="endTime" class="layui-input" id="endTimePick" placeholder="HH:mm:ss">
+ </div>
+ </div>
+ </div>
+ <blockquote class="layui-elem-quote blue-border">确认收款时间设置</blockquote>
+ <div class="layui-form-item">
+ <div class="layui-col-lg6">
+ <label class="layui-form-label febs-form-item-require">时间间隔：</label>
+ <div class="layui-input-block">
+ <input type="text" name="minuteCnt" class="layui-input" readonly>
+ <div class="layui-form-mid layui-word-aux">支付后，确认倒计时的分钟数，60，为记录支付时间开始计算60分钟的倒计时</div>
</div>
</div>
</div>
@@ -140,6 +150,7 @@
"outFcmMin": gfaBasicSet.outFcmMin,
"nftMin": gfaBasicSet.nftMin,
"frozenFcmCnt": gfaBasicSet.frozenFcmCnt,
+ "minuteCnt": gfaBasicSet.minuteCnt,
"endTime": gfaBasicSet.endTime
});
}
--
Gitblit v1.9.1