Merge branch 'release' into feature/game_divide_warn

5 years ago · dfd274a667
parent 0ebe11027e ef41dbfcee
commit dfd274a667
12 changed files with 68 additions and 9 deletions
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@ -5884,6 +5884,9 @@ class ExportController extends Controller
            if (I('status')) {
                $map['tab_promote.status'] = I('status');
            }
+            if (strlen(I('company_belong'))) {
+                $map['company_belong'] = I("company_belong");
+            }
            //为数据权限添加
            setPowerPromoteIds($map, 'tab_promote.id');

--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@ -96,6 +96,9 @@ class PromoteController extends ThinkController
        if (I("promote_level")) {
            $map['level'] = I("promote_level");
        }
+        if (strlen(I('company_belong'))) {
+            $map['company_belong'] = I("company_belong");
+        }
        $this->m_title = '推广员列表';
        $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/lists/type/1','status'=>1])->find());
        if (isset($_REQUEST['row'])) {
--- a/Application/Admin/Controller/PublicController.class.php
+++ b/Application/Admin/Controller/PublicController.class.php
@ -345,7 +345,7 @@ class PublicController extends \Think\Controller
    public function telsafecode($phone = '', $delay = 10, $flag = true)
    {
        $taskClient = new TaskClient();
-        $result = $taskClient->sendSms($phone);
+        $result = $taskClient->sendSms($phone, get_client_ip());
        $data = [];
        if ($result['code'] == TaskClient::SUCCESS) {
            $data['status'] = 1;
--- a/Application/Admin/View/Promote/belong.html
+++ b/Application/Admin/View/Promote/belong.html
@ -208,9 +208,9 @@

    </div>
    <div class="page">
-        <if condition="$is_admin eq true ">
+      <!--  <if condition="$is_admin eq true ">
            <a class="sch-btn" href="{:U('Export/promote_list',array_merge(['xlsname'=>'推广员管理_推广员列表'.((I('type',1)==2)?'_混服申请':'_推广员列表')],I('get.')))}">导出</a>
-        </if>
+        </if>-->
        {$_page|default=''}
    </div>

--- a/Application/Admin/View/Promote/lists.html
+++ b/Application/Admin/View/Promote/lists.html
@ -134,6 +134,14 @@
                        <option value="0">未关联</option>
                    </select>
                </div>
+
+                <div class="input-list input-list-channelstatus">
+                    <select name="company_belong">
+                        <option value="">内外团</option>
+                        <option value="0">内团</option>
+                        <option value="1">外团</option>
+                    </select>
+                </div>
                <else/>
                <div class="input-list input-list-channelstatus">
                    <select name="url_type">
@ -156,6 +164,7 @@
                        <option value="0">未关联</option>
                    </select>
                </div>
+
            </empty>
            <input type="hidden" name="" value="" class="sortBy">
            <input type="hidden" name="type" value="{$_GET['type']}">
--- a/Application/Admin/View/StatementMangement/createDownstreamOrder.html
+++ b/Application/Admin/View/StatementMangement/createDownstreamOrder.html
@ -200,6 +200,14 @@
 <script type="text/javascript">

  $(function(){
+
+    var CHECK = {
+      number: /^\d+(\.{1}\d+)?$/,
+      mobile:/^1[3456789]\d{9}$/,
+      BankNo:/^([1-9]{1})(\d{15}|\d{18})$/,
+      money:/((^[1-9]\d*)|^0)(\.\d{0,2}){0,1}$/
+    }
+
    var queryData = [];
    var statement = [];
    var key = 0;
@ -464,6 +472,12 @@
  function eventnew(){
      $(".tax").off("blur");
      $(".tax").on("blur", function() {
+
+        if (!CHECK.number.test($(this).val())) {
+          layer.msg("结算单的罚款与税率必须是数字且不能为空");
+          $(this).val('0');
+        }
+
        var lastNum = (parseFloat($(this).parent().next().text())).toFixed(2);
        $(this).parent().next().text(($(this).parent().next().attr('data-value')*(1-$(this).val()/100)).toFixed(2));
        var nowNum = (parseFloat($(this).parent().next().text())).toFixed(2);
@ -473,8 +487,15 @@

      $(".forfeit").off("blur");
    $(".forfeit").on("blur", function() {
+
      var lastNumber = $(this).parent().next().next().next().text();

+      if(!$(this).val()||!CHECK.number.test($(this).val())) {
+        layer.msg("结算单的罚款与税率必须是数字且不能为空");
+        $(this).val(lastNumber);
+        return;
+      }
+
      $(this).parent().next().next().next().text(parseFloat($(this).val()).toFixed(2));
      $(".sumAmount").text($(".sumAmount").attr("data-value")-$(this).val());

--- a/Application/Admin/View/StatementMangement/edit.html
+++ b/Application/Admin/View/StatementMangement/edit.html
@ -177,6 +177,13 @@
    var statement = [];
    var key = 0;

+    var CHECK = {
+      number: /^\d+(\.{1}\d+)?$/,
+      mobile:/^1[3456789]\d{9}$/,
+      BankNo:/^([1-9]{1})(\d{15}|\d{18})$/,
+      money:/((^[1-9]\d*)|^0)(\.\d{0,2}){0,1}$/
+    }
+
    //搜索功能
    $("#ext_field").change(function(){
      var ext_field = $("#ext_field").val();
@ -287,6 +294,12 @@
      $(".tax").off("blur");
      $(".tax").on("blur", function() {
        var lastNum = (parseFloat($(this).parent().next().text())).toFixed(2);
+
+        if (!CHECK.number.test($(this).val())) {
+          layer.msg("结算单的罚款与税率必须是数字且不能为空");
+          $(this).val('0');
+        }
+
        $(this).parent().next().text(($(this).parent().next().attr('data-value')*(1-$(this).val()/100)).toFixed(2));
        var nowNum = (parseFloat($(this).parent().next().text())).toFixed(2);
        console.log((nowNum-lastNum))
@ -297,6 +310,12 @@
    $(".forfeit").on("blur", function() {
      var lastNumber = $(this).parent().next().next().next().text();

+      if(!$(this).val()||!CHECK.number.test($(this).val())) {
+        layer.msg("结算单的罚款与税率必须是数字且不能为空");
+        $(this).val(lastNumber);
+        return;
+      }
+
      $(this).parent().next().next().next().text(parseFloat($(this).val()).toFixed(2));
      $(".sumAmount").text(($(".sumAmount").attr("data-value")-$(this).val()).toFixed(2));

--- a/Application/Base/Tool/TaskClient.class.php
+++ b/Application/Base/Tool/TaskClient.class.php
@ -28,9 +28,9 @@ class TaskClient
        return json_decode($result, true);
    }

-    public function sendSms($mobile, $type = 'common')
+    public function sendSms($mobile, $clientIp, $type = 'common')
    {
-        return $this->post('/message/sms-send', ['mobile' => $mobile, 'type' => $type]);
+        return $this->post('/message/sms-send', ['mobile' => $mobile, 'type' => $type, 'client_ip' => $clientIp]);
    }

    public function checkSms($mobile, $code)
--- a/Application/Mobile/Controller/CommonController.class.php
+++ b/Application/Mobile/Controller/CommonController.class.php
@ -220,7 +220,7 @@ class CommonController extends BaseController {
    {
        $phone = I('phone');
        $taskClient = new TaskClient();
-        $result = $taskClient->sendSms($phone);
+        $result = $taskClient->sendSms($phone, get_client_ip());
        $data = [];
        if ($result['code'] == TaskClient::SUCCESS) {
            $this->respondSuccess('发送成功');
--- a/Application/Mobile/Controller/SsgController.class.php
+++ b/Application/Mobile/Controller/SsgController.class.php
@ -409,7 +409,7 @@ class SsgController extends BaseController {
    {
        $phone = I('phone');
        $taskClient = new TaskClient();
-        $result = $taskClient->sendSms($phone);
+        $result = $taskClient->sendSms($phone, get_client_ip());
        $data = [];
        if ($result['code'] == TaskClient::SUCCESS) {
            $data['status'] = 1;
--- a/Application/Mobile/Controller/UserController.class.php
+++ b/Application/Mobile/Controller/UserController.class.php
@ -581,7 +581,7 @@ class UserController extends BaseController
    public function telsafecode($phone = '', $delay = 10, $flag = true)
    {
        $taskClient = new TaskClient();
-        $result = $taskClient->sendSms($phone);
+        $result = $taskClient->sendSms($phone, get_client_ip());
        $data = [];
        if ($result['code'] == TaskClient::SUCCESS) {
            $data['status'] = 1;
--- a/Data/update.sql
+++ b/Data/update.sql
@ -1086,3 +1086,7 @@ ALTER TABLE `tab_promote_game_ratio`
 ADD COLUMN `relation_game_id` int(11) NOT NULL DEFAULT 0 COMMENT '关联游戏id' AFTER `game_id`;
 ALTER TABLE `tab_promote_game_ratio_log`
 ADD COLUMN `relation_game_id` int(11) NOT NULL DEFAULT 0 COMMENT '关联游戏id' AFTER `game_id`;
+
+ALTER TABLE `tab_spend`
+MODIFY COLUMN `selle_status` int(11) NOT NULL DEFAULT 0 COMMENT '渠道结算 0未结算1 结算',
+MODIFY COLUMN `selle_ratio` double(5, 2) DEFAULT 0.00 COMMENT '渠道分成比例';