Merge branch 'rmaster' of 39.97.239.116:gyfl/xyzshop into rmaster

admin/control/merchant.php

@@ -1123,8 +1123,9 @@ class merchantControl extends SystemControl
         if (chksubmit()) {
             $corder_success_count = $_POST['corder_success_count'];
             $corder_success_amounts = $_POST['corder_success_amounts'];
+            $corder_success_refill_amounts = $_POST['corder_success_refill_amounts'];
             $remark = $_POST['remark'];
-            $gap_order_count = $gap_success_amounts = 0;
+            $gap_order_count = $gap_success_amounts = $gap_success_refill_amounts = 0;
             if($type == 'provider') {
                 $gap_order_count = $corder_success_count - $stats_data['success_count'];
                 $gap_success_amounts = $corder_success_amounts - $stats_data['success_channel_amounts'];
@@ -1134,11 +1135,14 @@ class merchantControl extends SystemControl
             }else{
                 showMessage('对账数据类型错误', 'index.php?act=OrderStats&op=index');
             }
+            $gap_success_refill_amounts = $corder_success_refill_amounts - $stats_data['success_refill_amounts'];
 
             $updata['corder_success_count'] = $corder_success_count;
             $updata['corder_success_amounts'] = $corder_success_amounts;
+            $updata['corder_success_refill_amounts'] = $corder_success_refill_amounts;
             $updata['gap_order_count'] = $gap_order_count;
             $updata['gap_success_amounts'] = $gap_success_amounts;
+            $updata['gap_success_refill_amounts'] = $gap_success_refill_amounts;
             $updata['remark'] = $remark;
             if($gap_order_count == 0 && $gap_success_amounts == 0) {
                 $updata['check_status'] = 1;
@@ -1148,7 +1152,7 @@ class merchantControl extends SystemControl
             $res = $mod_stat->edit($stat_id, $updata);
 
             if ($res) {
-                showMessage('操作成功',"index.php?act=OrderStats&op=index&type={$type}");
+                showMessage('操作成功',"index.php?act=OrderStats&op=index&type={$type}&cid={$stats_data['cid']}&order_time_type={$stats_data['order_time_type']}");
             } else {
                 showMessage('操作失败');
             }

admin/control/orderstats.php

@@ -10,7 +10,7 @@ class orderstatsControl extends SystemControl
 
     public function indexOp()
     {
-        $type = $_GET['type'] ? $_GET['type'] : 'system';
+        $type = $_GET['type'] ?? 'system';
         $page = "{$type}.order.stats";
         $model_refill_order = Model('refill_order');
         $condition['type'] = $type;

admin/control/refill_successful.php

@@ -55,7 +55,7 @@ class refill_successfulControl extends SystemControl
         if($type == 'system') {
             preg_match_all('/\d{10}\/\d+\/\d{1,2}\/\d\/\d{2,4}/', $data, $matches);
         } else {
-            preg_match_all('/\d{10}\/[a-z]+\/\d{1,2}\/\d\/\d{2,4}/', $data, $matches);
+            preg_match_all('/\d{10}\/[a-z]+_*[a-z]*\/\d{1,2}\/\d\/\d{2,4}/', $data, $matches);
         }
         $conds = $matches[0];
         if(empty($conds)) {

admin/templates/default/merchant.order.stats.php

@@ -129,9 +129,11 @@
 <!--                <th class="align-center">失败订单数量</th>-->
 <!--                <th class="align-center">成功占比</th>-->
                 <th class="align-center">下游成功单量</th>
-                <th class="align-center">下游成功金额</th>
+                <th class="align-center">下游成功扣款金额</th>
+                <th class="align-center">下游成功面值</th>
                 <th class="align-center">单量误差</th>
-                <th class="align-center">金额误差</th>
+                <th class="align-center">扣款金额误差</th>
+                <th class="align-center">面值误差</th>
                 <th class="align-center">备注</th>
                 <th class="align-center">匹配状态</th>
                 <th class="align-center">统计日期类型</th>
@@ -155,8 +157,10 @@
 <!--                        <td class="align-center">--><?php //echo $v['success_ratio']; ?><!--</td>-->
                         <td class="align-center"><?php echo $v['corder_success_count']; ?></td>
                         <td class="align-center"><?php echo $v['corder_success_amounts']; ?></td>
+                        <td class="align-center"><?php echo $v['corder_success_refill_amounts']; ?></td>
                         <td class="align-center"><?php echo $v['gap_order_count']; ?></td>
                         <td class="align-center"><?php echo $v['gap_success_amounts']; ?></td>
+                        <td class="align-center"><?php echo $v['gap_success_refill_amounts']; ?></td>
                         <td class="align-center"><?php echo $v['remark']; ?></td>
                         <td class="align-center">
                             <?php if($v['check_status'] == 1){?>

admin/templates/default/order.stats.check.php

@@ -32,6 +32,13 @@
                 <td class="vatop rowform"><input type="text" value="" name="corder_success_amounts" id="corder_success_amounts" class="txt"></td>
                 <td class="vatop tips"></td>
             </tr>
+            <tr class="noborder">
+                <td colspan="2" class="required"><label class="validation" for="name"><?php echo $output['stats_type'];?>成功订单面值金额:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform"><input type="text" value="" name="corder_success_refill_amounts" id="corder_success_refill_amounts" class="txt"></td>
+                <td class="vatop tips"></td>
+            </tr>
             <tr>
                 <td colspan="2" class="required"><label>备注信息:</label></td>
             </tr>
@@ -74,6 +81,9 @@
                 corder_success_amounts: {
                     required: true,
                 },
+                corder_success_refill_amounts: {
+                    required: true,
+                }
             },
             messages: {
                 corder_success_count: {
@@ -81,6 +91,9 @@
                 },
                 corder_success_amounts: {
                     required: '不能为空',
+                },
+                corder_success_refill_amounts: {
+                    required: '不能为空',
                 }
             }
         });

admin/templates/default/provider.order.stats.php

@@ -128,9 +128,11 @@
 <!--                <th class="align-center">失败订单数量</th>-->
 <!--                <th class="align-center">成功占比</th>-->
                 <th class="align-center">上游成功单量</th>
-                <th class="align-center">上游成功金额</th>
+                <th class="align-center">上游成功扣款金额</th>
+                <th class="align-center">上游成功面值</th>
                 <th class="align-center">单量误差</th>
-                <th class="align-center">金额误差</th>
+                <th class="align-center">扣款金额误差</th>
+                <th class="align-center">面值误差</th>
                 <th class="align-center">备注</th>
                 <th class="align-center">匹配状态</th>
                 <th class="align-center">统计日期类型</th>
@@ -154,8 +156,10 @@
 <!--                        <td class="align-center">--><?php //echo $v['success_ratio']; ?><!--</td>-->
                         <td class="align-center"><?php echo $v['corder_success_count']; ?></td>
                         <td class="align-center"><?php echo $v['corder_success_amounts']; ?></td>
+                        <td class="align-center"><?php echo $v['corder_success_refill_amounts']; ?></td>
                         <td class="align-center"><?php echo $v['gap_order_count']; ?></td>
                         <td class="align-center"><?php echo $v['gap_success_amounts']; ?></td>
+                        <td class="align-center"><?php echo $v['gap_success_refill_amounts']; ?></td>
                         <td class="align-center"><?php echo $v['remark']; ?></td>
                         <td class="align-center">
                             <?php if($v['check_status'] == 1){?>
@@ -345,80 +349,80 @@
                 // console.log('data', data);
             })
         })
