YS

app/common/model/Order.php

@@ -182,7 +182,7 @@ class Order extends BaseModel
         if ($data['receipt_status'] == ReceiptStatusEnum::NOT_RECEIVED) {
             return '待收货';
         }
-        return $value;
+        return empty($value)?'':$value;
     }
 
     /**

app/store/model/OrderRefund.php

@@ -16,6 +16,7 @@ use app\api\service\User as UserService;
 use app\common\enum\order\DeliveryStatus as DeliveryStatusEnum;
 use app\common\enum\order\DeliveryType;
 use app\common\enum\order\OrderStatus as OrderStatusEnum;
+use app\common\enum\order\ReceiptStatus;
 use app\common\enum\order\refund\AuditStatus as AuditStatusEnum;
 use app\common\enum\order\refund\RefundStatus as RefundStatusEnum;
 use app\common\enum\order\refund\RefundType as RefundTypeEnum;
@@ -25,6 +26,7 @@ use app\common\service\Message as MessageService;
 use app\common\service\order\Refund as RefundService;
 use app\store\model\User as UserModel;
 use app\store\model\Order as OrderModel;
+use app\store\model\OrderGoods as OrderGoodsMOdel;
 
 /**
  * 售后单模型
@@ -320,6 +322,7 @@ class OrderRefund extends OrderRefundModel
             }
             // 更新主订单状态为未发货
             (new OrderModel)->update(['order_status'=>OrderStatusEnum::NORMAL,'delivery_status'=>DeliveryStatusEnum::NOT_DELIVERED],['order_id'=>$order['order_id']]);
+            (new OrderGoodsModel)->update(['delivery_status'=>DeliveryStatusEnum::NOT_DELIVERED],['order_id'=>$order['order_id']]);
             // 发送消息通知
             MessageService::send('order.refund', [
                 'refund' => $this,                  // 售后单信息