Merge branch 'hotfix/pay_notice1123' of wmtx/platform into master

支付回调小数点后面.00处理

Application/Admin/View/Spend/lists.html

@@ -296,6 +296,11 @@
                                 </if>
                             </td>
                             <td style="text-indent:0;">
+
+                                <?php
+                                if (!(substr($data['pay_order_number'], 0, 3) == "PF_" &&
+                                    substr($data['pay_order_number'], -2) == '_1')) {
+                                ?>
                                 <if condition="($data['pay_game_status'] eq 0 or $data['pay_game_status'] eq 2) and $data['pay_status'] eq 1">
                                     <a class=" budan" href="javascript:void(0);"
                                        href-data="{$data.pay_order_number}" href-hhh="{:U('Repair/repairEdit')}" style="width:100%;">补单</a>
@@ -304,6 +309,8 @@
                                     <span>补单</span>
 
                                 </if>
+                                <?php }?>
+
                                 <br />
                                 
                                 <if condition="($data['pay_game_status'] eq 0 or $data['pay_game_status'] eq 2) and ($data['pay_status'] eq 0 or $data['pay_status'] eq 2)">

Application/Common/Api/GameApi.class.php

@@ -46,6 +46,7 @@ class GameApi {
 		if (isset($pay_data['deduction_amount']) && $pay_data['deduction_amount'] > 0) {
 		    $pay_data['cost'] += $pay_data['deduction_amount'];
 		}
+        $pay_data['cost'] = number_format($pay_data['cost'], 2, '.', '');
 		$md5_sign = md5($pay_data['pay_order_number'].$pay_data['cost']."1".$pay_data['extend'].$game_data['game_key']);
 
 		$data = array(