diff --git a/app/api/controller/Category.php b/app/api/controller/Category.php index 8b0c773e..643f7d96 100644 --- a/app/api/controller/Category.php +++ b/app/api/controller/Category.php @@ -68,7 +68,7 @@ class Category extends Controller } else { return $this->renderSuccess(compact('list')); } - + if (!empty($arr)) { $arr1 = ['cataIds' => $arr]; } else { diff --git a/app/common/model/Merchant.php b/app/common/model/Merchant.php index 696814df..c712ec56 100644 --- a/app/common/model/Merchant.php +++ b/app/common/model/Merchant.php @@ -145,7 +145,7 @@ class Merchant extends BaseModel * @param float $money * @return mixed */ - public static function setIncTotal(int $merchantId, float $money) + public static function setIncTotal(int $merchantId, $money) { (new static)->setInc($merchantId, 'total_amount', $money); (new static)->setInc($merchantId, 'available_amount', $money);