Merge branch 'phoenix' of ssh://120.24.33.109:11022/hyzjshwo/lanzu_api_hyperf into phoenix

# Conflicts:
#	app/JsonRpc/OrderService.php

app/JsonRpc/OrderService.php

@@ -192,7 +192,6 @@ class OrderService implements OrderServiceInterface
                 }
 
             }
-
             $totalAmount = $orderMain->total_money; // 订单可退款金额，总订单金额不含配送费和服务费
             $preRefundAmount = 0; // 预退款金额
             $refundAmount = 0; // 实际退款金额
@@ -222,7 +221,6 @@ class OrderService implements OrderServiceInterface
                 ]);
                 throw new ErrorCodeException(ErrorCode::ORDER_REFUND_FAIL);
             }
-
             // 开始退款
             $config = config('wxpay');
             $app = Factory::payment($config);

app/Model/v3/GoodsActivity.php

@@ -44,6 +44,7 @@ class GoodsActivity extends Model
         'is_effective',
         'noneffective_note',
         'total_seconds',
+        'details_imgs_url',
     ];
 
     // protected $visible = [
@@ -101,4 +102,13 @@ class GoodsActivity extends Model
         return $this->morphMany(ShoppingCart::class, 'goods');
     }
 
+    public function getDetailsImgsUrlAttribute()
+    {
+        $details_imgs = $this->details_imgs;
+        $img_host = config('alioss.img_host').'/';
+
+        return collect($details_imgs)->map(function($item) use ($img_host){
+            return $img_host . $item;
+        });
+    }
 }

app/Model/v3/GoodsActivityBanner.php

@@ -11,6 +11,10 @@ class GoodsActivityBanner extends Model
     use SoftDeletes;
     protected $table = 'lanzu_goods_activity_banners';
 
+    protected $appends = [
+        'banner_url',
+    ];
+
 
     public function getBannerUrlAttribute()
     {