cf_cloud/erp
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

!265 bug修复

Browse Source 
Merge pull request !265 from 杨建炊/fix-release-1.0.0/yjc-migrate
This commit is contained in:
杨建炊 2024-12-06 02:25:11 +00:00 committed by Gitee
commit 96efa40eeb
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Resources/BusinessOrderResource.php
View File

@ -14,6 +14,16 @@ class BusinessOrderResource extends JsonResource
*/
public function toArray($request)
{
return parent::toArray($request);
$data = parent::toArray($request);
$data['confirm_at'] = date('Y-m-d H:i:s', $data['confirm_at'] / 1000);
$map = ['未发货', '已发货', '部分发货', "已收货", '' => ''];
$data['shipping_status'] = $map[$data['shipping_status']] ?? '';
$map = ['帮忙团订单', '自卖团订单', '' => ''];
$data['is_supplier'] = $map[$data['is_supplier']] ?? '';
$map = ['未取消', '已取消', '' => ''];
$data['cancel_status'] = $map[$data['cancel_status']] ?? '';
$map = ['未发起售后 ', '退款中', '退款成功', '待处理', '拒绝退款', '待(顾客)退货', '待(团长)确认退货', '撤销', '撤销', '(系统)关闭' => ''];
$data['after_sales_status'] = $map[$data['after_sales_status']] ?? '';
return $data;
}
}

30
app/Models/BusinessOrder.php
View File

@ -62,36 +62,6 @@ class BusinessOrder extends Model
'order_sn',
];
public function getConfirmAtAttribute($value)
{
return date('Y-m-d H:i:s', $value / 1000);
}
public function getShippingStatusAttribute($value)
{
$map = ['未发货', '已发货', '部分发货',"已收货", '' => ''];
return $map[$value];
}
public function getIsSupplierAttribute($value)
{
$map = ['帮忙团订单', '自卖团订单', '' => ''];
return $map[$value];
}
public function getCancelStatusAttribute($value)
{
$map = ['未取消', '已取消', '' => ''];
return $map[$value];
}
public function getAfterSalesStatusAttribute($value)
{
return empty($value) ? '未售后' : '有售后';
}
public function items()
{

2
app/Services/Business/BusinessClient.php
View File

@ -161,7 +161,7 @@ abstract class BusinessClient
if (strlen($paramsJson) > 1024) {
$paramsJson = '';
}
if (!in_array($params['type'], ['pdd.ktt.increment.order.query', 'pdd.ktt.order.list',"pdd.ktt.after.sales.increment.list"], true)) {
if (!in_array($params['type'], ['pdd.ktt.increment.order.query', 'pdd.ktt.order.list',"pdd.ktt.after.sales.increment.list","pdd.ktt.order.get"], true)) {
$log = new Log();
$log->module = 'plat';
$log->action = $method;

4
app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php
View File

@ -185,7 +185,6 @@ class KuaiTuanTuan extends BusinessClient
if (!isset($res[$responseName]['order_info'])) {
return;
}
$queryOrder = $res[$responseName]['order_info'];
$needUpdate = false;
if ($order->shipping_status != $queryOrder['shipping_status']) {
@ -196,11 +195,12 @@ class KuaiTuanTuan extends BusinessClient
$order->cancel_status = $queryOrder['cancel_status'];
$needUpdate = true;
}
if ($order->after_sales_status!= $queryOrder['cancel_status']) {
if ($order->after_sales_status != $queryOrder['after_sales_status']) {
//售后状态更新
$order->after_sales_status = $queryOrder['after_sales_status'];
$needUpdate = true;
}
if ($needUpdate) {
$goodsSkuNum = 0;
foreach ($queryOrder['sub_order_list'] as $item) {

2
app/Services/Business/MiaoXuan/MiaoXuan.php
View File

@ -54,7 +54,7 @@ class MiaoXuan extends BusinessClient
$order->cancel_status = $queryOrder['cancel_status'];
$needUpdate = true;
}
if ($order->after_sales_status!= $queryOrder['cancel_status']) {
if ($order->after_sales_status!= $queryOrder['after_sales_status']) {
//售后状态更新
$order->after_sales_status = $queryOrder['after_sales_status'];
$needUpdate = true;