浏览代码

Merge branch 'master' into dev

shish 1 月之前
父节点
当前提交
56b0a3deda
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      app-hd/controllers/PurchaseController.php

+ 1 - 1
app-hd/controllers/PurchaseController.php

@@ -129,7 +129,7 @@ class PurchaseController extends BaseController
         //售后是否要求上传照片 0不要求 1必须
         //售后是否要求上传照片 0不要求 1必须
         $refundMustImg = 0;
         $refundMustImg = 0;
         if (!empty($ghsShopId)) {
         if (!empty($ghsShopId)) {
-            $shop = ShopClass::getByCondition(['ghsShopId' => $ghsShopId], false, false, 'id,afterSale,saleHour,refundOnlyPrice,refundMustImg');
+            $shop = ShopClass::getByCondition(['id' => $ghsShopId], false, false, 'id,afterSale,saleHour,refundOnlyPrice,refundMustImg');
             $afterSale = $shop['afterSale'] ?? 1;
             $afterSale = $shop['afterSale'] ?? 1;
             $saleHour = $shop['saleHour'] ?? 12;
             $saleHour = $shop['saleHour'] ?? 12;
             $refundOnlyPrice = $shop['refundOnlyPrice'] ?? 1;
             $refundOnlyPrice = $shop['refundOnlyPrice'] ?? 1;