theo пре 3 година
родитељ
комит
fb15e63baf

+ 2 - 0
backendApi/config/urlManagerRules.php

@@ -69,7 +69,9 @@ return [
             'GET remain-pv' => 'remain-pv',
             'GET flow-remain-pv' => 'flow-remain-pv',
             'GET ba-user-list' => 'ba-user-list',
+            'GET ba-user-list-export' => 'ba-user-list-export',
             'GET ba-order-list' => 'ba-order-list',
+            'GET ba-order-list-export' => 'ba-order-list-export',
         ],
     ],
     [

+ 26 - 1
backendApi/modules/v1/controllers/ShopController.php

@@ -10,6 +10,7 @@ namespace backendApi\modules\v1\controllers;
 
 use backendApi\modules\v1\models\exportForms\OrderExportForm;
 use backendApi\modules\v1\models\exportForms\ShopExportForm;
+use backendApi\modules\v1\models\exportForms\BaUserExportForm;
 use backendApi\modules\v1\models\lists\shop\DecOrderList;
 use backendApi\modules\v1\models\lists\shop\GoodsList;
 use backendApi\modules\v1\models\lists\shop\OrderDecList;
@@ -797,6 +798,30 @@ class ShopController extends BaseController {
         return static::notice($data);
     }
 
+    /**
+     * 订单表导出
+     * @return mixed
+     * @throws \yii\db\Exception
+     * @throws \yii\web\HttpException
+     */
+    public function actionBaOrderListExport()
+    {
+        $filter = $this->filterCondition([
+            'SN'=> 'O.SN',
+            'USER_NAME'=> 'U.USER_NAME',
+            'MOBILE'=> 'O.MOBILE',
+            'PERIOD_NUM'=> 'O.PERIOD_NUM',
+            'CREATED_AT'=> 'O.CREATED_AT',
+        ]);
+        $filter['condition'] = !$filter['condition'] ? '1=1 AND O.IS_DELETE=0' : ('O.IS_DELETE=0 ' . $filter['condition']);
+        $form = new ShopExportForm();
+        $result = $form->run($filter, 'Ba_Order_List'); // 订单列表
+        if (!$result) {
+            return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
+        }
+        return static::notice('Starting exporting, please go to File Management - Export Files to view.'); // 导出开始,请到文件管理-导出文件查看
+    }
+
     /**
      * BA会员列表
      * @return mixed
@@ -896,7 +921,7 @@ class ShopController extends BaseController {
             'ALLOW_TRANSFER' => 'UI.ALLOW_TRANSFER',
         ]);
         $form = new BaUserExportForm();
-        $result = $form->run($filter, 'Member_List');
+        $result = $form->run($filter, 'Ba_User_List');
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }

+ 22 - 0
backendApi/modules/v1/models/exportForms/BaUserExportForm.php

@@ -0,0 +1,22 @@
+<?php
+namespace backendApi\modules\v1\models\exportForms;
+
+use common\libs\export\module\BaUserExport;
+
+class BaUserExportForm extends BaseExportForm
+{
+    /**
+     * 导出
+     * @param $filter
+     * @param $listName
+     * @param null $consoleRouter
+     * @return bool
+     * @throws \yii\db\Exception
+     */
+    public function run($filter, $listName, $consoleRouter = null){
+        $this->exportObj = BaUserExport::instance();
+        return $this->export($filter, $listName, $consoleRouter);
+    }
+
+
+}

+ 3 - 3
backendEle/src/views/shop/ba-order-list.vue

@@ -123,7 +123,7 @@ export default {
         cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
-        return network.getData(`shop/order-list-export`, this.filterModel)
+        return network.getData(`shop/ba-order-list-export`, this.filterModel)
       }).then(response => {
         this.$message({
           message: response,
@@ -161,7 +161,7 @@ export default {
       }).then(() => {
         // 导出时只需要订单ID即可
         let orderSn = orderSnSet[0]
-        network.getData(`shop/order-list-export-pdf/${orderSn}`).then(response => {
+        network.getData(`shop/ba-order-list-export-pdf/${orderSn}`).then(response => {
           this.$message({
             message: response,
             type: 'success'
@@ -188,7 +188,7 @@ export default {
         let postData = {
           orderSn
         }
-        return network.postData('shop/delete-order', postData).then(response => {
+        return network.postData('shop/delete-ba-order', postData).then(response => {
           console.log(response)
           this.$message({
             message: response,

+ 10 - 0
common/libs/export/module/BaUserExport.php

@@ -0,0 +1,10 @@
+<?php
+namespace common\libs\export\module;
+
+use common\libs\export\BaseExport;
+
+class BaUserExport extends BaseExport
+{
+    public $moduleId = 'ba_user';
+
+}

+ 37 - 0
sql/upgrade/1962.sql

@@ -390,3 +390,40 @@ CREATE TABLE `AR_BA_USER_INFO`  (
   INDEX `REC_UID`(`REC_UID`) USING BTREE,
   INDEX `CON_UID`(`CON_UID`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '会员资料表' ROW_FORMAT = Dynamic;
+
+CREATE TABLE `AR_BA_DEC_ORDER`  (
+    `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+    `DEC_SN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+    `ORDER_SN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+    `USER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+    `TO_USER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+    `TYPE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+    `IS_ADMIN` tinyint(1) NOT NULL DEFAULT 0,
+    `DEC_AMOUNT` decimal(16, 3) NOT NULL DEFAULT 0,
+    `DEC_PV` decimal(16, 3) NOT NULL DEFAULT 0,
+    `PAID_WALLET` varchar(48) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+    `IS_BATCH` tinyint(1) NOT NULL DEFAULT 0,
+    `REMARK` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
+    `REC_USER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '',
+    `CON_USER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '',
+    `PERIOD_NUM` int(10) NOT NULL,
+    `P_CALC_MONTH` date NOT NULL,
+    `CALC_MONTH` int(8) NOT NULL DEFAULT 0,
+    `CREATED_AT` int(10) NOT NULL,
+    `UPDATER` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '',
+    `UPDATED_AT` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '0',
+    `IS_DEL` tinyint(1) NOT NULL DEFAULT 0,
+    `DELETED_AT` int(10) NOT NULL DEFAULT 0,
+    `DEC_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '',
+    `DETAIL_TYPE` tinyint(1) NOT NULL DEFAULT 1 COMMENT '默认为1注册 2为升级',
+    `UPGRADE_TYPE` tinyint(1) NOT NULL DEFAULT 0 COMMENT '1 补差额升级 2全额升级',
+    `ORI_LV` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '升级前的级别',
+    `UPGRADE_LV` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '升级后的级别',
+    PRIMARY KEY (`ID`) USING BTREE,
+    UNIQUE INDEX `DEC_SN`(`DEC_SN`) USING BTREE,
+    INDEX `USER_ID`(`USER_ID`) USING BTREE,
+    INDEX `TYPE`(`TYPE`) USING BTREE,
+    INDEX `PERIOD_NUM`(`PERIOD_NUM`) USING BTREE,
+    INDEX `IS_DEL`(`IS_DEL`) USING BTREE,
+    INDEX `ORDER_SN`(`ORDER_SN`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '报单' ROW_FORMAT = Dynamic;