解决部分问题
This commit is contained in:
parent
85df5bcc9d
commit
255e66d5c5
@ -24,11 +24,11 @@ class ListenLoginStatus
|
||||
if($request->isAjax()){
|
||||
echo json_encode(['status'=>-999,'msg'=>'对不起，您还没有登录，请先登录']);
|
||||
}else{
|
||||
if('quanlianggongmall' == input('key')){
|
||||
// if('quanlianggongmall' == input('key')){
|
||||
header("Location:".url('admin/index/login?key=quanlianggongmall'));
|
||||
}else{
|
||||
echo 'hello';
|
||||
}
|
||||
// }else{
|
||||
// echo 'hello';
|
||||
// }
|
||||
|
||||
}
|
||||
exit();
|
||||
|
||||
@ -12,12 +12,8 @@ class Index extends Base{
|
||||
* 跳去登录页
|
||||
*/
|
||||
public function login(){
|
||||
if('quanlianggongmall' == input('key')){
|
||||
model('CronJobs')->autoByAdmin();
|
||||
return $this->fetch("/login");
|
||||
}else{
|
||||
echo 'hello';
|
||||
}
|
||||
}
|
||||
|
||||
public function index(){
|
||||
|
||||
@ -186,6 +186,18 @@ class CashDraws extends Base{
|
||||
$orders['collectionGatheringSum'] += abs($v['payable']);
|
||||
}
|
||||
}
|
||||
// $data = Db::name('cash_draws')->whereTime('createTime',[$date,date('Y-m-d',strtotime('+1 day',strtotime($date)))])
|
||||
// ->where("cashSatus", '=', 1)->select();
|
||||
// foreach ($data as $item){
|
||||
// $m->setTable('users');
|
||||
// $name = $m->getField(['userId'=>$item['targetId']],'loginName');
|
||||
// if(!isset($orders['collection'][$item['targetId']])) $orders['collection'][$item['targetId']]=[];
|
||||
// $orders['collection'][$item['targetId']]['shopLoginName'] = $name;
|
||||
// if(!isset($orders['collection'][$item['targetId']]['gathering'])) $orders['collection'][$shopUserId]['gathering']=0;
|
||||
// if(!isset($orders['collection'][$item['targetId']]['pay'])) $orders['collection'][$shopUserId]['pay']=0;
|
||||
// $orders['collection'][$item['targetId']]['pay']+=$item['money'];//代付款
|
||||
// $orders['collectionPaySum'] += $item['money'];
|
||||
// }
|
||||
$allMoney = $orders['collectionGatheringSum']-($orders['coupousEarningsSum']+$orders['hasVouchersEearningsSum']+$orders['taxFeeSum']+$orders['collectionPaySum']);
|
||||
$orders['todayMoney'] = $orders['yesterdayMoney'] + $allMoney;
|
||||
if(1 == $isSave && $allMoney != 0){
|
||||
|
||||
@ -92,6 +92,9 @@ class Orders extends Base
|
||||
$page['Rows'][$key]['payable'] = '0.00';
|
||||
}
|
||||
$page['Rows'][$key]['loginName'] = $v['loginName'];
|
||||
$page['Rows'][$key]['accidentGet'] = number_format($page['Rows'][$key]['productNum'] + $page['Rows'][$key]['couponsNum'],2,'.','');
|
||||
$page['Rows'][$key]['accidentTaxGet'] = number_format($page['Rows'][$key]['productTaxFee'] + $page['Rows'][$key]['couponsTaxFee'],2,'.','');
|
||||
$page['Rows'][$key]['accidentHandlingGet'] = number_format($page['Rows'][$key]['productHandlingFee'] + $page['Rows'][$key]['couponsHandlingFee'],2,'.','');
|
||||
$page['Rows'][$key]['userName'] = $v['userName'];
|
||||
$shopUserInfo = getUserInfo(['userId' => $v['shopUserId']], 'loginName');
|
||||
$page['Rows'][$key]['shopLoginName'] = $shopUserInfo['loginName'];
|
||||
|
||||
@ -99,6 +99,12 @@
|
||||
</div>
|
||||
|
||||
<!--start-->
|
||||
<style>
|
||||
table.layui-table th,
|
||||
table.layui-table td {
|
||||
font-size: 18px;
|
||||
}
|
||||
</style>
|
||||
<table class="layui-table">
|
||||
<tbody>
|
||||
<tr>
|
||||
|
||||
@ -158,25 +158,28 @@ function initGrid(){
|
||||
}},
|
||||
{title:'交易额', name:'realTotalMoney', width: 60,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
{title:'购户', name:'loginName', width: 50,sortable:true},
|
||||
{title:'收货人', name:'userName', width: 50,sortable:true},
|
||||
{title:'购户付现', name:'moneyNum', width: 60,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
// {title:'收货人', name:'userName', width: 50,sortable:true},
|
||||
{title:'旺旺券', name:'wangNum', width: 60,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
{title:'产品券', name:'productNum', width: 60,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
{title:'产品券税', name:'productTaxFee', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
{title:'产品券手续费', name:'productHandlingFee', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
{title:'偶然所得', name:'accidentGet', width: 70,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
{title:'偶然所得税', name:'accidentTaxGet', width: 70,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
{title:'所得手续费', name:'accidentHandlingGet', width: 70,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
// {title:'产品券', name:'productNum', width: 60,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
// {title:'产品券税', name:'productTaxFee', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
// {title:'产品券手续费', name:'productHandlingFee', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
// {title:'产品券手续费+税', name:'productHandlingFee', width: 30,sortable:true, renderer:function(val,item,rowIndex){
|
||||
// return item['productTaxFee']+val;
|
||||
// }},
|
||||
{title:'优惠券', name:'couponsNum', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
{title:'优惠券税', name:'couponsTaxFee', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
{title:'优惠券手续费', name:'couponsHandlingFee', width: 40,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
// {title:'优惠券', name:'couponsNum', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
// {title:'优惠券税', name:'couponsTaxFee', width: 50,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
// {title:'优惠券手续费', name:'couponsHandlingFee', width: 40,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
// {title:'优惠券手续费+税', name:'couponsHandlingFee', width: 30,sortable:true, renderer:function(val,item,rowIndex){
|
||||
// return item['couponsTaxFee']+val;;
|
||||
// }},
|
||||
{title:'商户', name:'shopLoginName', width: 50,sortable:true},
|
||||
{title:'店铺', name:'shopName', width: 60,sortable:true},
|
||||
{title:'优惠款', name:'coupons', width: 40,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
{title:'商户付现', name:'payable', width: 40,sortable:true, renderer:function(val,item,rowIndex){return '￥'+val;}},
|
||||
// {title:'店铺', name:'shopName', width: 60,sortable:true},
|
||||
// {title:'支付方式', name:'payType' , width: 30,sortable:true},
|
||||
// // mark by cheng 添加支付通道显示
|
||||
// {title:'支付通道', name:'payFrom' , width: 30,sortable:true, renderer:function(val,item,rowIndex){
|
||||
|
||||
@ -486,8 +486,6 @@
|
||||
|
||||
<div class='summary'>应付总金额：¥<span>{$object['totalMoney']}</span></div>
|
||||
|
||||
<div class='summary line'>积分抵扣金额：¥-<span>{$object['scoreMoney']}</span></div>
|
||||
|
||||
{:hook('adminDocumentOrderSummaryView',['order'=>$object])}
|
||||
|
||||
<div class='summary'>实付总金额：¥<span>{$object['realTotalMoney']}</span></div>
|
||||
@ -495,7 +493,6 @@
|
||||
<div class='summary'>使用优惠券：¥<span>{$object['couponsNum']}</span></div>
|
||||
<div class='summary'>使用旺旺券：¥<span>{$object['wangNum']}</span></div>
|
||||
<div class='summary'>使用现金：¥<span>{$object['moneyNum']}</span></div>
|
||||
<div>可获得积分：<span class='orderScore'>{$object["orderScore"]}</span>个</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@ -14,11 +14,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();
|
||||
@ -27,7 +27,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){
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user