From 4d1635e73a1555bb9bf83f43ebbad3ef01d34df1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 27 Jul 2023 10:16:24 +0800
Subject: [PATCH] 组合支付
---
src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java | 2 +-
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 3 +++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 6 ++++--
src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowDto.java | 2 +-
src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java | 8 +-------
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 7 +------
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 6 +++++-
7 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
index b6574ce..ed77efd 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
@@ -4,7 +4,7 @@
/**
*
- * 1-静态收益 2-直推奖 3-代理收益 4-排名收益 5-总监收益 6-社区点补 7-一代收益 8-提现 9-转增 10-支付 11-退款
+ * 1-赠送积分 2-直推奖 10-余额支付 23-积分支付 24-兑换券支付
* @author wzy
* @date 2021-09-24
**/
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowDto.java
index 1d627b4..7e0f72b 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowDto.java
@@ -25,7 +25,7 @@
@ApiModelProperty(value = "类型 1-全部 2-支出 3-收入")
private Integer inOrOut;
- @ApiModelProperty(value = "流水类型 1-余额 2-赠送积分 3-竞猜积分 4-佣金")
+ @ApiModelProperty(value = "流水类型 1-余额 2-赠送积分 3-兑换卷")
private Integer flowType;
@ApiModelProperty(hidden = true)
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 10db004..a535b8c5 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
@@ -286,7 +286,11 @@
mallMemberVo.setIsAgent(3);
}
// log.info(mallMemberVo.getName()+"---"+mallMemberVo.getAgentLevel());
-
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SCORE_CHANGE.getType(),
+ DataDictionaryEnum.SCORE_CHANGE.getCode()
+ );
+ mallMemberVo.setScoreChange(dataDictionaryCustom.getValue() == null ? "1" : dataDictionaryCustom.getValue());
return new FebsResponse().success().data(mallMemberVo);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 8494349..4605836 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -427,7 +427,7 @@
}
wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestDataThree);
payResultStr = brandWCPayRequestDataThree.getPrepay_id();
- orderInfo.setPayMethod("微信支付");
+ orderInfo.setPayMethod("余额加微信");
amountActualMsg = amountThree.toString();
break;
/**
@@ -465,6 +465,8 @@
mallMoneyFlowService.addMoneyFlow(member.getId(), amountActualOne.negate(), MoneyFlowTypeEnum.PAY.getValue(),
orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
amountActualMsg = amountActualOne.toString();
+
+ orderInfo.setPayMethod("积分加余额");
mallMoneyFlowService.addMoneyFlow(member.getId(), scoreOne.negate(),
MoneyFlowTypeEnum.SCORE_PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue(),"积分支付",2);
break;
@@ -501,7 +503,7 @@
}
wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestDataTwo);
payResultStr = brandWCPayRequestDataTwo.getPrepay_id();
- orderInfo.setPayMethod("微信支付");
+ orderInfo.setPayMethod("积分加微信");
amountActualMsg = amountActualTwo.toString();
break;
default:
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index d2f93f0..9808150 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -84,4 +84,7 @@
@ApiModelProperty(value = "代理等级数字 1：一级 2：二级 3：三级")
private Integer agentLevel;
+ @ApiModelProperty(value = "积分兑换比例 1，则一积分等于一元 2则2积分等于壹元")
+ private String scoreChange;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java
index 178599f..a72da5c 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java
@@ -25,13 +25,7 @@
@ApiModelProperty(value = "类型 1-静态收益 2-直推奖 3-代理收益 4-排名收益 5-总监收益 6-社区点补 7-一代收益 8-提现 9-转增 10-支付 11-退款")
private Integer type;
- @ApiModelProperty(value = "对方手机号")
- private String phone;
-
- @ApiModelProperty(value = "代理等级")
- private String memberLevel;
-
- @ApiModelProperty(value = "提现状态 1-提现中2-成功 3-拒绝")
+ @ApiModelProperty(value = "提现状态 1-进行中 2-成功 3-失败")
private Integer status;
@ApiModelProperty(value = "时间")
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 6840259..58b21ba 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -9,14 +9,9 @@
<select id="selectApiMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo">
select
- a.*,
- case when a.rt_member_id is null then (select n.phone from mall_member n where n.id=a.member_id)
- when a.rt_member_id is not null then (select m.phone from mall_member m where m.id=a.rt_member_id)
- end phone,
- c.description memberLevel
+ a.*
from mall_money_flow a
left join mall_member b on a.rt_member_id=b.id
- left join data_dictionary_custom c on b.level = c.code and c.type='AGENT_LEVEL'
<where>
1=1 and a.status = 2
<if test="record.inOrOut == 3">
--
Gitblit v1.9.1