Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/library/Our/RedisHelper.php

@@ -59,7 +59,7 @@ class RedisHelper
  * @param array $args 函数参数数组
  * @param number $ttl 过期时间，单位：秒
  * @param array $options 额外参数
- * @throws Exception
+ * @throws Exception 
  * @return mixed 返回执行 $function 返回的结果
  */
     public static function delCachedFunction($cache_instance, $function, array $args = array(), array $options = array())

application/library/Payment/WxPay.php

@@ -90,7 +90,32 @@ class WxPay extends \Payment\TencentPay
         $this->checkSign($values);
         return $values;
     }
-
+    public function refundWxProgram($param)
+    {
+        $total_fee = intval($param['totalFee']);
+        $refund_fee = intval($param['refundFee']);
+        if(APP_ENV == 'develop'||APP_ENV == 'test'||APP_ENV == 'pre' || APP_ENV=='ccwdevelop'){
+            $this->parameters['total_fee'] = 1;
+            $this->parameters['refund_fee'] = 1;
+        } else {
+            $this->parameters['total_fee'] = $total_fee;
+            $this->parameters['refund_fee'] = $refund_fee;
+        }
+        $this->parameters['out_refund_no'] = $param['refundOrderNo'];
+        $this->parameters['out_trade_no'] = $param['outTradeNo'];
+        $this->parameters['op_user_id'] = $this->mch_id;
+        $this->parameters['nonce_str'] = $this->createNoncestr(32);
+        $this->parameters['appid'] = \Our\PayConst::wxLiteAppId;
+        $this->parameters['mch_id'] = \Our\PayConst::wxPayMchId;
+        $xml = $this->createXml();
+        $response = $this->postXmlSSLCurl($xml, $this->refundUrl, 6);
+        $values = $this->xmlToArray($response);
+        if ($values['return_code'] != 'SUCCESS') {
+            return $values;
+        }
+        $this->checkSign($values);
+        return $values;
+    }
 
     /**
      * 类实例

application/models/DAO/Order/Order.php

@@ -777,7 +777,7 @@ class OrderModel extends \DAO\AbstractModel
     //删除订单列表缓存
     public function deleteGetShopKeeperCountByStoreId($storeId)
     {
-        return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getShopKeeperCountByStoreId'), array(), array($storeId));
+        return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getShopKeeperCountByStoreId'), array(),array($storeId));
     }
 
     //删除订单列表缓存