Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/OrderController.php

@@ -109,14 +109,14 @@ class OrderController extends BaseController
             //判断花材有效性
             ProductClass::valid($productList, $this->shopId);
             $post['product'] = $productList;
-            OrderClass::addOrder($post, $this->shop);
+            $return = OrderClass::addOrder($post, $this->shop);
             $transaction->commit();
+            util::success($return);
         } catch (\Exception $e) {
             $transaction->rollBack();
             Yii::info("下单报错：" . $e->getMessage());
             util::fail('下单失败');
         }
-        util::complete();
     }
 
     //延期支付 shish 2021.1.19

biz-ghs/order/classes/OrderClass.php

@@ -464,7 +464,7 @@ class OrderClass extends BaseClass
         self::updateById($orderId, $upData);
 
         //增加业绩
-        StatYjClass::addYj($order);
+        //StatYjClass::addYj($order);
 
         $shop['unSendOrder']++;
         $shop['unPayOrder']--;