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

setter

master
wangxinglong 2022-03-16 15:15:54 +08:00
parent ffbc6897de
commit bf23e279aa
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controller/api/Business.php
View File

@ -384,7 +384,12 @@ class Business extends Base
$data["lat"] = $couponMain->lat; $data["lat"] = $couponMain->lat;
$data["lng"] = $couponMain->lng; $data["lng"] = $couponMain->lng;
$data["money"] = $couponMain->money; $data["money"] = $couponMain->money;
$data["is_distribution"] = $couponMain->is_distribution; $data["is_distribution"] =
$business['is_assign'] == BusinessModel::COMMON_ON
?
BusinessModel::COMMON_OFF
:
BusinessModel::COMMON_ON;
$data["usingRule"] = DictionaryRepository::getInstance()->getUsingRuleByCouponMainId($couponMain->id); $data["usingRule"] = DictionaryRepository::getInstance()->getUsingRuleByCouponMainId($couponMain->id);
$data["punishRule"] = '';//处罚规则 已取消 $data["punishRule"] = '';//处罚规则 已取消

2
app/controller/manager/Bill.php
View File

@ -29,7 +29,7 @@ class Bill extends Base
$list['agency_money_sum'] = BillRepository::getInstance()->getAgencyMoneySum(CouponBill::agency_money, $keyword, $startTime, $endTime); $list['agency_money_sum'] = BillRepository::getInstance()->getAgencyMoneySum(CouponBill::agency_money, $keyword, $startTime, $endTime);
$list['admin_money_sum'] = BillRepository::getInstance()->getAgencyMoneySum(CouponBill::admin_money, $keyword, $startTime, $endTime); $list['admin_money_sum'] = BillRepository::getInstance()->getAgencyMoneySum(CouponBill::admin_money, $keyword, $startTime, $endTime);
$list['consumer_money_sum'] = BillRepository::getInstance()->getAgencyMoneySum(CouponBill::consumer_money, $keyword, $startTime, $endTime); $list['consumer_money_sum'] = BillRepository::getInstance()->getAgencyMoneySum(CouponBill::consumer_money, $keyword, $startTime, $endTime);
$list['distribution_money_money'] = BillRepository::getInstance()->getAgencyMoneySum(CouponBill::distribution_money_money, $keyword, $startTime, $endTime); $list['distribution_money_sum'] = BillRepository::getInstance()->getAgencyMoneySum(CouponBill::distribution_money_money, $keyword, $startTime, $endTime);
return $this->json(0, 'success', $list); return $this->json(0, 'success', $list);
} }

2
public/static/manager/js/bill.js
View File

@ -38,7 +38,7 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect',"laydate"]
$("#new_agency_money_sum").text(res.data.agency_money_sum?res.data.agency_money_sum:0) $("#new_agency_money_sum").text(res.data.agency_money_sum?res.data.agency_money_sum:0)
$("#new_admin_money_sum").text(res.data.admin_money_sum?res.data.admin_money_sum:0) $("#new_admin_money_sum").text(res.data.admin_money_sum?res.data.admin_money_sum:0)
$("#new_consumer_money_sum").text(res.data.consumer_money_sum?res.data.consumer_money_sum:0) $("#new_consumer_money_sum").text(res.data.consumer_money_sum?res.data.consumer_money_sum:0)
$("#new_distribution_money_sum").text(res.data.new_distribution_money_sum?res.data.new_distribution_money_sum:0) $("#new_distribution_money_sum").text(res.data.distribution_money_sum?res.data.distribution_money_sum:0)
return { return {
"code": res.code, //解析接口状态 "code": res.code, //解析接口状态
"msg": res.msg, //解析提示文本 "msg": res.msg, //解析提示文本