From 378ee0f70e1eafdd7165aa1c6ec9f05a8071c1a8 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 26 十月 2023 11:07:15 +0800
Subject: [PATCH] 10.26.3
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html | 1 +
cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js | 41 +++++++++++++++++++++++++++++++++++++++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 14 ++++++++++++++
3 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 41b066c..1623201 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -173,6 +173,20 @@
return new ResultUtil<>(0,0,"到店成功",null,null);
}
+ @RequestMapping("/confirm/{id}")
+ @ResponseBody
+ public ResultUtil confirm(@PathVariable("id") Integer id) {
+
+ System.out.println("============"+id);
+ SiteBooking siteBooking = new SiteBooking();
+ siteBooking.setId(id);
+ siteBooking.setStatus(1);
+ iSiteBookingService.updateById(siteBooking);
+
+ return new ResultUtil<>(0,0,"手动支付成功",null,null);
+ }
+
+
/**
* 获取变更列表
*/
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html
index 0c33d28..dfb3c18 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html
@@ -103,6 +103,7 @@
<#button name="修改" icon="fa-edit" clickFun="TStudent.openTStudentDetail()" space="true"/>
<#button name="确认到店" icon="fa-edit" clickFun="TStudent.openTStudentDetail1()" space="true"/>
<#button name="取消凭证" icon="fa-edit" clickFun="TStudent.openTStudentDetail4()" space="true"/>
+ <#button name="手动支付" icon="fa-edit" clickFun="TStudent.openTStudentDetail6()" space="true"/>
<#button name="查看详情" icon="fa-edit" clickFun="TStudent.openTStudentDetail5()" space="true"/>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
index 685ba76..a3ed6b0 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
@@ -208,6 +208,47 @@
}
};
+
+TStudent.openTStudentDetail6 = function () {
+ if (this.check()) {
+
+ if (TStudent.seItem.status!=0){
+ Feng.error("请选择待支付的数据")
+ return
+ }
+
+
+ parent.layer.confirm("是否手动支付" , {
+ btn: ['确定', '取消']
+ }, function (index) {
+ let ajax = new $ax(Feng.ctxPath + "/ball/confirm/"+TStudent.seItem.id, function (data) {
+ Feng.success("手动支付" + "成功!");
+ TStudent.table.refresh();
+ }, function (data) {
+ Feng.error(state == 1 ? '手动支付' : "下架" + "失败!" + data.responseJSON.message + "!");
+ });
+ ajax.start();
+ parent.layer.close(index);
+
+ }, function (index) {
+ parent.layer.close(index);
+ }
+
+
+ )
+ // var index = layer.open({
+ // type: 2,
+ // title: '',
+ // area: ['30%', '40%'], //宽高
+ // fix: false, //不固定
+ // maxmin: true,
+ // content: Feng.ctxPath + '/ball/tocancel/' + TStudent.seItem.id
+ // });
+ //
+ // this.layerIndex = index;
+ }
+};
+
TStudent.openTStudentDetail2 = function () {
if (this.check()) {
var index = layer.open({
--
Gitblit v1.7.1