From 66e610587da17510f76b727fc74c8cbc7788d130 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Mon, 26 Jun 2023 12:30:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/services/order/StoreOrderServices.php |   1 +
 crmeb/crmeb/services/serve/storage/Crmeb.php  | 102 ------------------
 2 files changed, 1 insertion(+), 102 deletions(-)

diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php
index 59bd8dd74..17eeedeb7 100644
--- a/crmeb/app/services/order/StoreOrderServices.php
+++ b/crmeb/app/services/order/StoreOrderServices.php
@@ -105,6 +105,7 @@ class StoreOrderServices extends BaseServices
                 $cart_num += $items['cart_info']['cart_num'];
             }
             $item['is_all_refund'] = $refund_num == $cart_num ? true : false;
+            $item['total_price'] = bcadd($item['total_price'], $item['vip_true_price'], 2);
         }
         return compact('data', 'count');
     }
diff --git a/crmeb/crmeb/services/serve/storage/Crmeb.php b/crmeb/crmeb/services/serve/storage/Crmeb.php
index e2731bb53..d15c46f8b 100644
--- a/crmeb/crmeb/services/serve/storage/Crmeb.php
+++ b/crmeb/crmeb/services/serve/storage/Crmeb.php
@@ -52,98 +52,6 @@ class Crmeb extends BaseStorage
         return $this->accessToken->httpRequest('v2/user/info');
     }
 
-    /**
-     * 用户登录
-     * @param string $account
-     * @param string $secret
-     * @return array|mixed
-     */
-    public function login(string $account, string $secret)
-    {
-        return $this->accessToken->httpRequest('user/login', ['account' => $account, 'secret' => $secret], 'POST', false);
-    }
-
-    /**
-     * 注册平台
-     * @param array $data
-     * @return array|mixed
-     */
-    public function register(array $data)
-    {
-        return $this->accessToken->httpRequest('user/register', $data, 'POST', false);
-    }
-
-    /**
-     * 平台用户消息记录
-     * @param int $page
-     * @param int $limit
-     * @return array|mixed
-     */
-    public function userBill(int $page, int $limit)
-    {
-        return $this->accessToken->httpRequest('user/bill', ['page' => $page, 'limit' => $limit]);
-    }
-
-    /**
-     * 找回账号
-     * @param array $data
-     * @return array|mixed
-     */
-    public function forget(array $data)
-    {
-        return $this->accessToken->httpRequest('user/forget', $data, 'POST', false);
-    }
-
-    /**
-     * 修改密码
-     * @param array $data
-     * @return array|mixed
-     */
-    public function modify(array $data)
-    {
-        return $this->accessToken->httpRequest('user/modify', $data, 'POST', false);
-    }
-
-    /**
-     * 获取验证码
-     * @param string $phone
-     * @return array|mixed
-     */
-    public function code(string $phone, $type = 0)
-    {
-        return $this->accessToken->httpRequest('user/code', ['phone' => $phone, 'types' => $type], 'POST', false);
-    }
-
-    /**
-     * 验证验证码
-     * @param string $phone
-     * @return array|mixed
-     */
-    public function checkCode(string $phone, string $verify_code)
-    {
-        return $this->accessToken->httpRequest('user/code/verify', ['phone' => $phone, 'verify_code' => $verify_code], 'POST', false);
-    }
-
-    /**
-     * 套餐列表
-     * @param string $type 套餐类型：sms,短信；query,物流查询；dump,电子面单；copy,产品复制
-     * @return array|mixed
-     */
-    public function mealList(string $type)
-    {
-        return $this->accessToken->httpRequest('meal/list', ['type' => $type]);
-    }
-
-    /**
-     * 套餐支付
-     * @param array $data
-     * @return array|mixed
-     */
-    public function payMeal(array $data)
-    {
-        return $this->accessToken->httpRequest('meal/code', $data);
-    }
-
     /**
      * 用量记录
      * @param int $page
@@ -163,14 +71,4 @@ class Crmeb extends BaseStorage
         }
         return $this->accessToken->httpRequest('user/record', $data);
     }
-
-    /**
-     * 修改手机号
-     * @param array $data
-     * @return array|mixed
-     */
-    public function modifyPhone(array $data)
-    {
-        return $this->accessToken->httpRequest('user/modify/phone', $data);
-    }
 }