Merge branch 'master' of http://47.108.67.251:8099/coupon.xp.yn.cn/coupon_backend

@@ -202,6 +202,7 @@ class Client extends Api
             'user_id'=>$user_id,
             'user_id'=>$user_id,
             'createtime'=>$createtime,
             'createtime'=>$createtime,
             'type'=>$type,
             'type'=>$type,
+            'price'=>$activity['price'],
             'verification_coupon_ids'=>$verification_coupon_ids,
             'verification_coupon_ids'=>$verification_coupon_ids,
             'verification_activity_id'=>$verification_activity_id,
             'verification_activity_id'=>$verification_activity_id,
             'name'=>$name,
             'name'=>$name,

@@ -15,8 +15,8 @@ use app\api\controller\Common;
  */
  */
 class Wechat extends Api
 class Wechat extends Api
 {
 {
-    protected $noNeedLogin = ["*"];
-    protected $noNeedRight = '*';
+	protected $noNeedLogin = ['*'];
+    protected $noNeedRight = ['*'];
 
 
     public function _initialize()
     public function _initialize()
     {
     {
@@ -286,19 +286,22 @@ class Wechat extends Api
 
 
 	*/
 	*/
 	public function prepare_order($order_no = ''){
 	public function prepare_order($order_no = ''){
-		$user_id = $this->auth->id;
-	
-		if(empty($user_id)){
-			return $this->error('预下单的用户信息错误');
+		if(empty($order_no)){
+			return $this->error('预下单信息错误');
 		}
 		}
+		$o_w["order_no"] = $order_no;
+		$order_info = Db::name('verification_order')->where($o_w)->find();
+		$user_id = $order_info['user_id'];
 		$userInfo = Db::name('user')->where(['id'=>$user_id])->find();
 		$userInfo = Db::name('user')->where(['id'=>$user_id])->find();
-
 		$out_trade_no = $order_no;
 		$out_trade_no = $order_no;
+		$o_w["order_no"] = $out_trade_no;
+		$order_info = Db::name('verification_order')->where($o_w)->find();
+		$total_fee = $order_info['price'] = 1;//测试支付1分钱
 		$app = WehcatModule::getInstance()->initWechatPay();
 		$app = WehcatModule::getInstance()->initWechatPay();
 		$result = $app->order->unify([
 		$result = $app->order->unify([
 			'body' => '优惠券购买',
 			'body' => '优惠券购买',
 			'out_trade_no' => $out_trade_no,
 			'out_trade_no' => $out_trade_no,
-			'total_fee' => 1,
+			'total_fee' => $total_fee,
 			'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
 			'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
 			'openid' => $userInfo['openid'],
 			'openid' => $userInfo['openid'],
 		]);
 		]);
@@ -412,7 +415,6 @@ class Wechat extends Api
 	}
 	}
 	// 发放佣金
 	// 发放佣金
 	public function grant_commission($pid=0,$order_id=0){
 	public function grant_commission($pid=0,$order_id=0){
-		
 		try{
 		try{
 			$verification_order = Db::name('verification_order')->where(['id'=>$order_id])->find();
 			$verification_order = Db::name('verification_order')->where(['id'=>$order_id])->find();
 			$app = WehcatModule::getInstance()->initWechatPay();
 			$app = WehcatModule::getInstance()->initWechatPay();
@@ -433,4 +435,32 @@ class Wechat extends Api
 			Common::put_file_log('异常-佣金发放',json_encode($result), 'grant_commission', __CLASS__ . __FUNCTION__ . __LINE__);
 			Common::put_file_log('异常-佣金发放',json_encode($result), 'grant_commission', __CLASS__ . __FUNCTION__ . __LINE__);
 		}
 		}
 	}
 	}
+
+
+	// 发放红包
+	public function grant_red_packets($pid=0,$order_id=0){
+		try{
+			$verification_order = Db::name('verification_order')->where(['id'=>$order_id])->find();
+			$app = WehcatModule::getInstance()->initWechatPay();
+			$result = $app->redpack->sendNormal([
+				
+				'mch_billno'   => '168532907259455',
+				'send_name'    => '测试红包',
+				're_openid'    => 'o5OQw6PPEGaHqIjAir7gqeDV5MzQ',
+				'total_num'    => 1,  //固定为1，可不传
+				'total_amount' => 100,  //单位为分，不小于100
+				'wishing'      => '祝福语',
+				
+				'act_name'     => '测试活动',
+				'remark'       => '测试备注',
+			]);
+			if($result['return_code'] == 'SUCCESS' && $result['result_code'] == 'SUCCESS'){
+				//记录佣金表
+			}else{
+				Common::put_file_log('失败-红包发放',json_encode($result), 'grant_red_packets', __CLASS__ . __FUNCTION__ . __LINE__);
+			}
+		}catch(\Exception $e){
+			Common::put_file_log('异常-红包发放',json_encode($result), 'grant_red_packets', __CLASS__ . __FUNCTION__ . __LINE__);
+		}
+	}
 }
 }