diff --git a/app/admin/form/Payrequestlog.php b/app/admin/form/Payrequestlog.php
index dea0c0a4f..00355225e 100644
--- a/app/admin/form/Payrequestlog.php
+++ b/app/admin/form/Payrequestlog.php
@@ -95,6 +95,7 @@ class PayRequestLog
'grid_size' => 'sm',
'search_config' => [
'form_type' => 'input',
+ 'form_name' => 'business_handle',
'where_type' => 'like',
],
],
@@ -105,7 +106,6 @@ class PayRequestLog
'grid_size' => 'sm',
'search_config' => [
'form_type' => 'input',
- 'form_name' => 'business_handle',
'where_type' => 'like',
],
],
diff --git a/app/index/view/default/useraddress/save_info.html b/app/index/view/default/useraddress/save_info.html
index 97fbd9f8f..f0745ef1c 100755
--- a/app/index/view/default/useraddress/save_info.html
+++ b/app/index/view/default/useraddress/save_info.html
@@ -24,7 +24,7 @@
-
+
diff --git a/app/service/OrderService.php b/app/service/OrderService.php
index 4b5093e24..a14d257b3 100755
--- a/app/service/OrderService.php
+++ b/app/service/OrderService.php
@@ -848,13 +848,23 @@ class OrderService
}
}
+ // 查看支付日志是否已支付处理成功、避免异步通知太快导致重叠处理
+ if($order_total_price > 0 && !empty($params['pay_log_data']) && !empty($params['payment']))
+ {
+ $pay_log_status = Db::name('PayLog')->where(['id'=>$params['pay_log_data']['id']])->field('id,status')->value('status');
+ if($pay_log_status == 1)
+ {
+ return DataReturn('支付成功', 0);
+ }
+ }
+
// 开启事务
Db::startTrans();
// 循环处理
foreach($params['order'] as $order)
{
- // 订单已支付则不处理
+ // 订单非待支付则不处理
if($order['pay_status'] != 0)
{
continue;
diff --git a/app/service/PayLogService.php b/app/service/PayLogService.php
index 4018ba55a..e8f85e95c 100755
--- a/app/service/PayLogService.php
+++ b/app/service/PayLogService.php
@@ -129,6 +129,7 @@ class PayLogService
}
/**
+ * 支付日志更新
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index d0a3d351c..42857a03c 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -775,6 +775,30 @@ button.colorpicker-submit img {
color: #0e90d2 !important;
}
+/**
+ * 内部表格
+ */
+.form-inside-table tr th,
+.form-inside-table tr td {
+ padding: 5px !important;
+ z-index: 0 !important;
+}
+.form-inside-table tr th {
+ background: transparent !important;
+ padding-top: 0 !important;
+}
+.form-inside-table tr th:first-child,
+.form-inside-table tr td:first-child {
+ padding-left: 0 !important;
+}
+.form-inside-table tr th:last-child,
+.form-inside-table tr td:last-child {
+ padding-right: 0 !important;
+}
+.form-inside-table tr:last-child td {
+ padding-bottom: 0 !important;
+}
+
/**
* 公共联动地区组件样式
*/
diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js
index f43f58ddc..4aa7d6323 100755
--- a/public/static/common/js/common.js
+++ b/public/static/common/js/common.js
@@ -2876,7 +2876,7 @@ $(function()
}
}
address += $('#form-address').val();
- if(province.length <= 0 || address.length <= 0)
+ if(province.length <= 0 && address.length <= 0)
{
Prompt('地址为空');
return false;