Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Trippest账单: 财务表的拼团总成本对比实际拼团总成本

Browse Source
feature/trippest
lyt 6 years ago
parent eb7e1b35ab
commit 2ba826c8af
3 changed files with 77 additions and 79 deletions
Show Stats Download Patch File Download Diff File

2
webht/third_party/trippestOrderSync/controllers/vendor_money.php vendored
Unescape Escape View File

@ -268,6 +268,8 @@ class Vendor_money extends CI_Controller {
$result['col_sum']['trippest']['sum_payout'] = bcadd($result['col_sum']['trippest']['sum_payout'], $vmi['trippest']['payout']);
// $result['col_sum']['vendor']['sum_payout'] = bcadd($result['col_sum']['vendor']['sum_payout'], $vmi['vendor']['payout']);
}
// 财务表成本和实际成本不相等
$result['diff_cost'] = $this->money_model->report_tour_diff($start_date, $end_date, implode(',', $vendors));
$this->load->view('vendor_money_sum', $result);
return ;
}

57
webht/third_party/trippestOrderSync/models/vendor_money_model.php vendored
Unescape Escape View File

@ -556,6 +556,63 @@ class Vendor_money_model extends CI_Model {
return $query->result_array();
}
public function report_tour_diff($start_date, $end_date, $all_vendor)
{
$sql = "SELECT * ,
(SELECT top 1 RPT_Total
FROM report_tour
WHERE 1=1
AND tourProvide=gci_vei_name
AND tourBZ LIKE '%'+REPLACE(gci_no,'[','[[]')+'%'
AND ( RPT_Total<>to_be_diff.report_total_cost0
OR RPT_Total<>to_be_diff.total_cost ) ) AS diff_report_total_cost0
FROM
(SELECT * ,
(SELECT isnull(SUM(CONVERT(float,gcod.GCOD_sumMoney)),0)
FROM GroupCombineOperationDetail gcod
WHERE GCOD_GCI_combineNo=all_gci_no.gci_no
AND gcod.GCOD_operationType <> 'otherReceives'
AND GCOD_VEI_SN=all_gci_no.GCI_VEI_SN
) AS total_cost ,
(SELECT isnull(round(SUM(isnull(tourcost,0)),2),0)
FROM report_tour
WHERE 1=1
AND tourProvide=gci_vei_name
AND tourBZ LIKE '%'+REPLACE(gci_no,'[','[[]')+'%'
) AS report_cost ,
(SELECT top 1 RPT_Total
FROM report_tour
WHERE 1=1
AND tourProvide=gci_vei_name
AND tourBZ LIKE '%'+REPLACE(gci_no,'[','[[]')+'%'
) AS report_total_cost0
FROM ( select
CASE WHEN GCI_combineNo is NULL THEN 'nn'
WHEN GCI_combineNo='cancel' THEN CONVERT(varchar(50), 'nn')
ELSE GCI_combineNo END gci_no ,
GCI_VEI_SN ,
(SELECT VEI2_CompanyBN
FROM VEndorInfo2
WHERE VEI2_VEI_SN=GCI_VEI_SN
AND VEI2_LGC=2 ) AS gci_vei_name
FROM GroupCombineInfo
WHERE GCI_travelDate
BETWEEN '$start_date'
AND '$end_date'
and GCI_VEI_SN in ($all_vendor)
and CHARINDEX('TA', GCI_combineNo ) = 0
GROUP BY GCI_combineNo,GCI_VEI_SN
) all_gci_no
) AS to_be_diff
WHERE CONVERT(decimal(10,2),to_be_diff.report_cost) <> to_be_diff.report_total_cost0
OR CONVERT(decimal(10,2),to_be_diff.total_cost) <> to_be_diff.report_total_cost0
OR CONVERT(decimal(10,2),to_be_diff.total_cost) <> round(to_be_diff.report_cost,2)
ORDER BY to_be_diff.GCI_VEI_SN
";
$query = $this->HT->query($sql);
return $query->result_array();
}
}
/* End of file vendor_money.php */

97
webht/third_party/trippestOrderSync/views/vendor_money_sum.php vendored
Unescape Escape View File

