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/dto/MallGoodsQueryDto.java | 3 +
src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java | 2 +
src/main/resources/mapper/dapp/DappMemberDao.xml | 22 ++++++++++
src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java | 4 ++
src/main/java/cc/mrbird/febs/dapp/mapper/MallOrderInfoMapper.java | 1
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappOrderController.java | 9 ++++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 19 ++++++---
src/main/java/cc/mrbird/febs/dapp/vo/MallOrderListVo.java | 3 +
src/main/java/cc/mrbird/febs/dapp/vo/MallOrderItemVo.java | 3 +
9 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappOrderController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappOrderController.java
index 794260c..885ec3d 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappOrderController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappOrderController.java
@@ -166,4 +166,13 @@
dappMemberService.updateAddress(createAddressDto);
return new FebsResponse().success().message("操作成功");
}
+
+ @ApiOperation(value = "自提点", notes = "自提点")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = MallAddressInfo.class)
+ })
+ @PostMapping(value = "/shopAddressList")
+ public FebsResponse shopAddressList(@RequestBody MallGoodsQueryDto queryDto) {
+ return new FebsResponse().success().data(dappMemberService.shopAddressList(queryDto));
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/MallGoodsQueryDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/MallGoodsQueryDto.java
index c81d06c..a128ca7 100644
--- a/src/main/java/cc/mrbird/febs/dapp/dto/MallGoodsQueryDto.java
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/MallGoodsQueryDto.java
@@ -15,4 +15,7 @@
@ApiModelProperty(value = "分类ID", example = "10")
private Long categoryId;
+ @ApiModelProperty(hidden = true)
+ private Long memberId;
+
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java
index 5ba2282..57d87a9 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java
@@ -103,4 +103,8 @@
DappMemberInfoVo selectDappMemberInfoVoByMemberId(@Param("memberId")long id);
IPage<MallAddressInfo> selectAddressListInPage(@Param("record")MallGoodsQueryDto queryDto, Page<MallAddressInfo> page);
+
+ Integer selectOrderCntByMemberIdAndStatus(@Param("memberId")Long id, @Param("status")int i);
+
+ IPage<MallAddressInfo> selectShopAddressListInPage(@Param("record")MallGoodsQueryDto queryDto, Page<MallAddressInfo> page);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/MallOrderInfoMapper.java b/src/main/java/cc/mrbird/febs/dapp/mapper/MallOrderInfoMapper.java
index 710b061..b1c1f76 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/MallOrderInfoMapper.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/MallOrderInfoMapper.java
@@ -5,5 +5,4 @@
public interface MallOrderInfoMapper extends BaseMapper<MallOrderInfo> {
-
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
index 0c6f445..3c2527c 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
@@ -100,4 +100,6 @@
List<MallGoodsCategory> categoryList();
FebsResponse balanceSystem();
+
+ IPage<MallAddressInfo> shopAddressList(MallGoodsQueryDto queryDto);
}
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();
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/MallOrderItemVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/MallOrderItemVo.java
index 8cfd659..ce5f27c 100644
--- a/src/main/java/cc/mrbird/febs/dapp/vo/MallOrderItemVo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/MallOrderItemVo.java
@@ -14,6 +14,9 @@
//商品名称
@ApiModelProperty(value = "商品名称")
private String goodsName;
+
+ @ApiModelProperty(value = "商品图片")
+ private String goodsThumb;
//数量
@ApiModelProperty(value = "数量")
private Integer cnt;
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/MallOrderListVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/MallOrderListVo.java
index a709843..2b8d1ed 100644
--- a/src/main/java/cc/mrbird/febs/dapp/vo/MallOrderListVo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/MallOrderListVo.java
@@ -57,6 +57,9 @@
@ApiModelProperty(value = "商品名称")
private String goodsName;
+ @ApiModelProperty(value = "商品图片")
+ private String goodsThumb;
+
@ApiModelProperty(value = "商品数量")
private String goodsCnt;
diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index 6c5db4e..5cb5078 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -278,6 +278,7 @@
select a.*,
b.goods_name goodsName,
b.goods_id goodsId,
+ b.thumb goodsThumb,
b.cnt goodsCnt
from mall_order_info a
left join mall_order_item b on a.id = b.order_id
@@ -300,8 +301,10 @@
</select>
<select id="selectMallOrderItemVoByOrderId" resultType="cc.mrbird.febs.dapp.vo.MallOrderItemVo">
- select a.*
+ select a.*,
+ b.thumb goodsThumb
from mall_order_item a
+ left join mall_goods b on a.goods_id = b.id
where order_id = #{orderId}
</select>
@@ -354,4 +357,21 @@
where is_default = 1
order by a.CREATE_TIME desc
</select>
+
+ <select id="selectOrderCntByMemberIdAndStatus" resultType="java.lang.Integer">
+ select count(a.id)
+ from mall_order_info a
+ where a.member_id = #{memberId}
+ and status = #{status}
+ </select>
+
+
+ <select id="selectShopAddressListInPage" resultType="cc.mrbird.febs.dapp.entity.MallAddressInfo">
+ select
+ a.*
+ from mall_address_info a
+ where is_default = 1
+ and a.member_id = #{record.memberId}
+ order by a.CREATE_TIME desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1