合并分支 'heshupeng' 到 'master'

内购充值



查看合并请求 !260

@@ -569,7 +569,7 @@ class Course extends Api
      * @ApiParams (name="course_id", type="int", required=true, description="课程ID")
      * @ApiParams (name="spec_id", type="int", required=true, description="课程规格ID")
      * @ApiParams (name="score_switch", type="int", description="积分开关:0=关,1=开")
-     * @ApiParams (name="pay_type", type="string", required=true, description="支付方式:wechat=微信,alipay=支付宝,ios=苹果内购")
+     * @ApiParams (name="pay_type", type="string", required=true, description="支付方式:wechat=微信,alipay=支付宝,money=余额")
      *
      * @ApiReturn({
         "code": 1,

@@ -354,14 +354,7 @@ class Notify extends Api
                     $product_id = $in_app->product_id;
                     if($product_id && !empty($product_id)){
                         // 产品ID数组
-                        $productids = [
-                            "com.zhanghao.GMAT_12",
-                            "com.zhanghao.GMAT_73",
-                            "com.zhanghao.GMAT_113",
-                            "com.zhanghao.GMAT_288",
-                            "com.zhanghao.GMAT_488",
-                            "com.zhanghao.GMAT_798"
-                        ];
+                        $productids = ["1","2","3","4","5","6"];
                         if(in_array($product_id, $productids)){
                             // 查询该比交易是否已经成功
                             $transaction_id = $in_app->transaction_id;// 本次购买苹果内购的唯一标识，相当于订单号

@@ -8275,7 +8275,7 @@
                                                         <td>pay_type</td>
                                                         <td>string</td>
                                                         <td>是</td>
-                                                        <td>支付方式:wechat=微信,alipay=支付宝,ios=苹果内购</td>
+                                                        <td>支付方式:wechat=微信,alipay=支付宝,money=余额</td>
                                                     </tr>
                                                                                                     </tbody>
                                             </table>
@@ -8320,7 +8320,7 @@
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="pay_type">pay_type</label>
-                                                            <input type="string" class="form-control input-sm" id="pay_type" required placeholder="支付方式:wechat=微信,alipay=支付宝,ios=苹果内购" name="pay_type">
+                                                            <input type="string" class="form-control input-sm" id="pay_type" required placeholder="支付方式:wechat=微信,alipay=支付宝,money=余额" name="pay_type">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <button type="submit" class="btn btn-success send" rel="54">提交</button>
@@ -23636,7 +23636,7 @@
 
             <div class="row mt0 footer">
                 <div class="col-md-6" align="left">
-                    Generated on 2021-02-27 19:42:31                </div>
+                    Generated on 2021-02-27 20:01:32                </div>
                 <div class="col-md-6" align="right">
                     <a href="./" target="_blank">企智帮</a>
                 </div>