+
-
+
diff --git a/app/Library/AppInfo.php b/app/Library/AppInfo.php
index b5df7269..de45a4a2 100644
--- a/app/Library/AppInfo.php
+++ b/app/Library/AppInfo.php
@@ -11,7 +11,7 @@ class AppInfo
protected $link = 'https://koogua.com';
- protected $version = '1.2.7';
+ protected $version = '1.2.8';
public function __get($name)
{
diff --git a/app/Models/Course.php b/app/Models/Course.php
index 71285d02..de7e38fd 100644
--- a/app/Models/Course.php
+++ b/app/Models/Course.php
@@ -408,6 +408,7 @@ class Course extends Model
public static function refundExpiryOptions()
{
return [
+ 0 => '0天',
7 => '7天',
14 => '14天',
30 => '30天',
diff --git a/app/Models/Vip.php b/app/Models/Vip.php
index b6a8446e..5f998438 100644
--- a/app/Models/Vip.php
+++ b/app/Models/Vip.php
@@ -22,7 +22,7 @@ class Vip extends Model
public $title = '';
/**
- * 期限（天）
+ * 期限（月）
*
* @var int
*/
diff --git a/app/Services/LiveNotify.php b/app/Services/LiveNotify.php
index 82fcc768..f088a6bd 100644
--- a/app/Services/LiveNotify.php
+++ b/app/Services/LiveNotify.php
@@ -35,9 +35,7 @@ class LiveNotify extends Service
'action' => $action,
]));
- if (!$this->checkSign($sign, $time)) {
- return false;
- }
+ if (!$this->checkSign($sign, $time)) return false;
$result = false;
@@ -125,7 +123,7 @@ class LiveNotify extends Service
*/
protected function handleRecord()
{
-
+ return true;
}
/**
@@ -133,7 +131,7 @@ class LiveNotify extends Service
*/
protected function handleSnapshot()
{
-
+ return true;
}
/**
@@ -141,7 +139,7 @@ class LiveNotify extends Service
*/
protected function handlePorn()
{
-
+ return true;
}
protected function handleStreamBeginNotice(ChapterModel $chapter)
@@ -153,9 +151,7 @@ class LiveNotify extends Service
$keyName = "live_notify:{$chapter->id}";
- if ($cache->get($keyName)) {
- return;
- }
+ if ($cache->get($keyName)) return;
$cache->save($keyName, time(), 86400);
@@ -163,9 +159,7 @@ class LiveNotify extends Service
$courseUsers = $courseUserRepo->findByCourseId($chapter->course_id);
- if ($courseUsers->count() == 0) {
- return;
- }
+ if ($courseUsers->count() == 0) return;
$notice = new LiveBeginNotice();
@@ -206,13 +200,9 @@ class LiveNotify extends Service
*/
protected function checkSign($sign, $time)
{
- if (!$sign || !$time) {
- return false;
- }
+ if (!$sign || !$time) return false;
- if ($time < time()) {
- return false;
- }
+ if ($time < time()) return false;
$notify = $this->getSettings('live.notify');
diff --git a/app/Services/Logic/Notice/RefundFinish.php b/app/Services/Logic/Notice/RefundFinish.php
index 6defe9fb..cec2ff8e 100644
--- a/app/Services/Logic/Notice/RefundFinish.php
+++ b/app/Services/Logic/Notice/RefundFinish.php
@@ -8,7 +8,7 @@ use App\Repos\Refund as RefundRepo;
use App\Repos\User as UserRepo;
use App\Repos\WeChatSubscribe as WeChatSubscribeRepo;
use App\Services\Logic\Notice\Sms\RefundFinish as SmsRefundFinishNotice;
-use App\Services\Logic\Notice\WeChat\OrderFinish as WeChatRefundFinishNotice;
+use App\Services\Logic\Notice\WeChat\RefundFinish as WeChatRefundFinishNotice;
use App\Services\Logic\Service as LogicService;
class RefundFinish extends LogicService
diff --git a/app/Services/Logic/Refund/RefundCreate.php b/app/Services/Logic/Refund/RefundCreate.php
index bb9749ec..228e52ab 100644
--- a/app/Services/Logic/Refund/RefundCreate.php
+++ b/app/Services/Logic/Refund/RefundCreate.php
@@ -70,11 +70,7 @@ class RefundCreate extends Service
$task = new TaskModel();
$itemInfo = [
- 'refund' => [
- 'id' => $refund->id,
- 'order_id' => $refund->order_id,
- 'trade_id' => $refund->trade_id,
- ],
+ 'refund' => ['id' => $refund->id],
];
$task->item_id = $refund->id;
diff --git a/app/Services/Pay/Alipay.php b/app/Services/Pay/Alipay.php
index 25ce01dc..fb65b0fc 100644
--- a/app/Services/Pay/Alipay.php
+++ b/app/Services/Pay/Alipay.php
@@ -207,15 +207,15 @@ class Alipay extends PayService
/**
* 查询交易（扫码生成订单后可执行）
*
- * @param string $outTradeNo
+ * @param string $tradeNo
* @param string $type
* @return Collection|bool
*/
- public function find($outTradeNo, $type = 'wap')
+ public function find($tradeNo, $type = 'wap')
{
try {
- $order = ['out_trade_no' => $outTradeNo];
+ $order = ['out_trade_no' => $tradeNo];
$result = $this->gateway->find($order, $type);
@@ -235,14 +235,14 @@ class Alipay extends PayService
/**
* 关闭交易（扫码生成订单后可执行）
*
- * @param string $outTradeNo
+ * @param string $tradeNo
* @return bool
*/
- public function close($outTradeNo)
+ public function close($tradeNo)
{
try {
- $response = $this->gateway->close(['out_trade_no' => $outTradeNo]);
+ $response = $this->gateway->close(['out_trade_no' => $tradeNo]);
$result = $response->code == '10000';
@@ -262,14 +262,14 @@ class Alipay extends PayService
/**
* 撤销交易（未生成订单也可执行）
*
- * @param string $outTradeNo
+ * @param string $tradeNo
* @return bool
*/
- public function cancel($outTradeNo)
+ public function cancel($tradeNo)
{
try {
- $response = $this->gateway->cancel(['out_trade_no' => $outTradeNo]);
+ $response = $this->gateway->cancel(['out_trade_no' => $tradeNo]);
$result = $response->code == '10000';
diff --git a/app/Services/Pay/Wxpay.php b/app/Services/Pay/Wxpay.php
index 89ee126a..051b3187 100644
--- a/app/Services/Pay/Wxpay.php
+++ b/app/Services/Pay/Wxpay.php
@@ -208,15 +208,15 @@ class Wxpay extends PayService
/**
* 查询交易（扫码生成订单后可执行）
*
- * @param string $outTradeNo
+ * @param string $tradeNo
* @param string $type
* @return Collection|bool
*/
- public function find($outTradeNo, $type = 'wap')
+ public function find($tradeNo, $type = 'wap')
{
try {
- $order = ['out_trade_no' => $outTradeNo];
+ $order = ['out_trade_no' => $tradeNo];
$result = $this->gateway->find($order, $type);
@@ -236,14 +236,14 @@ class Wxpay extends PayService
/**
* 关闭交易（扫码生成订单后可执行）
*
- * @param string $outTradeNo
+ * @param string $tradeNo
* @return bool
*/
- public function close($outTradeNo)
+ public function close($tradeNo)
{
try {
- $response = $this->gateway->close(['out_trade_no' => $outTradeNo]);
+ $response = $this->gateway->close(['out_trade_no' => $tradeNo]);
$result = $response->result_code == 'SUCCESS';
@@ -263,12 +263,12 @@ class Wxpay extends PayService
/**
* 取消交易
*
- * @param string $outTradeNo
+ * @param string $tradeNo
* @return bool
*/
- public function cancel($outTradeNo)
+ public function cancel($tradeNo)
{
- return $this->close($outTradeNo);
+ return $this->close($tradeNo);
}
/**
diff --git a/app/Services/Refund.php b/app/Services/Refund.php
index 124450ea..5b0736ad 100644
--- a/app/Services/Refund.php
+++ b/app/Services/Refund.php
@@ -3,15 +3,23 @@
namespace App\Services;
use App\Models\Order as OrderModel;
+use App\Models\Trade as TradeModel;
use App\Repos\Course as CourseRepo;
use App\Repos\CourseUser as CourseUserRepo;
+use App\Repos\Order as OrderRepo;
class Refund extends Service
{
public function preview(OrderModel $order)
{
- $result = [];
+ $result = [
+ 'item_type' => 0,
+ 'item_info' => [],
+ 'refund_amount' => 0.00,
+ 'service_fee' => 0.00,
+ 'service_rate' => 5.00,
+ ];
switch ($order->item_type) {
case OrderModel::ITEM_COURSE:
@@ -20,6 +28,15 @@ class Refund extends Service
case OrderModel::ITEM_PACKAGE:
$result = $this->previewPackageRefund($order);
break;
+ case OrderModel::ITEM_REWARD:
+ $result = $this->previewRewardRefund($order);
+ break;
+ case OrderModel::ITEM_VIP:
+ $result = $this->previewVipRefund($order);
+ break;
+ case OrderModel::ITEM_TEST:
+ $result = $this->previewTestRefund($order);
+ break;
}
return $result;
@@ -27,19 +44,19 @@ class Refund extends Service
protected function previewCourseRefund(OrderModel $order)
{
- /**
- * @var array $itemInfo
- */
$itemInfo = $order->item_info;
$itemInfo['course']['cover'] = kg_cos_cover_url($itemInfo['course']['cover']);
+ $serviceFee = $this->getServiceFee($order);
+ $serviceRate = $this->getServiceRate($order);
+
$refundPercent = 0.00;
$refundAmount = 0.00;
if ($itemInfo['course']['refund_expiry_time'] > time()) {
$refundPercent = $this->getCourseRefundPercent($order->item_id, $order->owner_id);
- $refundAmount = $order->amount * $refundPercent;
+ $refundAmount = round(($order->amount - $serviceFee) * $refundPercent, 2);
}
$itemInfo['course']['refund_percent'] = $refundPercent;
@@ -49,16 +66,18 @@ class Refund extends Service
'item_type' => $order->item_type,
'item_info' => $itemInfo,
'refund_amount' => $refundAmount,
+ 'service_fee' => $serviceFee,
+ 'service_rate' => $serviceRate,
];
}
protected function previewPackageRefund(OrderModel $order)
{
- /**
- * @var array $itemInfo
- */
$itemInfo = $order->item_info;
+ $serviceFee = $this->getServiceFee($order);
+ $serviceRate = $this->getServiceRate($order);
+
$totalMarketPrice = 0.00;
foreach ($itemInfo['courses'] as $course) {
@@ -80,7 +99,7 @@ class Refund extends Service
if ($course['refund_expiry_time'] > time()) {
$pricePercent = round($course['market_price'] / $totalMarketPrice, 4);
$refundPercent = $this->getCourseRefundPercent($course['id'], $order->owner_id);
- $refundAmount = round($order->amount * $pricePercent * $refundPercent, 2);
+ $refundAmount = round(($order->amount - $serviceFee) * $pricePercent * $refundPercent, 2);
$totalRefundAmount += $refundAmount;
}
@@ -92,45 +111,97 @@ class Refund extends Service
'item_type' => $order->item_type,
'item_info' => $itemInfo,
'refund_amount' => $totalRefundAmount,
+ 'service_fee' => $serviceFee,
+ 'service_rate' => $serviceRate,
];
}
+ protected function previewRewardRefund(OrderModel $order)
+ {
+ return $this->previewOtherRefund($order);
+ }
+
+ protected function previewVipRefund(OrderModel $order)
+ {
+ return $this->previewOtherRefund($order);
+ }
+
+ protected function previewTestRefund(OrderModel $order)
+ {
+ return $this->previewOtherRefund($order);
+ }
+
+ protected function previewOtherRefund(OrderModel $order)
+ {
+ $serviceFee = $this->getServiceFee($order);
+ $serviceRate = $this->getServiceRate($order);
+
+ $refundAmount = round($order->amount - $serviceFee, 2);
+
+ return [
+ 'item_type' => $order->item_type,
+ 'item_info' => $order->item_info,
+ 'refund_amount' => $refundAmount,
+ 'service_fee' => $serviceFee,
+ 'service_rate' => $serviceRate,
+ ];
+ }
+
+ protected function getServiceFee(OrderModel $order)
+ {
+ $serviceRate = $this->getServiceRate($order);
+
+ $serviceFee = round($order->amount * $serviceRate / 100, 2);
+
+ return $serviceFee >= 0.01 ? $serviceFee : 0.00;
+ }
+
+ protected function getServiceRate(OrderModel $order)
+ {
+ $orderRepo = new OrderRepo();
+
+ $trade = $orderRepo->findLastTrade($order->id);
+
+ $alipay = $this->getSettings('pay.alipay');
+ $wxpay = $this->getSettings('pay.wxpay');
+
+ $serviceRate = 5;
+
+ switch ($trade->channel) {
+ case TradeModel::CHANNEL_ALIPAY:
+ $serviceRate = $alipay['service_rate'] ?: $serviceRate;
+ break;
+ case TradeModel::CHANNEL_WXPAY:
+ $serviceRate = $wxpay['service_rate'] ?: $serviceRate;
+ break;
+ }
+
+ return $serviceRate;
+ }
+
protected function getCourseRefundPercent($courseId, $userId)
{
$courseRepo = new CourseRepo();
$courseLessons = $courseRepo->findLessons($courseId);
- if ($courseLessons->count() == 0) {
- return 1.00;
- }
+ if ($courseLessons->count() == 0) return 1.00;
$courseUserRepo = new CourseUserRepo();
$courseUser = $courseUserRepo->findCourseUser($courseId, $userId);
- if (!$courseUser) {
- return 1.00;
- }
+ if (!$courseUser) return 1.00;
$userLearnings = $courseRepo->findUserLearnings($courseId, $userId, $courseUser->plan_id);
- if ($userLearnings->count() == 0) {
- return 1.00;
- }
+ if ($userLearnings->count() == 0) return 1.00;
- /**
- * @var array $consumedUserLearnings
- */
$consumedUserLearnings = $userLearnings->filter(function ($item) {
- if ($item->consumed == 1) {
- return $item;
- }
+ if ($item->consumed == 1) return $item;
});
- if (count($consumedUserLearnings) == 0) {
- return 1.00;
- }
+ if (count($consumedUserLearnings) == 0) return 1.00;
$courseLessonIds = kg_array_column($courseLessons->toArray(), 'id');
$consumedUserLessonIds = kg_array_column($consumedUserLearnings, 'chapter_id');
diff --git a/app/Validators/Order.php b/app/Validators/Order.php
index cdf4f45c..5fc693c9 100644
--- a/app/Validators/Order.php
+++ b/app/Validators/Order.php
@@ -5,6 +5,7 @@ namespace App\Validators;
use App\Exceptions\BadRequest as BadRequestException;
use App\Models\Order as OrderModel;
use App\Models\Refund as RefundModel;
+use App\Models\Trade as TradeModel;
use App\Repos\Course as CourseRepo;
use App\Repos\Order as OrderRepo;
use App\Repos\Package as PackageRepo;
@@ -154,6 +155,12 @@ class Order extends Validator
$orderRepo = new OrderRepo();
+ $trade = $orderRepo->findLastTrade($order->id);
+
+ if ($trade->status != TradeModel::STATUS_FINISHED) {
+ throw new BadRequestException('order.refund_not_allowed');
+ }
+
$refund = $orderRepo->findLastRefund($order->id);
$scopes = [
@@ -174,16 +181,8 @@ class Order extends Validator
$order = $orderRepo->findUserLastFinishedOrder($userId, $courseId, $itemType);
- if ($order) {
-
- /**
- * @var array $itemInfo
- */
- $itemInfo = $order->item_info;
-
- if ($itemInfo['course']['study_expiry_time'] > time()) {
- throw new BadRequestException('order.has_bought_course');
- }
+ if ($order && $order->item_info['course']['study_expiry_time'] > time()) {
+ throw new BadRequestException('order.has_bought_course');
}
}
diff --git a/app/Validators/Refund.php b/app/Validators/Refund.php
index 1b309b91..c0a6d37d 100644
--- a/app/Validators/Refund.php
+++ b/app/Validators/Refund.php
@@ -42,9 +42,15 @@ class Refund extends Validator
public function checkAmount($orderAmount, $refundAmount)
{
+ if ($orderAmount <= 0 || $refundAmount <= 0) {
+ throw new BadRequestException('refund.invalid_amount');
+ }
+
if ($refundAmount > $orderAmount) {
throw new BadRequestException('refund.invalid_amount');
}
+
+ return (float)$refundAmount;
}
public function checkStatus($status)
diff --git a/config/errors.php b/config/errors.php
index ca812440..326947ff 100644
--- a/config/errors.php
+++ b/config/errors.php
@@ -289,6 +289,7 @@ $error['refund.review_note_too_short'] = '审核备注太短（少于2个字符
$error['refund.review_note_too_long'] = '审核备注太长（多于255个字符）';
$error['refund.cancel_not_allowed'] = '当前不允许取消退款';
$error['refund.review_not_allowed'] = '当前不允许审核退款';
+$error['refund.invalid_amount'] = '无效的退款金额';
$error['refund.invalid_status'] = '无效的状态类型';
/**
diff --git a/db/migrations/20210305115507_data_202103051930.php b/db/migrations/20210305115507_data_202103051930.php
new file mode 100644
index 00000000..1053b337
--- /dev/null
+++ b/db/migrations/20210305115507_data_202103051930.php
@@ -0,0 +1,39 @@
+ 'pay.alipay',
+ 'item_key' => 'service_rate',
+ 'item_value' => 5,
+ ],
+ [
+ 'section' => 'pay.wxpay',
+ 'item_key' => 'service_rate',
+ 'item_value' => 5,
+ ],
+ ];
+
+ $this->table('kg_setting')->insert($rows)->save();
+ }
+
+ public function down()
+ {
+ $this->getQueryBuilder()
+ ->delete('kg_setting')
+ ->where(['section' => 'pay.alipay', 'item_key' => 'service_rate'])
+ ->execute();
+
+ $this->getQueryBuilder()
+ ->delete('kg_setting')
+ ->where(['section' => 'pay.wxpay', 'item_key' => 'service_rate'])
+ ->execute();
+ }
+
+}
diff --git a/public/static/admin/css/common.css b/public/static/admin/css/common.css
index 1bba752e..22bc2a78 100644
--- a/public/static/admin/css/common.css
+++ b/public/static/admin/css/common.css
@@ -34,6 +34,18 @@
list-style: decimal;
}
+.red {
+ color: red;
+}
+
+.green {
+ color: green;
+}
+
+.gray {
+ color: gray;
+}
+
.loading {
padding: 30px;
text-align: center;
diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css
index d30bd0c5..31aea755 100644
--- a/public/static/home/css/common.css
+++ b/public/static/home/css/common.css
@@ -489,11 +489,12 @@
height: 118px;
}
-.course-meta .info span {
+.course-meta .info .key {
margin-right: 5px;
}
.course-meta .info .value {
+ margin-right: 5px;
color: #666;
}
@@ -1074,9 +1075,13 @@
float: left;
}
-.cart-course-card span {
+.cart-course-card .key {
+ margin-right: 5px;
+}
+
+.cart-course-card .value {
+ margin-right: 5px;
color: #666;
- margin: 0 5px;
}
.cart-course-card .origin-price {
@@ -1683,17 +1688,14 @@
}
.order-card {
- padding: 10px 0;
+ padding-bottom: 20px;
margin-bottom: 20px;
- background-color: white;
+ border-bottom: 1px dashed #e6e6e6;
color: #666;
- box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
}
.order-card .header {
- padding-bottom: 10px;
margin-bottom: 10px;
- border-bottom: 1px solid #e6e6e6;
}
.order-card .header span {
diff --git a/scheduler.php b/scheduler.php
index 253ad168..4c73f927 100644
--- a/scheduler.php
+++ b/scheduler.php
@@ -13,9 +13,6 @@ $bin = '/usr/local/bin/php';
$scheduler->php($script, $bin, ['--task' => 'deliver', '--action' => 'main'])
->at('*/3 * * * *');
-$scheduler->php($script, $bin, ['--task' => 'notice', '--action' => 'main'])
- ->at('*/3 * * * *');
-
$scheduler->php($script, $bin, ['--task' => 'vod_event', '--action' => 'main'])
->at('*/5 * * * *');
@@ -34,6 +31,9 @@ $scheduler->php($script, $bin, ['--task' => 'server_monitor', '--action' => 'mai
$scheduler->php($script, $bin, ['--task' => 'close_trade', '--action' => 'main'])
->at('*/13 * * * *');
+$scheduler->php($script, $bin, ['--task' => 'notice', '--action' => 'main'])
+ ->everyMinute();
+
$scheduler->php($script, $bin, ['--task' => 'close_order', '--action' => 'main'])
->hourly(3);