This commit is contained in:
Jerry Yan 2021-01-24 13:18:34 +08:00
parent 92875784d8
commit 6309728f42

View File

@ -1438,7 +1438,7 @@ class Orders extends Base{
} }
$order = $this->alias('o')->join('__SHOPS__ s','o.shopId=s.shopId','left') $order = $this->alias('o')->join('__SHOPS__ s','o.shopId=s.shopId','left')
->where(['o.userId'=>$userId,'o.orderId'=>$orderId,'o.orderStatus'=>1]) ->where(['o.userId'=>$userId,'o.orderId'=>$orderId,'o.orderStatus'=>1])
->field('o.orderId,o.orderNo,o.helpUserId,o.helpUserLevel,o.payType,s.userId,s.shopId,s.userId as sUserId,o.orderScore,o.payFrom,o.goodsMoney,o.realTotalMoney,o.goodsType,commissionFee')->find(); ->field('o.orderId,o.orderNo,o.helpUserId,o.helpUserLevel,o.payType,s.userId,s.shopId,s.userId as sUserId,o.orderScore,o.payFrom,o.goodsMoney,o.realTotalMoney,o.goodsType,commissionFee,o.createTime as ctime')->find();
if(!empty($order)){ if(!empty($order)){
Db::startTrans(); Db::startTrans();
try{ try{
@ -1624,7 +1624,7 @@ class Orders extends Base{
//四级功能相关字:购户吉日获得“已获优惠券”为“助购值”的?% 50 //四级功能相关字:购户吉日获得“已获优惠券”为“助购值”的?% 50
try { try {
$sysConf = (new SCM())->getSysConfigs(); $sysConf = (new SCM())->getSysConfigs();
if (date('Y/m/d') == date('Y-m-d', strtotime($sysConf['jiri']))) { if (date('Y-m-d', strtotime($order['ctime'])) == date('Y-m-d', strtotime($sysConf['jiri']))) {
$sm = Model('common/SysSummary'); $sm = Model('common/SysSummary');
$toPayInfo = $sm->getInfo(['id'=>1],'toPaySlow'); $toPayInfo = $sm->getInfo(['id'=>1],'toPaySlow');
$toPaySlow = (float)$toPayInfo['toPaySlow']; $toPaySlow = (float)$toPayInfo['toPaySlow'];