Merge branch 'master' of http://git.sotype.com/chenxiqiang/houseworking

manage-server/app/Http/Controllers/RewardController.php

             $reward->price = $price;
             $reward->wechat_id = $wechat_id;
             $reward->save();
+            $order_id = $reward->id;
 
             $order = CommonController::getRecord($order_type, $reward->id);