shish пре 5 година
родитељ
комит
f59e278696

+ 20 - 0
app-pt/controllers/PtAssetController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace pt\controllers;
+
+use biz\pt\classes\PtAssetClass;
+use common\components\util;
+
+class PtAssetController extends BaseController
+{
+
+    public $guestAccess = [];
+
+    public function actionIndex()
+    {
+        $respond = PtAssetClass::getAllByCondition([], null, '*');
+        $out = ['top' => $respond];
+        util::success($out);
+    }
+
+}

+ 26 - 0
app-pt/controllers/PtYeChangeController.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace pt\controllers;
+
+use biz\pt\classes\PtYeChangeClass;
+use common\components\util;
+use Yii;
+
+class PtYeChangeController extends BaseController
+{
+
+    public $guestAccess = [];
+
+    public function actionList()
+    {
+        $get = Yii::$app->request->get();
+        $status = $get['status'] ?? 0;
+        $where = [];
+        if (!empty($status)) {
+            $where['status'] = $status;
+        }
+        $list = PtYeChangeClass::getChangeList($where);
+        util::success($list);
+    }
+
+}

+ 1 - 0
biz-hd/purchase/classes/PurchaseClearClass.php

@@ -130,6 +130,7 @@ class PurchaseClearClass extends BaseClass
                 'sjId' => $order->sjId,
                 'shopId' => $order->shopId,
                 'tx' => dict::getDict('yeTx', 'can'),
+                'ptStyle' => $shop->ptStyle,
             ];
             ShopYeChangeClass::addChange($change, true);
         }

+ 3 - 0
biz/pt/classes/PtAssetClass.php

@@ -53,6 +53,7 @@ class PtAssetClass extends BaseClass
             'sjId' => $order->merchantId,
             'shopId' => $order->shopId,
             'tx' => $tx,
+            'ptStyle' => $ptStyle
         ];
         PtYeChangeClass::addChange($change, true);
     }
@@ -103,6 +104,7 @@ class PtAssetClass extends BaseClass
             'sjId' => $order->sjId,
             'shopId' => $order->shopId,
             'tx' => $tx,
+            'ptStyle' => $ptStyle,
         ];
         PtYeChangeClass::addChange($change, true);
     }
@@ -155,6 +157,7 @@ class PtAssetClass extends BaseClass
             'sjId' => $order->merchantId,
             'shopId' => $order->shopId,
             'tx' => $tx,
+            'ptStyle' => $ptStyle,
         ];
         PtYeChangeClass::addChange($change, true);
     }

+ 6 - 0
biz/pt/classes/PtYeChangeClass.php

@@ -17,4 +17,10 @@ class PtYeChangeClass extends BaseClass
         return self::add($change, $returnObj);
     }
 
+    public static function getChangeList($where)
+    {
+        $data = self::getList('*', $where, 'addTime DESC');
+        return $data;
+    }
+
 }

+ 3 - 0
biz/shop/classes/ShopClass.php

@@ -173,6 +173,7 @@ class ShopClass extends BaseClass
             'sjId' => $order->merchantId,
             'shopId' => $order->shopId,
             'tx' => $tx,
+            'ptStyle' => $shop->ptStyle,
         ];
         ShopYeChangeClass::addChange($change, true);
 
@@ -219,6 +220,7 @@ class ShopClass extends BaseClass
             'sjId' => $order->sjId,
             'shopId' => $order->shopId,
             'tx' => $tx,
+            'ptStyle' => $shop->ptStyle,
         ];
         ShopYeChangeClass::addChange($change, true);
 
@@ -292,6 +294,7 @@ class ShopClass extends BaseClass
             'sjId' => $sjId,
             'shopId' => $shopId,
             'tx' => $tx,
+            'ptStyle'=>$shop->ptStyle,
         ];
         ShopYeChangeClass::addChange($change, true);
 

+ 2 - 0
common/components/dict.php

@@ -30,8 +30,10 @@ class dict
 
         //需要显示国兰的信息 0不需要 1需要(要审核小程序请显示国兰信息)
         'showGlInfo' => 1,
+
         //显示零售和供货商的演示入口
         'showDemo' => 0,
+
         //零售演示的管理员id
         'hdDemoAdminId' => 320,
         //供货商演示的管理员id

+ 3 - 1
sql.sql

@@ -2640,4 +2640,6 @@ ALTER TABLE xhCash MODIFY `status` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1待
 ALTER TABLE xhCash DROP COLUMN `balance`;
 ALTER TABLE xhCash ADD remark VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '备注' AFTER `status`;
 ALTER TABLE xhCash ADD `cashName` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '收款人姓名' AFTER `thirdOrderSn`;
-ALTER TABLE xhCash ADD `cashAccount` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '收款人账号' AFTER `cashName`;
+ALTER TABLE xhCash ADD `cashAccount` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '收款人账号' AFTER `cashName`;
+ALTER TABLE xhPtYeChange CHANGE `style` `ptStyle` TINYINT NOT NULL DEFAULT 1 COMMENT '平台类型 查看dict.php表';
+ALTER TABLE xhShopYeChange ADD `ptStyle` TINYINT NOT NULL DEFAULT 1 COMMENT '平台类型 查看dict.php表' AFTER `relateId`;