自动合格，假订单FO类型修改

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

@@ -197,8 +197,6 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
                         switch ($row['ORDER_TYPE']) {
-                            case 'FO':
-                                return 'remain BV order';
                             case 'ZC':
                                 return 'Welcome pack';
                             case 'FX':

common/helpers/bonus/BonusSend.php

@@ -129,8 +129,9 @@ class BonusSend extends BaseObject {
      *
      */
     public function putFakeOrder() {
-        echo('开始处理假订单' . PHP_EOL);
-        $fakeOrder= Order::find()->where(['PERIOD_NUM'=>$this->_periodNum, 'ORDER_TYPE'=>'FO'])->asArray()->all();
+        echo('开始处理-假订单' . PHP_EOL);
+        $fakeOrder= Order::find()->where(['PERIOD_NUM'=>$this->_periodNum, 'IS_FAKE'=>'1'])->asArray()->all();
+//        print_r($fakeOrder);exit;
         foreach($fakeOrder as $fOrder){
             $oRemainPv=RemainPv::findOne(["USER_ID"=>$fOrder['USER_ID']]);
             $transactionRemain = \Yii::$app->db->beginTransaction();

common/helpers/bonus/PerfCalc.php

@@ -196,7 +196,7 @@ class PerfCalc {
             $periods = Period::getCurrentMonthPeriodByPeriodNum($periodNum);
             //先清除本期的假订单
             echo('首先，清除上次尝试生成业绩单时所创建的虚假订单'. date('Y-m-d  H:i:s', time()) . PHP_EOL);
-            $delFOrder = Order::deleteAll(['ORDER_TYPE'=>'FO','PERIOD_NUM'=>$periodNum]);
+            $delFOrder = Order::deleteAll(['IS_FAKE'=>'1','PERIOD_NUM'=>$periodNum]);
             echo('检查有结余PV的用户，如果他当月PV不足30，则为其创建假订单'. PHP_EOL);
             foreach($userHaveRemain as $uR){
                 $myPv = Order::find()->where(['PERIOD_NUM'=>$periods, 'USER_ID'=>$uR['USER_ID']])->SUM('PV');

common/models/forms/OrderForm.php

@@ -998,13 +998,14 @@ class OrderForm extends Model
         $orderModel->USER_NAME = $userName;
         $orderModel->PERIOD_NUM = $periodNum;
         $orderModel->CREATE_USER = 'FAKE';
-        $orderModel->ORDER_TYPE = 'FO';
+        $orderModel->ORDER_TYPE = 'FX';
         $orderModel->STATUS = 1;
         $orderModel->PV = 30;
         $orderModel->PAY_PV = 30;
         $orderModel->P_CALC_MONTH = '1970-01-01';
         $orderModel->CREATED_AT = Date::nowTime();
         $orderModel->EXPRESS_TYPE = 1;
+        $orderModel->IS_FAKE = 1;
         if(!$orderModel->save()){
             $this->addErrors($orderModel->getErrors());
             return false;

sql/upgrade/1540.sql

@@ -1,9 +1,9 @@
-alter table `AR_ORDER` add column REMAIN_PV decimal(16,2) not null default 0.00 comment "当期未计入的剩余PV";
-alter table `AR_ORDER_GOODS` add column REMAIN_PV decimal(16,2) not null default 0.00 comment "当期未计入的剩余PV";
+alter table `AR_ORDER` add column REMAIN_PV decimal(16,2) not null default 0.00 comment "褰撴湡鏈��鍏ョ殑鍓╀綑PV";
+alter table `AR_ORDER_GOODS` add column REMAIN_PV decimal(16,2) not null default 0.00 comment "褰撴湡鏈��鍏ョ殑鍓╀綑PV";
 
-alter table `AR_APPROACH_ORDER` add column REMAIN_PV decimal(16,2) not null default 0.00 comment "当期未计入的剩余PV";
+alter table `AR_APPROACH_ORDER` add column REMAIN_PV decimal(16,2) not null default 0.00 comment "褰撴湡鏈��鍏ョ殑鍓╀綑PV";
 
-ALTER TABLE `AR_SHOP_GOODS` ADD COLUMN PV_SPLIT TINYINT NOT NULL DEFAULT 0 COMMENT "是否BV分期";
+ALTER TABLE `AR_SHOP_GOODS` ADD COLUMN PV_SPLIT TINYINT NOT NULL DEFAULT 0 COMMENT "鏄�惁BV鍒嗘湡";
 
 CREATE TABLE `AR_REMAIN_PV`  (
   `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
@@ -24,3 +24,6 @@ CREATE TABLE `AR_FLOW_REMAIN_PV`  (
   `ORDER_SN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+alter table `AR_ORDER` add column IS_FAKE int(11) not null default 0 comment "鍋囪�鍗曟爣蹇�";
+alter table `AR_APPROACH_ORDER` add column IS_FAKE int(11) not null default 0 comment "鍋囪�鍗曟爣蹇�";