Merge branch 'feature/game_select_bug' of wmtx/platform into release

Application/Admin/Controller/FinanceController.class.php

@@ -1029,6 +1029,10 @@ class FinanceController extends ThinkController
         if (!empty(I("game_id"))) {
             $map['game_id'] = I("game_id");
         }
+        if(empty(I("game_id")) && !empty(I("game_name"))){
+            $map['game_name'] = array('like','%'.I("game_name").'%');;
+        }
+
         if (!empty(I('user_account'))) {
             $map['user_account'] = array('like','%'.I("user_account").'%');
         }
@@ -1096,7 +1100,10 @@ class FinanceController extends ThinkController
             $totalMap['s.game_id'] = $map['game_id'];
             unset($totalMap['game_id']);
         }
-
+        if ($map['game_name']) {
+            $totalMap['s.game_name'] = $map['game_name'];
+            unset($totalMap['game_name']);
+        }
         $totalData = D('spend')->totalGameStatistics($totalMap, false);
 
         $sumCash = $totalData['cash_count'] ?? 0;

Application/Admin/Controller/RepairController.class.php

@@ -32,7 +32,18 @@ class RepairController extends ThinkController {
                 'type' => 1  // 补单
             ]);
 
+            $sp = $spend->where([
+                'pay_order_number' => $orderNo
+            ])->find();
             $rr = $spend->where(array('pay_order_number'=>$orderNo))->save(array('pay_game_status'=>1));
+            if ($sp['extend']) {
+                $spend->where([
+                    'extend' => $sp['extend'],
+                    'pay_status' => 1,
+                    'user_id' => $sp['user_id']
+                ])->save(array('pay_game_status' => 1));
+            }
+
             //操作日志
             addOperationLog(array(
                 "op_type"=>1,

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(