Browse Source

直接退款的状态新增一个,然后还要重新统计和订单列表

master
weigang 5 years ago
parent
commit
e5b2021964
  1. 7
      app/Constants/v3/OrderState.php
  2. 2
      app/JsonRpc/OrdersService.php
  3. 2
      app/Service/v3/Implementations/OrderStatisticsService.php

7
app/Constants/v3/OrderState.php

@ -60,6 +60,11 @@ class OrderState extends AbstractConstants
*/ */
const REFUND_REFUSE = 10; const REFUND_REFUSE = 10;
/**
* @Message("部分直接退款")
*/
const REFUNDED_DIRECT= 11;
/** /**
* @Message("待送达") * @Message("待送达")
*/ */
@ -73,7 +78,7 @@ class OrderState extends AbstractConstants
/** /**
* @Message("售后/退款") * @Message("售后/退款")
*/ */
const REFUND = [self::REFUNDING, self::REFUNDED, self::REFUND_REFUSE];
const REFUND = [self::REFUNDING, self::REFUNDED, self::REFUND_REFUSE, self::REFUNDED_DIRECT];
/** /**
* @Message("可删除") * @Message("可删除")

2
app/JsonRpc/OrdersService.php

@ -274,7 +274,7 @@ class OrdersService implements OrdersServiceInterface
$currentTime = time(); $currentTime = time();
// 处理订单状态 // 处理订单状态
$orderMain->state = OrderState::REFUNDED;
$orderMain->state = OrderState::REFUNDED_DIRECT;
$orderMain->total_refund_note = $note; $orderMain->total_refund_note = $note;
$orderMain->refund_time = $currentTime; $orderMain->refund_time = $currentTime;
$orderMain->save(); $orderMain->save();

2
app/Service/v3/Implementations/OrderStatisticsService.php

@ -38,7 +38,7 @@ class OrderStatisticsService implements OrderStatisticsServiceInterface
->selectRaw('COUNT(DISTINCT '.$mainTable.'.id) AS count') ->selectRaw('COUNT(DISTINCT '.$mainTable.'.id) AS count')
->join($childTable, ''.$childTable.'.order_main_id', '=', ''.$mainTable.'.global_order_id') ->join($childTable, ''.$childTable.'.order_main_id', '=', ''.$mainTable.'.global_order_id')
->where([''.$childTable.'.store_id' => $storeId, ''.$mainTable.'.type' => $type]) ->where([''.$childTable.'.store_id' => $storeId, ''.$mainTable.'.type' => $type])
->whereIn(''.$mainTable.'.state', array_merge(OrderState::FINISH, [OrderState::REFUNDED,OrderState::REFUND_REFUSE]));
->whereIn(''.$mainTable.'.state', array_merge(OrderState::FINISH, [OrderState::REFUNDED_DIRECT,OrderState::REFUND_REFUSE]));
if ($type == OrderType::ONLINE) { if ($type == OrderType::ONLINE) {
$builder = $builder->join($goodsTable, ''.$goodsTable.'.order_id', '=', ''.$childTable.'.id') $builder = $builder->join($goodsTable, ''.$goodsTable.'.order_id', '=', ''.$childTable.'.id')

Loading…
Cancel
Save