From 2ea179b58ce7b3b624f4dad02cd0f4375ce3c939 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 14 Dec 2023 16:53:02 +0800
Subject: [PATCH] 微信小程序配置
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 10 ++++++++++
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 22 ++++++++++++++++++++++
src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java | 2 ++
src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java | 2 ++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 9 +++++++++
5 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
index 3dee7b0..db3afc5 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -115,6 +115,16 @@
return memberService.moneyFlows(moneyFlowDto);
}
+
+ @ApiOperation(value = "FCM-资金流水列表-互转记录")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = MoneyFlowVo.class)
+ })
+ @PostMapping(value = "/moneyFlowInside")
+ public FebsResponse moneyFlowInside(@RequestBody MoneyFlowDto moneyFlowDto) {
+ return memberService.moneyFlowInside(moneyFlowDto);
+ }
+
@ApiOperation(value = "FCM-转账")
@PostMapping(value = "/transfer")
public FebsResponse transfer(@RequestBody @Validated TransferDto transferDto) {
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java
index 971e1d8..9c59630 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java
@@ -53,4 +53,6 @@
MallMoneyFlow selectByOrderNoAndMemberId(@Param("orderNo")String orderNo, @Param("memberId")Long memberId, @Param("isReturn")int isReturn);
MallMoneyFlow selectByOrderAndType(@Param("orderNo")String orderNo, @Param("type")int type, @Param("flowType")int flowType, @Param("memberId")Long memberId);
+
+ IPage<MoneyFlowVo> selectApiFcmMoneyFlowInsideInPage(IPage<MoneyFlowVo> page, @Param("record") MoneyFlowDto moneyFlowDto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
index e266992..be182ab 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
@@ -92,4 +92,6 @@
FebsResponse unfreeze(UnfreezeDto unfreezeDto);
FebsResponse memberSpeak(ApiMemberSpeakDto memberSpeakDto);
+
+ FebsResponse moneyFlowInside(MoneyFlowDto moneyFlowDto);
}
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 937aa8f..3e63cf0 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
@@ -867,6 +867,15 @@
return new FebsResponse().success().message("操作成功");
}
+ @Override
+ public FebsResponse moneyFlowInside(MoneyFlowDto moneyFlowDto) {
+ IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
+ Long id = LoginUserUtil.getLoginUser().getId();
+ moneyFlowDto.setMemberId(id);
+ IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiFcmMoneyFlowInsideInPage(page, moneyFlowDto);
+ return new FebsResponse().success().data(pages);
+ }
+
public static void main(String[] args) {
Set<String> objectsAccount = new HashSet<>();
Set<String> objects = new HashSet<>();
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index ab30866..113e8d5 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -278,4 +278,26 @@
AND a.member_id = #{memberId}
AND a.order_no = #{orderNo}
</select>
+
+ <select id="selectApiFcmMoneyFlowInsideInPage" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo">
+ select
+ a.*
+ from mall_money_flow a
+ <where>
+ a.type in (2,3,4,5)
+ <if test="record.inOrOut == 3">
+ and a.amount > 0
+ </if>
+ <if test="record.inOrOut == 2">
+ and 0 > a.amount
+ </if>
+ <if test="record.memberId != null">
+ and a.member_id=#{record.memberId}
+ </if>
+ <if test="record.flowType != null and record.flowType != ''">
+ and a.flow_type=#{record.flowType}
+ </if>
+ </where>
+ order by a.created_time desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1