Merge branch 'feature/new-backend-adaptation' of http://16.162.42.175:8014/guanli/ngds into feature/new-backend-adaptation

backendApi/modules/v1/controllers/FinanceController.php

@@ -153,7 +153,8 @@ class FinanceController extends BaseController {
      * @throws \yii\web\HttpException
      */
     public function actionChangeBalanceType(){
-        $type = BalanceAudit::TYPE;
+        // $type = BalanceAudit::TYPE;
+        $type = BalanceAudit::getBalanceAuditType();
         $dealTypes = DealType::getTypes();
         return static::notice(['type' => $type, 'dealTypes' => $dealTypes]);
     }

backendApi/modules/v1/models/lists/finance/BalanceAuditList.php

@@ -206,18 +206,64 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
             $this->filterTypes = [
                 'USER_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListUserName')], //会员编号
                 'REAL_NAME' => ['isUserTable' => false, 'name' =>  Yii::t('ctx', 'memberName')], //会员姓名
-                'LAST_DEC_LV_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListMemberLevel'), 'other' => 'decLevel'], // 会员级别
-                'LAST_DEC_ROLE_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListStockistLevel'), 'other' => 'decRole'], // 报单中心级别
-                'LAST_EMP_LV_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListEmpLevel'), 'other' => 'empLevel'], // 聘级
-                'TYPE_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListTypeName'), 'other' => 'select', 'selectData' => Tool::formatFilter(BalanceAudit::TYPE, 'name', 'label')], // 账户类型
-                'DEAL_TYPE_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListDealType'), 'other' => 'select', 'selectData' => Tool::formatFilter(DealType::getAllTypesForShow(), 'ID', 'TYPE_NAME')], // 交易类型
-                'AMOUNT' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAmount')], // 调整金额
-                'CREATE_REMARK' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListRemark')], // 备注
-                'REMARK_IS_SHOW' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListRemarkIsShow'), 'other' => 'yesOrNo'], // 前台是否显示备注
-                'CREATE_ADMIN_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListApplicant')], // 申请人
-                'CREATED_AT' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListCreatedAt'), 'other' => 'date'], // 申请时间
-                'AUDIT_ADMIN_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAuditName')], // 审核人
-                'AUDITED_AT' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAuditTime'), 'other' => 'date'], // 审核时间
+                'LAST_DEC_LV_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListMemberLevel'), 
+                    'other' => 'decLevel'
+                ], // 会员级别
+                'LAST_DEC_ROLE_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListStockistLevel'), 
+                    'other' => 'decRole'
+                ], // 报单中心级别
+                'LAST_EMP_LV_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListEmpLevel'), 
+                    'other' => 'empLevel'
+                ], // 聘级
+                'TYPE_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListTypeName'), 
+                    'other' => 'select', 
+                    'selectData' => Tool::formatFilter(BalanceAudit::getBalanceAuditType(), 'name', 'label')
+                ], // 账户类型
+                'DEAL_TYPE_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListDealType'), 
+                    'other' => 'select', 
+                    'selectData' => Tool::formatFilter(DealType::getAllTypesForShow(), 'ID', 'TYPE_NAME')
+                ], // 交易类型
+                'AMOUNT' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAmount')
+                ], // 调整金额
+                'CREATE_REMARK' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListRemark')
+                ], // 备注
+                'REMARK_IS_SHOW' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListRemarkIsShow'), 
+                    'other' => 'yesOrNo'
+                ], // 前台是否显示备注
+                'CREATE_ADMIN_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListApplicant')
+                ], // 申请人
+                'CREATED_AT' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListCreatedAt'), 
+                    'other' => 'date'
+                ], // 申请时间
+                'AUDIT_ADMIN_NAME' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAuditName')
+                ], // 审核人
+                'AUDITED_AT' => [
+                    'isUserTable' => false, 
+                    'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAuditTime'), 
+                    'other' => 'date'
+                ], // 审核时间
             ];
         }
         return $this->filterTypes;

