Merge branch 'test' of git.oschina.net:yiguanjia/php into test

commit

www/protected/config/yiguanjia_const.php

@@ -63,13 +63,8 @@ $wz['service_type_option'] = array(
 );
 //新手礼包
 $wz['new_user_coupon_ids'] = array(
-    '56c58b2ca84ea022168b5747',
-    '56c58c46a84ea077188c53c7',
-    '56c58ccba84ea07d268be2ce',
-    '56c58d78a84ea000288b7fc3',
-    '56c58deda84ea0f1258c49b1',
-    '56c58e2fa84ea0b14c8d448a',
+    '57df714b9f5160c1048b456a',
 );
 //新手礼包金额
-$wz['new_user_coupons_value'] = 205;
+$wz['new_user_coupons_value'] = 20;
 

www/protected/controllers/MaterialController.php

@@ -1,7 +1,7 @@
 <?php 
 /**
  * 物资控制器
- * @author     2015-09-16
+ * @author zhouxuchen 2015-09-16
  */
 class MaterialController extends AdminController {
 
@@ -116,7 +116,7 @@ class MaterialController extends AdminController {
         $material->enable = $enable;
         $material->enable_str = $this->enable_str($enable);
         $material->remarks = $remarks;
-        
+
         $arr_addMaterial = array('name', 'unit_str', 'unit', 'price', 'stock', 'stockWarnLine', 'addTime', 'user', 'status', 'status_str', 'enable', 'enable_str', 'remarks');
 
         $success = $material->save(true, $arr_addMaterial);
@@ -212,7 +212,7 @@ class MaterialController extends AdminController {
             $stock->station = new MongoId($sid);
             $stock->stationName = $station->name;
 
-            
+
             $arr_addStock = array('mid', 'mname', 'operate', 'operate_str', 'user', 'time', 'username', 'num', 'tot_price', 'lastStock', 'newStock', 'remarks', 'object', 'objectName', 'station', 'stationName');
         } else {
             $stock->objectName = '公司总库';
@@ -229,7 +229,7 @@ class MaterialController extends AdminController {
         $stock->username = $userInfo->name;
         $stock->time = $time;
 
-        $stock->remarks = $remarks;        
+        $stock->remarks = $remarks;
 
         $material->stock = $stock->newStock;
         $material->status = $this->status($material->stock, $material->stockWarnLine);
@@ -333,6 +333,21 @@ class MaterialController extends AdminController {
             case 6:
                 $unit_str = '双';
                 break;
+            case 7:
+                $unit_str = '只';
+                break;
+            case 8:
+                $unit_str = '个';
+                break;
+            case 9:
+                $unit_str = '套';
+                break;
+            case 10:
+                $unit_str = '副';
+                break;
+            case 11:
+                $unit_str = '毫升';
+                break;
             default:
                 $unit_str = '未找到相应单位';
                 break;

www/protected/controllers/SiteController.php

@@ -129,7 +129,14 @@ class SiteController extends AdminController
 	}
 
     public function actionTest(){
-        echo 'temp99999';exit;
-        echo Yii::app()->params['o2o_service'][2]['name'];exit;
+        $list = new ARedisList('o2o_after_pay_success');
+        var_dump(Yii::app()->redis);
+       /* $redis = new Redis();
+        $redis->connect('10.9.160.211', 6379);
+        $key = "testkey";
+        $tvalue = "testvalue";
+        $redis->set($key, $tvalue);
+        $nvalue = $redis->get($key);
+        print_r($nvalue . "\n");*/
     }
 }

www/protected/modules/common/controllers/ConfirmController.php

@@ -48,6 +48,11 @@ class ConfirmController extends CController{
                 $balance_log->amount = $amount;
                 $balance_log->save(true);
 
+                $order->charge_id = $input_data['id'];
+                $order->pay_channel = $input_data['channel'];
+                $order->status = 1;
+                $order->update(array('charge_id','pay_channel','status'),true);
+
                 echo 'success';
                 die();
 
@@ -59,10 +64,29 @@ class ConfirmController extends CController{
                 }
                 $order->charge_id = $input_data['id'];
                 $order->pay_channel = $input_data['channel'];
+                if($order->final_price>$order->pay_price){
+                    $order->pay_channel = 'mix';
+                }
                 $order->status = 1;
-                if($order->update(array('charge_id','pay_channel','status'),true)){
+                if($order->update(array('charge_id','pay_channel','status','pay_channel'),true)){
                     $list = new ARedisList('o2o_after_pay_success');
                     $list->push(json_encode($input_data));
+
+                    //如果有余额支付  扣除用户余额  并生成余额变动日志
+                    if($order->final_price>$order->pay_price){
+                        $user_obj = RUser::get($order->user);
+                        $user_obj->balance = $user_obj->balance-($order->final_price-$order->pay_price);
+                        $user_obj->save();
+
+                        $balance_log = new BalanceLog();
+                        $balance_log->time = time();
+                        $balance_log->user =  $user_obj->_id;
+                        $balance_log->memo = '微信下订单';
+                        $balance_log->type = 'order';
+                        $balance_log->amount = $order->final_price-$order->pay_price;
+                        $balance_log->save(true);
+                    }
+
                     echo 'success';
                     die();
                 }else{

www/protected/modules/o2o/controllers/OrderController.php

@@ -154,7 +154,21 @@ class  OrderController extends O2oBaseController{
         if(isset($user_coupon->coupon)){
             $order->coupon_type = $user_coupon->coupon;
         }
-        if($order->final_price == 0){
+        if($order->pay_price == 0){
+            $user_obj->balance = $user_obj->balance-$balance;
+            $user_obj->save();
+
+            $balance_log = new BalanceLog();
+            $balance_log->time = time();
+            $balance_log->user =  $user_obj->_id;
+            $balance_log->memo = '微信下订单';
+            $balance_log->type = 'order';
+            $balance_log->amount = $balance;
+            $balance_log->save(true);
+
+            if($order->final_price>0){
+                $order->pay_channel = 'balance';
+            }
             $order->status = 1;
         }else{
             $order->status = 0;
@@ -250,6 +264,8 @@ class  OrderController extends O2oBaseController{
         }
         $str = isset($str)&&$str?$str:'上门';
         $amount = ceil($order->pay_price*1000)/10;
+
+
         $result = Service::factory('PayService')->Pay($pay_channel,$amount,(string)$order->_id,$str,$str,$user_obj->wx_pub_openid);
         if($result === false){
             CommonFn::requestAjax(false,'支付遇到点问题了，请稍候再试');

www/protected/modules/o2o/models/Material.php

@@ -1,7 +1,7 @@
 <?php 
 /**
  * 物资
- * @author     2015-09-16
+ * @author zhouxuchen 2015-09-16
  */
 class Material extends MongoAr {
 
@@ -37,7 +37,12 @@ class Material extends MongoAr {
         3 => array('name' => '盒'),
         4 => array('name' => '台'),
         5 => array('name' => '件'),
-        6 => array('name' => '双')
+        6 => array('name' => '双'),
+        7 => array('name' => '只'),
+        8 => array('name' => '个'),
+        9 => array('name' => '套'),
+        10 => array('name' => '副'),
+        11 => array('name' => '毫升')
     );
 
     public function __construct($scenario='insert') {

www/protected/modules/o2o/models/ROrder.php

@@ -84,6 +84,8 @@ class ROrder extends MongoAr
         "dongfang" => array('name' => '东方CJ'),
         "youzan" => array('name' => '有赞'),
         "shangmenshoukuan" => array('name' => '保洁师上门收款'),
+        "balance"=>array('name' => '余额支付'),
+        "mix"=>array('name' => '混合支付'),  //部分余额支付   部分付款
         "other" => array('name' => '其他'),
     );
 

www/protected/views/rUser/index.php

@@ -565,11 +565,11 @@ $(function(){
                     id: data.id
                 },
                 columns: [[
-                    {field: 'time_str', title: '时间', width: 100},
-                    {field: 'type_str', title: '类型', width: 100,},
+                    {field: 'time_str', title: '时间', width: 60},
+                    {field: 'type_str', title: '类型', width: 50,},
                     {field: 'action_user', title: '操作者', width: 100,},
                     {field:'amount', title:'数量', width:40},
-                    {field:'memo', title:'说明', width:40}
+                    {field:'memo', title:'说明', width:200}
                 ]]
             });