wangxinglong
/
caipan_shop_admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

setter

master
wangxinglong 2022-06-14 14:13:05 +08:00
parent 4493db3bc5
commit be35042bea
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/repository/OrderRepository.php
View File

@ -941,7 +941,7 @@ class OrderRepository extends Repository
} }
$this->update([ $this->update([
'status' => self::STATUS_COMPLETED, 'status' => self::STATUS_ARRIVED,
'commission_give' => Order::COMMON_ON, 'commission_give' => Order::COMMON_ON,
'accepted_at' => $nowDateTime 'accepted_at' => $nowDateTime
], ['id' => $orderId]); ], ['id' => $orderId]);
@ -1027,7 +1027,6 @@ class OrderRepository extends Repository
case self::STATUS_MAKEING: case self::STATUS_MAKEING:
case self::STATUS_SHIPPED: case self::STATUS_SHIPPED:
case self::STATUS_ARRIVED: case self::STATUS_ARRIVED:
case self::STATUS_COMPLETED:
case self::STATUS_CANCEL: case self::STATUS_CANCEL:
$status = [$tag]; $status = [$tag];
break; break;
@ -1035,7 +1034,7 @@ class OrderRepository extends Repository
/* /*
case 'waiting_comment': case 'waiting_comment':
$where[] = ['is_evaluate', '=', self::IS_EVALUATE_YES]; $where[] = ['is_evaluate', '=', self::IS_EVALUATE_YES];
$status = [self::STATUS_COMPLETED]; $status = [self::STATUS_ARRIVED];
break; break;
*/ */
// 待核验 // 待核验
@ -1044,13 +1043,13 @@ class OrderRepository extends Repository
$where[] = ['has_virtual', '=', Order::COMMON_ON]; $where[] = ['has_virtual', '=', Order::COMMON_ON];
$where[] = ['virtual_check', '=', Order::COMMON_OFF]; $where[] = ['virtual_check', '=', Order::COMMON_OFF];
$where[] = ['frontend_check', '=', Order::COMMON_OFF]; $where[] = ['frontend_check', '=', Order::COMMON_OFF];
$status = [self::STATUS_PAID, self::STATUS_COMPLETED, self::STATUS_SHIPPED]; $status = [self::STATUS_PAID, self::STATUS_ARRIVED, self::STATUS_SHIPPED];
break; break;
*/ */
// 售后记录 // 售后记录
/* /*
case 'after_sale': case 'after_sale':
$status = [self::STATUS_PAID, self::STATUS_SHIPPED, self::STATUS_COMPLETED]; $status = [self::STATUS_PAID, self::STATUS_SHIPPED, self::STATUS_ARRIVED];
$where[] = ['is_after_sale', '=', self::BOOL_TRUE]; $where[] = ['is_after_sale', '=', self::BOOL_TRUE];
break; break;
*/ */
@ -1060,7 +1059,6 @@ class OrderRepository extends Repository
self::STATUS_MAKEING , self::STATUS_MAKEING ,
self::STATUS_SHIPPED , self::STATUS_SHIPPED ,
self::STATUS_ARRIVED , self::STATUS_ARRIVED ,
self::STATUS_COMPLETED ,
self::STATUS_CANCEL , self::STATUS_CANCEL ,
]; ];
} }
@ -1164,7 +1162,7 @@ class OrderRepository extends Repository
$expressInfo = []; $expressInfo = [];
if (!empty($order['express_code']) && !empty($order['express_number'])) { if (!empty($order['express_code']) && !empty($order['express_number'])) {
try { try {
if ($order['status'] == self::STATUS_COMPLETED) { if ($order['status'] == self::STATUS_ARRIVED) {
$exprLog = $this->findExpressLogByNu($order['coding'], $order['express_code'], $order['express_number']); $exprLog = $this->findExpressLogByNu($order['coding'], $order['express_code'], $order['express_number']);
if (!empty($exprLog)) { if (!empty($exprLog)) {
$expressInfo['status'] = 200; $expressInfo['status'] = 200;