backendApi/modules/v1/models/lists/finance/RechargeList.php

@@ -73,7 +73,8 @@ class RechargeList extends \common\libs\dataList\DataList implements DataListInt
                 'AUDIT_STATUS' => [
                     'header' => \Yii::t('ctx', 'modelsListsFinanceRechargeListgetColumnAuditStatus'), // 审核状态
                     'value' => function ($row) {
-                        return Recharge::STATUS_NAME[$row['AUDIT_STATUS']];
+                        // return Recharge::STATUS_NAME[$row['AUDIT_STATUS']];
+                        return Recharge::getStatusName()[$row['AUDIT_STATUS']];
                     },
                     'headerOther' => [
                         'width' => '120',

backendApi/modules/v1/models/lists/finance/WithdrawList.php

@@ -77,7 +77,8 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                     'header' => \Yii::t('ctx', 'modelListFinanceWithdrawState'), // 提现状态
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return Withdraw::STATUS_NAME[$row['AUDIT_STATUS']];
+                        return Withdraw::getStatusName()[$row['AUDIT_STATUS']];
+                        // return Withdraw::STATUS_NAME[$row['AUDIT_STATUS']];
                     },
                 ],
                 'USER_NAME' => [

backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -112,7 +112,8 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                         'width' => '110',
                     ],
                     'value' => function ($row) {
-                        return \Yii::$app->params['orderStatus'][$row['STATUS']]['label'] ?? '';
+                        return $this->getOrderStatus()[$row['STATUS']]['label'] ?? '';
+                        // return \Yii::$app->params['orderStatus'][$row['STATUS']]['label'] ?? '';
                     },
                 ],
                 'SKU_CODE' => [
@@ -350,7 +351,9 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                         'width' => '130',
                     ],
                     'value' => function ($row) {
-                        return \Yii::$app->params['deliveryStatus'][$row['DELIVERY_STATUS']]['label'] ?? '';
+                        // return \Yii::$app->params['deliveryStatus'][$row['DELIVERY_STATUS']]['label'] ?? '';
+
+                       return $this->getDeliveryStatus()[$row['DELIVERY_STATUS']]['label'] ?? '';
                     },
                 ],
                 'IS_AUTO' => [
@@ -389,9 +392,9 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'name'=> \Yii::t('ctx', 'shopOrderListOrderStatus'),
                     'other'=> 'select',
                     'selectData'=> [
-                        ['id' => \Yii::$app->params['orderStatus']['paid']['value'], 'name' => \Yii::$app->params['orderStatus']['paid']['label']],
-                        ['id' => \Yii::$app->params['orderStatus']['notPaid']['value'], 'name' => \Yii::$app->params['orderStatus']['notPaid']['label']],
-                        ['id' => \Yii::$app->params['orderStatus']['failPaid']['value'], 'name' => \Yii::$app->params['orderStatus']['failPaid']['label']]
+                        ['id' => $this->getOrderStatus()['paid']['value'], 'name' => $this->getOrderStatus()['paid']['label']],
+                        ['id' => $this->getOrderStatus()['notPaid']['value'], 'name' => $this->getOrderStatus()['notPaid']['label']],
+                        ['id' => $this->getOrderStatus()['failPaid']['value'], 'name' => $this->getOrderStatus()['failPaid']['label']]
                     ]
                 ],
                 'IS_AUTO' => [
@@ -406,4 +409,105 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
         }
         return $this->filterTypes;
     }
