From 5f1941acf9148dedde559f52f6f6b893a27bac84 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 16 Aug 2023 10:43:43 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 f7bb9b9..e2e9375 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
@@ -522,9 +522,7 @@
DappWalletMineEntity dappWalletMineEntity = dappWalletMineDao.selectByMemberId(member.getId());
dappMemberInfoVo.setScore(ObjectUtil.isEmpty(dappWalletMineEntity) ? BigDecimal.ZERO : dappWalletMineEntity.getTotalAmount());
- QueryWrapper<MallOrderInfo> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("status", 1);
- Integer selectCount = mallOrderInfoMapper.selectCount(objectQueryWrapper);
+ Integer selectCount = dappMemberDao.selectOrderCntByMemberIdAndStatus(member.getId(),1);
dappMemberInfoVo.setWaitPayCnt(selectCount);
return new FebsResponse().success().data(dappMemberInfoVo);
}
@@ -660,9 +658,10 @@
mallOrderInfo.setAmount(totalAmount);
mallOrderInfo.setStatus(MallOrderInfo.STATUS_WAIT);
mallOrderInfo.setDeliverType(addOrderDto.getDeliverType());
- if(1 == addOrderDto.getDeliverType()){
- mallOrderInfo.setAddressId(addOrderDto.getAddressId());
- }
+ mallOrderInfo.setAddressId(addOrderDto.getAddressId());
+// if(1 == addOrderDto.getDeliverType()){
+// mallOrderInfo.setAddressId(addOrderDto.getAddressId());
+// }
mallOrderInfo.setOrderType(1);
mallOrderInfoMapper.insert(mallOrderInfo);
MallOrderItem mallOrderItem = new MallOrderItem();
@@ -1227,6 +1226,14 @@
return new FebsResponse().success();
}
+ @Override
+ public IPage<MallAddressInfo> shopAddressList(MallGoodsQueryDto queryDto) {
+ Long memberId = LoginUserUtil.getAppUser().getId();
+ Page<MallAddressInfo> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
+ queryDto.setMemberId(1L);
+ return dappMemberDao.selectShopAddressListInPage(queryDto, page);
+ }
+
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