会员升级功能开关

backendApi/config/urlManagerRules.php

@@ -263,6 +263,7 @@ return [
             'POST,GET other' => 'other',
             'GET dec-level' => 'dec-level',
             'GET,POST month-limit' => 'month-limit',
+            'POST open-upgrade' => 'open-upgrade',
             'POST dec-level-add' => 'dec-level-add',
             'POST,GET dec-level-edit/<id>' => 'dec-level-edit',
             'GET dec-level-delete/<selected>' => 'dec-level-delete',

backendApi/modules/v1/controllers/ConfigController.php

@@ -475,8 +475,39 @@ class ConfigController extends BaseController {
                 return static::notice('更新观察期失败，请重试');
             }
         }
-        $data = Config::find()->where("CONFIG_NAME='observePeriodLimit'")->asArray()->one();
-        return static::notice($data);
+        $data = Config::find()
+        ->where("CONFIG_NAME='observePeriodLimit'")
+        ->asArray()
+        ->one();
+        $isSwitchUpgrade = Config::find()
+        ->where("CONFIG_NAME='isOpenUpgrade'")
+        ->asArray()
+        ->one();
+
+        return static::notice([
+            'observe' => $data,
+            'isOpenUpgrade' => $isSwitchUpgrade
+        ]);
+    }
+
+    // 开关会员升级单功能
+    public function actionOpenUpgrade() {
+        if (Yii::$app->request->isPost) {
+            $postData = Yii::$app->request->post();
+            $isOpen = $postData['isOpen'];
+            $ret = Config::updateAll(
+                ['VALUE' => $isOpen, 'UPDATED_AT' => Date::nowTime()], 
+                "CONFIG_NAME=:CONFIG_NAME", 
+                [':CONFIG_NAME' => 'isOpenUpgrade']
+            );
+            if ($ret) {
+                $msg = $isOpen == 1 ? '开启' : '关闭';
+                return static::notice("$msg,操作成功");
+            } else {
+                return static::notice('操作失败，请重试');
+            }
+        }
+        return static::notice('非法请求');
     }
 
     /**

backendEle/src/views/config/dec-level.vue

@@ -75,6 +75,12 @@
         <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">更新观察期</el-button>
       </div></el-form-item>
       </el-form>
+      <el-switch
+        v-model="value1"
+        :active-text="value1Text"
+        @change="switchUpgrade"
+      >
+      </el-switch>
     </div>
 
   </div>
@@ -97,12 +103,17 @@ export default {
     })
 
     network.getData('config/month-limit').then(response => {
-      this.form.monthLimitTITLE = response.TITLE
-      this.form.monthLimitVALUE = response.VALUE
+      this.form.monthLimitTITLE = response.observe.TITLE
+      this.form.monthLimitVALUE = response.observe.VALUE
+      // 是否开启会员升级功能
+      this.value1 = response.isOpenUpgrade.VALUE == 0 ? false : true
+      this.value1Text = response.isOpenUpgrade.TITLE
     })
   },
   data () {
     return {
+      value1:true,
+      value1Text: '',
       submitButtonStat: false,
       form:{
         monthLimitTITLE:'',
@@ -115,6 +126,24 @@ export default {
     }
   },
   methods: {
+    // 切换开关
+    switchUpgrade() {
+      network.postData('config/open-upgrade', {
+          isOpen: this.value1 === true ? 1 : 0, // 0关闭 1开启
+        }).then(response => {
+          this.$message({
+            message: response,
+            type: 'success'
+          })
+          this.submitButtonStat = false
+        
+        }).catch(response => {
+          this.submitButtonStat = false
+  
+      })
+      
+      console.log('sss',this.value1)
+    },
     onSubmit() {
       this.submitButtonStat = true
       network.postData('config/month-limit', {

common/models/Order.php

@@ -64,7 +64,8 @@ class Order extends \common\components\ActiveRecord
     public function rules()
     {
         return [
-            [['USER_ID', 'USER_NAME', 'ORDER_TYPE', 'CREATE_USER', 'EMAIL'], 'required'],
+            // [['USER_ID', 'USER_NAME', 'ORDER_TYPE', 'CREATE_USER', 'EMAIL'], 'required'],
+            [['USER_ID', 'USER_NAME', 'ORDER_TYPE', 'CREATE_USER'], 'required'],
             [['ORDER_AMOUNT', 'PV', 'PAY_AMOUNT', 'PAY_PV', 'FREIGHT', 'PAY_FREIGHT'], 'number'],
             [['PAY_AT', 'DELIVERY_STATUS', 'DELIVERY_PERIOD', 'DELIVERY_AT', 'EXPRESS_TYPE', 'PERIOD_NUM', 'STATUS', 'PROVINCE', 'CITY', 'COUNTY', 'CREATED_AT', 'UPDATED_AT', 'IS_DELETE', 'DELETED_AT'], 'integer'],
             [['ID','SN', 'DEC_SN', 'USER_ID', 'ORDER_TRACK_NO','PAY_TYPE'], 'string', 'max' => 32],

common/models/forms/DeclarationUpgradeForm.php

@@ -207,6 +207,7 @@ class DeclarationUpgradeForm extends Model
         if(!$warehouse){
             throw new Exception('地区暂时不支持配送，具体联系客服');
         }
+        
         $upgradeType = $isObserve ? 1 : 2; // 1补差  2全额
         $periodObj = Period::instance();
         $nowPeriodNum = $periodObj->getNowPeriodNum();
@@ -236,10 +237,13 @@ class DeclarationUpgradeForm extends Model
             $decOrderModel->CREATED_AT = Date::nowTime();
             $decOrderModel->UPGRADE_TYPE = $upgradeType;
             $decOrderModel->REMARK = $remark;
+            $decOrderModel->ORI_LV = $oriDecLv; // 变更前的级别
+            $decOrderModel->UPGRADE_LV = $this->decLv; // 变更后的级别
             if(!$decOrderModel->save()){
                 $transaction->rollBack();
                 throw new Exception(Form::formatErrorsForApi($decOrderModel->getErrors()));
             }
+
             $orderModel = new Order();
             $orderModel->SN = 'OS'.$ord;
             $orderModel->DEC_SN = 'DS'.$ord;
@@ -270,6 +274,7 @@ class DeclarationUpgradeForm extends Model
                 $transaction->rollBack();
                 throw new Exception(Form::formatErrorsForApi($orderModel->getErrors()));
             }
+
             // 加入商品到订单商品表
             foreach($this->_orderGoods as $key=>$value){
                 $this->_orderGoods[$key]['ORDER_SN'] = $orderModel->SN;
@@ -291,28 +296,6 @@ class DeclarationUpgradeForm extends Model
                 $transaction->rollBack();
                 throw new Exception(Form::formatErrorsForApi($addressModel->getErrors()));
             }
-            // 加入商品到订单商品表
-            foreach($this->_orderGoods as $key=>$value){
-                $this->_orderGoods[$key]['ORDER_SN'] = $orderModel->SN;
-                $this->_orderGoods[$key]['P_CALC_MONTH'] = Date::ociToDate($nowCalcMonth, Date::OCI_TIME_FORMAT_SHORT_MONTH);
-            }
-            OrderGoods::batchInsert($this->_orderGoods);
-            //写入收货地址信息
-            $addressModel = new ReceiveAddress();
-            $addressModel->USER_ID = $this->_insertUserId;
-            $addressModel->USER_NAME = $this->insertUserName;
-            $addressModel->CONSIGNEE = $this->consignee;
-            $addressModel->MOBILE = $this->acceptMobile;
-            $addressModel->PROVINCE = $this->province;
-            $addressModel->CITY = $this->city;
-            $addressModel->COUNTY = intval($this->county) ?? 0;
-            $addressModel->ADDRESS = $this->address;
-            $addressModel->IS_DEFAULT = 0;
-            if(!$addressModel->save()){
-                $transaction->rollBack();
-                throw new Exception(Form::formatErrorsForApi($addressModel->getErrors()));
-            }
-        
             // 扣报单人现金钱包
             Cash::changeUserCash(\Yii::$app->user->id, 'CASH', -abs($this->_decAmount), ['REMARK' =>'为'.$this->insertUserName.'升级报单']);
             // 为被升级人进行升级操作

frontendApi/modules/v1/controllers/UserController.php

@@ -206,6 +206,14 @@ class UserController extends BaseController {
 
     // 会员升级,通过会员的编号,获取会员信息
     public function actionUpgradeInfo() {
+        $isSwitchUpgrade = Config::find()
+        ->where("CONFIG_NAME='isOpenUpgrade'")
+        ->asArray()
+        ->one();
+        $isOpen = !empty($isSwitchUpgrade) && isset($isSwitchUpgrade['VALUE']) ? $isSwitchUpgrade['VALUE'] : 0;
+        if ($isOpen < 1) {
+            return static::notice('功能暂未开放',400);
+        }
         $userNumber = \Yii::$app->request->request('userName');
         $baseInfo = Info::baseInfoZhByUserName($userNumber);
         if ($baseInfo['STATUS'] != 1) {
@@ -276,6 +284,14 @@ class UserController extends BaseController {
     
     // 会员升级管理
     public function actionUpgrade() {
+        $isSwitchUpgrade = Config::find()
+        ->where("CONFIG_NAME='isOpenUpgrade'")
+        ->asArray()
+        ->one();
+        $isOpen = !empty($isSwitchUpgrade) && isset($isSwitchUpgrade['VALUE']) ? $isSwitchUpgrade['VALUE'] : 0;
+        if ($isOpen < 1) {
+            return static::notice('功能暂未开放',400);
+        }
         // 开始升级
         if (\Yii::$app->request->isPost) {
             $formModel = new DeclarationUpgradeForm();