From b55ab83baaa50b05e5f39643596cae3c49705825 Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Tue, 9 Feb 2021 16:20:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?todo:=E9=A2=84=E4=BB=98=E6=AC=BE=E6=94=B6?= =?UTF-8?q?=E8=B4=B9=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/fantang/prepayment/index.vue | 83 ++++++++++++++++--- 1 file changed, 71 insertions(+), 12 deletions(-) diff --git a/ruoyi-ui/src/views/fantang/prepayment/index.vue b/ruoyi-ui/src/views/fantang/prepayment/index.vue index 59ddaa558..561737158 100644 --- a/ruoyi-ui/src/views/fantang/prepayment/index.vue +++ b/ruoyi-ui/src/views/fantang/prepayment/index.vue @@ -94,7 +94,7 @@ @pagination="getList" /> - +
- 确 定 + 收 费 关 闭 打印收据
+ + + + + + + + + + + + + + + + + + + + + + +
+ 收 费 + 关 闭 + 打印收据 +
+ + @@ -169,6 +226,8 @@ export default { components: {}, data() { return { + openChargeDialogTitle: null, + openChargeDialogFlag: false, // 权限相关的参数 user: null, roleGroup: null, @@ -418,23 +477,23 @@ export default { this.open = true; this.title = "添加收费管理"; }, - /** 修改按钮操作 */ + /** 收费按钮操作 */ handleUpdate(row) { this.reset(); const prepaymentId = row.prepaymentId || this.ids - this.open = true; console.log('row:',row); - getPrepayment(row.prepaymentId).then(response =>{ - console.log(response); - this.formAddPrepayment.hospitalId = row.hospitalId; - this.formAddPrepayment.name = row.name; - this.formAddPrepayment.collectAt = response.data.prepayment = response.data.collectAt; - this.formAddPrepayment.prepaid = response.data.prepaid; - this.formAddPrepayment.row = row; - }); + this.formAddPrepayment.hospitalId = row.hospitalId; + this.formAddPrepayment.name = row.name; + this.formAddPrepayment.collectAt = new Date(); + this.formAddPrepayment.prepaid = 700; + this.formAddPrepayment.row = row; + this.openChargeDialogFlag = true; + }, + submitformChangePrepayment() { }, + /** 提交按钮 */ submitformAddPrepayment() { From d0e6c84aabc1e8512ba99eb654640cf174aa88ae Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Tue, 9 Feb 2021 17:20:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81BASE64=E8=A7=A3?= =?UTF-8?q?=E7=A0=81=E5=90=8E=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/fantang/controller/ClientController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java index b8161a867..a801140cf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java @@ -2,10 +2,12 @@ package com.ruoyi.system.fantang.controller; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import cn.hutool.extra.ssh.JschRuntimeException; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.sign.Base64; import com.ruoyi.system.fantang.common.DinnerTypeUtils; import com.ruoyi.system.fantang.domain.*; import com.ruoyi.system.fantang.service.*; @@ -16,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; +import java.util.Arrays; import java.util.Calendar; import java.util.Date; import java.util.List; @@ -649,10 +652,12 @@ public class ClientController extends BaseController { @PostMapping("qrcode") public AjaxResult qrcode(@RequestBody JSONObject params) { - Long staffId = params.getLong("staffId"); - Long orderId = params.getLong("orderId"); + JSONObject data =(JSONObject)JSONObject.parse(Arrays.toString(Base64.decode(params.getString("data")))); + Long staffId = data.getLong("staffId"); + Long orderId = data.getLong("orderId"); System.out.println("staffId: " + staffId.toString()); System.out.println("orderId: " + orderId.toString()); + log.info("二维码：原始字串-{}；员工id：{}; 订单id：{}", data, staffId, orderId); return AjaxResult.success("二维码扫码成功"); } From 4de95f7dcfacef9979abf5305a2183243b7ee246 Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Tue, 9 Feb 2021 17:44:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81BASE64=E8=A7=A3?= =?UTF-8?q?=E7=A0=81=E5=90=8E=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fantang/controller/ClientController.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java index a801140cf..5e8958e3a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java @@ -1,13 +1,12 @@ package com.ruoyi.system.fantang.controller; +import cn.hutool.core.codec.Base64; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.extra.ssh.JschRuntimeException; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.sign.Base64; import com.ruoyi.system.fantang.common.DinnerTypeUtils; import com.ruoyi.system.fantang.domain.*; import com.ruoyi.system.fantang.service.*; @@ -652,13 +651,13 @@ public class ClientController extends BaseController { @PostMapping("qrcode") public AjaxResult qrcode(@RequestBody JSONObject params) { - JSONObject data =(JSONObject)JSONObject.parse(Arrays.toString(Base64.decode(params.getString("data")))); - Long staffId = data.getLong("staffId"); - Long orderId = data.getLong("orderId"); - System.out.println("staffId: " + staffId.toString()); - System.out.println("orderId: " + orderId.toString()); - log.info("二维码：原始字串-{}；员工id：{}; 订单id：{}", data, staffId, orderId); - return AjaxResult.success("二维码扫码成功"); + String data = params.getString("data"); + JSONObject jsonData = JSONObject.parseObject(Base64.decodeStr(data)); + Long staffId = jsonData.getLong("staffId"); + Long orderId = jsonData.getLong("orderId"); + String tel = jsonData.getString("tel"); + log.info("二维码：原始字串-{}；员工id：{}; 订单id：{}", jsonData, staffId, orderId); + return AjaxResult.success(String.format("二维码：原始字串-%s；员工id：%d; 订单id：%d, 电话：%s", jsonData, staffId, orderId, tel)); } }