blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

修改订单备注

Browse Source
This commit is contained in:
邹景立 2021-03-17 18:11:17 +08:00
parent 767b35f65d
commit 32a634fa4a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/data/controller/ShopOrderSend.php
View File

@ -47,7 +47,7 @@ class ShopOrderSend extends Controller
$db = $this->_query('DataUser')->like('phone#user_phone,nickname#user_nickname')->db();
if ($db->getOptions('where')) $query->whereRaw("uid in {$db->field('id')->buildSql()}");
// 订单搜索查询
$db = $this->_query('ShopOrder')->whereIn('status', [4, 5, 6])->where(['truck_type' => 1])->db();
$db = $this->app->db->name('ShopOrder')->whereIn('status', [4, 5, 6])->where(['truck_type' => 1]);
$query->whereRaw("order_no in {$db->field('order_no')->buildSql()}");
// 列表选项卡状态
if (is_numeric($this->type = trim(input('type', 'ta'), 't'))) {

18
app/data/controller/api/auth/Order.php
View File

@ -309,6 +309,7 @@ class Order extends Auth
$data = $this->_vali([
'uid.value' => $this->uuid,
'order_no.require' => '单号不能为空',
'order_remark.default' => '',
'payment_code.require' => '支付不能为空',
'payment_back.default' => '', # 支付回跳地址
'payment_image.default' => '', # 支付凭证图片
@ -316,12 +317,19 @@ class Order extends Auth
[$map, $order] = $this->getOrderData();
if ($order['status'] !== 2) $this->error('不能发起支付');
if ($order['payment_status'] > 0) $this->error('已经完成支付');
// 更新订单备注
if (!empty($data['order_remark'])) {
$this->app->db->name('ShopOrder')->where($map)->update([
'order_remark' => $data['order_remark'],
]);
}
// 自动处理用户字段
$openid = '';
if (in_array($this->type, [UserAdminService::API_TYPE_WXAPP, UserAdminService::API_TYPE_WECHAT])) {
$openid = $this->user[UserAdminService::TYPES[$this->type]['auth']] ?? '';
if (empty($openid)) $this->error("发起支付失败");
}
try {
$openid = '';
if (in_array($this->type, [UserAdminService::API_TYPE_WXAPP, UserAdminService::API_TYPE_WECHAT])) {
$openid = $this->user[UserAdminService::TYPES[$this->type]['auth']] ?? '';
if (empty($openid)) $this->error("发起支付失败");
}
// 返回订单数据及支付发起参数
$type = $order['amount_real'] <= 0 ? 'empty' : $data['payment_code'];
$param = PaymentService::instance($type)->create($openid, $order['order_no'], $order['amount_real'], '商城订单支付', '', $data['payment_back'], $data['payment_image']);