-        $('.examine').click(function() {
-            layer.open({
-            type: 1,
-            title: "对账",
-            area: ['900px', '500px'],
-            shadeClose: true, //点击遮罩关闭
-            content: `<form id="user_form" enctype="multipart/form-data" method="post">
-                        <input type="hidden" name="form_submit" value="ok"/>
-                        <input type="hidden" name="stat_id" value="<?php echo $_GET['stat_id'];?>"/>
-                        <table class="table tb-type2">
-                        <tbody>
-                        <tr class="noborder">
-                        <td colspan="2" class="required"><label class="validation" for="corder_success_count"><?php echo $output['stats_type'];?>成功订单数量:</label></td>
-                        </tr>
-                        <tr class="noborder">
-                        <td class="vatop rowform"><input type="text" value="" name="corder_success_count" id="corder_success_count" class="txt"></td>
-                        <td class="vatop tips"></td>
-                        </tr>
-                        <tr class="noborder">
-                        <td colspan="2" class="required"><label class="validation" for="name"><?php echo $output['stats_type'];?>成功订单金额:</label></td>
-                        </tr>
-                        <tr class="noborder">
-                        <td class="vatop rowform"><input type="text" value="" name="corder_success_amounts" id="corder_success_amounts" class="txt"></td>
-                        <td class="vatop tips"></td>
-                        </tr>
-                        <tr>
-                        <td colspan="2" class="required"><label>备注信息:</label></td>
-                        </tr>
-                        <tr class="noborder">
-                        <td class="vatop rowform"><textarea name="remark" rows="6" class="tarea"></textarea></td>
-                        <td class="vatop tips"></td>
-                        </tr>
-                        </tbody>
-                        <tfoot>
-                        <tr class="tfoot">
-                        <td colspan="15"><a href="JavaScript:void(0);" class="btn" id="submitBtn"><span><?php echo $lang['nc_submit']; ?></span></a></td>
-                        </tr>
-                        </tfoot>
-                        </table>
-                        </form>`,
+    //     $('.examine').click(function() {
+    //         layer.open({
+    //         type: 1,
+    //         title: "对账",
+    //         area: ['900px', '500px'],
+    //         shadeClose: true, //点击遮罩关闭
+    //         content: `<form id="user_form" enctype="multipart/form-data" method="post">
+    //                     <input type="hidden" name="form_submit" value="ok"/>
+    //                     <input type="hidden" name="stat_id" value="<?php echo $_GET['stat_id'];?>"/>
+    //                     <table class="table tb-type2">
+    //                     <tbody>
+    //                     <tr class="noborder">
+    //                     <td colspan="2" class="required"><label class="validation" for="corder_success_count"><?php echo $output['stats_type'];?>成功订单数量:</label></td>
+    //                     </tr>
+    //                     <tr class="noborder">
+    //                     <td class="vatop rowform"><input type="text" value="" name="corder_success_count" id="corder_success_count" class="txt"></td>
+    //                     <td class="vatop tips"></td>
+    //                     </tr>
+    //                     <tr class="noborder">
+    //                     <td colspan="2" class="required"><label class="validation" for="name"><?php echo $output['stats_type'];?>成功订单金额:</label></td>
+    //                     </tr>
+    //                     <tr class="noborder">
+    //                     <td class="vatop rowform"><input type="text" value="" name="corder_success_amounts" id="corder_success_amounts" class="txt"></td>
+    //                     <td class="vatop tips"></td>
+    //                     </tr>
+    //                     <tr>
+    //                     <td colspan="2" class="required"><label>备注信息:</label></td>
+    //                     </tr>
+    //                     <tr class="noborder">
+    //                     <td class="vatop rowform"><textarea name="remark" rows="6" class="tarea"></textarea></td>
+    //                     <td class="vatop tips"></td>
+    //                     </tr>
+    //                     </tbody>
+    //                     <tfoot>
+    //                     <tr class="tfoot">
+    //                     <td colspan="15"><a href="JavaScript:void(0);" class="btn" id="submitBtn"><span><?php echo $lang['nc_submit']; ?></span></a></td>
+    //                     </tr>
+    //                     </tfoot>
+    //                     </table>
+    //                     </form>`,
   
              
 
-                        //按钮先执行验证再提交表单
-                        $("#submitBtn").click(function () {
-                        if ($("#user_form").valid()) {
-                            $("#user_form").submit();
-                        }
-                    });
-                    $('#user_form').validate({
-                        errorPlacement: function (error, element) {
-                        error.appendTo(element.parent().parent().prev().find(td:first));
-                        },
-                        rules: {
-                            corder_success_count: {
-                                required: true,
-                            },
-                            corder_success_amounts: {
-                                required: true,
-                            },
-                        },
-                        messages: {
-                            corder_success_count: {
-                                required: '不能为空',
-                            },
-                            corder_success_amounts: {
-                                required: '不能为空',
-                            }
-                        }
-                    });
+    //                     //按钮先执行验证再提交表单
+    //                     $("#submitBtn").click(function () {
+    //                     if ($("#user_form").valid()) {
+    //                         $("#user_form").submit();
+    //                     }
+    //                 });
+    //                 $('#user_form').validate({
+    //                     errorPlacement: function (error, element) {
+    //                     error.appendTo(element.parent().parent().prev().find(td:first));
+    //                     },
+    //                     rules: {
+    //                         corder_success_count: {
+    //                             required: true,
+    //                         },
+    //                         corder_success_amounts: {
+    //                             required: true,
+    //                         },
+    //                     },
+    //                     messages: {
+    //                         corder_success_count: {
+    //                             required: '不能为空',
+    //                         },
+    //                         corder_success_amounts: {
+    //                             required: '不能为空',
+    //                         }
+    //                     }
+    //                 });
 
 
-    });
+    // });
 
-        });
+    //     });
     });
 </script>

admin/templates/default/refill.order.index.php

@@ -24,11 +24,17 @@
     .layui-form-select .layui-input {
         padding: 13px 5px;
     }
+    .layui-form-selected dl {
+    display: flex!important;
+    flex-wrap: wrap!important;
+}
     .layui-form-select dl {
+      
         top: 29px !important;
         left: 4px!important;
-        width: 30%;
+        min-width: 590%!important;
         max-height: 280px!important;
+        padding: 14px 0!important;
     }
     .layui-form-select {
         width: 45%;

admin/templates/default/refill.refund.add.php

@@ -202,7 +202,8 @@
        // 日期选择器
        laydate.render({
             elem: '#refund_time',
-            type: 'datetime'
+            type: 'datetime',
+            trigger: 'click'
         });
        function trim(str) {
       if (str && typeof str === "text") {