dxtc
/
coupon-admin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sesttter

master
wangxinglong 2021-12-22 10:20:55 +08:00
parent 46010e4ac2
commit f874243c8f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controller/api/Coupon.php
View File

@ -115,7 +115,7 @@ class Coupon extends Base
$endTime = strtotime($item->endTime); $endTime = strtotime($item->endTime);
$ExpirationTime = abs(($endTime - $time) / 86400); $ExpirationTime = abs(($endTime - $time) / 86400);
if (($endTime > $time) ) { if (($endTime > $time) ) {
$expirationStr = "还有".ceil($ExpirationTime)."天过期期"; $expirationStr = "还有".ceil($ExpirationTime)."天过期";
} else { } else {
$expirationStr = "已过期" . ceil($ExpirationTime) . "天"; $expirationStr = "已过期" . ceil($ExpirationTime) . "天";
} }

9
app/repository/CommentRepository.php
View File

@ -31,7 +31,14 @@ class CommentRepository extends Repository
return CommentModel::alias("a") return CommentModel::alias("a")
->join("account b" ,"a.user_code = b.user_code") ->join("account b" ,"a.user_code = b.user_code")
->where($whereMap) ->where($whereMap)
->whereTime("b.blank_time","<",date("Y-m-d H:i:s")) ->whereOr(
[
["b.blank_time","=","null"],
["b.blank_time","=",""],
["b.blank_time","<",date("Y-m-d H:i:s")],
]
)
->field([ ->field([
"a.comment", "a.comment",
"a.user_code as userCode", "a.user_code as userCode",