Merge remote-tracking branch 'origin/master'

example/bbs_tcptuan.php

@@ -9,4 +9,4 @@
 require __DIR__.'/_init.php';
 
 \internalApi\bbs\Tcptuan::setDebug(true);
-print_r(\internalApi\bbs\Tcptuan::getGoods(1));
\ No newline at end of file
+print_r(\internalApi\bbs\Tcptuan::getTuanGoods(1));
\ No newline at end of file

example/bbs_thread.php

@@ -11,4 +11,4 @@ use internalApi\bbs\Thread;
 require __DIR__.'/_init.php';
 
 Thread::setDebug(true);
-print_r(Thread::getUnresolveQustion());
\ No newline at end of file
+print_r(Thread::getBlockThread(32));
\ No newline at end of file

example/bbs_user.php

@@ -12,5 +12,5 @@ require __DIR__.'/_init.php';
 
 User::setDebug(true);
 $uid = 42;
-$data = User::updateGoldCoin('18503078897', 5, '完工奖励', '完工奖励+5');
+$data = User::getMonthSignList(582);
 print_r($data);
\ No newline at end of file

example/ucenter_order.php

@@ -18,4 +18,8 @@ $order = Order::getByOid('2018010818030671446574');
 //$order = Order::create(12, '0.01', 'http://xue.yunya.com/api/pay-notify', 'xue_test', 'xue_test_123',
 //	'学院测试订单', 'http://xue.yunya.com/home/course-info?courseId=123');
 
+$order = Order::createAndPayment('wx_lite',12, '0.01', 'http://xue.yunya.com/api/pay-notify', 'xue_test', 'xue_test_123', '学院测试订单', 'http://xue.yunya.com/home/course-info?courseId=123',array(
+    'open_id'=>'1111111111'
+));
+
 print_r($order);
\ No newline at end of file

example/ucenter_transfer.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: pader
+ * Date: 2018/1/8
+ * Time: 18:52
+ */
+
+use internalApi\ucenter\Transfer;
+
+require __DIR__.'/_init.php';
+
+Transfer::setDebug();
+//try{
+//    $result = Transfer::create('12','kw','wx_lite',10,'123123123123123','http://u.yunya.com/test/tcallback');
+//
+//}catch (\internalApi\base\ApiException $e){
+//    echo 123123;
+//}
+$result = Transfer::verifyNotifyCode(1,2);
+
+
+print_r($result);
\ No newline at end of file

example/xue_live_show.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: QQ
+ * Date: 2018/5/31
+ * Time: 15:43
+ */
+
+use internalApi\xue\Live;
+
+require __DIR__.'/_init.php';
+
+Live::setDebug(true);
+print_r(Live::getShow());
\ No newline at end of file

example/xue_recommend_course.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: QQ
+ * Date: 2018/5/31
+ * Time: 16:49
+ */
+
+use internalApi\xue\Course;
+
+require __DIR__.'/_init.php';
+
+Course::setDebug(true);
+print_r(Course::getRecommendCourseShow());
\ No newline at end of file

src/bbs/Tcptuan.php

@@ -19,4 +19,14 @@ class Tcptuan extends Client
         return self::call('tcptuan.getGoods',compact('num'));
     }
 
+	/**
+	 * 拼团商品接口
+	 * @param int $num
+	 * @return mixed
+	 */
+    public static function getTuanGoods($num = 1)
+    {
+    	return self::call('tcptuan.getTuanGoods',compact('num'));
+    }
+
 }
\ No newline at end of file

src/bbs/Thread.php

@@ -47,4 +47,70 @@ class Thread extends Client
         return self::call('thread.getUnresolveQustion');
     }
 
+	/**
+	 * 获取未解决问题
+	 * @return mixed
+	 */
+    public static function getQuestionList($page=1,$num=10)
+    {
+    	return self::call('thread.getQuestionList',compact('page','num'));
+    }
+
+
+	/**
+	 * 获取问题日志
+	 * @return mixed
+	 */
+    public static function getMaintenanceLog($page=1,$num=10)
+    {
+    	return self::call('thread.getMaintenanceLog',compact('page','num'));
+    }
+
+	/**
+	 * 获取问题日志精华3
+	 * @return mixed
+	 */
+    public static function getMaintenanceLogDigest($num = 1){
+    	return self::call('thread.getMaintenanceLogDigest',compact('num'));
+    }
+
+	/**
+	 * 获取问题互助精华3
+	 * @return mixed
+	 */
+	public static function getQuestionDigest($num = 1){
+		return self::call('thread.getQuestionDigest',compact('num'));
+	}
+
+	/**
+	 * 获取维修中精华3的帖子
+	 * @param int $num
+	 * @return mixed
+	 */
+	public static function getThreadDigest($num = 1)
+	{
+		return self::call('thread.getThreadDigest',compact('num'));
+	}
+
+	/**
+	 * 根据fid获取帖子
+	 * @param int $fid
+	 * @param int $page
+	 * @param int $num
+	 * @return mixed
+	 */
+	public static function getThread($fid,$page,$num)
+	{
+		return self::call('thread.getThread',compact('fid','page','num'));
+	}
+
+	/**
+	 * 获取板块帖子
+	 * @param int $bid
+	 * @return mixed
+	 */
+	public static function getBlockThread($bid)
+	{
+		return self::call('thread.getBlockThread',compact('bid'));
+	}
 }
