From 8a005e61bc7d1b016dd9998f62b41d513705da96 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 26 Dec 2021 13:18:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Plugins.php               |  2 +-
 app/admin/view/default/order/module/goods.html |  2 +-
 app/service/OrderService.php                   | 13 +++++++++----
 app/service/UserService.php                    |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/admin/controller/Plugins.php b/app/admin/controller/Plugins.php
index aa27875d1..0b23641fd 100755
--- a/app/admin/controller/Plugins.php
+++ b/app/admin/controller/Plugins.php
@@ -113,7 +113,7 @@ class Plugins extends Common
         // 是否未绑定商店账号
         if($ret['code'] == -300)
         {
-            MyViewAssign('ext_html', '<p class="am-margin-top-sm"><button type="button" class="am-btn am-btn-secondary am-radius am-btn-xs am-margin-left-xs am-icon-gg store-accounts-event"> 绑定ShopXO商店账户</button></p>');
+            MyViewAssign('ext_html', '<p class="am-margin-top-sm"><button type="button" class="am-btn am-btn-secondary am-radius am-btn-xs am-margin-left-xs am-icon-gg store-accounts-event"> 绑定ShopXO商店账户</button></p><p class="am-text-warning am-margin-top-xl">如已绑定、请到商城后台左侧菜单工具下面清除缓存再尝试访问！</p>');
         }
 
         // 调用失败
diff --git a/app/admin/view/default/order/module/goods.html b/app/admin/view/default/order/module/goods.html
index 82f4f4f49..ba945bfe5 100644
--- a/app/admin/view/default/order/module/goods.html
+++ b/app/admin/view/default/order/module/goods.html
@@ -23,7 +23,7 @@
     <!-- 订单列表基础顶部-结束 -->
 
     <!-- 基础信息 -->
-    {{if $module_data['pay_status'] eq 1 and $module_data['pay_price'] lt $module_data['total_price'] and in_array($module_data['status'], [2,3,4])}}
+    {{if $module_data['pay_status'] eq 1 and $module_data['pay_price'] lt $module_data['total_price'] and !in_array($module_data['status'], [0,1,5,6])}}
         <p class="am-text-danger am-animation-shake am-animation-delay-1">
             <i class="am-icon-warning am-text-lg"></i>
             <span class="am-text-sm">请注意、该订单支付金额小于总价金额</span>
diff --git a/app/service/OrderService.php b/app/service/OrderService.php
index 36634c345..c33fad894 100755
--- a/app/service/OrderService.php
+++ b/app/service/OrderService.php
@@ -567,7 +567,7 @@ class OrderService
      * @blog    http://gong.gg/
      * @version 1.0.0
      * @date    2018-09-28
-     * @desc    description
+     * @desc    一般仅web端回调这个页面
      * @param   [array]          $params [输入参数]
      */
     public static function Respond($params = [])
@@ -617,7 +617,12 @@ class OrderService
             if(in_array($payment_name, MyConfig('shopxo.under_line_list')))
             {
                 // 线下支付处理
-                return self::UserOrderPayUnderLine($pay_ret['data']['out_trade_no']);
+                // cpde=-8888 则表示需要用户线下支付，仅表示订单已提交成功
+                $ret = self::UserOrderPayUnderLine($pay_ret['data']['out_trade_no']);
+                if($ret['code'] == -8888)
+                {
+                    $pay_ret['msg'] = $ret['msg'];
+                }
             }
         }
         return $pay_ret;
@@ -683,13 +688,13 @@ class OrderService
 
                 // 完成
                 Db::commit();
-                return DataReturn('操作成功', 0);
+                return DataReturn('支付成功', 0);
             } catch(\Exception $e) {
                 Db::rollback();
                 return DataReturn($e->getMessage(), -1);
             }
         }
-        return DataReturn('操作成功、请尽快联系管理员确认支付信息', -8888);
+        return DataReturn('提交成功、请尽快联系管理员确认支付信息', -8888);
     }
 
     /**
diff --git a/app/service/UserService.php b/app/service/UserService.php
index 3cf3c6806..65596ef60 100755
--- a/app/service/UserService.php
+++ b/app/service/UserService.php
@@ -1397,7 +1397,7 @@ class UserService
         // 是否开启用户注册
         if(!in_array($params['type'], MyC('home_user_reg_type', [], true)))
         {
-            return DataReturn('暂时关闭用户注册');
+            return DataReturn('暂时关闭用户注册', -1);
         }
 
         // 验证码基础参数