merge to master

data/config/config.ini.php

@@ -1,17 +1,21 @@
 <?php
 
 defined('InShopNC') or exit('Access Invalid!');
+
+define('USE_REMOTE_IMAGE',true);
+
 $config = array();
 
 const test_srv_host = 'http://121.43.114.153';
 const stanley_home = 'http://192.168.1.2';
-const stanley_host = 'http://192.168.1.132';
+const DY_HOST = 'http://192.168.1.135';
 
 const boss_host    = 'http://172.40.2.14';
 const jeff_office = 'http://192.168.1.128';
 const liax_office = 'http://192.168.1.136';
 
-$SRV_HOST = jeff_office;
+$SRV_HOST = DY_HOST;
+$REMOTE_IMG_HOST = 'http://p.lrlz.com';
 
 $config['base_site_url']        = $SRV_HOST;
 $config['shop_site_url'] 		= $SRV_HOST.'/shop';
@@ -24,8 +28,16 @@ $config['wap_site_url'] 		= $SRV_HOST.'/wap';
 $config['chat_site_url'] 		= $SRV_HOST.'/chat';
 
 $config['node_site_url'] 		= 'http://127.0.0.1:8090';
-$config['upload_site_url']		= $SRV_HOST.'/data/upload';
-$config['resource_site_url']	= $SRV_HOST.'/data/resource';
+
+if(defined('USE_REMOTE_IMAGE') && USE_REMOTE_IMAGE == true) {
+    $config['upload_site_url']		= $REMOTE_IMG_HOST.'/data/upload';
+    $config['resource_site_url']	= $REMOTE_IMG_HOST.'/data/resource';
+} else {
+    $config['upload_site_url']		= $SRV_HOST.'/data/upload';
+    $config['resource_site_url']	= $SRV_HOST.'/data/resource';
+}
+
+
 $config['version'] 		= '201502020388';
 $config['setup_date'] 	= '2015-08-22 15:52:34';
 $config['gip'] 			= 0;
@@ -35,7 +47,7 @@ $config['db']['1']['dbhost']       = '127.0.0.1';
 $config['db']['1']['dbport']       = '3306';
 $config['db']['1']['dbuser']       = 'root';
 $config['db']['1']['dbpwd']        = '55668899';
-$config['db']['1']['dbname']       = 'shop';
+$config['db']['1']['dbname']       = 'shopnc';
 $config['db']['1']['dbcharset']    = 'UTF-8';
 $config['db']['slave']                  = $config['db']['master'];
 $config['session_expire'] 	= 3600;

data/logic/payment.logic.php

@@ -52,6 +52,11 @@ class paymentLogic
                 $change_type = '';
                 // 计算运费+订单总额
                 $total_amount = floatval($order_info['order_amount']) + floatval($order_info['shipping_fee']);
+                // 已经使用过红包， 不允许第二次使用
+                if (intval($order_info['pd_amount']) != 0) {
+                    DB::rollback();
+                    return -2;
+                }
                 if ((floatval($pd_amount) + floatval($order_info['pd_amount'])) > floatval($total_amount))  {
                     // 预存款增量, 当二次付款并使用红包的时候, 需要进行二次计算预存款
                     $increment_amount = floatval($total_amount) - floatval($order_info['pd_amount']);

mobile/control/app_pay.php

@@ -268,13 +268,13 @@ class app_payControl extends mbMemberControl
         $input->SetTrade_type("APP");//JSAPI--公众号支付、NATIVE--原生扫码支付、APP--app支付，统一下单接口trade_type的传参可参考这里,MICROPAY--刷卡支付，刷卡支付有单独的支付接口，不调用统一下单接口
         $order = WxPayApi::unifiedOrder($input);
 
+        $sorder = $this->toString($order);
+        Log::record($sorder, Log::DEBUG);
+
         if (array_key_exists('err_code', $order)) {
             return false;
         }
 
-        $sorder = $this->toString($order);
-        Log::record($sorder, Log::DEBUG);
-
         $ret = array();
         $ret['appid'] = $order["appid"];
         $ret['noncestr'] = WxPayApi::getNonceStr();