add PUSH_OMS option

fooder.php

@@ -9,28 +9,30 @@ define('BASE_CRONTAB_PATH',BASE_ROOT_PATH.'/crontab');
 define('BASE_UPLOAD_PATH',BASE_DATA_PATH.'/upload');
 define('BASE_UTIL_PATH',BASE_ROOT_PATH.'/util');
 
-require_once(BASE_MOBILE_PATH . '/util/errcode.php');
-require_once(BASE_ROOT_PATH . '/request_helper.php');
 require_once(BASE_ROOT_PATH . '/global.php');
-
 require_once(BASE_DATA_PATH . '/config/config.ini.php');
-require_once(BASE_CORE_PATH .'/33hao.php');
+require_once(BASE_CORE_PATH . '/33hao.php');
+
 require_once(BASE_MOBILE_PATH . '/config/config.ini.php');
-require_once(BASE_MOBILE_PATH.'/framework/function/function.php');
+require_once(BASE_MOBILE_PATH . '/framework/function/function.php');
+require_once(BASE_MOBILE_PATH . '/util/errcode.php');
+require_once(BASE_MOBILE_PATH . '/control/log.php');
 
-require_once(BASE_CORE_PATH.'/framework/libraries/queue.php');
-require_once(BASE_CORE_PATH.'/framework/libraries/tpl.php');
-require_once(BASE_CORE_PATH.'/framework/function/core.php');
-require_once(BASE_CORE_PATH.'/framework/core/base.php');
-require_once(BASE_CORE_PATH.'/framework/libraries/cache.php');
-require_once(BASE_CORE_PATH.'/framework/libraries/queue.php');
-require_once(BASE_CORE_PATH.'/framework/libraries/language.php');
-require_once(BASE_CORE_PATH.'/framework/libraries/model.php');
-require_once(BASE_CORE_PATH.'/framework/libraries/log.php');
-require_once(BASE_CORE_PATH.'/framework/db/mysqli.php');
-require_once(BASE_CORE_PATH.'/framework/function/goods.php');
+require_once(BASE_CORE_PATH . '/framework/libraries/queue.php');
+require_once(BASE_CORE_PATH . '/framework/libraries/tpl.php');
+require_once(BASE_CORE_PATH . '/framework/function/core.php');
+require_once(BASE_CORE_PATH . '/framework/core/base.php');
+require_once(BASE_CORE_PATH . '/framework/libraries/cache.php');
+require_once(BASE_CORE_PATH . '/framework/libraries/queue.php');
+require_once(BASE_CORE_PATH . '/framework/libraries/language.php');
+require_once(BASE_CORE_PATH . '/framework/libraries/model.php');
+require_once(BASE_CORE_PATH . '/framework/libraries/log.php');
+require_once(BASE_CORE_PATH . '/framework/db/mysqli.php');
+require_once(BASE_CORE_PATH . '/framework/function/goods.php');
 require_once(BASE_CORE_PATH . '/framework/libraries/validate.php');
-require_once(BASE_CORE_PATH.'/framework/libraries/resizeimage.php');
-require_once (BASE_MOBILE_PATH . '/control/log.php');
+require_once(BASE_CORE_PATH . '/framework/libraries/resizeimage.php');
+
 require_once (BASE_ROOT_PATH . '/helper/performance_helper.php');
+require_once (BASE_ROOT_PATH . '/helper/request_helper.php');
+require_once (BASE_ROOT_PATH . '/helper/configure.php');
 ?>

helper/configure.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: stanley-king
+ * Date: 16/5/24
+ * Time: 下午6:07
+ */
+
+function is_debug()
+{
+    if(defined('DEBUG_MODE') && DEBUG_MODE == true) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+function is_publish()
+{
+    if(defined('MOBILE_PUBLISH') && MOBILE_PUBLISH == false) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+function is_pushoms()
+{
+    if(is_publish()) return true;
+    if(is_debug() == false) return true;
+
+    if(defined('PUSH_OMS') && PUSH_OMS == true) {
+        return true;
+    } else {
+        return false;
+    }
+}

helper/predeposit_helper.php

@@ -184,7 +184,13 @@ class predeposit_helper
     //返回分
     public function calc_pred($order_amount,$avail_amound,$pd_amount,&$no_cash)
     {
-        $cur_used = intval($order_amount * 0.30 + 0.5);
+        if(is_pushoms()) {
+            $scale = 0.30;
+        } else {
+            $scale = 0.99;
+        }
+
+        $cur_used = intval($order_amount * $scale + 0.5);
         $cur_used = $cur_used > $avail_amound  ? $avail_amound : $cur_used;
 
         if($order_amount == $cur_used) {

request_helper.php

@@ -209,8 +209,7 @@ class request_helper
         $_SERVER[REQUEST_TIME] = intval($tm['sec']);
 
         $fields = self::SRV_PARAMS();
-        foreach ($fields as $field)
-        {
+        foreach ($fields as $field) {
             $param = fcgi_getparam($field);
             $_SERVER[$field] = $param;
         }

mobile/alipay_notify_url.php

@@ -42,10 +42,15 @@ if ($verify_result)
                 Log::record("update_order fail: pay_sn={$pay_sn}", Log::DEBUG);
                 echo('fail');
                 return;
-            } else {
-                $logic_delivery = Logic('delivery');
-                $ret = $logic_delivery->putOrder($pay_sn, $trade_no);
-                Log::record("update_order success: pay_sn={$pay_sn}", Log::DEBUG);
+            }
+            else
+            {
+                if(is_pushoms()) {
+                    $logic_delivery = Logic('delivery');
+                    $ret = $logic_delivery->putOrder($pay_sn, $trade_no);
+                    Log::record("update_order success: pay_sn={$pay_sn}", Log::DEBUG);
+                }
+
                 echo('success');
                 return;
             }

mobile/control/app_pay.php

@@ -98,11 +98,13 @@ class app_payControl extends mbMemberControl
             // 推送到oms
             if (isset($result) && $result['state'])
             {
-                $logic_delivery = Logic('delivery');
-                $ret = $logic_delivery->putOrder($pay_sn, $pay_sn);
-
-                if(empty($ret)) { //todo must add to 定时任务
-                    Log::record("Put order to oms error: pay_sn={$pay_sn},bonus pay.",Log::ERR);
+                if(is_pushoms())
+                {
+                    $logic_delivery = Logic('delivery');
+                    $ret = $logic_delivery->putOrder($pay_sn, $pay_sn);
+                    if(empty($ret)) { //todo must add to 定时任务
+                        Log::record("Put order to oms error: pay_sn={$pay_sn},bonus pay.",Log::ERR);
+                    }
                 }
             }
         }

mobile/wxnotify.php

@@ -56,13 +56,16 @@ try
 
         Log::record("out_trade_no={$out_trade_no} and pay_sn={$pay_sn} and trade_no = {$trade_no}",Log::DEBUG);
         $cb_info = app_payControl::update_order($pay_sn,$trade_no,'wxpay');
-
         if($cb_info['state'] == false) {
             Log::record('wxpay error.',Log::DEBUG);
-        } else {
+        }
+        else
+        {
             Log::record('wxpay success.',Log::DEBUG);
-            $logic_delivery = Logic('delivery');
-            $ret = $logic_delivery->putOrder($pay_sn, $trade_no);
+            if(is_pushoms()) {
+                $logic_delivery = Logic('delivery');
+                $ret = $logic_delivery->putOrder($pay_sn, $trade_no);
+            }
         }
 
         $ret_wx['return_code'] = 'SUCCESS';