diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
index e1a3a7bcf..8de0b0f1d 100644
--- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php
+++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
@@ -8,10 +8,10 @@ namespace Admin\Controller;
class AggregateFinanceStatementController extends ThinkController
{
public $verify_status = [
- "-1"=>"审核拒绝",
+ "-1"=>"审批拒绝",
"0"=>"未申请开票",
"1"=>"申请开票",
- "2"=>"审核同意",
+ "2"=>"审批同意",
"3"=>"已开票",
"4"=>"已上传凭证",
"5"=>"已到账"
@@ -110,7 +110,8 @@ class AggregateFinanceStatementController extends ThinkController
$data[$key]['oplist'] = $this->OpAuth($value);
}
- $count = M("aggregate_statement","tab_")->field("count(id) count,SUM(ratio_money) ratio_money,SUM(pay_money) pay_money")->where($map)->find();
+ $count = M("aggregate_statement","tab_")->field("count(id) count,SUM(ratio_money) ratio_money")->where($map)->find();
+ $pay_money_count = M("aggregate_statement","tab_")->field("SUM(pay_money) pay_money")->where($map)->where("withdraw_type <> 2")->find()['pay_money'];
//分页
$parameter['p'] = $page;
@@ -123,7 +124,7 @@ class AggregateFinanceStatementController extends ThinkController
$this->assign('menubtn',$this->menuAuth());
$this->assign('data',$data);
$this->assign('total',$count['ratio_money']);
- $this->assign('pay_money',$count['pay_money']);
+ $this->assign('pay_money',$pay_money_count);
$this->assign('channel',$this->getAggChannel());
$this->assign('verify_status',$this->verify_status);
$this->display();
diff --git a/Application/Admin/View/AggregateFinanceStatement/createStatement.html b/Application/Admin/View/AggregateFinanceStatement/createStatement.html
index 15b16ea59..c2786ac5e 100644
--- a/Application/Admin/View/AggregateFinanceStatement/createStatement.html
+++ b/Application/Admin/View/AggregateFinanceStatement/createStatement.html
@@ -224,10 +224,10 @@
结算时间 |
产品 |
- 平台总额 |
+ 平台总额(元) |
分成比例 |
税费费率 |
- 结算金额 |
+ 结算金额(元) |
@@ -408,20 +408,20 @@
${it.begintime}~${it.endtime} |
${it.game_name} |
- ${it.money}元 |
+ ${it.money} |
% |
% |
- ${it.ratio_money}元 |
+ ${it.ratio_money} |
{@/each}
合计 |
|
- ${count.pay_money}元 |
+ ${count.pay_money} |
|
|
- ${count.ratio_money}元 |
+ ${count.ratio_money} |
本月分成总金额(人民币大写): |
diff --git a/Application/Admin/View/AggregateFinanceStatement/editStatement.html b/Application/Admin/View/AggregateFinanceStatement/editStatement.html
index 319ccda07..0a4759a80 100644
--- a/Application/Admin/View/AggregateFinanceStatement/editStatement.html
+++ b/Application/Admin/View/AggregateFinanceStatement/editStatement.html
@@ -210,10 +210,10 @@
结算时间 |
产品 |
- 平台总额 |
+ 平台总额(元) |
分成比例 |
税费费率 |
- 结算金额 |
+ 结算金额(元) |
@@ -394,20 +394,20 @@
${it.begintime}~${it.endtime} |
${it.game_name} |
- ${it.money}元 |
+ ${it.money} |
% |
% |
- ${it.ratio_money}元 |
+ ${it.ratio_money} |
{@/each}
合计 |
|
- ${count.pay_money}元 |
+ ${count.pay_money} |
|
|
- ${count.ratio_money}元 |
+ ${count.ratio_money} |
本月分成总金额(人民币大写): |
diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html
index f37b6fd03..4715c0911 100644
--- a/Application/Admin/View/AggregateFinanceStatement/lists.html
+++ b/Application/Admin/View/AggregateFinanceStatement/lists.html
@@ -49,7 +49,7 @@
聚合渠道结算单管理
-
流程说明:结算自动生成对账单--->发起人申请开票--->财务审核开票--->寄发票--->发起人上传收款凭证--->财务确认到账
+
流程说明:结算自动生成对账单--->发起人申请开票--->财务审批开票--->寄发票--->发起人上传收款凭证--->财务确认到账
@@ -89,7 +89,7 @@
- 合计 | 结算总流水:{$pay_money}元 结算金额:{$total}元 |
+ 合计 | 结算总流水:{$pay_money}元(补点单据不重复计算在内) 结算总金额:{$total}元 |
@@ -239,7 +241,7 @@
}
}).get().join(",");
if(text == ''){
- layer.msg("" + '无需要审核通过的结算单,仅[已申请发票]状态可以进行审核通过' + "");
+ layer.msg("" + '无需要审批通过的结算单,仅[已申请发票]状态可以进行审批通过' + "");
return;
}
if(flag){
@@ -280,7 +282,7 @@
}
}).get().join(",");
if(text == ''){
- layer.msg("" + '无需要审核拒绝的结算单,仅[已申请发票]状态可以进行审核拒绝' + "");
+ layer.msg("" + '无需要批拒绝的结算单,仅[已申请发票]状态可以进行审批拒绝' + "");
return;
}
if(flag){
@@ -321,11 +323,11 @@
}
}).get().join(",");
if(text == ''){
- layer.msg("" + '无需要进行已开票的结算单,仅[审核同意]状态可以进行已开票' + "");
+ layer.msg("" + '无需要进行已开票的结算单,仅[审批同意]状态可以进行已开票' + "");
return;
}
if(flag){
- layer.confirm("已开票仅会对 [审核同意] 结算单处理,选择中包含其他的状态的结算单将被忽略,点击取消停止操作",{title:false}, function(index){
+ layer.confirm("已开票仅会对 [审批同意] 结算单处理,选择中包含其他的状态的结算单将被忽略,点击取消停止操作",{title:false}, function(index){
_doInvoiced();
layer.close(index);
});
@@ -403,7 +405,7 @@
// return $(elem).val();
}).get().join(",");
if(text == ''){
- layer.msg("" + '无需要进行重新结算的结算单,仅[未申请发票][申请开票][审核拒绝]状态可以进行重新结算' + "");
+ layer.msg("" + '无需要进行重新结算的结算单,仅[未申请发票][申请开票][审批拒绝]状态可以进行重新结算' + "");
return;
}
layer.confirm("重算结算金额会对结算单回退到未申请发票状态,请慎重处理,点击取消停止操作",{title:false}, function(index){
@@ -575,10 +577,10 @@
content:""+remark+"
"
});
});
- //撤销审核
+ //撤销审批
$(".cancelVerify").click(function(){
var id = $(this).data("id");
- layer.confirm("撤销审核将回退到[已申请开票]状态,点击取消停止操作",{title:false}, function(index){
+ layer.confirm("撤销审批将回退到[已申请开票]状态,点击取消停止操作",{title:false}, function(index){
$.ajax({
type: "POST",
url: "{:U('cancelVerify')}",
diff --git a/Application/Admin/View/AggregateFinanceStatement/viewStatement.html b/Application/Admin/View/AggregateFinanceStatement/viewStatement.html
index 9d7bf0bb3..037f7d39a 100644
--- a/Application/Admin/View/AggregateFinanceStatement/viewStatement.html
+++ b/Application/Admin/View/AggregateFinanceStatement/viewStatement.html
@@ -192,10 +192,10 @@
结算时间 |
产品 |
- 平台总额 |
+ 平台总额(元) |
分成比例 |
税费费率 |
- 结算金额 |
+ 结算金额(元) |
@@ -203,10 +203,10 @@
{$it.begintime}~{$it.endtime} |
{$it.game_name} |
- {$it.money}元 |
+ {$it.money} |
% |
% |
- {$it.ratio_money}元 |
+ {$it.ratio_money} |
@@ -214,10 +214,10 @@
合计 |
|
- {$data.statement_count.pay_money}元 |
+ {$data.statement_count.pay_money} |
|
|
- {$data.statement_count.ratio_money}元 |
+ {$data.statement_count.ratio_money} |
本月分成总金额(人民币大写): |
diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php
index 4af55713c..17971be6b 100644
--- a/Application/Base/Service/GameSourceService.class.php
+++ b/Application/Base/Service/GameSourceService.class.php
@@ -229,6 +229,10 @@ class GameSourceService {
$gameSourceUrl = $this->getGameSourceUrl($gameSource);
if ($gameSource == null || !file_exists($gameSourceUrl)) {
M('apply', 'tab_')->where(['id' => $apply['id']])->setField('enable_status', -1);
+ return [
+ 'status' => false,
+ 'message' => '打包失败,原包或原包路径不存在!',
+ ];
}
/* 检测是否存在投放申请,存在则更改投放申请信息,否则进行渠道打包 */
@@ -351,20 +355,27 @@ class GameSourceService {
'base_uri' => C('PACKAGE_CHUNK_URL'),
'timeout' => 30.0,
]);
- $response = $client->post('/upload', [
- 'verify' => false,
- 'form_params' => [
- 'file' => $localFilePath,
- 'dest' => $distFilePath,
- 'is_delete_local' => ($isDeleteLocal ? 1 : 0),
- ]
- ]);
- $result = (string)$response->getBody();
- $result = json_decode($result, true);
- if (!$result) {
+ try {
+ $response = $client->post('/upload', [
+ 'verify' => false,
+ 'form_params' => [
+ 'file' => $localFilePath,
+ 'dest' => $distFilePath,
+ 'is_delete_local' => ($isDeleteLocal ? 1 : 0),
+ ]
+ ]);
+ $result = (string)$response->getBody();
+ $result = json_decode($result, true);
+ if (!$result) {
+ return [
+ 'status' => false,
+ 'message' => '请求异常',
+ ];
+ }
+ } catch (\Exception $e) {
return [
'status' => false,
- 'message' => '请求打包失败',
+ 'message' => '请求异常: ' . $e->getMessage(),
];
}
return $result;