Skip to content

M
my-yaf-project
Commit 4da0ae28 authored by liuyuzhen's avatar liuyuzhen
Browse files
Options

配置文件修改合并

parents ab2a7568 84aff275
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 149 deletions
application/library/Payment/TencentPay.php
View file @ 4da0ae28
......@@ -26,8 +26,8 @@ class TencentPay {
protected $prepay_id ='';
protected $tradeType = '';
public $data;//接收到的数据，类型为关联数组
var $returnParameters;//返回参数，类型为关联数组
var $parameters;//请求参数，类型为关联数组
public $returnParameters;//返回参数，类型为关联数组
public $parameters;//请求参数，类型为关联数组
public function setRequestParams($orderInfo){
$pay_sn = $orderInfo['paySn'];
......@@ -158,7 +158,11 @@ class TencentPay {
{
if($signType=='MD5'){
//echo '加签参数:'.json_encode($this->parameters)."\n";
$this->parameters["sign"] = $this->getSign($this->parameters);//签名
if(empty($this->parameters)){
echo 234234;exit;
}
$tempParam = $this->parameters;
$this->parameters["sign"] = $this->getSign($tempParam);//签名
}else{
$this->parameters["sign"] = $this->getHMACSHA1Sign($this->parameters,'sha256');
}
......@@ -280,6 +284,9 @@ class TencentPay {
*/
public function getSign($Obj)
{
/*if(empty($Obj)){
$Obj = $this->parameters;
}*/
foreach ($Obj as $k => $v)
{
$Parameters[$k] = $v;
......@@ -287,11 +294,11 @@ class TencentPay {
//签名步骤一：按字典序排序参数
ksort($Parameters);
$String = $this->formatBizQueryParaMap($Parameters, false);
$String = $String."&key=".$this->key;
$String = str_replace(array("\r\n", "\r", "\n"," "), "", $String);
$String = md5($String);
$result_ = strtoupper($String);
//echo "\r\n sign:"."$result_";
return $result_;
}
......
application/library/Payment/WxLitePay.php
View file @ 4da0ae28
......@@ -91,7 +91,6 @@ class WxLitePay extends \Payment\TencentPay{
$this->parameters['out_trade_no'] = $param['outTradeNo'];
$this->parameters['out_refund_no'] = $param['refundOrderNo'];
$xml = $this->createXml();
$response = $this->postXmlSSLCurl($xml, $this->refundUrl, 6);
$values = $this->xmlToArray($response);
......
application/models/Business/Order/OrderService.php
View file @ 4da0ae28
......@@ -895,7 +895,8 @@ class OrderServiceModel extends \Business\AbstractModel
// }
// }
$orderInfo['refundOrderNo']=$refundSn;
if($refundReturnDao->refundMoney($orderInfo)){
$refundRes=$refundReturnDao->refundMoney($orderInfo);
if($refundRes){
$where['order_id']=$orderInfo['orderId'];
//$orderGoodsUpdateData['refund_state_name']='退款成功';
$orderGoodsUpdateData['is_refund']=1;
......@@ -906,6 +907,7 @@ class OrderServiceModel extends \Business\AbstractModel
echo $refundReturnDao->errorMessage."orderId:".$orderId;
return false;
}
$orderDao->update(array('order_id' =>$orderInfo['orderId']),array('order_note'=>$refundReturnDao->errorMessage));
}
......@@ -985,13 +987,16 @@ class OrderServiceModel extends \Business\AbstractModel
}
file_put_contents($this->baseDir . \Our\PathConst::orderCancelTime, $endTime);
}
public function changeOrderStatusSecond()
public function changeOrderStatusSecond($bTime=false)
{
$orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
$endTime = file_get_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder);
$endTime = $endTime ? $endTime : ApiConst::zero;
$beginTime = $endTime - ApiConst::halfDaySecond;
$beginTime = $endTime - ApiConst::tenDaySecond;
$storeDao=\DAO\StoreModel::getInstance();
if($bTime){
$beginTime=0;
}
// $beginTime=0;
$orders = $orderDao->getMustCecelRecieveOrders($beginTime, $endTime, $orderDao->getOrderDetailField());
$newOrders=array();
......@@ -1085,10 +1090,12 @@ class OrderServiceModel extends \Business\AbstractModel
if ($order['paymentTime'] > ApiConst::zero && in_array($order['paymentType'], ArrayConst::orderPayTypeOnlines)) {
$isRefunMoney= $this->changeOrderStateCancelUnconditional($order);
if(!$isRefunMoney){
$orderDao->db->doRollback();
continue;
}
}
array_push($orderIds,$order['orderId']);
$this->updateOrderGoodsStoregeByOrderIds($orderIds);
array_push($newOrders,$order);
......@@ -1097,6 +1104,7 @@ class OrderServiceModel extends \Business\AbstractModel
$orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId'],true);
$storeDao->deleteStoreCache($order['storeId'],$order['orderId']);
$push=\Our\Push::getInstance();
echo json_encode($order);
$pushData=array('storeId'=>$order['storeId'],
'type'=>ApiConst::messageWaitReceive,
'waitReceiveCount'=>ApiConst::reduceOne,
......
application/models/Business/Store/StoreService.php
View file @ 4da0ae28
......@@ -202,6 +202,8 @@ class StoreServiceModel extends \Business\AbstractModel{
if($sale_act && $sale_act['sale_start_date'] <= time() && $sale_act['sale_end_date'] >= time()){
$result = \DAO\SaleMemberModel::getInstance()->insertOrUpdate(array('sale_id'=>$sale['member_id'],'sale_act_id'=>$sale['sale_act_id'],'member_id'=>$memberId,'store_id'=>$sale_act['store_id']));
\Redis\Db4\SaleActivityRedisModel::getInstance()->tableDel('storeId:'.$storeId);
$saleMemberDao = \DAO\SaleMemberModel::getInstance();
\Our\RedisHelper::delCachedFunction(\Redis\Db4\SaleMemberRedisModel::getInstance(),array(&$saleMemberDao, 'getActAndSale'),array(array('han_sale_member.store_id'=>$storeId,'han_sale_member.member_id'=>$memberId),'han_sale_activity.sale_act_id,han_sale_activity.sale_start_date,han_sale_activity.sale_end_date,han_sale_member.sale_id'),array($storeId));
}
}
}
......@@ -213,11 +215,11 @@ class StoreServiceModel extends \Business\AbstractModel{
$storeMember['fav_type'] = \Our\ApiConst::one;
$storeMembers[] = $storeMember;
$favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
$one = $favoritesStoreDao->getOne('store_id',array('store_id'=>$storeId,'member_id'=>$memberId,'fav_type'=>\Our\ApiConst::one),'');
$result = $favoritesStoreDao->insertAll($storeMembers);
if($result) {
if($result && !$one) {
$favoritesStoreDao->updateStoreCollecitonsCache(array($storeId),$memberId,2);
}
}else{
$sess=\Yaf\Session::getInstance();
$scan_store_ids = $sess->get('scan_store_ids');
......@@ -570,34 +572,34 @@ class StoreServiceModel extends \Business\AbstractModel{
* @param $memberId
*/
public function updateFavoritesStore($param,$memberId){
if(!(isset($param['storeId'])&&$param['storeId'])){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyScanStoreId);
}
$storeId = trim($param['storeId']);
$storeInfo = \DAO\StoreModel::getInstance()->get($storeId,false);
if(!$storeInfo){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyScanStoreInfo);
}
$storeMembers = array();
$storeMember = array();
$storeMember['store_id'] = $storeId;
$storeMember['member_id'] = $memberId;
$storeMember['fav_from'] = \Our\ApiConst::scanFavor;
$storeMember['fav_type'] = \Our\ApiConst::one;
$storeMembers[] = $storeMember;
$favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
$one = $favoritesStoreDao->getOne('store_id',array('store_id'=>$storeId,'member_id'=>$memberId,'fav_type'=>\Our\ApiConst::one,'fav_from'=>\Our\ApiConst::scanFavor),'');
if(!$one) {
$result = $favoritesStoreDao->insertAll($storeMembers);
if(!$result){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::saveScanStoreInfoFailed);
}
$favoritesStoreDao->updateStoreCollecitonsCache(array($storeId),$memberId,2);
$favoritesDao = \DAO\FavoritesStoreModel::getInstance();
\Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$favoritesDao, 'getOne'),array(),array($memberId));
}
// if(!(isset($param['storeId'])&&$param['storeId'])){
// \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyScanStoreId);
// }
// $storeId = trim($param['storeId']);
// $storeInfo = \DAO\StoreModel::getInstance()->get($storeId,false);
// if(!$storeInfo){
// \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyScanStoreInfo);
// }
// $storeMembers = array();
// $storeMember = array();
// $storeMember['store_id'] = $storeId;
// $storeMember['member_id'] = $memberId;
// $storeMember['fav_from'] = \Our\ApiConst::scanFavor;
// $storeMember['fav_type'] = \Our\ApiConst::one;
// $storeMembers[] = $storeMember;
// $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
//
// $one = $favoritesStoreDao->getOne('store_id',array('store_id'=>$storeId,'member_id'=>$memberId,'fav_type'=>\Our\ApiConst::one),'');
// if(!$one) {
// $result = $favoritesStoreDao->insertAll($storeMembers);
// if(!$result){
// \Error\ErrorModel::throwException(\Error\CodeConfigModel::saveScanStoreInfoFailed);
// }
// $favoritesStoreDao->updateStoreCollecitonsCache(array($storeId),$memberId,2);
// $favoritesDao = \DAO\FavoritesStoreModel::getInstance();
// \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$favoritesDao, 'getOne'),array(),array($memberId));
//
// }
return true;
......
application/models/Business/User/MemberService.php
View file @ 4da0ae28
......@@ -369,15 +369,15 @@ class MemberServiceModel extends \Business\AbstractModel
$favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
$storeIds = array_column($scan_store_ids,'store_id');
//$list = $favoritesStoreDao->selectList(array('store_id'=>array('in',$storeIds),'member_id'=>$memberId,'fav_type'=>0),'store_id');
$list = $favoritesStoreDao->selectList(array('store_id'=>array('in',$storeIds),'member_id'=>$memberId,'fav_type'=>\Our\ApiConst::one,'fav_from'=>\Our\ApiConst::scanFavor),'store_id');
$list = $favoritesStoreDao->selectList(array('store_id'=>array('in',$storeIds),'member_id'=>$memberId,'fav_type'=>\Our\ApiConst::one),'store_id');
$storeIds2 = $list ? array_column($list, 'store_id') : [];
$storeIds = array_diff($storeIds,$storeIds2);
if($storeIds) {
$result = $favoritesStoreDao->insertAll($storeMembers);
if(!$result){
\Our\Log::getInstance()->write(json_encode($storeMembers).'扫码数据写入失败');
return false;
}
$result = $favoritesStoreDao->insertAll($storeMembers);
if(!$result){
\Our\Log::getInstance()->write(json_encode($storeMembers).'扫码数据写入失败');
return false;
}
if($storeIds && $result) {
$favoritesStoreDao->updateStoreCollecitonsCache($storeIds,$memberId,2);
}
......
application/models/DAO/Order/Order.php
View file @ 4da0ae28
......@@ -1007,7 +1007,7 @@ class OrderModel extends \DAO\AbstractModel
public function getMustCecelRecieveOrders($beginTime=ApiConst::zero, $endTime, $field = '*')
{
$this->setDb($this->dbName);
$where=Common::format(" add_time between {0} and {1} and order_state={2}",$beginTime,$endTime,ApiConst::orderStateWaitConfirm);
$where=Common::format(" order_state={2} and add_time between {0} and {1} ",$beginTime,$endTime,ApiConst::orderStateWaitConfirm);
$list = $this->db->select($field)->from($this->_tableName)->where($where)->order('add_time','desc')->fetchAll();
return $list;
}
......
application/models/DAO/Order/RefundReturn.php
View file @ 4da0ae28
......@@ -474,6 +474,7 @@ class RefundReturnModel extends \DAO\AbstractModel
$param['refundFee'] = $orderInfo['orderAmount'];//全额退款
$param['storeId'] = $orderInfo['storeId'];
$param['buyerId'] = $orderInfo['buyerId'];
if (CURRENTVERSION != \Our\NameConst::versionDefault && in_array(intval($orderInfo['paymentType']), array(\Our\ApiConst::wxAppPayType, \Our\ApiConst::wxProgram))) {
$mchIdArray = \DAO\StoreModel::getInstance()->getStoreWxMchId($param['storeId']);
if ($mchIdArray['errorCode'] > 0) {
......@@ -483,17 +484,23 @@ class RefundReturnModel extends \DAO\AbstractModel
$param['subMchId'] = $mchIdArray['mchId'];
}
if (intval($orderInfo['paymentType']) == ApiConst::wxAppPayType) {
$wxpay = \Payment\WxPay::getInstance();
$wxpay = new \Payment\WxPay();
//unset($param['subMchId']);
$refund_return = $wxpay->refund($param);
unset($wxpay);
$this->errorMessage = "微信返回:" . json_encode($refund_return);
if (!($refund_return['return_code'] == 'SUCCESS' && $refund_return['result_code'] == 'SUCCESS')) {
if($refund_return['err_code_des']=='订单已全额退款' || $refund_return['err_code_des']=='订单已Q68额退款'){
$this->errorMessage = date('Y-m-d') . $refund_return['err_code_des'] . $orderInfo['orderId'] . "\r\n";
return true;
}
$this->errorMessage = date('Y-m-d') . '微信退款操作执行失败！' . $orderInfo['orderId'] . "\r\n";
return false;
}
} else if (intval($orderInfo['paymentType']) == ApiConst::alipay) {
$aliPay = \Payment\Alipay::getInstance();
$aliPay = new \Payment\Alipay();
$return = $aliPay->refund($param);
unset($aliPay);
$this->errorMessage = "支付宝返回:" . json_encode($return);
$resultCode = $return->code;
if (!empty($resultCode) && $resultCode == ApiConst::alipayRefundSuccess) {
......@@ -503,13 +510,20 @@ class RefundReturnModel extends \DAO\AbstractModel
return false;
}
} else if (intval($orderInfo['paymentType']) == ApiConst::wxProgram) {
$wxpay = \Payment\WxLitePay::getInstance();
$wxpay = new \Payment\WxLitePay();
$refund_return = $wxpay->refund($param);
unset($wxpay);
$this->errorMessage = "微信返回:" . json_encode($refund_return)."\r\n";
if (!($refund_return['return_code'] == 'SUCCESS' && $refund_return['result_code'] == 'SUCCESS')) {
if($refund_return['err_code_des']=='订单已全额退款' || $refund_return['err_code_des']=='订单已Q68额退款'){
$this->errorMessage = date('Y-m-d') . $refund_return['err_code_des'] . $orderInfo['orderId'] . "\r\n";
return true;
}
$this->errorMessage = date('Y-m-d') . '微信退款操作执行失败！' . $orderInfo['orderId'] . "\r\n";
return false;
}
}
return true;
}
......
conf/application.ini
View file @ 4da0ae28
This diff is collapsed.
conf/url.ini
View file @ 4da0ae28
......@@ -12,8 +12,7 @@ config.url.resourcesHost = "http://api.shenbd.com"
config.url.userHost = ""
;
; ; oss 域名
config.url.ossHost = "https://img.shenbd.com"
;config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
;
; ;推送域名
config.url.pushHost="172.16.142.15:9503";
......@@ -37,8 +36,8 @@ config.url.resourcesHost = "http://api.shenbd.com"
; 用户中心host
config.url.userHost = ""
config.url.ossHost = "https://img.shenbd.com"
;config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
; oss 域名
config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
;推送域名
config.url.pushHost="127.0.0.1:9503";
......@@ -55,9 +54,9 @@ config.url.convert=/usr/local/bin/wkhtmltoimage
config.url.resourcesHost = "http://apitest.shenbd.com"
; 用户中心host
config.url.userHost = ""
config.url.ossHost = "https://imgpre.shenbd.com"
; oss 域名
;config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
;推送域名
config.url.pushHost="127.0.0.1:9503";
......@@ -75,9 +74,9 @@ config.url.source="/www/web/testadmin_shenbd_com/public_html/data/upload/"
config.url.resourcesHost = "http://apitest.qm.com"
; 用户中心host
config.url.userHost = ""
config.url.ossHost = "https://img.shenbd.com"
; oss 域名
;config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
;推送域名
config.url.pushHost="127.0.0.1:9503";
......@@ -91,16 +90,11 @@ config.url.resourcesHost = "http://test.qm.com"
config.url.userHost = ""
; oss 域名
config.url.ossHost = "https://img.shenbd.com"
config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
;推送域名
config.url.pushHost="127.0.0.1:9503";
config.url.indexUrl="/www/web/test_qm_com/application/library/React"
config.url.libary="/www/web/test_qm_com/application/library"
config.url.source="/www/web/test_qm_com/public_html/data/upload/"
;config.url.source="E:/WAMP/www/www.qm.com/data/upload/"
; 文件目录
;店铺图片报错目录
......@@ -122,10 +116,10 @@ config.url.resourcesHost = "http://local.qm.com"
config.url.userHost = ""
; oss 域名
config.url.ossHost = "https://imgpre.shenbd.com"
config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
;推送域名
config.url.pushHost="192.168.1.201:9503";
config.url.pushHost="127.0.0.1:9503";
config.url.convert="/usr/local/bin/wkhtmltoimage";
......
scripts/crontab/order/closeSecond.php
View file @ 4da0ae28
......@@ -61,7 +61,7 @@ class cliOrderClose extends basecli
echo '****create dir fail ****';
exit;
}
$this->lockFileName = $lockDir .DS.'close.locks';
$this->lockFileName = $lockDir .DS.'closeSecond.locks';
if( file_exists( $this->lockFileName ) )
{
$stat = stat($this->lockFileName);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment