From 541d141cf8d306c1974e17427666e4f09e4b1457 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 21 Feb 2024 18:08:59 +0800
Subject: [PATCH] 抽奖
---
src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html | 89 ++----------
src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java | 4
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 33 ++--
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 1
src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html | 97 ++-----------
src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java | 3
src/main/resources/templates/febs/views/modules/order/cjList.html | 42 +++--
src/main/resources/templates/febs/views/modules/mallMember/chargeFlowListType.html | 3
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 87 +-----------
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 4
10 files changed, 94 insertions(+), 269 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
index dcb5383..9216ef6 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -148,7 +148,6 @@
@GetMapping("paymentInfo/{id}")
@RequiresPermissions("paymentInfo:update")
public String paymentInfo(@PathVariable long id, Model model) {
-// AdminMallMemberPaymentVo data = mallMemberService.getMallMemberPaymentInfoByFlowId(id);
AdminMallMemberPaymentVo data = mallMemberService.getMallBankInfoById(id);
model.addAttribute("paymentInfo", data);
return FebsUtil.view("modules/mallMember/paymentInfo");
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 735457f..06969ba 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
@@ -177,31 +177,9 @@
return new FebsResponse().fail().message("当前状态不是提现中");
}
- Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
- MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
- String bankName = mallMemberBank.getBankName();
- NBYHResponse nbyhResponse = new NBYHResponse();
- if("宁波银行".equals(bankName)){
- nbyhResponse = nbyhService.tradeSinge(mallMemberWithdraw.getId());
- }else{
- nbyhResponse = nbyhService.tradeSingeOuterTransfer(mallMemberWithdraw.getId());
- }
- if(nbyhResponse.isFlag()){
- 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);
- }
- return new FebsResponse().success().message(nbyhResponse.getMsg());
- }else{
- return new FebsResponse().fail().message(nbyhResponse.getMsg());
- }
+ mallMemberWithdraw.setStatus(2);
+ mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
+ return new FebsResponse().success().message("操作成功");
}
@Override
@@ -220,63 +198,13 @@
QueryWrapper<MallMoneyFlow> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo());
- objectQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue());
+ objectQueryWrapper.eq("type",MoneyFlowTypeNewEnum.RANK_BONUS.getValue());
MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(objectQueryWrapper);
mallMoneyFlow.setStatus(3);
mallMoneyFlowMapper.updateById(mallMoneyFlow);
- if(AppContants.MEMBER_WITHDRAW_NORMAL.equals(mallMemberWithdraw.getRemark())){
- //用户佣金增加对应的余额
- iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
- mallMemberService.addMoneyFlow(mallMemberWithdraw.getMemberId(),
- mallMemberWithdraw.getAmount(),
- MoneyFlowTypeEnum.WITHDRAWAL.getValue(),
- mallMemberWithdraw.getWithdrawNo(),
- null,
- null,
- mallMemberWithdraw.getMemberId(),
- 2,
- FlowTypeEnum.BALANCE.getValue(),
- 1);
- }
- if(AppContants.MEMBER_WITHDRAW_VOUCHER.equals(mallMemberWithdraw.getRemark())){
- iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
+ //用户佣金增加对应的余额
+ iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
- mallMemberService.addMoneyFlow(mallMemberWithdraw.getMemberId(),
- mallMemberWithdraw.getAmount(),
- MoneyFlowTypeEnum.WITHDRAWAL.getValue(),
- mallMemberWithdraw.getWithdrawNo(),
- null,
- null,
- mallMemberWithdraw.getMemberId(),
- 2,
- FlowTypeEnum.BALANCE.getValue(),
- 1);
- iApiMallMemberWalletService.add(mallMemberWithdraw.getAmountFee(),mallMemberWithdraw.getMemberId(),"voucherFireCnt");
-
- mallMemberService.addMoneyFlow(mallMemberWithdraw.getMemberId(),
- mallMemberWithdraw.getAmountFee(),
- MoneyFlowTypeEnum.WITHDRAWAL.getValue(),
- mallMemberWithdraw.getWithdrawNo(),
- null,
- null,
- mallMemberWithdraw.getMemberId(),
- 2,
- FlowTypeEnum.COMMISSION.getValue(),
- 1);
- }
- if(AppContants.MEMBER_WITHDRAW_VOUCHER_AMOUNT.equals(mallMemberWithdraw.getRemark())){
- iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"voucherAmount");
- mallMemberService.addMoneyFlow(mallMemberWithdraw.getMemberId(),
- mallMemberWithdraw.getAmount(),
- MoneyFlowTypeEnum.WITHDRAWAL.getValue(),
- mallMemberWithdraw.getWithdrawNo(),
- null,
- null,
- mallMemberWithdraw.getMemberId(),
- 2,
- FlowTypeEnum.VOUCHER_AMOUNT.getValue(),
- 1);
- }
return new FebsResponse().success();
}
@@ -691,6 +619,9 @@
adminMallMemberPaymentVo.setDigitalNo(mallMemberBank.getDigitalNo());
adminMallMemberPaymentVo.setSubbranchName(mallMemberBank.getSubbranchName());
adminMallMemberPaymentVo.setBank(mallMemberBank.getBankName());
+ adminMallMemberPaymentVo.setIdCardNum(mallMemberBank.getIdCardNum());
+ adminMallMemberPaymentVo.setPhone(mallMemberBank.getPhone());
+ adminMallMemberPaymentVo.setName(mallMemberBank.getName());
}
return adminMallMemberPaymentVo;
}
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 b584790..9c984a7 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
@@ -90,8 +90,8 @@
mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.getCode());
mallMember.setSex("男");
mallMember.setBindPhone(account);
- String inviteId = ShareCodeUtil.toSerialCode(mallMember.getId());
- mallMember.setInviteId(inviteId);
+// String inviteId = ShareCodeUtil.toSerialCode(mallMember.getId());
+// mallMember.setInviteId(inviteId);
this.baseMapper.insert(mallMember);
MallMemberWallet wallet = new MallMemberWallet();
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java
index 978a42a..997d491 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallMemberPaymentVo.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.mall.vo;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@@ -44,4 +45,7 @@
private String digitalNo;
private String subbranchName;
+ private String name;
+ private String idCardNum;
+ private String phone;
}
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 687df16..5072e48 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java
@@ -22,6 +22,9 @@
@ApiModelProperty(value = "金额，有正负")
private BigDecimal amount;
+ @ApiModelProperty(value = "1-进行中 2-成功 3-失败")
+ private Integer status;
+
@ApiModelProperty(value = "描述")
private String description;
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 7d9317e..1d46d9f 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
@@ -8,21 +8,9 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">登录账户：</label>
+ <label class="layui-form-label">账号：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="登录账户" name="accountLogin" 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="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">
@@ -30,9 +18,9 @@
<div class="layui-input-inline">
<select name="status">
<option value="">请选择</option>
- <option value="1">提现中</option>
+ <option value="1">进行中</option>
<option value="2">成功</option>
- <option value="3">拒绝</option>
+ <option value="3">失败</option>
</select>
</div>
</div>
@@ -58,14 +46,23 @@
{{# if(d.status === 1) { }}
<!-- <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="chargeAgree:update" lay-event="chargeAgree">同意</button>-->
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="chargeAgree:update" lay-event="chargeAgree">同意</button>
- <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="searchInfo:view" lay-event="searchInfo">查询结果</button>
- <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="accountInfo:view" lay-event="accountInfo">账户余额</button>
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="chargeDisagree:update" lay-event="chargeDisagree" >拒绝</button>
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="paymentInfo:update" lay-event="paymentInfo">查看收款方式</button>
{{# } else { }}
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="paymentInfo:update" lay-event="paymentInfo">查看收款方式</button>
- <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="searchInfo:view" lay-event="searchInfo">查询结果</button>
{{# } }}
+</script>
+
+<script type="text/html" id="txStatusFormat">
+ <div>
+ {{# if (d.status == 1) { }}
+ <span class="layui-badge febs-tag-blue">进行中</span>
+ {{# } else if (d.status == 2) { }}
+ <span class="layui-badge febs-tag-green">成功</span>
+ {{# } else { }}
+ <span class="layui-badge febs-tag-red">失败</span>
+ {{# } }}
+ </div>
</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
@@ -94,35 +91,14 @@
table.on('tool(moneyFlowChargeTable)', function (obj) {
var data = obj.data,
layEvent = obj.event;
- // if (layEvent === 'chargeAgree') {
- // febs.modal.confirm('同意', '同意提现？', function () {
- // chargeAgree(data.id);
- // });
- // }
if (layEvent === 'chargeAgree') {
- febs.modal.open( '提现方式', 'modules/mallMember/chargeFlowListType/' + data.id, {
- btn: ['提交', '取消'],
- yes: function (index, layero) {
- $('#charge-update').find('#submit').trigger('click');
- },
- btn2: function () {
- layer.closeAll();
- }
+ febs.modal.confirm('同意', '同意提现？', function () {
+ chargeAgree(data.id);
});
}
if (layEvent === 'chargeDisagree') {
febs.modal.confirm('拒绝', '拒绝提现？', function () {
chargeDisagree(data.id);
- });
- }
- if (layEvent === 'searchInfo') {
- febs.modal.confirm('查询结果', '查看银行转账结果？', function () {
- searchInfo(data.id);
- });
- }
- if (layEvent === 'accountInfo') {
- febs.modal.confirm('账户余额', '查看银行账户余额是否大于此次转账金额？', function () {
- accountInfo(data.id);
});
}
if (layEvent === 'paymentInfo') {
@@ -131,22 +107,6 @@
});
}
});
- function searchInfo(id) {
- febs.get(ctx + 'admin/mallMember/searchInfo/' + id, null, function (data) {
- febs.alert.success(data.message);
- // febs.alert.success('操作成功');
- // window.location.reload();
- $query.click();
- });
- }
- function accountInfo(id) {
- febs.get(ctx + 'admin/mallMember/accountInfo/' + id, null, function (data) {
- febs.alert.success(data.message);
- // febs.alert.success('操作成功');
- // window.location.reload();
- $query.click();
- });
- }
function chargeAgree(id) {
febs.get(ctx + 'admin/mallMember/chargeAgree/' + id, null, function () {
febs.alert.success('操作成功');
@@ -182,25 +142,10 @@
totalRow: true ,// 开启合计行
cols: [[
{field: 'withdrawNo', title: '编号', minWidth: 100,align:'left', totalRowText: '合计：'},
- {field: 'accountLogin', title: '登录账户', minWidth: 100,align:'left'},
- {field: 'name', title: '名称', minWidth: 100,align:'left'},
- {field: 'phone', title: '手机号码', minWidth: 150,align:'left'},
- // {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
+ {field: 'phone', 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) {
- return '<span style="color:green;">提现中</span>'
- } else if (d.status === 2) {
- return '<span style="color:blue;">成功</span>'
- } else if (d.status === 3) {
- return '<span style="color:red;">拒绝</span>'
- } else{
- return ''
- }
- }, minWidth: 80,align:'center'},
+ {templet:"#txStatusFormat", title: '状态', minWidth: 100,align:'left'},
{field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'},
{title: '操作', minWidth: 400 ,toolbar: '#charge-flow-list-option'}
]]
@@ -210,8 +155,6 @@
// 获取查询参数
function getQueryParams() {
return {
- name: $searchForm.find('input[name="name"]').val().trim(),
- accountLogin: $searchForm.find('input[name="accountLogin"]').val().trim(),
phone: $searchForm.find('input[name="phone"]').val().trim(),
status: $searchForm.find("select[name='status']").val(),
};
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowListType.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowListType.html
index 386f772..3674234 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowListType.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowListType.html
@@ -30,8 +30,7 @@
<div class="layui-form-item sftj">
<label class="layui-form-label febs-form-item-require">方式：</label>
<div class="layui-input-block">
- <input type="radio" name="agreeType" value="1" title="手动转账" >
- <input type="radio" name="agreeType" value="2" title="宁波银行转账" checked="">
+ <input type="radio" name="agreeType" value="1" title="手动转账" checked="">
</div>
</div>
<div class="layui-form-item febs-hide">
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 e5d3fe4..f5c49eb 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -8,9 +8,9 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">手机号码：</label>
+ <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">
@@ -43,6 +43,20 @@
</div>
</div>
</div>
+<script type="text/html" id="typeFormat">
+ <div>
+ {{# if (d.type == 1) { }}
+ <span class="layui-badge febs-tag-cyan">投注</span>
+ {{# } else if (d.type == 2) { }}
+ <span class="layui-badge febs-tag-green">中奖</span>
+ {{# } else if (d.type == 3) { }}
+ <span class="layui-badge febs-tag-blue">充值</span>
+ {{# } else if (d.type == 4) { }}
+ <span class="layui-badge febs-tag-yellow">提现</span>
+ {{# } else { }}
+ {{# } }}
+ </div>
+</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
@@ -90,20 +104,7 @@
cols: [[
{field: 'phone', title: '手机号码', minWidth: 150,align:'left'},
{field: 'amount', title: '金额', minWidth: 150,align:'left'},
- {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{
- return ''
- }
- }, minWidth: 80,align:'center'},
+ {templet:"#typeFormat", title: '流水类型', minWidth: 100,align:'left'},
{field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
{field: 'remark', title: '备注', minWidth: 150,align:'left'},
{field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'}
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html b/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
index 77b4dc8..b09d4d0 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
@@ -19,78 +19,28 @@
</style>
<div class="layui-fluid" id="user-payment-info">
<form class="layui-form" action="" lay-filter="user-payment-info-form">
-<!-- <div class="layui-row layui-col-space10 layui-form-item">-->
-<!-- <div class="layui-col-lg6">-->
-<!-- <label class="layui-form-label">微信姓名：</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input type="text" name="wxName" class="layui-input" readonly>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg6">-->
-<!-- <label class="layui-form-label">微信账号：</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input type="text" name="wxAccount" class="layui-input" readonly>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">微信收款码：</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <img alt="微信收款码" data-th-src="${paymentInfo.wxQrcode}" style="width: 200px">-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-row layui-col-space10 layui-form-item">-->
-<!-- <div class="layui-col-lg6">-->
-<!-- <label class="layui-form-label">支付宝姓名：</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input type="text" name="aliName" class="layui-input" readonly>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-col-lg6">-->
-<!-- <label class="layui-form-label">支付宝账号：</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input type="text" name="aliAccount" class="layui-input" readonly>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">支付宝收款码：</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <img alt="支付宝收款码" data-th-src="${paymentInfo.aliQrcode}" style="width: 200px">-->
-<!-- </div>-->
-<!-- </div>-->
- <div class="layui-row layui-col-space10 layui-form-item">
- <div class="layui-col-lg6">
- <label class="layui-form-label">持卡人姓名：</label>
- <div class="layui-input-block">
- <input type="text" name="bankName" class="layui-input" readonly>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">姓名：</label>
+ <div class="layui-input-block">
+ <input type="text" name="name" class="layui-input" readonly>
</div>
</div>
- <div class="layui-row layui-col-space10 layui-form-item">
- <div class="layui-col-lg6">
- <label class="layui-form-label">所属银行：</label>
- <div class="layui-input-block">
- <input type="text" name="bank" class="layui-input" readonly>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">手机号码：</label>
+ <div class="layui-input-block">
+ <input type="text" name="phone" class="layui-input" readonly>
</div>
- <div class="layui-col-lg6">
- <label class="layui-form-label">所属支行：</label>
- <div class="layui-input-block">
- <input type="text" name="subbranchName" class="layui-input" readonly>
- </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">身份证：</label>
+ <div class="layui-input-block">
+ <input type="text" name="idCardNum" class="layui-input" readonly>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">银行卡号：</label>
<div class="layui-input-block">
<input type="text" name="bankNo" class="layui-input" readonly>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">数字账号：</label>
- <div class="layui-input-block">
- <input type="text" name="digitalNo" class="layui-input" readonly>
</div>
</div>
</form>
@@ -116,17 +66,10 @@
function initUserValue() {
form.val("user-payment-info-form", {
- // "wxName": paymentInfo.wxName,
- // "wxAccount": paymentInfo.wxAccount,
- // "wxQrcode": paymentInfo.wxQrcode,
- // "aliName": paymentInfo.aliName,
- // "aliAccount": paymentInfo.aliAccount,
- // "aliQrcode": paymentInfo.aliQrcode,
- "bankName": paymentInfo.bankName,
- "subbranchName": paymentInfo.subbranchName,
+ "name": paymentInfo.name,
+ "idCardNum": paymentInfo.idCardNum,
"bankNo": paymentInfo.bankNo,
- "digitalNo": paymentInfo.digitalNo,
- "bank": paymentInfo.bank
+ "phone": paymentInfo.phone
});
}
});
diff --git a/src/main/resources/templates/febs/views/modules/order/cjList.html b/src/main/resources/templates/febs/views/modules/order/cjList.html
index 2dc5b4b..8502ebe 100644
--- a/src/main/resources/templates/febs/views/modules/order/cjList.html
+++ b/src/main/resources/templates/febs/views/modules/order/cjList.html
@@ -76,6 +76,26 @@
<a lay-event="edit" shiro:hasPermission="user:update"><i
class="layui-icon febs-edit-area febs-blue"></i></a>
</script>
+<script type="text/html" id="kjStateFormat">
+ <div>
+ {{# if (d.kjState == 0) { }}
+ <span class="layui-badge febs-tag-cyan">未开奖</span>
+ {{# } else if (d.kjState == 1) { }}
+ <span class="layui-badge febs-tag-green">已开奖</span>
+ {{# } else { }}
+ {{# } }}
+ </div>
+</script>
+<script type="text/html" id="zjStateFormat">
+ <div>
+ {{# if (d.zjState == 0) { }}
+ <span class="layui-badge febs-tag-cyan">未中奖</span>
+ {{# } else if (d.zjState == 1) { }}
+ <span class="layui-badge febs-tag-green">中奖</span>
+ {{# } else { }}
+ {{# } }}
+ </div>
+</script>
<script type="text/html" id="tableToolBar">
<div class="layui-btn-container">
</div>
@@ -141,26 +161,8 @@
{field: 'phone', title: '账号', minWidth: 120,align:'left'},
{field: 'totalAmount', title: '投注金额', minWidth: 120,align:'left'},
{field: 'perkAmount', title: '奖金', minWidth: 120,align:'left'},
- {field: 'kjState', title: '是否开奖',
- templet: function (d) {
- if (d.kjState === 0) {
- return '<span style="color:blue;">未开奖</span>'
- } else if (d.kjState === 1) {
- return '<span style="color:green;">已开奖</span>'
- }else{
- return ''
- }
- }, minWidth: 120,align:'center'},
- {field: 'zjState', title: '是否开奖',
- templet: function (d) {
- if (d.zjState === 0) {
- return '<span style="color:green;">未中奖</span>'
- } else if (d.zjState === 1) {
- return '<span style="color:red;">中奖</span>'
- }else{
- return ''
- }
- }, minWidth: 120,align:'center'},
+ {templet:"#kjStateFormat", title: '是否开奖', minWidth: 100,align:'left'},
+ {templet:"#zjStateFormat", title: '是否开奖', minWidth: 100,align:'left'},
{field: 'kjNum', title: '中奖号码', minWidth: 120,align:'left'},
{field: 'createdTime', title: '时间', minWidth: 200,align:'left'},
]]
--
Gitblit v1.9.1