q792602257/qlg.tsgz.moe
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of ssh://git.qgmzbxs.com:23333/q792602257/qlg.backend into test

Browse Source
This commit is contained in:
Your Name
2020-06-10 13:27:47 +08:00
parent 3d19b6129b f48ab07f2f
commit 47ba4bb2cd
29 changed files with 990 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hyhproject/common/model/CashDraws.php
View File

@@ -14,6 +14,7 @@ class CashDraws extends Base{
$where = [];
$where['targetType'] = (int)$targetType;
$where['targetId'] = (int)$targetId;
$where['cashStatus'] = 1;
if(in_array($type,[0,1]))$where['moneyType'] = $type;
return $this->where($where)->order('cashId desc')->paginate()->toArray();
}

4
hyhproject/common/model/SysSummary.php
View File

@@ -12,7 +12,9 @@ class SysSummary extends Base{
$noticeData['fastScale'] = $fastScale;
$noticeData['createTime'] = time();
Db::name('sys_notice')->insert($noticeData);
$this->addSysSummary($payFastNum,0);
// 原：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代快付值
// 改为：当购户“预获优惠券”、“预获产品券”的值同时≤15元时，所获“已获优惠券”、“已获产品券”转入代慢付值
$this->addSysSummary(0, $payFastNum);
}
/**
* 添加系统数据

6
hyhproject/common/model/UserVouchers.php
View File

@@ -13,11 +13,11 @@ class UserVouchers extends Base{
//获取代快付值
$toPayFast = $sysData['toPayFast'];
//今日代快付释放值
$payFast = round($toPayFast * (dataConf('fastPayDayScale')*0.01),2);
$payFast = round($toPayFast * (dataConf('fastPayDayScale')*0.01),5);
//获取代慢付值
$toPaySlow = $sysData['toPaySlow'];
//今日付慢付释放值
$paySlow = round($toPaySlow * (dataConf('slowPayDayScale')*0.01),2);
$paySlow = round($toPaySlow * (dataConf('slowPayDayScale')*0.01),5);
//应释放总额
$toPaySum = $payFast + $paySlow;
Db::startTrans();
@@ -26,7 +26,7 @@ class UserVouchers extends Base{
$m->setTable('user_vouchers_summary');
if(1 == date('j')){
//每月损耗
$monthScale = round((100-dataConf('couponsNextMonthInitSacle'))*0.01,2);
$monthScale = round((100-dataConf('couponsNextMonthInitSacle'))*0.01,5);
$giveList = $m->getList([],'id, userId, expectedProductNum, expectedCouponsNum');
foreach ($giveList as &$g) {
if($g['expectedProductNum'] > 0){