充值记录

app/shop/controllers/RechargeController.php

@@ -13,6 +13,14 @@ use Yii;
 class RechargeController extends BaseController
 {
 
+    //充值记录 shish 2021.2.21
+    public function actionList()
+    {
+        $where = ['shopId' => $this->shopId, 'payStatus' => RechargeClass::PAY_STATUS_HAS_PAY];
+        $list = RechargeClass::getRechargeList($where);
+        util::success($list);
+    }
+
     //免费续期活动 shish 2021.2.21
     public function actionRenew()
     {
@@ -41,6 +49,7 @@ class RechargeController extends BaseController
             'sjStyle' => MerchantClass::STYLE_RETAIL,
             'shopId' => $this->shopId,
             'modPrice' => 0,
+            'remark' => '免费续期充值',
         ];
         $order = RechargeClass::addOrder($data);
         $orderSn = $order['orderSn'];

biz/merchant/classes/ShopClass.php

@@ -110,6 +110,7 @@ class ShopClass extends BaseClass
     public static function addBalance($shop, $amount, $fix = false)
     {
         $shop->balance += $amount;
+        $shop->totalRecharge += $amount;
         if ($fix) {
             $shop->fixBalance += $amount;
         }

biz/recharge/classes/RechargeClass.php

@@ -15,6 +15,13 @@ class RechargeClass extends BaseClass
     const PAY_STATUS_UN_PAY = 1;
     const PAY_STATUS_HAS_PAY = 2;
 
+    //充值记录 shish 2021.2.21
+    public static function getRechargeList($where)
+    {
+        $data = self::getList('*', $where, 'addTime DESC');
+        return $data;
+    }
+
     //创建订单 shish 2021.2.21
     public static function addOrder($data)
     {
@@ -29,7 +36,6 @@ class RechargeClass extends BaseClass
         $recharge->save();
         $orderSn = $recharge->orderSn;
         $shopId = $recharge->shopId;
-        $sjId = $recharge->sjId;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
             noticeUtil::push("充值支付回调通知，没有找到门店 orderSn:{$orderSn}");
@@ -37,18 +43,6 @@ class RechargeClass extends BaseClass
         }
         $amount = $recharge->amount;
         ShopClass::addBalance($shop, $amount);
-
-        //增加充值记录
-        $remark = '免费续期充值';
-        $totalRecharge = bcadd($shop->totalRecharge, $amount, 2);
-        $log = [
-            'sjId' => $sjId,
-            'shopId' => $shopId,
-            'amount' => $amount,
-            'totalRecharge' => $totalRecharge,
-            'remark' => $remark,
-        ];
-        RechargeLogClass::addLog($log);
     }
 
 }

biz/recharge/classes/RechargeLogClass.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace biz\recharge\classes;
-
-use biz\base\classes\BaseClass;
-use biz\merchant\classes\ShopClass;
-use common\components\noticeUtil;
-use common\components\orderSn;
-
-class RechargeLogClass extends BaseClass
-{
-
-    public static $baseFile = '\biz\recharge\models\RechargeLog';
-
-    //增加记录 shish 2021.2.21
-    public static function addLog($log)
-    {
-        self::add($log);
-    }
-
-}

biz/recharge/models/RechargeLog.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace biz\recharge\models;
-
-use biz\base\models\Base;
-
-class RechargeLog extends Base
-{
-
-    public static function tableName()
-    {
-        return 'xhRechargeLog';
-    }
-
-}

biz/recharge/services/RechargeLogService.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace biz\recharge\services;
-
-use biz\base\services\BaseService;
-
-class RechargeLogService extends BaseService
-{
-
-    public static $baseFile = '\biz\recharge\classes\RechargeLogClass';
-
-}

sql.sql

@@ -1200,4 +1200,8 @@ ALTER TABLE `xhShop` DROP COLUMN `createTime`;
 ALTER TABLE `xhShop` DROP COLUMN `addTime`;
 ALTER TABLE `xhShop` ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `status`;
 ALTER TABLE xhRechargeRecord RENAME TO xhRechargeLog;
-ALTER TABLE xhShop ADD totalRecharge DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值' AFTER `fixBalance`;
+ALTER TABLE xhShop ADD totalRecharge DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值' AFTER `fixBalance`;
+ALTER TABLE xhRecharge ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `payStatus`;
+ALTER TABLE xhRecharge ADD `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间' AFTER `addTime`;
+ALTER TABLE xhRecharge ADD remark VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '' AFTER `payStatus`;
+DROP TABLE IF EXISTS `xhRechargeLog`;