\ No newline at end of file

src/bbs/User.php

@@ -47,4 +47,14 @@ class User extends Client
         return self::call('user.updateGoldCoin', compact('telephone','num','title','text'));
     }
 
+	/**
+	 * 获取签到的日期
+	 * @param int $userId
+	 * @return mixed
+	 */
+    public static function getMonthSignList($userId)
+    {
+    	return self::call('user.getMonthSignList',compact('userId'));
+    }
+
 }
\ No newline at end of file

src/ucenter/Order.php

@@ -37,6 +37,29 @@ class Order extends Client
 		return self::call('order.create', compact('uid', 'amount', 'callbackUrl', 'prefix', 'key', 'name', 'url', 'image', 'description'));
 	}
 
+
+
+    /**
+     * 创建订单并发起支付返回charge对象
+     *
+     * @param string $type 付款类型
+     * @param int $uid 用户ID
+     * @param float $amount 订单金额
+     * @param string $callbackUrl 支付回调地址
+     * @param string $prefix 商品类型前缀
+     * @param string $key 商品在该平台唯一索引，如商品ID
+     * @param string $name 商品名称
+     * @param string $url 商品URL地址
+     * @param array $extra 扩展信息,详见 https://www.pingxx.com/api#%E6%94%AF%E4%BB%98%E6%B8%A0%E9%81%93-extra-%E5%8F%82%E6%95%B0%E8%AF%B4%E6%98%8E
+     * @param string $image 商品图片
+     * @param string $description 商品介绍
+     * @return array 对象信息
+     */
+    public static function createAndPayment($type,$uid, $amount, $callbackUrl, $prefix, $key, $name, $url,$extra, $image='', $description='')
+    {
+        return self::call('order.createAndPayment', compact('type','uid', 'amount', 'callbackUrl', 'prefix', 'key', 'name', 'url','extra', 'image', 'description'));
+    }
+
 	/**
 	 * 发起指定订单的退款请求
 	 *

src/ucenter/Transfer.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: xiabin
+ * Date: 2018/5/8
+ * Time: 10:53 AM
+ */
+
+
+namespace internalApi\ucenter;
+
+
+use internalApi\base\Client;
+
+class Transfer extends Client
+{
+
+
+    /**
+     * 企业付款
+     * @param int $uid
+     * @param string $type 付款业务类型
+     * @param string $channel 付款渠道
+     * @param float $amount 付款金额，元为单位，支付小数点两位，最大 9999.99
+     * @param string $recipient 收款账号  支付宝账号或者使用微信企业付款到零钱时为用户在  wx 、 wx_pub 及 wx_lite 渠道下的  open_id
+     * @param string $callbackUrl 成功回调地址
+     * @param string $body 额外信息
+     * @param string $recipientName 收款姓名 微信相关渠道可以不传，传则进行校验
+     * @param string $description 描述 99 个英文和数字的组合或最多 33 个中文字符，不可以包含特殊字符；
+     * @return mixed
+     * @throws \internalApi\base\ApiException
+     * @throws \internalApi\base\ClientException
+     */
+    public static function create($uid, $type, $channel, $amount, $recipient, $callbackUrl, $body = '', $recipientName = '', $description = '')
+    {
+        return self::call('transfer.create', compact('uid', 'type', 'channel', 'amount', 'recipient', 'callbackUrl', 'body', 'recipientName', 'description'));
+    }
+
+
+    /**
+     * 验证企业付款回调码
+     *
+     * @param string $orderno
+     * @param string $code
+     * @return bool 返回true代表验证通过，返回false验证失败
+     */
+    public static function verifyNotifyCode($orderno, $code)
+    {
+        return self::call('transfer.verifyNotifyCode', compact('orderno', 'code'));
+    }
+
+}
\ No newline at end of file

src/xue/Course.php

@@ -35,4 +35,16 @@ class Course extends Client
 		return self::call('course.getSectionInfo', compact('sectionId'));
 	}
 
+
+	/**
+	 * 获取推荐免费或付费课程
+	 * @param int $fee 0是免费 1是付费
+	 * @param $num
+	 * @return mixed
+	 */
+	public static function getRecommendCourseShow($fee=0,$num=1)
+	{
+		return self::call('course.getRecommendCourseShow', compact('fee','num'));
+	}
+
 }
\ No newline at end of file

src/xue/Live.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: QQ
+ * Date: 2018/5/31
+ * Time: 15:31
+ */
+namespace internalApi\xue;
+use internalApi\base\Client;
+
+class Live extends Client
+{
+	/**
+	 * 获取正在直播的场次
+	 * @param int $userId 未登录状态不传
+	 * @param int $num
+	 * @return mixed
+	 */
+	public static function getShow($userId = 0,$num = 1)
+	{
+		return self::call('live.getLiveShow', compact('userId','num'));
+	}
+}
\ No newline at end of file