收款码限额和页面修改
diff --git a/src/main/java/com/supwisdom/dlpay/api/service/impl/PhoneScanQRcodeServiceImpl.java b/src/main/java/com/supwisdom/dlpay/api/service/impl/PhoneScanQRcodeServiceImpl.java
index 65e144b..cf15330 100644
--- a/src/main/java/com/supwisdom/dlpay/api/service/impl/PhoneScanQRcodeServiceImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/api/service/impl/PhoneScanQRcodeServiceImpl.java
@@ -23,6 +23,7 @@
import com.supwisdom.dlpay.restaurant.service.CustomerService;
import com.supwisdom.dlpay.restaurant.service.DeviceGroupService;
import com.supwisdom.dlpay.restaurant.util.RestaurantConstant;
+import org.apache.commons.lang.math.NumberUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -196,10 +197,10 @@
// tTransdtl.setManagefeetype(RestaurantConstant.RULETYPE_NORMAL);
// tTransdtl.setManagefee(0.0);
- //判断单次消费限额,无设备取默认组？
- List<TDevpara> singleLimit = devparaDao.findSystemDefaultDevparaByParaname("shop_qrscan_once_limit_amt");
- if (null != singleLimit && singleLimit.size() > 0) {
- Double oncelimit = Double.parseDouble(singleLimit.get(0).getParaval()) / 100;
+ //判断单次消费限额,取业务参数
+ String singleLimit = systemUtilService.getBusinessValue("shop.qrscan.once.limit.amt"); //单位：分
+ if (NumberUtils.isDigits(singleLimit)) {
+ double oncelimit = Double.parseDouble(singleLimit) / 100.0;
if (amount > oncelimit) {
throw new WebCheckException("消费金额超出单笔支付限额");
}
diff --git a/src/main/resources/templates/h5/qrscan/order.html b/src/main/resources/templates/h5/qrscan/order.html
index 87d5cf0..a7ab020 100644
--- a/src/main/resources/templates/h5/qrscan/order.html
+++ b/src/main/resources/templates/h5/qrscan/order.html
@@ -9,6 +9,17 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" th:href="@{/static/libs/layui/css/layui.css}"/>
+ <style type="text/css">
+ input.def-input {
+ height: 60px !important;
+ font-size: 30px;
+ }
+ label.def-label {
+ width:105px;
+ font-size:18px;
+ padding: 20px 15px;
+ }
+ </style>
</head>
<div class="layui-container">
@@ -30,15 +41,15 @@
<div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
<form action="#" method="post" id="devGroup-QRCode-order-form" class="layui-form">
<div class="layui-form-item">
- <label class="layui-form-label"><span style="color: red">* </span>支付金额：</label>
- <div class="layui-input-block">
- <input type="number" class="layui-input" name="amount" id="shop-qrcode-order-amount" placeholder="单位：元" />
+ <label class="layui-form-label def-label"><span style="color: red">* </span>支付金额：</label>
+ <div class="layui-input-block" style="margin-left: 135px;">
+ <input type="number" class="layui-input def-input" name="amount" id="shop-qrcode-order-amount" placeholder="单位：元" />
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">备 注：</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="remark" id="shop-qrcode-order-remark" placeholder="备注信息" />
+ <label class="layui-form-label def-label">备 注：</label>
+ <div class="layui-input-block" style="margin-left: 135px;">
+ <input type="text" class="layui-input def-input" name="remark" id="shop-qrcode-order-remark" placeholder="备注信息" />
<input type="hidden" name="uid" id="shop-qrcode-order-uid" th:value="${uid}" />
</div>
</div>