Merge branch 'rmaster' into rtest

admin/control/merchant.php

@@ -245,6 +245,7 @@ class merchantControl extends SystemControl
             {
                 $mchid = intval($merchant['mchid']);
                 $amount_lock = \refill\util::get_amount_lock($mchid);
+                Log::record("mchid: {$mchid}, amount_lock: {$amount_lock}", Log::DEBUG);
                 $result['mchid'] = $mchid;
                 if (!empty($amount_lock)) {
                     $result['amount'] = $amount_lock;

admin/templates/default/css/login.css

@@ -73,7 +73,7 @@ box-shadow: 0 2px 3px 0 rgba(0,0,0,.1) inset;
 input:-moz-placeholder { color: #fff; }
 input:-ms-input-placeholder { color: #fff; }
 input::-webkit-input-placeholder { color: #fff; }
-input:focus { filter:progid:DXImageTransform.Microsoft.gradient(enabled='true',startColorstr='#3F000000', endColorstr='#3F000000');background:rgba(0,0,0,0.25);
+input:focus { filter:progid:DXImageTransform.Microsoft.gradient(enabled=true,startColorstr='#3F000000', endColorstr='#3F000000');background:rgba(0,0,0,0.25);
     outline: none; border-color: rgba(255,255,255,0.5);
     -moz-box-shadow:
         0 2px 3px 0 rgba(0,0,0,.1) inset,
@@ -187,7 +187,7 @@ input:focus { filter:progid:DXImageTransform.Microsoft.gradient(enabled='true',s
 }
 
 .progress-bar-success {
-  filter:progid:DXImageTransform.Microsoft.gradient(enabled='true',startColorstr='#E5FFFFFF', endColorstr='#E5FFFFFF');background:rgba(255,255,255,0.9);
+  filter:progid:DXImageTransform.Microsoft.gradient(enabled=true,startColorstr='#E5FFFFFF', endColorstr='#E5FFFFFF');background:rgba(255,255,255,0.9);
 }
 
 .progress-striped .progress-bar-success {

admin/templates/default/css/skin_0.css

@@ -1227,7 +1227,7 @@ span.module-assembly-html { background-position: -490px -1040px;}
 .special-goods-list dd.taobao-item-delete { font-size: 0; line-height: 0; background: url(../images/sky/bg_position.gif) no-repeat -250px -640px; display: none; width: 9px; height: 9px; position: absolute; z-index: 9; top: 0; right: 0; cursor: pointer;}
 .special-goods-list dl:hover dd.taobao-item-delete { display: block}
 .special-hot-point { position: relative; z-index: 1;}
-.special-hot-point div { font-size: 16px; font-weight: 600; font-style: italic; line-height: 24px; color: #000000; text-shadow: 1px 1px 0 rgba(255,255,255,0.75); text-indent: 10px; filter:progid:DXImageTransform.Microsoft.gradient(enabled='true',startColorstr='#5900FF00', endColorstr='#5900FF00'); background:rgba(0,255,0,0.35); border-color: #F00;}
+.special-hot-point div { font-size: 16px; font-weight: 600; font-style: italic; line-height: 24px; color: #000000; text-shadow: 1px 1px 0 rgba(255,255,255,0.75); text-indent: 10px; filter:progid:DXImageTransform.Microsoft.gradient(enabled=true,startColorstr='#5900FF00', endColorstr='#5900FF00'); background:rgba(0,255,0,0.35); border-color: #F00;}
 .hot-point-list li { display: block; padding: 5px; clear: both; position: relative; z-index: 1; border: solid 2px #FFF; margin-bottom: 5px;}
 .hot-point-list li:hover { border-color: #F30;}
 .hot-point-list li i { background: url(../images/select.gif) no-repeat 0 0; vertical-align: middle; display: inline-block; width: 16px; height: 16px; margin-right: 6px;}

admin/templates/default/oil.amount.lock.php

@@ -92,7 +92,9 @@
             </ul>
         </div>
     </div>
+
     <div class="fixed-empty"></div>
+
     <form id="price_form" enctype="multipart/form-data" method="post">
         <input type="hidden" name="form_submit" value="ok"/>
         <table class="table tb-type2 tableFixed">
@@ -121,29 +123,29 @@
                                     </label>
                                 </td>
                             </tr>
-                            <tr class="w500">
-                                <th class="align-center" style="width: 105px;">机构号</th>
-                                <th class="align-center"  style="width: 85px;">机构名称</th>
-                                <th class="align-center"  style="width: 70px;">锁定金额</th>
-                                <th class="align-center"  style="width: 70px;">变动金额</th>
+                            <tr class="w800">
+                                <th class="w100 align-left">机构号</th>
+                                <th class="w120 align-left">机构名称</th>
+                                <th class="w100 align-left">锁定金额</th>
+                                <th class="w100 align-left">变动金额</th>
                             </tr>
                         </tbody>
                         <tbody class="tbody tableContent" style="display: block;padding-top: 142px;">
                             <?php if (!empty($output['data']) && is_array($output['data'])) { ?>
                                 <?php foreach ($output['data'] as $k => $v) { ?>
                                     <tr class="w500 trFlex">
-                                        <td class="w50 align-center" style="width: 105px">
+                                        <td class="w100 align-left">
                                             <?php echo $v['mchid'];?>
                                             <input type="hidden" name="mchid[]" value="<?php echo $v['mchid'];?>">
                                         </td>
-                                        <td class="w50 align-center" style="width: 85px">
+                                        <td class="w120 align-left">
                                             <?php echo $v['company_name'];?>
                                         </td>
-                                        <td class="w50 align-center" style="width:60px">
-                                            <input type="text" readonly value="<?php echo $v['amount'];?>" style="display:block;width:60px;background-color: #eaeaea;">
+                                        <td class="w100 align-left">
+                                            <input type="text" readonly value="<?php echo $v['amount'];?>" style="display:block;width:100px;background-color: #eaeaea;">
                                         </td>
-                                        <td class="w50 align-center" style="width:60px">
-                                            <input type="text" name="change[]" value="0" style="display:block;width:60px" class="amountInput">
+                                        <td class="w100 align-left">
+                                            <input type="text" name="change[]" value="0" style="display:block;width:100px" class="w50 amountInput">
                                         </td>
                                     </tr>
                                 <?php } ?>
@@ -154,7 +156,8 @@
             </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>
+                <td colspan="15"><a href="JavaScript:void(0);" class="btn"
+                                    id="submitBtn"><span><?php echo $lang['nc_submit']; ?></span></a></td>
             </tr>
             </tfoot>
         </table>

crontab/control/minutes.php

@@ -51,7 +51,7 @@ class minutesControl extends BaseCronControl
             if($available_pd < $alarm_pd || $available_pd < 10000)
             {
                 $counts =  $mch_cache['send_count'];
-                if(($mch_cache['last_time'] + 300 < time()) && $counts < 5) {
+                if(($mch_cache['last_time'] + 300 < time()) && $counts < 2) {
                     $mch_cache = ['last_time' => time(), 'send_count' => $counts + 1];
                     foreach ($phones as $phone) {
                         if(!empty($phone)){

helper/refill/RefillBase.php

@@ -112,7 +112,7 @@ class RefillBase
                 if(!empty($refill_info))
                 {
                     util::incr_notify($chname, $card_type, $spec, $quality, false);
-                    util::decr_amount_lock($refill_info['mchiid'],$card_type,$refill_info['refill_amount']);
+                    util::incr_amount_lock($refill_info['mchid'],$card_type,$refill_info['refill_amount']);
 
                     $logic_vr_order->changeOrderStateCancel($order_info, '', "{$chname}接口回调通知失败，正在重试");
 
@@ -134,7 +134,7 @@ class RefillBase
             }
             else {
                 util::incr_notify($chname, $card_type, $spec, $quality, false);
-                util::decr_amount_lock($refill_info['mchiid'],$card_type,$refill_info['refill_amount']);
+                util::incr_amount_lock($refill_info['mchid'],$card_type,$refill_info['refill_amount']);
 
                 $logic_vr_order->changeOrderStateCancel($order_info, '', "{$chname}接口回调通知失败,不可重试.");
             }
@@ -353,7 +353,7 @@ class RefillBase
             {
                 //提交成功
                 util::incr_commit($channel_name,$card_type,$amount,$quality,true);
-                util::incr_amount_lock($mchid,$card_type,$amount);
+                util::decr_amount_lock($mchid,$card_type,$amount);
                 $trade_no = $errmsg;
                 if ($provider->refill_type() == 'api') {
                     $logic_vr_order = Logic("vr_order");
@@ -374,7 +374,6 @@ class RefillBase
             else {
                 //提交失败
                 util::incr_commit($channel_name,$card_type,$amount,$quality,false);
-                util::decr_amount_lock($mchid,$card_type,$amount);
 
                 Log::record("channel:{$channel_name} err:{$errmsg}");
                 $logic_vr_order = Logic("vr_order");

helper/refill/policy/quaility.php

@@ -38,7 +38,7 @@ class Quality
     public function find_quality($mchid,$card_type,$quality,$times,$used_time): array
     {
         if($card_type == mtopcard\ChinaMobileCard || $card_type == mtopcard\ChinaUnicomCard || $card_type == mtopcard\ChinaTelecomCard) {
-            return $this->mobile_quality($mchid,$quality,$times,$used_time);
+            return $this->mobile_quality($mchid, $quality, $times, $used_time);
         }
         elseif($card_type == mtopcard\PetroChinaCard || $card_type == mtopcard\SinopecCard) {
             return [1, [1]];
@@ -73,7 +73,7 @@ class Quality
         elseif(array_key_exists($quality,$this->mQualities)) {
             $org = $quality;
             $qualities = $this->mQualities[$quality];
-            [$sucdess,$setting_quality,$time_out] = $this->mMchctl->getCtls($mchid);
+            [$sucdess, $setting_quality, $time_out] = $this->mMchctl->getCtls($mchid);
         }
         else {
             Log::record("find_quality: cannot find any quality",Log::DEBUG);

helper/refill/policy/xyz/policy.php

@@ -36,6 +36,7 @@ class policy extends ProviderManager implements IPolicy
 
         $turn_name = 'oil_amount_lock_turn';
         $this->mAmountLockTurn = rkcache($turn_name);
+        Log::record("AmountLockTurn = {$this->mAmountLockTurn}",Log::DEBUG);
     }
 
 
@@ -120,11 +121,11 @@ class policy extends ProviderManager implements IPolicy
 
     public function allow($mchid,$card_type,$amount,$quality) : bool
     {
-        if($this->mAmountLockTurn) {
-            return util::get_amount_lock($mchid) > 0;
+        if(empty($this->mAmountLockTurn)) {
+            return true;
         }
         else {
-            return true;
+            return util::get_amount_lock($mchid) > 0;
         }
     }
 

helper/refill/util.php

@@ -37,13 +37,13 @@ class util
             } else {
                 $latest = current($result);
                 $cur = time();
-                $success = ($cur - $latest) > 120;
+                $success = ($cur - $latest) > 2;
 
                 if ($success) {
                     wcache("card_expired", [$card_no => time()], '');
                 }
 
-                return [$success, $latest + 120 - $cur];
+                return [$success, $latest + 2 - $cur];
             }
         } else {
             return [true, 0];