+
+    // 为了多语言,params.php中无法解析,const无法解析.做成函数返回
+    public function getDeliveryStatus() {
+        return [
+            '0' => [
+                'value' => 0,
+                'label' => \Yii::t('ctx', 'shopOrderListUndelivered')//未发货
+            ],
+            'notDelivery' => [
+                'value' => 0,
+                'label' => \Yii::t('ctx', 'shopOrderListUndelivered')//未发货
+            ],
+            '1' => [
+                'value' => 1,
+                'label' => \Yii::t('ctx', 'shopOrderListDelivered')//已发货
+            ],
+            'delivered' => [
+                'value' => 1,
+                'label' => \Yii::t('ctx', 'shopOrderListDelivered')//已发货
+            ],
+            '2' => [
+                'value' => 2,
+                'label' => \Yii::t('ctx', 'shopOrderListConfirmReceipt')//确认收货
+            ],
+            'confirm' => [
+                'value' => 2,
+                'label' => \Yii::t('ctx', 'shopOrderListConfirmReceipt')//确认收货
+            ],
+        ];
+    }
+
+    // 同上原因,获取订单状态
+    public function getOrderStatus(){
+        return [
+            '0' => [
+                'value' => 0,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusUnpaid')//待支付
+            ],
+            'notPaid' => [
+                'value' => 0,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusUnpaid')//待支付
+            ],
+            '1' => [
+                'value' => 1,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusPaid')//已支付
+            ],
+            'paid' => [
+                'value' => 1,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusPaid')//已支付
+            ],
+            // 此时进入发货流程参考发货状态
+            '3' => [
+                'value' => 3,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusLogisticsStatus')//物流状态
+            ],
+            'delivery' => [
+                'value' => 3,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusLogisticsStatus')//物流状态
+            ],
+            '4' => [
+                'value' => 4,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusOrderCompletion')//订单完成
+            ],
+            'complete' => [
+                'value' => 4,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusOrderCompletion')//订单完成
+            ],
+            '5' => [
+                'value' => 5,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusOrderCancellation'),//订单取消
+            ],
+            'cancel' => [
+                'value' => 5,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusOrderCancellation'),//订单取消
+            ],
+            '6' => [
+                'value' => 6,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusOrderDeletion'),//订单删除
+            ],
+            'del' => [
+                'value' => 6,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusOrderDeletion'),//订单删除
+            ],
+            '7' => [
+                'value' => 7,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusOrderDeletionOrderRefund'),//订单退款
+            ],
+            'refund' => [
+                'value' => 7,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusOrderDeletionOrderRefund'),//订单退款
+            ],
+            '-1' => [
+                'value' => -1,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusPaymentFailed'),//支付失败
+            ],
+            'failPaid' => [
+                'value' => -1,
+                'label' => \Yii::t('ctx', 'shopOrderListGetOrderStatusPaymentFailed'),//支付失败
+            ],
+        ];
+    }
 }

common/messages/en-US/ctx.php

