floraachy/shopxo
1
0
Fork 0
mirror of https://gitee.com/zongzhige/shopxo.git synced 2024-11-29 18:39:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

细节优化

Browse Source
This commit is contained in:
gongfuxiang 2021-12-26 13:18:26 +08:00
parent 726e1f0f0e
commit 8a005e61bc
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/controller/Plugins.php
View File

@ -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>');
}
// 调用失败

2
app/admin/view/default/order/module/goods.html
View File

@ -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>

13
app/service/OrderService.php
View File

@ -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);
}
/**

2
app/service/UserService.php
View File

@ -1397,7 +1397,7 @@ class UserService
// 是否开启用户注册
if(!in_array($params['type'], MyC('home_user_reg_type', [], true)))
{
return DataReturn('暂时关闭用户注册');
return DataReturn('暂时关闭用户注册', -1);
}
// 验证码基础参数