@ -259,88 +259,27 @@
<?php } ?>
</tbody>
</table>
<!--
<p>旧的算法, 需扣除Trippest自营订单的地接代收款项:</p>
<table class="table table-bordered table-hover">
<thead>
<?php if ( ! empty($diff_cost)) { ?>
<p>财务表成本与实际成本不一致, 检查是否需要重新生成账单:</p>
<table class="table table-bordered table-hover">
<thead>
<tr>
<th >拼团号</th>
<th >实际总成本</th>
<th >财务表总成本</th>
</tr>
</thead>
<tbody>
<?php foreach ($diff_cost as $kdc => $diff) { ?>
<tr>
<th rowspan="2">目的地</th>
<th colspan="2">总营收</th>
<th colspan="2">总成本</th>
<th rowspan="2">⑤利润</th>
<th rowspan="2">⑥海纳利润</th>
<th rowspan="2">⑦地接利润</th>
<th rowspan="2">⑧海纳应付地接</th>
<td><?php echo $diff['gci_no'] ?></td>
<td><?php echo $diff['total_cost'] ?></td>
<td><?php echo $diff['report_total_cost0'] ?></td>
</tr>
<tr>
<th >①海纳代收</th>
<th >②地接代收</th>
<th rowspan="2">③海纳成本</th>
<th rowspan="2">④地接成本</th>
</tr>
</thead>
<tbody>
<?php // if ( ! empty($money)) {
// foreach ($money as $kv => $vendor) {
?>
<tr>
<td class="text-left"><?php // echo $vendor['vendor_name'] ?></td>
<td><?php // echo $vendor['vendor']['trippest_sum'] ?></td>
<td><?php // echo $vendor['vendor']['vendor_sum'] ?></td>
<td><?php // echo $vendor['trippest_cost'] ?></td>
<td><?php // echo $vendor['vendor_cost'] ?></td>
<td><?php // echo $vendor['vendor']['total_profit'] ?></td>
<td><?php // echo $vendor['vendor']['trippest_profit'] ?></td>
<td><?php // echo $vendor['vendor']['vendor_profit'] ?></td>
<td><?php // echo $vendor['vendor']['payout'] ?></td>
</tr>
<?php
// if ($vendor['vendor']['other_sum'] > 0) {
?>
<tr class="bg-grey">
<td >非包价产品的收款 <br></td>
<td ><?php // echo $vendor['vendor']['other_sum'] ?></td>
<td ></td>
<td ></td>
<td ><?php // echo $vendor['vendor']['other_sum_cost'] ?></td>
<td ></td>
<td colspan="4"></td>
</tr>
<?php
// }
?>
<?php // }
//} ?>
<?php //if ( ! empty($col_sum)) {
?>
<tr class="text-bold">
<td class="text-left">合计（仅包价产品）</td>
<td><?php // echo $col_sum['vendor']['sum_trippest_sum'] ?></td>
<td><?php // echo $col_sum['vendor']['sum_vendor_sum'] ?></td>
<td><?php // echo $col_sum['vendor']['sum_trippest_cost'] ?></td>
<td><?php // echo $col_sum['vendor']['sum_vendor_cost'] ?></td>
<td><?php // echo $col_sum['vendor']['sum_profit'] ?></td>
<td><?php // echo $col_sum['vendor']['sum_trippest_profit'] ?></td>
<td><?php // echo $col_sum['vendor']['sum_vendor_profit'] ?></td>
<td><?php // echo $col_sum['vendor']['sum_payout'] ?></td>
</tr>
<?php // } ?>
<?php // if ( ! empty($trippest_order_vendor_money)) {
?>
<tr class="text-bold">
<th colspan="2">团号</th>
<th colspan="7">应扣除地接收款: 总计 <?php // echo $transfer_sum ?></th>
</tr>
<?php // foreach ($trippest_order_vendor_money as $ko => $order) {
?>
<tr>
<td colspan="2" class="text-left"><?php // echo $order['COLI_GroupCode'] ?></td>
<td colspan="7" class="text-left"><?php // echo $order["vendor_sum"] ?></td>
</tr>
<?php // } } ?>
<?php } ?>
</tbody>
</table>
-->
</table>
<?php } ?>
</div>
</body>
<script src="/js/jquery.min.js" type="text/javascript"></script>

Write Preview
Loading…
Cancel
Save