@@ -89,6 +89,25 @@ return [
     'rechargeRechargeStateNew'=>'New',
     'rechargeRechargeStateProcessing'=>'Processing',
     'rechargeRechargeStateSuccess'=>'Success',
+    'shopOrderListUndelivered' => 'Undelivered',
+    'shopOrderListDelivered'=>'Delivered',
+    'shopOrderListConfirmReceipt' => 'Confirm receipt',
+    'shopOrderListGetOrderStatusUnpaid' => 'Unpaid',
+    'shopOrderListGetOrderStatusPaid' => 'Paid',
+    'shopOrderListGetOrderStatusLogisticsStatus' => 'Logistics status',
+    'shopOrderListGetOrderStatusOrderCompletion' => 'Order completion',
+    'shopOrderListGetOrderStatusOrderCancellation' => 'Order cancellation',
+    'shopOrderListGetOrderStatusOrderDeletion' => 'Order deletion',
+    'shopOrderListGetOrderStatusOrderDeletionOrderRefund' => 'Order refund',
+    'shopOrderListGetOrderStatusPaymentFailed' => 'Payment failed',
+    'balanceAuditListGetBalanceAuditType' => 'Member bonus account',
+    'balanceAuditListCash' => 'Member Ecoin account',
+    'balanceAuditListGaragePoints' => 'Car points',
+    'balanceAuditListVillaPoints' => 'Villa points',
+    'financeRechargeListStatusTobeReviewed' => 'To be reviewed',
+    'financeRechargeListStatusApproved' => 'Approved',
+    'financeRechargeListStatusVoucherUploaded' => 'Voucher uploaded',
+    'financeRechargeListStatusRejected' => 'Rejected',
 
     'memberEcoinAdjustmentListFileName'=> 'Member_Ecoin_adjustment_list',
     'applicationChangeBalanceSucceeded'=> 'Application for change of member balance succeeded',

common/messages/zh-CN/ctx.php

@@ -86,9 +86,17 @@ return [
     'rechargeAuditStatusVoucherUploaded'=>'已上传凭证',
     'rechargeAuditStatusAudited'=>'已审核',
     'rechargeRechargeState'=>'充值状态',
-    'rechargeRechargeStateNew'=>'New',
-    'rechargeRechargeStateProcessing'=>'Processing',
-    'rechargeRechargeStateSuccess'=>'Success',
+    'rechargeRechargeStateNew'=>'待审核',
+    'rechargeRechargeStateProcessing'=>'已上传凭证',
+    'rechargeRechargeStateSuccess'=>'已审核',
+    'balanceAuditListGetBalanceAuditType' => '会员账户奖金',
+    'balanceAuditListCash' => '会员账户余额',
+    'balanceAuditListGaragePoints' => '车奖积分',
+    'balanceAuditListVillaPoints' => '房奖积分',
+    'financeRechargeListStatusTobeReviewed' => '待审核',
+    'financeRechargeListStatusApproved' => '已审核',
+    'financeRechargeListStatusVoucherUploaded' => '已上传凭证',
+    'financeRechargeListStatusRejected' => '已拒绝',
 
     'memberEcoinAdjustmentListFileName'=> '会员余额调整列表',
     'applicationChangeBalanceSucceeded'=> '申请变动会员余额成功',
@@ -197,7 +205,17 @@ return [
     'shopListPayTravelBonus' => '旅游积分',
     'shopListPayCarFund' => '车奖积分',
     'shopListPayVillaFund' => '房奖积分',
-    
+    'shopOrderListUndelivered' => '未发货',
+    'shopOrderListDelivered'=>'已发货',
+    'shopOrderListConfirmReceipt' => '确认收货',
+    'shopOrderListGetOrderStatusUnpaid' => '待支付',
+    'shopOrderListGetOrderStatusPaid' => '已支付',
+    'shopOrderListGetOrderStatusLogisticsStatus' => '物流状态',
+    'shopOrderListGetOrderStatusOrderCompletion' => '订单完成',
+    'shopOrderListGetOrderStatusOrderCancellation' => '订单取消',
+    'shopOrderListGetOrderStatusOrderDeletion' => '订单删除',
+    'shopOrderListGetOrderStatusOrderDeletionOrderRefund' => '订单退款',
+    'shopOrderListGetOrderStatusPaymentFailed' => '支付失败',
     
 
     'shopExportListName' => '商品列表',
@@ -263,9 +281,9 @@ return [
     'shopOrderListDeliveryTime'=>'发货时间',
     'shopOrderListQty' => '数量',
     'shopOrderListItemPricing'=>'商品单价',
-    'shopOrderListTotalPrice' => '订单总价',
-    'shopOrderListBVAmount'=>'商品金额',
-    'shopOrderListUsTotalPrice'=>'美元价格($)', // 或者标准价格
+    'shopOrderListTotalPrice' => '商品金额',
+    'shopOrderListBVAmount'=>'BV合计',
+    'shopOrderListUsTotalPrice'=>'商品金额($)', // 或者标准价格
     'shopOrderListFreight' => '运费',
     'shopOrderListTaxRate'=>'税率',
     'shopOrderListTax' => '税额',
@@ -400,7 +418,7 @@ return [
 
     # 会员
     'memberCode' => '会员编号',
-    'memberName' => '会员名字',
+    'memberName' => '会员姓名',
     'memberAddress' => '收货地址',
     'loginStatus' => '登录状态',
     'allowLogin' => '允许登录',

common/models/BalanceAudit.php

@@ -175,4 +175,45 @@ class BalanceAudit extends \common\components\ActiveRecord
             ],
         ];
     }
+
+    public static function getBalanceAuditType() {
+        return [
+            'bonus' => [
+                'name' => 'bonus',
+                'label' => \Yii::t('ctx', 'balanceAuditListGetBalanceAuditType'),//会员账户奖金
+            ],
+    //        'reconsume_points' => [
+    //            'name' => 'reconsume_points',
+    //            'label' => '复消积分',
+    //        ],
+    //        'exchange_points' => [
+    //            'name' => 'exchange_points',
+    //            'label' => '兑换积分',
+    //        ],
+            'cash' => [
+                'name' => 'cash',
+                'label' => \Yii::t('ctx', 'balanceAuditListCash'),// 会员账户余额
+            ],
+    //        'cf' => [
+    //            'name' => 'cf',
+    //            'label' => '车房养老奖余额',
+    //        ],
+    //        'lx' => [
+    //            'name' => 'lx',
+    //            'label' => '领袖分红奖余额',
+    //        ],
+    //        'tourism_points' => [
+    //            'name' => 'tourism_points',
+    //            'label' => '旅游积分',
+    //        ],
+            'garage_points' => [
+                'name' => 'garage_points',
+                'label' => \Yii::t('ctx', 'balanceAuditListGaragePoints'),// 车奖积分
+            ],
+            'villa_points' => [
+                'name' => 'villa_points',
+                'label' => \Yii::t('ctx', 'balanceAuditListVillaPoints'),// 房奖积分
+            ],
+        ];
+    }
 }

common/models/Recharge.php

@@ -232,4 +232,14 @@ class Recharge extends \common\components\ActiveRecord {
         //$result = curl_exec($ch);
         echo $result;
     }
+
+    // 多语言状态名
+    public static function getStatusName() {
+        return [
+            self::STATUS_APPLIED => \Yii::t('ctx', 'financeRechargeListStatusTobeReviewed'), // 待审核
+            self::STATUS_PROVED => \Yii::t('ctx', 'financeRechargeListStatusVoucherUploaded'), // 已上传凭证
+            self::STATUS_AUDITED => \Yii::t('ctx', 'financeRechargeListStatusApproved'), // 已审核
+            self::STATUS_REFUSED => \Yii::t('ctx', 'financeRechargeListStatusRejected'), // 已拒绝
+        ];
+    }
 }

common/models/Withdraw.php

@@ -413,5 +413,18 @@ class Withdraw extends \common\components\ActiveRecord {
         $total = self::find()->where('AUDIT_STATUS=:AUDIT_STATUS', [':AUDIT_STATUS' => $type])->sum('AMOUNT');
         return $total ? $total : '0.00';
     }
-
+    
+    // 提现状态
+    public static function getStatusName() {
+        return [
+            self::STATUS_APPLIED =>  Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusApplied'), // 提现待审核
+    //        self::STATUS_INVOICED => '提现待审核',
+            self::STATUS_AUDITED => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusAudited'), // 提现已审核 
+            self::STATUS_WAIT_PAID => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusWaitPaid'), // 提现待付款 
+            self::STATUS_PAID_FALSE => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusPaidFalse'), // 付款失败  
+            self::STATUS_REFUSED => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusRefused'), // 已拒绝 
+            self::STATUS_PAID => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusPaid'), // 提现已付款 
+            self::STATUS_RETURN => Yii::t('ctx', 'commonModelsWithdrawStatusNameStatusReturned'), // 已退回
+        ];
+    }
 }