订单期数调整修改

backendApi/modules/v1/controllers/ShopController.php

@@ -37,6 +37,7 @@ use common\models\forms\UploadForm;
 use common\models\Order;
 use common\models\Period;
 use common\models\ShopGoods;
+use Yii;
 use yii\web\HttpException;
 use yii\web\UploadedFile;
 use yii\base\Exception;
@@ -863,7 +864,7 @@ class ShopController extends BaseController {
             $formModel = new OrderPeriodAdjustForm();
             $formModel->scenario = 'orderPeriodAdjust';
             if ($formModel->load(\Yii::$app->request->post(), '') && $formModel->periodAdjust()) {
-                return static::notice('成功');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
@@ -891,16 +892,16 @@ class ShopController extends BaseController {
 
         $order = Order::findOneAsArray('SN=:SN', [':SN' => $orderSn]);
         if (!$order) {
-            return static::notice('订单不存在', 400);
+            return static::notice(Yii::t('ctx', 'orderNotExist'), 400);
         }
-        $order['ORDER_TYPE'] = $order['ORDER_TYPE'] === 'ZC' ? '首单' : '复消';
+        $order['ORDER_TYPE'] = $order['ORDER_TYPE'] === 'ZC' ? Yii::t('ctx', 'shopOrderListOrderTypeZc') : Yii::t('ctx', 'shopOrderListOrderTypeFx');
         // 如果当前订单所在期数已挂网,则不可调整
         $period = Period::getInfoByPeriodNum($order['PERIOD_NUM']);
         if (!$period) {
-            return static::notice('期数无效', 400);
+            return static::notice(Yii::t('ctx', 'invalidPcNo'), 400);
         }
         if ($period['IS_SENT'] > 0) {
-            return static::notice('订单已挂网', 400);
+            return static::notice(Yii::t('ctx', 'orderHasBeenConnected'), 400);
         }
         // 根据订单期数查询可调整期数
         $availablePeriod = [];

backendApi/modules/v1/models/lists/log/AdminHandleList.php

@@ -60,7 +60,7 @@ class AdminHandleList extends \common\libs\dataList\DataList implements DataList
                 'opt_obj_name' => [
                     'header' => \Yii::t('ctx', 'operationObjectNumber'),
                     'headerOther' => [
-                        'width' => '130',
+                        'width' => '150',
                     ],
                 ],
                 'remark' => [
@@ -86,7 +86,12 @@ class AdminHandleList extends \common\libs\dataList\DataList implements DataList
                     },
                     'headerOther' => ['width' => '180'],
                 ],
-                'period_num' =>  \Yii::t('ctx', 'numberOfPhases'),
+                'period_num' => [
+                    'header' => \Yii::t('ctx', 'numberOfPhases'),
+                    'headerOther' => [
+                        'width' => '150',
+                    ],
+                ],
                 'ip' => [
                     'header' => \Yii::t('ctx', 'IPAddress'),
                     'headerOther' => [
@@ -156,6 +161,7 @@ class AdminHandleList extends \common\libs\dataList\DataList implements DataList
                 ['id'=>'编辑体系','name'=>\Yii::t('ctx', 'editSystem')],
                 ['id'=>'恢复体系','name'=>\Yii::t('ctx', 'recoverySystem')],
                 ['id'=>'perf adjustment','name'=>'perf adjustment'],
+                ['id'=>'调整订单期数','name'=>\Yii::t('ctx', 'shopOrderPeriodAdjust')],
             ];
             $this->filterTypes = [
                 'opt_type' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingType'), 'other'=> 'select', 'selectData'=> $selectData],

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

@@ -5,6 +5,7 @@ use common\libs\dataList\DataListInterface;
 use common\models\Order;
 use common\models\OrderPeriodAdjust;
 use common\libs\dataList\column\DateTime;
+use Yii;
 
 class OrderPeriodAdjustList extends \common\libs\dataList\DataList implements DataListInterface
 {
@@ -42,22 +43,22 @@ class OrderPeriodAdjustList extends \common\libs\dataList\DataList implements Da
             $this->columns = [
                 'ID' => null,
                 'ORDER_SN' => [
-                    'header' => '订单号',
+                    'header' => Yii::t('ctx', 'shopOrderListOrderCode'),
                 ],
                 'ORDER_TYPE' => [
-                    'header' => '订单类型',
+                    'header' => Yii::t('ctx', 'shopOrderListOrderType'),
                     'value' => function ($row) {
-                        return $row['ORDER_TYPE'] == 'ZC' ? '首单' : '复消';
+                        return $row['ORDER_TYPE'] == 'ZC' ? Yii::t('ctx', 'shopOrderListOrderTypeZc') : Yii::t('ctx', 'shopOrderListOrderTypeFx');
                     },
                 ],
                 'ORIGIN_PERIOD' => [
-                    'header' => '调整前期数',
+                    'header' => Yii::t('ctx', 'beforeAdjustmentPcNo'),
                 ],
                 'MODERN_PERIOD' => [
-                    'header' => '调整后期数',
+                    'header' => Yii::t('ctx', 'afterAdjustmentPcNo'),
                 ],
                 'CREATED_AT' => [
-                    'header' => '调整时间',
+                    'header' => Yii::t('ctx', 'createAt'),
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -65,7 +66,7 @@ class OrderPeriodAdjustList extends \common\libs\dataList\DataList implements Da
                     },
                 ],
                 'ADMIN_ID' => [
-                    'header' => '操作人',
+                    'header' => Yii::t('ctx', 'operationAdministrator'),
                 ],
             ];
         }
@@ -80,10 +81,10 @@ class OrderPeriodAdjustList extends \common\libs\dataList\DataList implements Da
     {
         if (!$this->filterTypes) {
             $this->filterTypes = [
-                'ORDER_SN' => ['name'=> '订单号'],
-                'ORIGIN_PERIOD'=> ['name'=> '调整前期数'],
-                'MODERN_PERIOD'=> ['name'=> '调整后期数'],
-                'CREATED_AT'=> ['name'=> '调整时间', 'other'=>'date'],
+                'ORDER_SN' => ['name'=> Yii::t('ctx', 'shopOrderListOrderCode')],
+                'ORIGIN_PERIOD'=> ['name'=> Yii::t('ctx', 'beforeAdjustmentPcNo')],
+                'MODERN_PERIOD'=> ['name'=> Yii::t('ctx', 'afterAdjustmentPcNo')],
+                'CREATED_AT'=> ['name'=> Yii::t('ctx', 'createAt'), 'other'=>'date'],
             ];
         }
         return $this->filterTypes;

common/messages/en-US/ctx.php

@@ -227,6 +227,8 @@ return [
     'shopListPayStack' => 'PayStack',
     'shopGoodTypeDomestic' => '国内商品',
     'shopGoodTypeImport' => '国内商品',
+    'beforeAdjustmentPcNo' => 'Before adjust Pc No.',
+    'afterAdjustmentPcNo' => 'After adjust Pc No.',
 
     'shopExportListName' => 'Goods_List',
     'shopProductAddSucceededNotice' => 'Product add succeeded',
@@ -285,6 +287,7 @@ return [
     'shopOrderListOrderTypeRepeatPurchaseOrder' => 'Repurchase order',
     'shopOrderListOrderTypePointsOrder' => 'Point order',
     'shopOrderListOrderTypeZc'=>'Welcome Pack',
+    'shopOrderListOrderTypeFx'=>'Repeat Purchase',
     'shopOrderListCreationTime' => 'Creation Time',
     'shopOrderListPayType' => 'Pay Type',
     'shopOrderListPaymentTime'=>'Payment Time',
@@ -322,6 +325,9 @@ return [
     'totalTax' => 'Total Tax',
     'totalAmount' => 'Total Amount',
     'signature' => 'Signature',
+    'orderNotExist' => 'order does not exist',
+    'orderHasBeenConnected' => 'The order has been connected to the net, and this period cannot be adjusted',
+    'invalidPcNo' => 'Invalid Pc No.',
 
     #Log
     'adminUserDoesNotExist'  => 'Administrator does not exist',
@@ -381,6 +387,7 @@ return [
     'editSystem'  => 'Edit system',
     'recoverySystem'  => 'Recovery system',
     'systemLog'  => 'System log',
+    'shopOrderPeriodAdjust' => 'Order Period Adjust',
     'call'  => 'Transfer',
     'beCcalled'  => 'called',
     'userOperatingLog'  => 'Member operation log',

common/messages/zh-CN/ctx.php

@@ -227,6 +227,11 @@ return [
     'shopOrderListGetOrderStatusPaymentFailed' => '支付失败',
     'shopGoodTypeDomestic' => '国内商品',
     'shopGoodTypeImport' => '国内商品',
+    'orderNotExist' => '订单不存在',
+    'orderHasBeenConnected' => '订单已挂网，不能调整',
+    'invalidPcNo' => '无效的期数',
+    'beforeAdjustmentPcNo' => '调整前期数',
+    'afterAdjustmentPcNo' => '调整后期数',
 
     'shopExportListName' => '商品列表',
     'shopProductAddSucceededNotice' => '商品添加成功',
@@ -282,7 +287,8 @@ return [
     'shopOrderListOrderType' => '订单类型',
     'shopOrderListOrderTypeRepeatPurchase'=>'重消',
     'shopOrderListOrderTypePoints'=>'积分',
-    'shopOrderListOrderTypeZc'=>'报单',
+    'shopOrderListOrderTypeZc'=>'首单',
+    'shopOrderListOrderTypeFx'=>'复消',
     'shopOrderListOrderTypeRepeatPurchaseOrder' => '重消订单',
     'shopOrderListOrderTypePointsOrder' => '积分订单',
     'shopOrderListCreationTime' => '创建时间',
@@ -381,6 +387,7 @@ return [
     'editSystem'  => '编辑体系',
     'recoverySystem'  => '恢复体系',
     'systemLog'  => '系统日志',
+    'shopOrderPeriodAdjust' => '订单期数调整',
     'call'  => '调用',
     'beCcalled'  => '被调用',
     'userOperatingLog'  => '会员操作日志',

common/models/OrderPeriodAdjust.php

@@ -2,6 +2,8 @@
 
 namespace common\models;
 
+use Yii;
+
 /**
  * This is the model class for table "{{%ORDER_PERIOD_ADJUST}}".
  *
@@ -40,12 +42,12 @@ class OrderPeriodAdjust extends \common\components\ActiveRecord
     {
         return [
             'ID' => 'ID',
-            'ORDER_SN' => '订单号',
-            'DEC_SN' => '报单编号',
-            'ORIGIN_PERIOD' => '调整前期数',
-            'MODERN_PERIOD' => '调整后期数',
-            'ADMIN_ID' => '创建人',
-            'CREATED_AT' => '创建时间',
+            'ORDER_SN' => Yii::t('ctx', 'shopOrderListOrderCode'),
+            'DEC_SN' => Yii::t('ctx', 'entryNo'),
+            'ORIGIN_PERIOD' => Yii::t('ctx', 'beforeAdjustmentPcNo'),
+            'MODERN_PERIOD' => Yii::t('ctx', 'afterAdjustmentPcNo'),
+            'ADMIN_ID' => Yii::t('ctx', 'userCreator'),
+            'CREATED_AT' => Yii::t('ctx', 'createAt'),
         ];
     }
 }

common/models/forms/OrderPeriodAdjustForm.php

@@ -18,6 +18,7 @@ use common\models\OrderPeriodAdjust;
 use common\models\Period;
 use common\models\User;
 use common\models\UserInfo;
+use Yii;
 
 /**
  * OrderPeriodAdjustForm form
@@ -78,17 +79,17 @@ class OrderPeriodAdjustForm extends Model
         // 校验订单
         $this->order = Order::findOne(['SN' => $this->orderSn, 'IS_DELETE' => 0]);
         if (!$this->order) {
-            $this->addError('orderSn', '订单不存在');
+            $this->addError('orderSn', Yii::t('ctx', 'orderNotExist'));
             return false;
         }
         // 目前期数：已封期、未挂网可调整
         $period = Period::getInfoByPeriodNum($this->modernPeriod);
         if (!$period) {
-            $this->addError('modernPeriod', '期数不存在');
+            $this->addError('modernPeriod', Yii::t('ctx', 'invalidPcNo'));
             return false;
         }
         if (!((+$period['IS_CLOSED'] == 1) && (+$period['IS_SENT'] == 0))) {
-            $this->addError('orderSn', '调整后的期数必须是已封期且未挂网');
+            $this->addError('orderSn', Yii::t('ctx', 'orderHasBeenConnected'));
             return false;
         }
 
@@ -104,6 +105,8 @@ class OrderPeriodAdjustForm extends Model
             return null;
         }
 
+        $this->adminOperateLogger->saveBeforeContent = Order::findOneAsArray('SN=:SN', [':SN' => $this->orderSn]);
+
         $db = \Yii::$app->db;
         $transaction = $db->beginTransaction();
         try {
@@ -160,6 +163,12 @@ class OrderPeriodAdjustForm extends Model
             $this->addError('periodAdjust', $e->getMessage());
             return null;
         }
+
+        $this->adminOperateLogger->saveAfterContent = Order::findOneAsArray('SN=:SN', [':SN' => $this->orderSn]);
+        $this->adminOperateLogger->clean()->save([
+            'optType' => '调整订单期数',
+        ]);
+
         return true;
     }
 }