From 12b84637ae89a2136bfc6774284841e87af02f0d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 08 Apr 2023 17:01:49 +0800
Subject: [PATCH] 设置内转开关
---
src/main/resources/templates/index.html | 7
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 25 +-
src/main/resources/templates/febs/views/modules/score/orderList.html | 6
src/main/resources/mapper/modules/MallMemberMapper.xml | 8
src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html | 19 +-
src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html | 54 ++----
src/main/resources/templates/febs/views/modules/product/categoryList.html | 1
src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowListDto.java | 2
src/main/resources/templates/febs/views/modules/mallMember/agentList.html | 30 ++-
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 50 ++++--
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 13
src/main/resources/templates/febs/views/modules/score/goodsList.html | 3
src/main/resources/templates/febs/views/modules/mallMember/updateRefererId.html | 8
src/main/resources/templates/febs/views/modules/score/moneyFlowList.html | 29 --
src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java | 2
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 103 +++++-------
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 30 +-
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 10
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 35 ++--
src/main/resources/templates/febs/views/modules/order/orderList.html | 40 ++---
src/main/resources/templates/febs/views/modules/goods/goodsList.html | 3
21 files changed, 236 insertions(+), 242 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 82701ba..6200f0c 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
@@ -116,7 +116,7 @@
DIRECTOR_CASH_PERK(22),
/**
- * 董事现金补贴
+ * 合伙人现金补贴
*/
PARTNER_CASH_PERK(23),
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowListDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowListDto.java
index 4f9560b..6c42ffe 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowListDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowListDto.java
@@ -11,6 +11,8 @@
private String phone;
+ private String orderNo;
+
private Integer type;
private Integer flowType;
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index b9e686b..b3ece82 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -159,24 +159,38 @@
Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
+ if(ObjectUtil.isEmpty(mallMemberBank)){
+ return new FebsResponse().fail().message("提现银行卡已删除");
+ }
+ mallMemberWithdraw.setStatus(2);
+ mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
+
+ QueryWrapper<MallMoneyFlow> flowQueryWrapper = new QueryWrapper<>();
+ flowQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo());
+ flowQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue());
+ MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(flowQueryWrapper);
+ if(ObjectUtil.isNotEmpty(mallMoneyFlow)){
+ mallMoneyFlow.setStatus(2);
+ mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ }
/**
* 调用汇聚代付
*/
- SinglePayDto singlePayDto = new SinglePayDto();
- singlePayDto.setMerchantOrderNo(mallMemberWithdraw.getWithdrawNo());
- singlePayDto.setReceiverAccountNoEncBankNo(mallMemberBank.getBankNo());
- singlePayDto.setReceiverAccountNoEncName(mallMemberBank.getName());
- singlePayDto.setReceiverAccountType("201");
- BigDecimal paidAmount = mallMemberWithdraw.getAmount().subtract(mallMemberWithdraw.getAmountFee()).setScale(2, BigDecimal.ROUND_DOWN);
- singlePayDto.setPaidAmount(paidAmount);
- singlePayDto.setCurrency("201");
- singlePayDto.setIsChecked("202");
- singlePayDto.setPaidDesc("用户提现");
- singlePayDto.setPaidUse("202");
- String singlePayRep = unipayService.singlePay(singlePayDto);
- if(!mallMemberWithdraw.getWithdrawNo().equals(singlePayRep)){
- return new FebsResponse().fail().message("提现失败，请稍后查看错误信息一览");
- }
+// SinglePayDto singlePayDto = new SinglePayDto();
+// singlePayDto.setMerchantOrderNo(mallMemberWithdraw.getWithdrawNo());
+// singlePayDto.setReceiverAccountNoEncBankNo(mallMemberBank.getBankNo());
+// singlePayDto.setReceiverAccountNoEncName(mallMemberBank.getName());
+// singlePayDto.setReceiverAccountType("201");
+// BigDecimal paidAmount = mallMemberWithdraw.getAmount().subtract(mallMemberWithdraw.getAmountFee()).setScale(2, BigDecimal.ROUND_DOWN);
+// singlePayDto.setPaidAmount(paidAmount);
+// singlePayDto.setCurrency("201");
+// singlePayDto.setIsChecked("202");
+// singlePayDto.setPaidDesc("用户提现");
+// singlePayDto.setPaidUse("202");
+// String singlePayRep = unipayService.singlePay(singlePayDto);
+// if(!mallMemberWithdraw.getWithdrawNo().equals(singlePayRep)){
+// return new FebsResponse().fail().message("提现失败，请稍后查看错误信息一览");
+// }
return new FebsResponse().success();
}
@@ -202,8 +216,8 @@
mallMoneyFlow.setStatus(3);
mallMoneyFlowMapper.updateById(mallMoneyFlow);
- //用户佣金增加对应的余额
- iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"commission");
+ //用户增加对应的余额
+ iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
return new FebsResponse().success();
}
@@ -450,7 +464,7 @@
// 重置交易密码
if (type == 1) {
- String payPwd = SecureUtil.md5("654321");
+ String payPwd = SecureUtil.md5("123456");
member.setTradePassword(payPwd);
// 重置登录密码
} else {
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
index 02e5fbb..9a715bc 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
@@ -71,19 +71,16 @@
throw new FebsException("未找到银行卡信息");
}
- BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
- if (profit != null) {
- // 可提现
- BigDecimal canMoney = wallet.getCommission().subtract(profit);
-
- if(withdrawalDto.getAmount().compareTo(canMoney) > 0) {
- throw new FebsException("提现金额不足");
- }
+ if(wallet.getBalance().compareTo(BigDecimal.ZERO) <= 0){
+ throw new FebsException("金额不足");
+ }
+ if(withdrawalDto.getAmount().compareTo(wallet.getBalance()) > 0) {
+ throw new FebsException("金额不足");
}
BigDecimal serviceFee = cashOutSettingVo.getServiceFee().multiply(BigDecimal.valueOf(0.01));
- walletService.reduce(withdrawalDto.getAmount(), memberId, "commission");
+ walletService.reduce(withdrawalDto.getAmount(), memberId, "balance");
String orderNo = MallUtils.getOrderNum("W");
MallMemberWithdraw withdraw = new MallMemberWithdraw();
@@ -95,6 +92,14 @@
withdraw.setWtihdrawTypeId(mallMemberBank.getId());
this.baseMapper.insert(withdraw);
- mallMemberService.addMoneyFlow(memberId, withdrawalDto.getAmount().negate(), MoneyFlowTypeEnum.WITHDRAWAL.getValue(), orderNo, null, null, null, 1, FlowTypeEnum.COMMISSION.getValue());
+ mallMemberService.addMoneyFlow(memberId,
+ withdrawalDto.getAmount().negate(),
+ MoneyFlowTypeEnum.WITHDRAWAL.getValue(),
+ orderNo,
+ null,
+ null,
+ null,
+ 1,
+ FlowTypeEnum.BALANCE.getValue());
}
}
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index e436ebb..1f773fb 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -149,11 +149,9 @@
sum(b.amount)
FROM
mall_member e
- INNER JOIN mall_order_info b ON e.id = b.member_id
- AND b. STATUS = 4
+ INNER JOIN mall_achieve_record b ON e.id = b.member_id
WHERE
e.invite_id = m.invite_id
- OR e.referrer_id = m.invite_id
or find_in_set(m.invite_id, e.referrer_ids)
),0) amount
FROM mall_member m
@@ -223,11 +221,9 @@
ifnull(sum(b.amount),0)
FROM
mall_member e
- INNER JOIN mall_order_info b ON e.id = b.member_id
- AND b. STATUS = 4
+ INNER JOIN mall_achieve_record b ON e.id = b.member_id
WHERE
e.invite_id = #{inviteId}
- OR e.referrer_id = #{inviteId}
or find_in_set(#{inviteId}, e.referrer_ids)
</select>
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 8b00702..89c4558 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -41,12 +41,9 @@
select
a.*,
b.name,
- b.bind_phone bindPhone,
- c.pay_method payMethod,
b.phone
from mall_money_flow a
inner join mall_member b on a.member_id=b.id
- left join mall_order_info c on a.order_no = c.order_no
<where>
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
@@ -56,10 +53,13 @@
and b.phone like concat('%', #{record.phone},'%')
</if>
<if test="record.type!=null and record.type!=''">
- and a.type like concat('%', #{record.type},'%')
+ and a.type =#{record.type}
+ </if>
+ <if test="record.orderNo!=null and record.orderNo!=''">
+ and a.order_no like concat('%', #{record.orderNo},'%')
</if>
<if test="record.flowType!=null and record.flowType!=''">
- and a.flow_type like concat('%', #{record.flowType},'%')
+ and a.flow_type = #{record.flowType}
</if>
</if>
</where>
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
index 5208f25..b1c23af 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -85,24 +85,25 @@
<option value="1">普通商品区</option>
<option value="2">套餐区</option>
</select>
+ <div class="layui-form-mid layui-word-aux">商品类型选择套餐区，用户购买后，将产生业绩，并生成设定的补贴信息。</div>
</div>
</div>
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态倍数</label>
- <div class="layui-input-block">
- <input type="text" name="staticMulti" placeholder="请输入静态倍数" autocomplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分</div>
- </div>
- </div>
+<!-- <div class="layui-form-item febs-hide tc-set">-->
+<!-- <label class="layui-form-label">静态倍数</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticMulti" placeholder="请输入静态倍数" autocomplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分</div>-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态占比(%)</label>
- <div class="layui-input-block">
- <input type="text" name="staticProp" placeholder="请输入静态占比" autocomplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>
- </div>
- </div>
+<!-- <div class="layui-form-item febs-hide tc-set">-->
+<!-- <label class="layui-form-label">静态占比(%)</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticProp" placeholder="请输入静态占比" autocomplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<div class="layui-tab-item">
@@ -179,7 +180,6 @@
<label class="layui-form-label febs-form-item-require">现价：</label>
<div class="layui-input-block">
<input type="text" name="presentPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">现价设置为0进入零撸专区</div>
</div>
</div>
</div>
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsList.html b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
index a058469..e5e0519 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsList.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
@@ -8,8 +8,9 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">商品名称：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="名称" name="goodsName" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="商品名称" name="goodsName" autocomplete="off" class="layui-input">
</div>
</div>
</div>
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
index d91bcd3..dd90f3e 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -94,27 +94,28 @@
<option value="1">普通商品区</option>
<option value="2">套餐区</option>
</select>
+ <div class="layui-form-mid layui-word-aux">商品类型选择套餐区，用户购买后，将产生业绩，并生成设定的补贴信息。</div>
</div>
</div>
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态倍数</label>
- <div class="layui-input-block">
- <input type="text" name="staticMulti" placeholder="请输入静态倍数"
- autoComplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分
- </div>
- </div>
- </div>
+<!-- <div class="layui-form-item febs-hide tc-set">-->
+<!-- <label class="layui-form-label">静态倍数</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticMulti" placeholder="请输入静态倍数"-->
+<!-- autoComplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态占比(%)</label>
- <div class="layui-input-block">
- <input type="text" name="staticProp" placeholder="请输入静态占比"
- autoComplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>
- </div>
- </div>
+<!-- <div class="layui-form-item febs-hide tc-set">-->
+<!-- <label class="layui-form-label">静态占比(%)</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticProp" placeholder="请输入静态占比"-->
+<!-- autoComplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<div class="layui-tab-item">
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
index d91fb68..0aa1436 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
@@ -8,25 +8,29 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">名称：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="名称" name="name" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">账号：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="手机号" name="account" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="账号" name="account" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">代理层级</label>
+ <label class="layui-form-label">代理层级：</label>
<div class="layui-input-inline">
<select name="level">
<option value="">请选择</option>
- <option value="FIRST_LEVEL">普通会员</option>
- <option value="SECOND_LEVEL">一星</option>
- <option value="THIRD_LEVEL">二星</option>
- <option value="FOUR_LEVEL">三星</option>
- <option value="FIFTH_LEVEL">四星</option>
+ <option value="NORMAL">普通会员</option>
+ <option value="V1">V1</option>
+ <option value="V2">V2</option>
+ <option value="V3">V3</option>
+ <option value="V4">V4</option>
+ <option value="V5">V5</option>
+ <option value="V6">V6</option>
</select>
</div>
</div>
@@ -128,15 +132,15 @@
elem: $view.find('table'),
id: 'userAgentTable',
url: ctx + 'admin/mallMember/getAgentList',
+ totalRow: true ,// 开启合计行
cols: [[
- {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
+ {field: 'name', title: '名称', minWidth: 100,align:'left', totalRowText: '合计：'},
{field: 'phone', title: '账号', minWidth: 150,align:'left'},
- {field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'levelName', title: '代理层级', minWidth: 100,align:'left'},
- {field: 'memberNum', title: '下级', minWidth: 100,align:'left'},
- {field: 'allMemberNum', title: '我的团队总数', minWidth: 100,align:'left'},
- {field: 'amount', title: '团队业绩', minWidth: 100,align:'left'},
+ {field: 'memberNum', title: '下级', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.memberNum) }}'},
+ {field: 'allMemberNum', title: '我的团队总数', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.allMemberNum) }}'},
+ {field: 'amount', title: '团队业绩', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
{title: '操作',
templet: function (d) {
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agentAllMember" shiro:hasPermission="user:update">全部成员</button>'
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
index 03d6a16..a73e35b 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
@@ -8,17 +8,19 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">名称：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="名称" name="name" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">账号：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="手机号" name="phone" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="账号" name="phone" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">状态</label>
+ <label class="layui-form-label">状态：</label>
<div class="layui-input-inline">
<select name="status">
<option value="">请选择</option>
@@ -118,14 +120,15 @@
elem: $view.find('table'),
id: 'moneyFlowChargeTable',
url: ctx + 'admin/mallMember/getMoneyChargeList',
+ totalRow: true ,// 开启合计行
cols: [[
- {field: 'withdrawNo', title: '编号', minWidth: 100,align:'left'},
+ {field: 'withdrawNo', title: '编号', minWidth: 100,align:'left', totalRowText: '合计：'},
{field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'phone', title: '账号', minWidth: 150,align:'left'},
- {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
- {field: 'amount', title: '金额', minWidth: 150,align:'left'},
- {field: 'amountFee', title: '手续费', minWidth: 150,align:'left'},
- {field: 'remark', title: '错误信息', minWidth: 150,align:'left'},
+ // {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
+ {field: 'amount', title: '金额', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
+ {field: 'amountFee', title: '手续费', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amountFee) }}'},
+ // {field: 'remark', title: '错误信息', minWidth: 150,align:'left'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index 021e001..bb1aa63 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -227,13 +227,14 @@
url: ctx + 'admin/mallMember/getMallMemberList',
toolbar:"#toolbar",
defaultToolbar:[],
+ totalRow: true ,// 开启合计行
cols: [[
{type: 'checkbox'},
- {field: 'phone', title: '账号', minWidth: 150,align:'left'},
+ {field: 'phone', title: '账号', minWidth: 150,align:'left', totalRowText: '合计：'},
{field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
- {field: 'balance', title: '余额', minWidth: 100,align:'left'},
- {field: 'score', title: '积分', minWidth: 100,align:'left'},
+ {field: 'balance', title: '余额', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.balance) }}'},
+ {field: 'score', title: '积分', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.score) }}'},
// {field: 'prizeScore', title: '竞猜积分', minWidth: 100,align:'left'},
// {field: 'commission', title: '佣金', minWidth: 100,align:'left'},
{field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
@@ -287,7 +288,7 @@
}
if (layEvent === 'resetPwd') {
- febs.modal.confirm('重置登录密码', '是否重置选中账号登录密码？', function () {
+ febs.modal.confirm('重置登录密码', '是否重置选中账号登录密码为【a123456】？', function () {
var ids = [];
layui.each(checkData, function (key, item) {
ids.push(item.id)
@@ -297,7 +298,7 @@
}
if (layEvent === 'resetPayPwd') {
- febs.modal.confirm('重置交易密码', '是否重置选中账号交易密码？', function () {
+ febs.modal.confirm('重置交易密码', '是否重置选中账号交易密码为【123456】？', function () {
var ids = [];
layui.each(checkData, function (key, item) {
ids.push(item.id)
@@ -342,7 +343,7 @@
});
function systemPay(text, id, type) {
- febs.modal.open('text', 'modules/mallMember/mallSystemPay/' + type +'/'+ id, {
+ febs.modal.open(text, 'modules/mallMember/mallSystemPay/' + type +'/'+ id, {
btn: ['提交', '取消'],
yes: function (index, layero) {
$('#systemPay-update').find('#submit').trigger('click');
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
index d720f1d..b9e4f3a 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
@@ -46,42 +46,34 @@
{field: 'amount', title: '金额', minWidth: 80,align:'center'},
{field: 'type', title: '流水类型',
templet: function (d) {
- if (d.type === 1) {
- return '<span>静态收益</span>'
- } else if (d.type === 2) {
- return '<span>直推奖</span>'
- } else if (d.type === 3) {
- return '<span>代理收益</span>'
- } else if (d.type === 4) {
- return '<span>排名收益</span>'
- }else if (d.type === 5) {
- return '<span>总监收益</span>'
- }else if (d.type === 6) {
- return '<span>社区店补</span>'
- }else if (d.type === 7) {
- return '<span>一代收益</span>'
- }else if (d.type === 8) {
+ if (d.type === 8) {
return '<span>提现</span>'
- }else if (d.type === 9) {
+ } else if (d.type === 9) {
return '<span>转账</span>'
- }else if (d.type === 10) {
+ } else if (d.type === 10) {
return '<span>支付</span>'
- }else if (d.type === 11) {
+ } else if (d.type === 11) {
return '<span>退款</span>'
- }else if (d.type === 12) {
- return '<span>佣金转竞猜积分</span>'
- }else if (d.type === 13) {
- return '<span>佣金转余额</span>'
}else if (d.type === 14) {
- return '<span>竞猜积分签到</span>'
- }else if (d.type === 15) {
- return '<span>感恩奖</span>'
+ return '<span>签到</span>'
}else if (d.type === 16) {
return '<span>系统拨付</span>'
- }else if (d.type === 17) {
- return '<span>抽奖</span>'
+ }else if (d.type === 19) {
+ return '<span>套餐获取积分补贴</span>'
+ }else if (d.type === 20) {
+ return '<span>直推现金补贴</span>'
+ }else if (d.type === 21) {
+ return '<span>直推积分补贴</span>'
+ }else if (d.type === 22) {
+ return '<span>董事现金补贴</span>'
+ }else if (d.type === 23) {
+ return '<span>合伙人现金补贴</span>'
+ }else if (d.type === 24) {
+ return '<span>代理现金补贴</span>'
+ }else if (d.type === 25) {
+ return '<span>代理积分补贴</span>'
}else{
- return ''
+ return '-'
}
}, minWidth: 80,align:'center'},
{field: 'flowType', title: '资金类型',
@@ -89,11 +81,7 @@
if (d.flowType === 1) {
return '余额';
} else if(d.flowType === 2) {
- return '赠送积分'
- } else if(d.flowType === 3) {
- return '竞猜积分'
- } else if(d.flowType === 4) {
- return '佣金'
+ return '积分'
} else {
return '-';
}
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
index 48d958e..ab4eebd 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -8,50 +8,51 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">名称：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="名称" name="name" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">账号：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="手机号" name="phone" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="账号" name="phone" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">流水类型</label>
+ <label class="layui-form-label">订单编号：</label>
+ <div class="layui-input-inline">
+ <input type="text" placeholder="订单编号" name="orderNo" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">流水类型：</label>
<div class="layui-input-inline">
<select name="type">
<option value="">请选择</option>
- <option value="1">静态收益</option>
- <option value="2">直推奖</option>
- <option value="3">代理收益</option>
- <option value="4">排名收益</option>
- <option value="5">总监收益</option>
- <option value="6">社区店补</option>
- <option value="7">一代收益</option>
<option value="8">提现</option>
<option value="9">转账</option>
<option value="10">支付</option>
<option value="11">退款</option>
- <option value="12">佣金转竞猜积分</option>
- <option value="13">佣金转余额</option>
- <option value="14">竞猜积分签到</option>
- <option value="15">感恩奖</option>
+ <option value="14">签到</option>
<option value="16">系统拨付</option>
- <option value="17">抽奖</option>
- <option value="18">积分池收益</option>
+ <option value="19">套餐获取积分补贴</option>
+ <option value="20">直推现金补贴</option>
+ <option value="21">直推积分补贴</option>
+ <option value="22">董事现金补贴</option>
+ <option value="23">合伙人现金补贴</option>
+ <option value="24">代理现金补贴</option>
+ <option value="25">代理积分补贴</option>
</select>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">资金类型</label>
+ <label class="layui-form-label">资金类型：</label>
<div class="layui-input-inline">
<select name="flowType">
<option value="">请选择</option>
<option value="1">余额</option>
- <option value="2">赠送积分</option>
- <option value="3">竞猜积分</option>
- <option value="4">佣金</option>
+ <option value="2">积分</option>
</select>
</div>
</div>
@@ -117,50 +118,41 @@
elem: $view.find('table'),
id: 'moneyFlowTable',
url: ctx + 'admin/mallMember/getMoneyFlowList',
+ totalRow: true ,// 开启合计行
cols: [[
- {field: 'name', title: '名称', minWidth: 100,align:'left'},
+ {field: 'name', title: '名称', minWidth: 100,align:'left', totalRowText: '合计：'},
{field: 'phone', title: '账号', minWidth: 150,align:'left'},
- {field: 'amount', title: '金额', minWidth: 150,align:'left'},
+ {field: 'amount', title: '金额', minWidth: 150,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
{field: 'type', title: '流水类型',
templet: function (d) {
- if (d.type === 1) {
- return '<span>静态收益</span>'
- } else if (d.type === 2) {
- return '<span>直推奖</span>'
- } else if (d.type === 3) {
- return '<span>代理收益</span>'
- } else if (d.type === 4) {
- return '<span>排名收益</span>'
- }else if (d.type === 5) {
- return '<span>总监收益</span>'
- }else if (d.type === 6) {
- return '<span>社区店补</span>'
- }else if (d.type === 7) {
- return '<span>一代收益</span>'
- }else if (d.type === 8) {
+ if (d.type === 8) {
return '<span>提现</span>'
- }else if (d.type === 9) {
+ } else if (d.type === 9) {
return '<span>转账</span>'
- }else if (d.type === 10) {
+ } else if (d.type === 10) {
return '<span>支付</span>'
- }else if (d.type === 11) {
+ } else if (d.type === 11) {
return '<span>退款</span>'
- }else if (d.type === 12) {
- return '<span>佣金转竞猜积分</span>'
- }else if (d.type === 13) {
- return '<span>佣金转余额</span>'
}else if (d.type === 14) {
- return '<span>竞猜积分签到</span>'
- }else if (d.type === 15) {
- return '<span>感恩奖</span>'
+ return '<span>签到</span>'
}else if (d.type === 16) {
return '<span>系统拨付</span>'
- }else if (d.type === 17) {
- return '<span>抽奖</span>'
- }else if (d.type === 18) {
- return '<span>积分池收益</span>'
+ }else if (d.type === 19) {
+ return '<span>套餐获取积分补贴</span>'
+ }else if (d.type === 20) {
+ return '<span>直推现金补贴</span>'
+ }else if (d.type === 21) {
+ return '<span>直推积分补贴</span>'
+ }else if (d.type === 22) {
+ return '<span>董事现金补贴</span>'
+ }else if (d.type === 23) {
+ return '<span>合伙人现金补贴</span>'
+ }else if (d.type === 24) {
+ return '<span>代理现金补贴</span>'
+ }else if (d.type === 25) {
+ return '<span>代理积分补贴</span>'
}else{
- return ''
+ return '-'
}
}, minWidth: 80,align:'center'},
{field: 'flowType', title: '资金类型',
@@ -168,11 +160,7 @@
if (d.flowType === 1) {
return '余额';
} else if(d.flowType === 2) {
- return '赠送积分'
- } else if(d.flowType === 3) {
- return '竞猜积分'
- } else if(d.flowType === 4) {
- return '佣金'
+ return '积分'
} else {
return '-';
}
@@ -188,6 +176,7 @@
return {
name: $searchForm.find('input[name="name"]').val().trim(),
phone: $searchForm.find('input[name="phone"]').val().trim(),
+ orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
type: $searchForm.find("select[name='type']").val(),
flowType: $searchForm.find("select[name='flowType']").val(),
};
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/updateRefererId.html b/src/main/resources/templates/febs/views/modules/mallMember/updateRefererId.html
index b656380..05adb97 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/updateRefererId.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/updateRefererId.html
@@ -28,20 +28,22 @@
<input type="text" name="id">
</div>
</div>
+ <blockquote class="layui-elem-quote blue-border">当前推荐人</blockquote>
<div class="layui-form-item">
- <label class="layui-form-label febs-form-item-require">推荐人姓名：</label>
+ <label class="layui-form-label febs-form-item-require">姓名：</label>
<div class="layui-input-block">
<input type="text" name="name" lay-verify="required" autocomplete="off" class="layui-input" readonly>
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label febs-form-item-require">推荐人ID：</label>
+ <label class="layui-form-label febs-form-item-require">邀请码：</label>
<div class="layui-input-block">
<input type="text" name="inviteId" lay-verify="required" autocomplete="off" class="layui-input" readonly>
</div>
</div>
+ <blockquote class="layui-elem-quote blue-border">输入修改后的推荐人邀请码</blockquote>
<div class="layui-form-item">
- <label class="layui-form-label febs-form-item-require">修改推荐人ID：</label>
+ <label class="layui-form-label febs-form-item-require">邀请码：</label>
<div class="layui-input-block">
<input type="text" name="referrerId" lay-verify="required" autocomplete="off" class="layui-input">
</div>
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index ac7a50a..20b5d95 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -7,22 +7,25 @@
<div class="layui-form-item">
<div class="layui-col-md10">
<div class="layui-inline">
- <div class="layui-input-inline">
- <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input type="text" placeholder="商品名称" name="goodsName" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
+ <label class="layui-form-label">订单编号：</label>
<div class="layui-input-inline">
<input type="text" placeholder="订单编号" name="orderNo" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">订单状态</label>
+ <label class="layui-form-label">购买人：</label>
+ <div class="layui-input-inline">
+ <input type="text" placeholder="购买人" name="name" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">商品信息：</label>
+ <div class="layui-input-inline">
+ <input type="text" placeholder="商品信息" name="goodsName" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">状态：</label>
<div class="layui-input-inline">
<select name="status">
<option value="">请选择</option>
@@ -37,24 +40,14 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">支付状态</label>
- <div class="layui-input-inline">
- <select name="payResult">
- <option value="">请选择</option>
- <option value="1">成功</option>
- <option value="2">未成功</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">开始时间</label>
+ <label class="layui-form-label">开始时间：</label>
<div class="layui-input-inline">
<input type="text" name="startTime" id="febs-form-group-date-start" lay-verify="date"
placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">结束时间</label>
+ <label class="layui-form-label">结束时间：</label>
<div class="layui-input-inline">
<input type="text" name="endTime" id="febs-form-group-date-end" lay-verify="date"
placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
@@ -341,7 +334,6 @@
name: $searchForm.find('input[name="name"]').val().trim(),
orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
goodsName: $searchForm.find('input[name="goodsName"]').val().trim(),
- payResult: $searchForm.find("select[name='payResult']").val(),
status: $searchForm.find("select[name='status']").val(),
};
}
diff --git a/src/main/resources/templates/febs/views/modules/product/categoryList.html b/src/main/resources/templates/febs/views/modules/product/categoryList.html
index 3bb27d3..15b7872 100644
--- a/src/main/resources/templates/febs/views/modules/product/categoryList.html
+++ b/src/main/resources/templates/febs/views/modules/product/categoryList.html
@@ -8,6 +8,7 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">名称：</label>
<div class="layui-input-inline">
<input type="text" placeholder="名称" name="name" autocomplete="off" class="layui-input">
</div>
diff --git a/src/main/resources/templates/febs/views/modules/score/goodsList.html b/src/main/resources/templates/febs/views/modules/score/goodsList.html
index d372298..eca7ffb 100644
--- a/src/main/resources/templates/febs/views/modules/score/goodsList.html
+++ b/src/main/resources/templates/febs/views/modules/score/goodsList.html
@@ -8,8 +8,9 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">商品名称：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="名称" name="goodsName" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="商品名称" name="goodsName" autocomplete="off" class="layui-input">
</div>
</div>
</div>
diff --git a/src/main/resources/templates/febs/views/modules/score/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/score/moneyFlowList.html
index 4d14b9f..c79cdb5 100644
--- a/src/main/resources/templates/febs/views/modules/score/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/score/moneyFlowList.html
@@ -8,25 +8,15 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">名称：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="名称" name="name" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">账号：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="手机号" name="phone" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">账户状态</label>
- <div class="layui-input-inline">
- <select name="type">
- <option value="">请选择</option>
- <option value="10">支付</option>
- <option value="11">退款</option>
- <option value="12">佣金转竞猜积分</option>
- <option value="14">签到</option>
- </select>
+ <input type="text" placeholder="账号" name="phone" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -90,22 +80,17 @@
tableIns = febs.table.init({
elem: $view.find('table'),
id: 'moneyFlowTable',
- url: ctx + 'admin/mallMember/getMoneyFlowList?flowType=3',
+ url: ctx + 'admin/mallMember/getMoneyFlowList?flowType=2',
cols: [[
{field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'phone', title: '账号', minWidth: 150,align:'left'},
- {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
{field: 'amount', title: '金额', minWidth: 150,align:'left'},
{field: 'type', title: '流水类型',
templet: function (d) {
if (d.type === 10) {
return '<span>支付</span>'
- }else if (d.type === 11) {
- return '<span>退款</span>'
- }else if (d.type === 12){
- return '<span>佣金转竞猜积分</span>'
- }else if (d.type === 14){
- return '<span>签到</span>'
+ }else {
+ return '-'
}
}, minWidth: 80,align:'center'},
{field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
diff --git a/src/main/resources/templates/febs/views/modules/score/orderList.html b/src/main/resources/templates/febs/views/modules/score/orderList.html
index 132ce24..13ff7bc 100644
--- a/src/main/resources/templates/febs/views/modules/score/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/score/orderList.html
@@ -7,13 +7,15 @@
<div class="layui-form-item">
<div class="layui-col-md10">
<div class="layui-inline">
+ <label class="layui-form-label">订单编号：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="订单编号" name="orderNo" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">购买人：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="订单编号" name="orderNo" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="购买人" name="name" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index fa73565..bec1cc2 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -20,6 +20,13 @@
<script src="https://unpkg.com/@wangeditor/editor@latest/dist/index.js"></script>
<link rel="icon" th:href="@{febs/images/favicon.ico}" type="image/x-icon"/>
</head>
+
+<style type="text/css">
+ ::-webkit-scrollbar {
+ height: 20px !important;
+ background-color: #f4f4f4;
+ }
+</style>
<body>
<div id="febs"></div>
<script th:src="@{layui/layui.js}"></script>
--
Gitblit v1.9.1