DengTao 8 년 전
부모
커밋
c1266fa980
3개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 0
      www/protected/controllers/ROrderController.php
  2. 1 0
      www/protected/modules/o2o/models/ROrder.php
  3. 1 2
      www/protected/modules/o2o/models/Recharge.php

+ 1 - 0
www/protected/controllers/ROrderController.php

@@ -223,6 +223,7 @@ class ROrderController extends AdminController{
         // 获取用户信息,修改用户订单统计
         // 获取用户信息,修改用户订单统计
         //     2015-11-16
         //     2015-11-16
         $user_id = $order->user;
         $user_id = $order->user;
+        $order->_id = $id;
         if (!empty($user_id)) {
         if (!empty($user_id)) {
             $user = RUser::get($user_id);
             $user = RUser::get($user_id);
         } else {
         } else {

+ 1 - 0
www/protected/modules/o2o/models/ROrder.php

@@ -351,6 +351,7 @@ class ROrder extends MongoAr
 
 
             $order = $this->_id;
             $order = $this->_id;
             $commisionObj = Commision::getByOrder($order);
             $commisionObj = Commision::getByOrder($order);
+
             // 检查Cmmmision信息是否已录入
             // 检查Cmmmision信息是否已录入
             foreach ($this->technicians as $technician_id => $technician) {
             foreach ($this->technicians as $technician_id => $technician) {
 
 

+ 1 - 2
www/protected/models/data/Recharge.php → www/protected/modules/o2o/models/Recharge.php

@@ -9,9 +9,8 @@
 class Recharge extends MongoAr
 class Recharge extends MongoAr
 {
 {
     public $_id;
     public $_id;
-    public $user_id;//充值用户的id
     public $Denomination;//充值面额
     public $Denomination;//充值面额
-    public $pay;//充值方式
+    public $time;
     public $presentation;//赠送方式  1 赠送优惠券  2 返现
     public $presentation;//赠送方式  1 赠送优惠券  2 返现
     public $coupon = array();//赠送的优惠券
     public $coupon = array();//赠送的优惠券
     public $cash_back;//返现
     public $cash_back;//返现