From 6c75b0c0fd6862b0d10793821db7017341a6a771 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 18 Aug 2023 16:48:31 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index a0573b5..5a28953 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -18,6 +18,7 @@
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cc.mrbird.febs.system.entity.User;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -401,6 +402,7 @@
teamChildListVo.setOrderCnt(mallAchieveRecords.size());
}
}
+ myTeamVo.setTeam(list);
}
return myTeamVo;
}
@@ -916,6 +918,10 @@
@Override
public void delOrder(Long id) {
Long memberId = LoginUserUtil.getAppUser().getId();
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(id);
+ if(MallOrderInfo.STATUS_PAY == mallOrderInfo.getStatus()){
+ throw new FebsException("当前订单不允许删除");
+ }
mallOrderInfoMapper.deleteById(id);
QueryWrapper<MallOrderItem> objectQueryWrapper = new QueryWrapper<>();
@@ -956,6 +962,7 @@
public IPage<MallAddressInfo> findAddressList(MallGoodsQueryDto queryDto) {
Long memberId = LoginUserUtil.getAppUser().getId();
Page<MallAddressInfo> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
+ queryDto.setMemberId(memberId);
return dappMemberDao.selectAddressListInPage(queryDto, page);
}
@@ -1285,6 +1292,39 @@
mallOrderInfoMapper.updateById(orderInfo);
}
+ @Override
+ public MallAddressInfo findAddress() {
+ Long memberId = LoginUserUtil.getAppUser().getId();
+ MallAddressInfo mallAddressInfo = dappMemberDao.selectAddressOneByMemberId(memberId);
+ return mallAddressInfo;
+ }
+
+ @Override
+ public List<PackageRecordVo> packageRecord(PackageRecordDto packageRecordDto) {
+ List<PackageRecordVo> packageRecordVos = new ArrayList<>();
+ Integer type = packageRecordDto.getType();
+ if(2 == type){
+ packageRecordVos = dappMemberDao.selectPackageRecordWeekInPage(DateUtil.beginOfWeek(DateUtil.date()));
+ }else if(3 == type){
+ packageRecordVos = dappMemberDao.selectPackageRecordMonthInPage(DateUtil.date());
+ }else{
+ packageRecordVos = dappMemberDao.selectPackageRecordDayInPage(DateUtil.date());
+ }
+ if(CollUtil.isNotEmpty(packageRecordVos)){
+ Integer packageNum = 0;
+ for(PackageRecordVo packageRecordVo : packageRecordVos){
+ packageNum = packageNum + 1;
+ packageRecordVo.setPackageNum(packageNum);
+ }
+ }
+ return packageRecordVos;
+ }
+
+ @Override
+ public List<AKLineLimitVo> packageKline() {
+ return dappAKlineMapper.selectListByTypeAndLimit(2, 30);
+ }
+
public static List<List<String>> partitionList(List<String> originalList, int partitionSize) {
List<List<String>> partitionedList = new ArrayList<>();
int size = originalList.size();
--
Gitblit v1.9.1