fix

admin/control/provider.php

@@ -726,7 +726,7 @@ class providerControl extends SystemControl
                 }
                 $available_total += $value['available_predeposit'];
             }
-            if($available_total > $remit_cfg['remit_money']) continue;
+            if($available_total > $remit_cfg['remit_money'] || !array_key_exists($co_id, $refill_company)) continue;
             $result[] = [
                 'co_name' => $refill_company[$co_id]['co_name'],
                 'providers' => $data

admin/control/refill_company.php

@@ -220,6 +220,8 @@ class refill_companyControl extends SystemControl
         $params = json_decode($remit['params'], true);
         $provider_list = $this->providers();
         foreach ($provider_list as $provider) {
+            $co_id = $provider['co_id'];
+            if(empty($co_id)) continue;
             $pid = $provider['provider_id'];
             $account_id = intval($provider['account_id']);
             if($account_id > 0) {

admin/templates/default/provider.remit.edit.php

@@ -124,15 +124,18 @@
             });
         }
 
-        // //接口查询余额
-        // $('#available div').each(function(index, item) {
-        //     let txt = $(item).prev().text()
-        //     if (txt < 0 && txt < -10000) {
-        //         $(item).text('(' + '-' + cnMoneyFormat(txt) + ')')
-        //     } else {
-        //         $(item).text('(' + cnMoneyFormat(txt) + ')')
-        //     }
-        // })
+        //接口查询余额
+        $('#available div').each(function(index, item) {
+            let txt = $(item).prev().text()
+            txt = parseFloat(txt)
+            if (txt < 0 && txt < -10000) {
+                $(item).text('(' + '-' + cnMoneyFormat(txt) + ')')
+            } else if (txt > 0 && txt > 10000) {
+                $(item).text('(' + cnMoneyFormat(txt) + ')')
+            } else {
+                $(item).text(cnMoneyFormat(txt))
+            }
+        })
 
         $("#submitBtn").click(function() {
             if ($("#price_form").valid()) {
@@ -164,14 +167,17 @@
             }
         });
     });
-    //数字转大写
     function cnMoneyFormat(money) {
         let number_data = money;
-        number_data = parseInt(number_data);
+        if (number_data < 0) {
+            number_data = number_data.toString();
+            let num_data = number_data.substring(1, number_data.length)
+            number_data = parseInt(num_data);
+        } else {
+            number_data = parseInt(number_data);
+        }
         let yi = 0; //亿
         let wan = 0; //万
-        let qian = 0; //千
-        let qian_s = 1000; //千
         let wan_s = 10000; //万
         let yi_s = 100000000; //亿
         //取整
@@ -179,6 +185,7 @@
             data = Math.floor(data);
             return data;
         }
+
         //为0判断输出
         function data_if(data, amount) {
             if (data === 0) {
@@ -187,49 +194,37 @@
                 return data + amount;
             }
         }
+
         //亿
         function yi_f(data) {
             yi = qz(data / 100000000);
             data = data - (yi * yi_s);
-            return {
+            let data_json = {
                 data1: data_if(yi, '亿'),
                 data2: data,
-            };
+            }
+            return data_json;
         }
+
         //万
         function wan_f(data) {
             wan = qz(data / 10000);
             data = data - (wan * wan_s);
-            return {
+            let data_json = {
                 data1: data_if(wan, '万'),
                 data2: data,
-            };
-        }
-        //千
-        function qian_f(data) {
-            qian = qz(data / 1000);
-            data = data - (qian * qian_s);
-            return {
-                data1: data_if(qian, '千'),
-                data2: data,
-            };
+            }
+            return data_json;
         }
+
         yi = yi_f(number_data);
         number_data = yi.data2;
         wan = wan_f(number_data);
         number_data = wan.data2;
-        qian = qian_f(number_data);
-        number_data = qian.data2;
-        let result = yi.data1 + wan.data1 + qian.data1   + number_data;
-        let resultvalue = result.substr(0, 1)
-        if (resultvalue === 0) {
-            result = result.substr(1, result.length)
-        }
-        let resultvali = result.substr(0, 3);
-        if(resultvali === 'NaN') {
+        let result = yi.data1 + wan.data1;
+        if (result == 0) {
             return ''
-        }else {
-            return result
         }
+        return result
     }
 </script>

admin/templates/default/provider.remit.php

