From 9b8b1a8c660b04e49e4aa228858c45e2dd8f8c43 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Tue, 15 Jun 2021 20:06:44 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java | 7 +++++--
src/main/resources/mapper/walletCoinOrder/GbzOrderDao.xml | 7 +++++++
src/main/java/com/xcong/excoin/modules/coin/dao/GbzOrderDao.java | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java b/src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java
index 1736cff..dca00fa 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/controller/GbzOrderController.java
@@ -87,8 +87,11 @@
@ApiOperation(value = "获取订单列表")
@PostMapping(value = "/findList")
public Result findList(@RequestBody GbzListDto gbzListDto) {
+ MemberEntity member = LoginUserUtils.getAppLoginUser();
+ GbzOrderEntity gbzOrderEntity = new GbzOrderEntity();
+ gbzOrderEntity.setMemberId(member.getId());
Page<GbzOrderEntity> page = new Page<>(gbzListDto.getPageNum(), gbzListDto.getPageSize());
- IPage<GbzOrderEntity> result = gbzOrderDao.selectInPage(page);
+ IPage<GbzOrderEntity> result = gbzOrderDao.selectInPage(gbzOrderEntity, page);
return Result.ok(result.getRecords());
}
@@ -108,7 +111,7 @@
String remain = redisUtils.getString("bzz_coin_total");
- priceVo.setRemainCnt(Integer.parseInt(remain));
+ priceVo.setRemainCnt(88888);
BigDecimal totalAmount = gbzOrderDao.selectOrderTotalAmount(LoginUserUtils.getAppLoginUser().getId());
priceVo.setTotalAmount(totalAmount);
diff --git a/src/main/java/com/xcong/excoin/modules/coin/dao/GbzOrderDao.java b/src/main/java/com/xcong/excoin/modules/coin/dao/GbzOrderDao.java
index 3ab2631..dc1ba3b 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/dao/GbzOrderDao.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/dao/GbzOrderDao.java
@@ -10,7 +10,7 @@
public interface GbzOrderDao extends BaseMapper<GbzOrderEntity> {
- IPage<GbzOrderEntity> selectInPage(Page<GbzOrderEntity> page);
+ IPage<GbzOrderEntity> selectInPage(@Param("record") GbzOrderEntity gbzOrderEntity, Page<GbzOrderEntity> page);
BigDecimal selectOrderTotalAmount(@Param("memberId") Long memberId);
diff --git a/src/main/resources/mapper/walletCoinOrder/GbzOrderDao.xml b/src/main/resources/mapper/walletCoinOrder/GbzOrderDao.xml
index 95d59ca..187d6e1 100644
--- a/src/main/resources/mapper/walletCoinOrder/GbzOrderDao.xml
+++ b/src/main/resources/mapper/walletCoinOrder/GbzOrderDao.xml
@@ -4,6 +4,13 @@
<select id="selectInPage" resultType="com.xcong.excoin.modules.coin.entity.GbzOrderEntity">
select * from gbz_order
+ <where>
+ <if test="record != null" >
+ <if test="record.memberId != null">
+ member_id=#{record.memberId}
+ </if>
+ </if>
+ </where>
order by create_time desc
</select>
--
Gitblit v1.9.1