diff --git a/app/manager/controller/UserFollow.php b/app/manager/controller/UserFollow.php index c01386b..2f38a36 100644 --- a/app/manager/controller/UserFollow.php +++ b/app/manager/controller/UserFollow.php @@ -5,7 +5,7 @@ * @Author: kangkang * @Date: 2020-10-13 19:52:37 * @LastEditors: Please set LastEditors - * @LastEditTime: 2020-11-28 16:34:01 + * @LastEditTime: 2020-11-28 16:40:47 */ namespace app\manager\controller; @@ -344,6 +344,7 @@ class UserFollow extends Controller foreach ($data as $info) { $info['OrderType'] = $product_order_enum::$OrderType[$info['OrderType']]; $info['PayType'] = $product_order_enum::$ScoreName[$info['PayType']]; + $info['ConnectCount'] = $info['ConnectCount'] * $info['AccountCount']; $list[] = $info; } diff --git a/app/manager/model/ProductOrder.php b/app/manager/model/ProductOrder.php index 651b057..907306d 100644 --- a/app/manager/model/ProductOrder.php +++ b/app/manager/model/ProductOrder.php @@ -5,7 +5,7 @@ * @Author: kangkang * @Date: 2020-10-16 14:44:02 * @LastEditors: Please set LastEditors - * @LastEditTime: 2020-11-25 16:40:37 + * @LastEditTime: 2020-11-28 16:41:50 */ namespace app\manager\model; @@ -213,7 +213,7 @@ class ProductOrder extends Model */ public function getUserCost($user_id, $index, $where = '') { - return $this->field('UpdateTime,OrderNo,OrderType,ProductName,PackageName,PaymentAmount,Accounts,ConnectCount,PayType') + return $this->field('UpdateTime,OrderNo,OrderType,ProductName,PackageName,PaymentAmount,Accounts,ConnectCount,AccountCount,PayType,OrderAmount') ->where(['UserId' => $user_id]) ->where($where) ->order('Id desc')