@@ -41,23 +41,22 @@
                                 <th class="w150 align-center">打款金额</th>
                             </tr>
                             <?php foreach ($data['providers'] as $v){?>
-
-                            <tbody class="tbody">
-                                <tr class="w500" style="height: 50px;">
-                                    <td class="w100 align-center">
-                                        <?php echo $v['store_name']; ?>
-                                    </td>
-                                    <td class="w100 align-center" id="available">
-                                        <span><?php echo $v['available_predeposit']; ?></span>
-                                        <div style="color:red;"></div>
-                                    </td>
-                                    <td class="w100 align-center">
-                                        <input type="hidden" name="strs[]" value="<?php echo $v['co_id']?>-<?php echo $v['provider_id']?>">
-                                        <input type="text" name="remits[]" class="priceInput" value="<?php echo $v['remit'];?>">
-                                        <div id="money" style="color:red;"></div>
-                                    </td>
-                                </tr>
-                            </tbody>
+                                <tbody class="tbody">
+                                    <tr class="w500" style="height: 50px;">
+                                        <td class="w100 align-center">
+                                            <?php echo $v['store_name']; ?>
+                                        </td>
+                                        <td id="available" class="align-center">
+                                            <span><?php echo $v['available_predeposit'] ?? 0; ?></span>
+                                            <div style=" display: inline-block;margin-left: 7px; color:red;"></div>
+                                        </td>
+                                        <td class="w100 align-center">
+                                            <input type="hidden" name="strs[]" value="<?php echo $v['co_id']?>-<?php echo $v['provider_id']?>">
+                                            <input type="text" name="remits[]" class="priceInput" value="<?php echo $v['remit'];?>">
+                                            <div id="money" style="color:red;"></div>
+                                        </td>
+                                    </tr>
+                                </tbody>
                             <?php }?>
                         </table>
                     </td>
@@ -122,15 +121,18 @@
             });
         }
 
-        // //接口查询余额
-        // $('#available div').each(function(index, item) {
-        //     let txt = $(item).prev().text()
-        //     if (txt < 0 && txt < -10000) {
-        //         $(item).text('(' + '-' + cnMoneyFormat(txt) + ')')
-        //     } else {
-        //         $(item).text('(' + cnMoneyFormat(txt) + ')')
-        //     }
-        // })
+        //接口查询余额
+        $('#available div').each(function(index, item) {
+            let txt = $(item).prev().text()
+            txt = parseFloat(txt)
+            if (txt < 0 && txt < -10000) {
+                $(item).text('(' + '-' + cnMoneyFormat(txt) + ')')
+            } else if (txt > 0 && txt > 10000) {
+                $(item).text('(' + cnMoneyFormat(txt) + ')')
+            } else {
+                $(item).text(cnMoneyFormat(txt))
+            }
+        })
 
         $("#submitBtn").click(function() {
             if ($("#price_form").valid()) {
@@ -162,14 +164,17 @@
         });
     });
 
-    //数字转大写
     function cnMoneyFormat(money) {
         let number_data = money;
-        number_data = parseInt(number_data);
+        if (number_data < 0) {
+            number_data = number_data.toString();
+            let num_data = number_data.substring(1, number_data.length)
+            number_data = parseInt(num_data);
+        } else {
+            number_data = parseInt(number_data);
+        }
         let yi = 0; //亿
         let wan = 0; //万
-        let qian = 0; //千
-        let qian_s = 1000; //千
         let wan_s = 10000; //万
         let yi_s = 100000000; //亿
         //取整
@@ -177,6 +182,7 @@
             data = Math.floor(data);
             return data;
         }
+
         //为0判断输出
         function data_if(data, amount) {
             if (data === 0) {
@@ -185,49 +191,37 @@
                 return data + amount;
             }
         }
+
         //亿
         function yi_f(data) {
             yi = qz(data / 100000000);
             data = data - (yi * yi_s);
-            return {
+            let data_json = {
                 data1: data_if(yi, '亿'),
                 data2: data,
-            };
+            }
+            return data_json;
         }
+
         //万
         function wan_f(data) {
             wan = qz(data / 10000);
             data = data - (wan * wan_s);
-            return {
+            let data_json = {
                 data1: data_if(wan, '万'),
                 data2: data,
-            };
-        }
-        //千
-        function qian_f(data) {
-            qian = qz(data / 1000);
-            data = data - (qian * qian_s);
-            return {
-                data1: data_if(qian, '千'),
-                data2: data,
-            };
+            }
+            return data_json;
         }
+
         yi = yi_f(number_data);
         number_data = yi.data2;
         wan = wan_f(number_data);
         number_data = wan.data2;
-        qian = qian_f(number_data);
-        number_data = qian.data2;
-        let result = yi.data1 + wan.data1 + qian.data1   + number_data;
-        let resultvalue = result.substr(0, 1)
-        if (resultvalue === 0) {
-            result = result.substr(1, result.length)
-        }
-        let resultvali = result.substr(0, 3);
-        if(resultvali === 'NaN') {
+        let result = yi.data1 + wan.data1;
+        if (result == 0) {
             return ''
-        }else {
-            return result
         }
+        return result
     }
 </script>

admin/templates/default/refill.company.remit.php

@@ -103,10 +103,10 @@
                                 <a href="index.php?act=refill_company&op=remit_commit&remit_id=<?php echo $v['remit_id'] ?>">确认提交</a>
                                 |
                                 <a href="index.php?act=refill_company&op=remit_del&remit_id=<?php echo $v['remit_id'] ?>">删除</a>
+                                |
+                                <a href="index.php?act=refill_company&op=remit_edit&remit_id=<?php echo $v['remit_id'] ?>">编辑</a>
+                                |
                             <?php }?>
-                            |
-                            <a href="index.php?act=refill_company&op=remit_edit&remit_id=<?php echo $v['remit_id'] ?>">编辑</a>
-                            |
                             <a href="index.php?act=refill_company&op=remit_export&remit_id=<?php echo $v['remit_id'] ?>">下载表格</a>
                         </td>
                     </tr>