萤火科技 1 rok pred
rodič
commit
90fddc8954

+ 3 - 3
app/common/model/store/Address.php

@@ -35,7 +35,7 @@ class Address extends BaseModel
     protected $append = ['cascader', 'region', 'full_address'];
 
     /**
-     * 省市区ID集
+     * 获取器:省市区ID集
      * @param $value
      * @param $data
      * @return array
@@ -70,8 +70,8 @@ class Address extends BaseModel
      */
     public function getFullAddressAttr($value, $data): string
     {
-        $rgionNames = $this->getRegionNames($data);
-        return "{$rgionNames['province']}{$rgionNames['city']}{$rgionNames['region']}{$data['detail']}";
+        $regionNames = $this->getRegionNames($data);
+        return "{$regionNames['province']}{$regionNames['city']}{$regionNames['region']}{$data['detail']}";
     }
 
     /**

+ 11 - 1
app/store/model/Order.php

@@ -16,7 +16,7 @@ use app\common\model\Order as OrderModel;
 use app\common\service\Order as OrderService;
 use app\common\service\order\Refund as RefundService;
 use app\common\service\order\Printer as PrinterService;
-use app\common\service\order\PaySuccess as OrderPaySuccesService;
+use app\common\service\order\PaySuccess as OrderPaySuccessService;
 use app\common\enum\order\{
     DataType as DataTypeEnum,
     PayStatus as PayStatusEnum,
@@ -227,6 +227,16 @@ class Order extends OrderModel
         return $this->save(['merchant_remark' => $data['content'] ?? '']);
     }
 
+    /**
+     * 修改收货地址
+     * @param array $data
+     * @return bool
+     */
+    public function updateAddress(array $data): bool
+    {
+        return $this->save(['merchant_remark' => $data['content'] ?? '']);
+    }
+
     /**
      * 小票打印
      * @param array $data

+ 10 - 10
app/store/service/Home.php

@@ -126,7 +126,7 @@ class Home extends BaseService
         for ($i = 0; $i < 7; $i++) {
             $date[] = date('Y-m-d', strtotime('-' . $i . ' days'));
         }
-        return array_reverse($date);
+        return \array_reverse($date);
     }
 
     /**
@@ -135,7 +135,7 @@ class Home extends BaseService
      */
     private function getGoodsTotal(): string
     {
-        return number_format($this->GoodsModel->getGoodsTotal());
+        return \number_format($this->GoodsModel->getGoodsTotal());
     }
 
     /**
@@ -146,7 +146,7 @@ class Home extends BaseService
      */
     private function getUserTotal(string $date = null, $isConsume = null): string
     {
-        return number_format($this->UserModel->getUserTotal(compact('date', 'isConsume')));
+        return \number_format($this->UserModel->getUserTotal(compact('date', 'isConsume')));
     }
 
     /**
@@ -192,9 +192,9 @@ class Home extends BaseService
      * @param string $day
      * @return string
      */
-    private function getPayOrderUserTotal(string $day)
+    private function getPayOrderUserTotal(string $day): string
     {
-        return number_format($this->OrderModel->getPayOrderUserTotal($day));
+        return \number_format($this->OrderModel->getPayOrderUserTotal($day));
     }
 
     /**
@@ -204,31 +204,31 @@ class Home extends BaseService
      */
     private function getPayOrderTotal(string $day = null): string
     {
-        return number_format($this->OrderModel->getPayOrderTotal($day, $day));
+        return \number_format($this->OrderModel->getPayOrderTotal($day, $day));
     }
 
     // 获取未发货订单数量
     private function getNotDeliveredOrderTotal(): string
     {
-        return number_format($this->OrderModel->getNotDeliveredOrderTotal());
+        return \number_format($this->OrderModel->getNotDeliveredOrderTotal());
     }
 
     // 获取未付款订单数量
     private function getNotPayOrderTotal(): string
     {
-        return number_format($this->OrderModel->getNotPayOrderTotal());
+        return \number_format($this->OrderModel->getNotPayOrderTotal());
     }
 
     // 获取已售罄的商品
     private function getSoldoutGoodsTotal(): string
     {
-        return number_format($this->GoodsModel->getSoldoutGoodsTotal());
+        return \number_format($this->GoodsModel->getSoldoutGoodsTotal());
     }
 
     // 获取待处理售后单数量
     private function getRefundTotal(): string
     {
         $model = new OrderRefundModel;
-        return number_format($model->getRefundTotal());
+        return \number_format($model->getRefundTotal());
     }
 }