github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 22:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

Browse Source
This commit is contained in:
From-wh 2023-06-19 17:34:26 +08:00
commit 3336a9fbd7
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crmeb/app/api/controller/v1/order/StoreOrderController.php
View File

@ -814,6 +814,9 @@ class StoreOrderController
['data', ''],
]);
\think\facade\Log::error('回调:' . json_encode($data));
$data['data']['id'] = (int)$data['data']['id'];
if (md5(json_encode($data['data']) . $data['t']) != $data['sign']) {
return app('json')->fail('验签失败');
}
@ -831,13 +834,13 @@ class StoreOrderController
}
break;
case 'order_take'://取件
if (isset($data['task_id'])) {
$orderInfo = $this->services->get(['task_id' => $data['task_id']]);
if (isset($data['data']['task_id'])) {
$orderInfo = $this->services->get(['kuaidi_task_id' => $data['data']['task_id']]);
if (!$orderInfo) {
return app('json')->fail('订单不存在');
}
$this->services->transaction(function () use ($data, $orderInfo) {
$this->services->update(['task_id' => $data['task_id']], [
$this->services->update(['kuaidi_task_id' => $data['data']['task_id']], [
'status' => 1,
'is_stock_up' => 0
]);

2
crmeb/app/services/order/StoreOrderServices.php
View File

@ -2681,7 +2681,7 @@ HTML;
if (!$orderInfo->kuaidi_task_id || !$orderInfo->kuaidi_order_id) {
throw new ValidateException('商家寄件订单信息不存在，无法取消');
}
if ($orderInfo->status != 1) {
if ($orderInfo->is_stock_up != 1) {
throw new ValidateException('订单状态不正确，无法取消寄件');
}

2
crmeb/app/services/product/product/StoreProductReplyServices.php
View File

@ -216,7 +216,7 @@ class StoreProductReplyServices extends BaseServices
[$page, $limit] = $this->getPageValue();
$list = $this->dao->replyList($id, $type, $page, $limit);
foreach ($list as &$item) {
$item['suk'] = isset($item['cart_info']['productInfo']['attrInfo']) ? $item['cart_info']['productInfo']['attrInfo']['suk'] : '';
$item['suk'] = $item['suk'] != '' ? $item['suk'] : (isset($item['cart_info']['productInfo']['attrInfo']) ? $item['cart_info']['productInfo']['attrInfo']['suk'] : '');
$item['nickname'] = anonymity($item['nickname']);
$item['merchant_reply_time'] = date('Y-m-d H:i', $item['merchant_reply_time']);
$item['add_time'] = time_tran($item['add_time']);

2
template/uni-app/pages/annex/vip_paid/index.vue
View File

@ -769,7 +769,7 @@
data.from = 'routine';
// #endif
uni.showLoading({
title: this.$t(`active`)
title: this.$t(`激活中`)
});
memberCardDraw(data).then(res => {
let that = this;