|
|
@@ -611,6 +611,7 @@ class OrderService extends BaseService
|
|
|
public function after($userId, $params)
|
|
|
{
|
|
|
$id = isset($params['id']) ? $params['id'] : 0;
|
|
|
+ $afterType = isset($params['after_type']) ? $params['after_type'] : 1;
|
|
|
if ($id <= 0) {
|
|
|
$this->error = '请选择订单';
|
|
|
return false;
|
|
|
@@ -656,7 +657,7 @@ class OrderService extends BaseService
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- if ($status == 4) {
|
|
|
+ if ($status == 4 && $afterType==2) {
|
|
|
$this->error = '订单已完成';
|
|
|
RedisService::clear($cacheLockKey);
|
|
|
return false;
|
|
|
@@ -668,7 +669,7 @@ class OrderService extends BaseService
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- $afterType = isset($params['after_type']) ? $params['after_type'] : 1;
|
|
|
+
|
|
|
$afterRealname = isset($params['after_realname']) ? $params['after_realname'] : '';
|
|
|
$afterPhone = isset($params['after_phone']) ? $params['after_phone'] : '';
|
|
|
$afterRemark = isset($params['after_remark']) ? $params['after_remark'] : '';
|