Commit 24311f3e authored by 杨培's avatar 杨培

Merge remote-tracking branch 'origin/dev' into dev

parents 5ba89a1c ae2cacc2
......@@ -105,7 +105,7 @@ class AliPay
"partner" => $this->alipay_config['partner'],
"seller_id" => $this->alipay_config['seller_id'],
"payment_type" => $this->alipay_config['payment_type'],
"return_url" => $this->alipay_config['return_url'],
"notify_url" => $this->alipay_config['notify_url'],
"_input_charset" => trim(strtolower($this->alipay_config['input_charset']))
], $para_temp);
......
......@@ -8,7 +8,8 @@
namespace common\libs\alipay;
require_once (dirname(__FILE__) . "/libs/alipay_core.function.php");
require_once(dirname(__FILE__) . "/libs/alipay_md5.function.php");
class AlipayNotify
{
/**
......
......@@ -13,14 +13,18 @@ use yii\redis\ActiveRecord;
*
* @property integer $id
* @property integer $user_id
* @property integer $classed_id
* @property integer $class_id
* @property string $name
* @property integer $price
* @property string $price
* @property integer $free_time
* @property string $intro
* @property string $preview_pic
* @property integer $recommend
* @property integer $status
* @property integer $play_count
* @property integer $comment_count
* @property integer $favorite_count
* @property integer $support_count
* @property integer $created_at
* @property integer $updated_at
*/
......@@ -80,7 +84,7 @@ class Course extends \yii\db\ActiveRecord
['name', 'string', 'length' => [1, 60]],
[['user_id', 'class_id'], 'integer'],
['intro', 'string'],
['price', 'integer', 'min' => 0, 'max' => 9999],
[['price'], 'number'],
['free_time', 'integer', 'min' => 0, 'max' => 15],
['recommend', 'boolean'],
[['recommend', 'comment_count', 'favorite_count', 'support_count', 'play_count'], 'default', 'value' => 0],
......@@ -94,13 +98,22 @@ class Course extends \yii\db\ActiveRecord
public function attributeLabels()
{
return [
'teacher' => '讲师',
'name' => '标题',
'price' => '价格',
'free_time' => '免费试看',
'intro' => '课程介绍',
'preview_pic' => '预览图',
'favorite_count' => 'favorite_count'
'id' => 'ID',
'user_id' => 'User ID',
'class_id' => 'Class ID',
'name' => 'Name',
'price' => 'Price',
'free_time' => 'Free Time',
'intro' => 'Intro',
'preview_pic' => 'Preview Pic',
'recommend' => '0 表示推荐 1推荐',
'status' => '0 未审核 1 审核通过 2 审核不通过 3 锁定 ',
'play_count' => '播放次数',
'comment_count' => '评论次数',
'favorite_count' => '收藏次数',
'support_count' => '点赞次数',
'created_at' => 'Created At',
'updated_at' => 'Updated At',
];
}
......
......@@ -60,7 +60,8 @@ class Orders extends \yii\db\ActiveRecord
return [
[['user_id', 'course_id', 'number', 'credit', 'pay_order'], 'required'],
[['user_id', 'course_id', 'status', 'created_at', 'updated_at'], 'integer'],
[['number', 'credit'], 'string', 'max' => 32],
[['number'], 'string', 'max' => 32],
[['credit'], 'number'],
[['pay_order'], 'string', 'max' => 64],
];
}
......
......@@ -76,7 +76,7 @@ class User extends ActiveRecord implements IdentityInterface
public function rules()
{
return [
[['username', 'auth_key', 'password_hash', 'telephone', 'ip', 'logged_at'], 'required'],
[['username', 'auth_key', 'password_hash', 'telephone', 'ip', 'from', 'logged_at'], 'required'],
[['role', 'status'], 'integer'],
[['created_at', 'updated_at', 'logged_at'], 'safe'],
[['username', 'auth_key', 'wx_open_id', 'ip'], 'string', 'max' => 32],
......@@ -106,6 +106,7 @@ class User extends ActiveRecord implements IdentityInterface
'avatar' => 'avatar',
'wx_open_id' => 'wx_open_id',
'ip' => 'ip',
'from' => 'from',
'created_at' => 'created_at',
'updated_at' => 'updated_at',
'logged_at' => 'logged_at',
......@@ -177,22 +178,22 @@ class User extends ActiveRecord implements IdentityInterface
/**
* 获取用户头像 URL
*
*
* @param string $avatar
* @param string $size 头像尺寸,目前仅支持 m,留空返回原图
* @return string
*/
public static function getAvatarUrl($avatar, $size='m')
public static function getAvatarUrl($avatar, $size = 'm')
{
if (!$avatar) {
return \frontend\assets\AppAsset::getStaticUrl('img/avatarMax.png') ;
return \frontend\assets\AppAsset::getStaticUrl('img/avatarMax.png');
}
$url = Yii::$app->qiniu->getUrl('public', $avatar);
return $size ? $url."-{$size}.avatar" : $url;
return $size ? $url . "-{$size}.avatar" : $url;
}
/**
* @inheritdoc
*/
......
......@@ -26,6 +26,7 @@ class m160927_104153_users_init extends Migration
'avatar' => $this->string(128)->notNull()->defaultValue(''),
'wx_open_id' => $this->string(32)->defaultValue('')->comment('登录微信id'),
'ip' => $this->string(32)->notNull(),
'from' => $this->integer()->unsigned()->defaultValue(0)->comment('0 来自注册 其它为某个user_id'),
'created_at' => $this->integer()->notNull(),
'updated_at' => $this->integer()->notNull(),
'logged_at' => $this->integer()->notNull()
......
......@@ -19,7 +19,7 @@ class m160927_121107_course_init extends Migration
'user_id' => $this->integer()->notNull()->unsigned(),
'class_id' => $this->integer(10)->notNull()->unsigned(),
'name' => $this->string(32)->notNull(),
'price' => $this->integer(10)->notNull()->defaultValue(0),
'price' => $this->decimal(6,2)->unsigned()->notNull()->defaultValue(0),
'free_time' => $this->integer(10)->notNull()->defaultValue(0),
'intro' => $this->text()->notNull(),
'preview_pic' => $this->string(255)->notNull(),
......
......@@ -19,7 +19,7 @@ class m160927_122231_orders_init extends Migration
'user_id' => $this->integer()->notNull()->unsigned(),
'course_id' => $this->integer()->notNull()->unsigned(),
'number' => $this->string(32)->notNull(),
'credit' => $this->string(32)->notNull()->comment('消费'),
'credit' => $this->decimal(6,2)-unsigned()->notNull()->comment('消费'),
'status' => $this->smallInteger()->notNull()->defaultValue(0)->unsigned()->comment('0 未支付 1 已支付'),
'pay_order' => $this->string(64)->notNull()->comment('第三方支付订单'),
'created_at' => $this->integer()->notNull(),
......
......@@ -42,7 +42,6 @@ class PayController extends Controller
//获取支付宝的通知返回参数,可参考技术文档中服务器异步通知参数列表
//商户订单号
$out_trade_no = $_POST['out_trade_no'];
$trade_no = $_POST['trade_no'];
......@@ -50,28 +49,28 @@ class PayController extends Controller
$order = Orders::findOne(['number' => $out_trade_no]);
//交易状态
$trade_status = $_POST['trade_status'];
//并添加消费记录
$consume = new Consume();
$consume->orders_id = $order->id;
$consume->user_id = $order->user_id;
$consume->save();
//添加收入记录
$income = new Income();
$income->orders_id = $order->id;
$courseInfo = Course::findBaseInfoByCourseId($order->course_id);
$income->user_id = $courseInfo['user_id'];
$income->save();
if ($trade_status == 'TRADE_FINISHED' or $trade_status == 'TRADE_SUCCESS') {
$order->pay_order = $trade_no;
$order->status = Orders::PAID;
$order->update();
if ($order !== NULL and $order->status !== Orders::PAID) {
//交易状态
$trade_status = $_POST['trade_status'];
//并添加消费记录
$consume = new Consume();
$consume->orders_id = $order->id;
$consume->user_id = $order->user_id;
$consume->save();
//添加收入记录
$income = new Income();
$income->orders_id = $order->id;
$courseInfo = Course::findBaseInfoByCourseId($order->course_id);
$income->user_id = $courseInfo['user_id'];
$income->save();
if ($trade_status == 'TRADE_FINISHED' or $trade_status == 'TRADE_SUCCESS') {
$order->pay_order = $trade_no;
$order->status = Orders::PAID;
$order->update();
}
}
//——请根据您的业务逻辑来编写程序(以上代码仅作参考)——
echo "success"; //请不要修改或删除
......
......@@ -59,6 +59,7 @@ class SignupForm extends Model
$user->logged_at = time();
$user->avatar = '';
$user->ip = Utils::getRealIP();
$user->from = $this->from;
if (!$user->save()) {
Yii::getLogger()->log($user->getErrors(), Logger::LEVEL_ERROR);
$user = NULL;
......
......@@ -4,7 +4,7 @@
<div class="video-description">
<div class="title">视频介绍</div>
<div class="text">
{{coursewareInfo.intro}}
{{{coursewareInfo.intro}}}
</div>
</div>
......
......@@ -59,7 +59,7 @@
<div v-show="showQrcode" class="wecat-qrcode">
<div class="top-back-a">
<a href="javascript:;" @click="showQrcode = false">< 返回支付渠道选择</a>
<a href="javascript:;" @click="showQrcode = false"> &lt; 返回支付渠道选择</a>
</div>
<div class="qrcode-img">
<img :src="getWeixinPayQrcode(coursewareInfo.course_id)">
......@@ -82,9 +82,7 @@
<div class="teacher-info text-center">
<img :src="getFullPic(item.avatar)">
<h3>{{item.name}}</h3>
<p class="teacher-detail">
{{item.intro}}
</p>
<p class="teacher-detail">{{{item.intro}}}</p>
</div>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment