Browse Source

订单ID

master
weigang 6 years ago
parent
commit
b05a3ea911
  1. 9
      app/JsonRpc/OrderService.php
  2. 4
      app/Model/v3/OrderMain.php
  3. 3
      app/Model/v3/ShoppingCart.php
  4. 8
      app/Service/v3/Implementations/OrderOnlineService.php

9
app/JsonRpc/OrderService.php

@ -100,12 +100,13 @@ class OrderService implements OrderServiceInterface
/**
* 线上订单单笔退款
* 支持单商品、单店、整单
* @param $global_order_id 全局总订单ID
* @param $child_order_id 主订单ID,
* @param $order_goods_id 订单商品ID
* @param $user_id *用户ID
* @param $global_order_id *全局总订单ID
* @param $child_order_id *主订单ID,
* @param $order_goods_id *订单商品ID
* @param $note
*/
public function onlineSingleRefund($global_order_id, $child_order_id, $order_goods_id, $note)
public function onlineSingleRefund($user_id, $global_order_id, $child_order_id, $order_goods_id, $note)
{
}

4
app/Model/v3/OrderMain.php

@ -56,6 +56,10 @@ class OrderMain extends Model
'shipping_type_text',
];
protected $casts = [
'global_order_id' => 'string'
];
public function getCreatedAtTextAttribute()
{
return date('Y-m-d H:i:s', $this->attributes['created_at']);

3
app/Model/v3/ShoppingCart.php

@ -3,10 +3,11 @@
namespace App\Model\v3;
use App\Model\Model;
use Hyperf\Database\Model\SoftDeletes;
class ShoppingCart extends Model
{
use SoftDeletes;
protected $table = 'lanzu_shopping_cart';
protected $fillable = [

8
app/Service/v3/Implementations/OrderOnlineService.php

@ -244,13 +244,7 @@ class OrderOnlineService implements OrderOnlineServiceInterface
// 校验订单总金额
if ($totalAmount != $totalMoney) {
throw new ErrorCodeException(ErrorCode::ORDER_TOTAL_AMOUNT_ERROR, json_encode([
'计算的总订单金额:' => $totalAmount,
'前端的订单总金额:' => $totalMoney,
'Delivery:' => $deliveryAmount,
'Service:' => $serviceMoney,
'Coupon:' => $couponMoney,
]));
throw new ErrorCodeException(ErrorCode::ORDER_TOTAL_AMOUNT_ERROR);
}
$dataMain = [

Loading…
Cancel
Save