From 0e72821a8922105f591c2bf3f6ca809571b7d397 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Thu, 21 Nov 2019 14:24:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E5=B9=BF?=
=?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=85=85=E5=80=BC?=
=?UTF-8?q?=E6=89=8B=E7=BB=AD=E8=B4=B9=E8=B4=B9=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Home/Controller/CoinOrderController.class.php | 2 +-
Application/Home/View/default/CoinOrder/order_add.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Application/Home/Controller/CoinOrderController.class.php b/Application/Home/Controller/CoinOrderController.class.php
index 4c08ba073..16a086223 100644
--- a/Application/Home/Controller/CoinOrderController.class.php
+++ b/Application/Home/Controller/CoinOrderController.class.php
@@ -122,7 +122,7 @@ class CoinOrderController extends BaseController
$data['create_time'] = time();
$data['discount'] = "0";
if($pay_type==1){ // 在线转账
- $free = sprintf("%.2f",$coin_num*(0.6/100));
+ $free = sprintf("%.2f",$coin_num*(0.2/100));
$free = $free<'0.1' ? '0.1':$free;
$data['pay_amount'] = bcadd($coin_num,$free,2);
$data['order_status'] = 0;
diff --git a/Application/Home/View/default/CoinOrder/order_add.html b/Application/Home/View/default/CoinOrder/order_add.html
index 92808ab5e..a02df6102 100644
--- a/Application/Home/View/default/CoinOrder/order_add.html
+++ b/Application/Home/View/default/CoinOrder/order_add.html
@@ -87,7 +87,7 @@
- (手续费说明:每笔交易支付服务商将收取 0.60% 手续费,最低收取0.1元,上不封顶)
+ (手续费说明:每笔交易支付服务商将收取 0.20% 手续费,最低收取0.1元,上不封顶)
|
From e9e718abbb6e2446cfbeed2a0079f5d9c0b5cdc0 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Thu, 21 Nov 2019 14:25:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8C=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Home/View/default/CoinOrder/order_add.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Application/Home/View/default/CoinOrder/order_add.html b/Application/Home/View/default/CoinOrder/order_add.html
index a02df6102..abe4b71f3 100644
--- a/Application/Home/View/default/CoinOrder/order_add.html
+++ b/Application/Home/View/default/CoinOrder/order_add.html
@@ -143,7 +143,7 @@
var rodio_val = $('.jspayradio input:radio:checked').val();
coin_num = (discount/100)*coin_num;
if(rodio_val==1){ //在线转账
- var fee = coin_num*(0.6/100);
+ var fee = coin_num*(0.2/100);
if(fee<0.1){
fee=0.1
}
From dfca90000d1985294cc33aeeedc548212e4a7cbb Mon Sep 17 00:00:00 2001
From: zhengchanglong
Date: Thu, 21 Nov 2019 14:25:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?SQL=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Data/update.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Data/update.sql b/Data/update.sql
index b1dd63db4..1ca013245 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -492,8 +492,8 @@ CREATE TABLE `tab_device_statistics` (
PRIMARY KEY (`id`) USING BTREE,
INDEX `time`(`time`) USING BTREE
) ENGINE = MyISAM AUTO_INCREMENT = 163 CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = Dynamic;
-
SET FOREIGN_KEY_CHECKS = 1;
+
ALTER TABLE `platform`.`tab_device_record`
ADD INDEX `create_time`(`create_time`) USING BTREE,
ADD INDEX `unique_code`(`unique_code`) USING BTREE,