Skip to content

M
my-yaf-project
Commit fd6c9444 authored by chenchuanwen's avatar chenchuanwen
Browse files
Options

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

parents e6e96167 9ac1785f
Hide whitespace changes
Inline Side-by-side
Showing with 223 additions and 165 deletions
application/library/Order/OrderConfirmUtil.php
View file @ fd6c9444
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace Order; namespace Order;
use Our\ApiConst; use Our\ApiConst;
use Our\RedisHelper; use Our\RedisHelper;
use Our\WechatCommon;
/** /**
...@@ -709,8 +710,11 @@ class OrderConfirmUtil { ...@@ -709,8 +710,11 @@ class OrderConfirmUtil {
\Error\ErrorModel::throwException(\Error\CodeConfigModel::failedUpdateFavoritesStoreForOrder); \Error\ErrorModel::throwException(\Error\CodeConfigModel::failedUpdateFavoritesStoreForOrder);
} }
$orderModel->db->doCommit(); $orderModel->db->doCommit();
$wechatCommon = WechatCommon::getInstance();
$access_token = $wechatCommon->getAccessToken();
//订单通过小程序表单提交过来 //订单通过小程序表单提交过来
if($formId && ($access_token = $this->getLitAccesstoken())) { if($formId && $access_token) {
$settingDAO = \DAO\SettingModel::getInstance(); $settingDAO = \DAO\SettingModel::getInstance();
$msg_tpl = $settingDAO->getListCache(array('wxapp_order_create_tpl'))['wxapp_order_create_tpl']; $msg_tpl = $settingDAO->getListCache(array('wxapp_order_create_tpl'))['wxapp_order_create_tpl'];
$goods_str = ''; $goods_str = '';
...@@ -724,98 +728,24 @@ class OrderConfirmUtil { ...@@ -724,98 +728,24 @@ class OrderConfirmUtil {
$openid = $authInfo['openid']; $openid = $authInfo['openid'];
$req_data = array('touser'=>$openid, 'template_id'=> $msg_tpl, 'form_id'=>$formId, $req_data = array('touser'=>$openid, 'template_id'=> $msg_tpl, 'form_id'=>$formId,
'page'=> 'pages/orders/list/index', 'page'=> 'pages/orders/detail/index?id=' . $orderId,
'data'=>array( 'data'=>array(
'keyword1'=>array('value'=>'下单成功'), 'keyword1'=>array('value'=>'下单成功'),
'keyword2'=>array('value'=>$order['order_sn']), 'keyword2'=>array('value'=> $order['order_sn']),
'keyword3'=>array('value'=>number_format($order['order_amount']/100, 2).'元'), 'keyword3'=>array('value'=> number_format($order['order_amount']/100, 2).'元'),
'keyword4'=>array('value'=>$order['store_name']), 'keyword4'=>array('value'=> $order['store_name']),
'keyword5'=>array('value'=>$goods_str), 'keyword5'=>array('value'=> $goods_str),
)); ));
// \Our\Log::getInstance()->write(json_encode($req_data), '/data/log/apptest'); // \Our\Log::getInstance()->write(json_encode($req_data), '/data/log/apptest');
$url = 'https://api.weixin.qq.com/cgi-bin/message/wxopen/template/send?access_token='; $json = $wechatCommon->sendTemplateMessage($access_token, $req_data);
$result = $this->sendurl($url, $access_token, json_encode($req_data), 'post'); // \Our\Log::getInstance()->write($json, '/data/log/apptest');
\Our\Log::getInstance()->write(var_export($result, true), '/data/log/apptest');
} }
$this->opCacheInfo(); $this->opCacheInfo();
$this->pushMessage(); $this->pushMessage();
return array('needPayFlag'=>$needPayFlag,'paySn'=>$paySn); return array('needPayFlag'=>$needPayFlag,'paySn'=>$paySn);
} }
/**
* 获取小程序表单
* User: King <358887571@qq.com>
* Date: 2018/12/27 0027
* Time: 下午 3:15
*/
private function getLitAccesstoken(){
$model_wx = \DAO\MbWxModel::getInstance();
$weixin = $model_wx->getOne('id,lit_appid,lit_appsecret,lit_accesstoken,lit_expirestime', 'id=1');
$access_token = '';
if (!$weixin['lit_expirestime'] || $weixin['lit_expirestime'] < time()) {
$access_info = json_decode(file_get_contents('https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=' . $weixin['lit_appid'] . '&secret=' . $weixin['lit_appsecret']), true);
if (isset($access_info['access_token'])) {
$access_token = $access_info['access_token'];
$update_data = array();
$update_data['lit_accesstoken'] = $access_info['access_token'];
$update_data['lit_expirestime'] = TIMESTAMP + $access_info['expires_in'] - 1800;
$where = array('id' => $weixin['id']);
$result = $model_wx->update($update_data, $where);
}
} else {
$access_token = $weixin['lit_accesstoken'];
}
return $access_token;
}
/**
* curl请求
* @param $url
* @param $access_token
* @param $data
* @param $method
*/
private function sendurl($url, $access_token = '', $data = '', $method = 'get', $header = '') {
//
if(strtolower($method)=='post') {
$curl = curl_init();
curl_setopt($curl,CURLOPT_URL,$url.$access_token);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, FALSE);
} else {
$curl = curl_init($url.$access_token);
}
if($header){
//设置头部信息
curl_setopt($curl,CURLOPT_HTTPHEADER,$header);
}
//$curl = curl_init($url.$access_token);
curl_setopt($curl,CURLOPT_FAILONERROR,1);
//设置允许页面重定向
curl_setopt($curl,CURLOPT_FOLLOWLOCATION,1);
//设置返回值赋给变量
curl_setopt($curl,CURLOPT_RETURNTRANSFER,1);
//设置操作时间
curl_setopt($curl,CURLOPT_TIMEOUT,5);
if($method=='post'){
if(!$data) $data='';
// 使用post 请求
curl_setopt($curl,CURLOPT_POST,1);
// 设置请求参数
curl_setopt($curl,CURLOPT_POSTFIELDS,$data);
}
//开始事务
$r = curl_exec($curl);
curl_close($curl);
return $r;
}
public function pushMessage(){ public function pushMessage(){
if($this->pushMessageOrders){ if($this->pushMessageOrders){
$orderService=\Business\Order\OrderServiceModel::getInstance(); $orderService=\Business\Order\OrderServiceModel::getInstance();
......
application/library/Our/WechatCommon.php 100755 → 100644
View file @ fd6c9444
...@@ -72,6 +72,21 @@ class WechatCommon ...@@ -72,6 +72,21 @@ class WechatCommon
return $jsonstr; return $jsonstr;
} }
/**
* 发送模板消息
*
* @param $access_token token
* @param $req_data 请求数据数组
* User: King <358887571@qq.com>
* Date: 2019/1/2 0002
* Time: 下午 4:41
*/
public function sendTemplateMessage($access_token, $req_data) {
$url = 'https://api.weixin.qq.com/cgi-bin/message/wxopen/template/send?access_token='.$access_token;
$result = $this->httpsPostJson($url, $req_data, true);
return $result;
}
public function httpsPostJson($url, $data = '', $array = false) public function httpsPostJson($url, $data = '', $array = false)
{ {
...@@ -127,4 +142,4 @@ class WechatCommon ...@@ -127,4 +142,4 @@ class WechatCommon
return self::$_instance; return self::$_instance;
} }
} }
\ No newline at end of file
application/models/Business/Order/OrderService.php
View file @ fd6c9444
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace Business\Order; namespace Business\Order;
use Business\Store\StoreServiceModel;
use DAO\Order\OrderCommonModel; use DAO\Order\OrderCommonModel;
use Error\CodeConfigModel; use Error\CodeConfigModel;
use Error\ErrorModel; use Error\ErrorModel;
...@@ -17,6 +18,7 @@ use Our\NameConst; ...@@ -17,6 +18,7 @@ use Our\NameConst;
use Our\PageConst; use Our\PageConst;
use Our\Push; use Our\Push;
use Our\RedisHelper; use Our\RedisHelper;
use Our\WechatCommon;
/** /**
* 店铺service * 店铺service
...@@ -75,7 +77,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -75,7 +77,7 @@ class OrderServiceModel extends \Business\AbstractModel
$update_data = array(); $update_data = array();
$update_data['lit_accesstoken'] = $access_info['access_token']; $update_data['lit_accesstoken'] = $access_info['access_token'];
$update_data['lit_expirestime'] = time() + $access_info['expires_in'] - 1800; $update_data['lit_expirestime'] = TIMESTAMP + $access_info['expires_in'] - 1800;
$where = array('id' => $weixin['id']); $where = array('id' => $weixin['id']);
$result = $model_wx->update($update_data, $where); $result = $model_wx->update($update_data, $where);
...@@ -87,49 +89,150 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -87,49 +89,150 @@ class OrderServiceModel extends \Business\AbstractModel
} }
/** /**
* curl请求 * 发送付款消息
* @param $url * @param $order
* @param $access_token * @param $msg_tpl
* @param $data * User: King <358887571@qq.com>
* @param $method * Date: 2019/1/3 0003
* Time: 上午 11:01
*/ */
private function sendurl($url, $access_token = '', $data = '', $method = 'get', $header = '') { public function sendPaymentMessage($order, $msg_tpl) {
// $model = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
if(strtolower($method)=='post') { $model_member = \DAO\MemberModel::getInstance(DbNameConst::salveDBConnectName);
$curl = curl_init(); $model_order_goods = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
curl_setopt($curl,CURLOPT_URL,$url.$access_token); $wechatCommon = WechatCommon::getInstance();
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE); $access_token = $wechatCommon->getAccessToken();
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, FALSE); if($access_token && ($member = $model_member->getOneByMemberId($order['buyer_id'], array('member_id', 'member_wxappopenid')
} else { ))) {
$curl = curl_init($url.$access_token); $where = array('order_id'=>$order['order_id']);
} $goods_datas = $model_order_goods->getOrderGoods($where, 'order_id, goods_name');
$goods_str = '';
if(count($goods_datas)>1) {
$goods_str .= $goods_datas[0]['goods_name'].'等' .count($goods_datas).'件商品';
} else {
$goods_str .= $goods_datas[0]['goods_name'];
}
$req_data = array('touser'=>$member['member_wxappopenid'], 'template_id'=> $msg_tpl,
'form_id'=> $order['prepay_id'],
'page'=> 'pages/orders/detail/index?id='.$order['order_id'],
'data'=>array(
'keyword1'=>array('value'=>$order['order_sn']),
'keyword2'=>array('value'=>$order['store_name']),
'keyword3'=>array('value'=>$goods_str),
'keyword4'=>array('value'=>number_format($order['order_amount']/100, 2).'元'),
'keyword5'=>array('value'=>date('Y-m-d H:i',$order['payment_time'])),
'keyword6'=>array('value'=>'已付款'),
));
// \Our\Log::getInstance()->write(json_encode($req_data), '/data/log/apptest');
$json = $wechatCommon->sendTemplateMessage($access_token, $req_data);
if($json['errmsg']=='ok') {
$model->updateByOrderId(array('msg_status'=>2), $order['order_id']);
// echo 'order[' . $order['order_id'] .'] send payment succ'."\n";
}
if($header){
//设置头部信息
curl_setopt($curl,CURLOPT_HTTPHEADER,$header);
} }
//$curl = curl_init($url.$access_token); }
curl_setopt($curl,CURLOPT_FAILONERROR,1);
//设置允许页面重定向 public function sendShippingMessage($order, $msg_tpl) {
curl_setopt($curl,CURLOPT_FOLLOWLOCATION,1); $model = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
//设置返回值赋给变量 $model_member = \DAO\MemberModel::getInstance(DbNameConst::salveDBConnectName);
curl_setopt($curl,CURLOPT_RETURNTRANSFER,1); $model_order_goods = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
//设置操作时间 $wechatCommon = WechatCommon::getInstance();
curl_setopt($curl,CURLOPT_TIMEOUT,5); $access_token = $wechatCommon->getAccessToken();
if($method=='post'){ $common_model = \DAO\Order\OrderCommonModel::getInstance();
if(!$data) $data=''; if($access_token && ($member = $model_member->getOneByMemberId($order['buyer_id'], array('member_id', 'member_wxappopenid')
// 使用post 请求 ))) {
curl_setopt($curl,CURLOPT_POST,1); $sub_data = $common_model->findByOrderId($order['order_id'], 'reciver_name, reciver_info');
// 设置请求参数 $address = '';
curl_setopt($curl,CURLOPT_POSTFIELDS,$data); if($sub_data['reciver_info']) {
$reciver_info = unserialize($sub_data['reciver_info']);
$address = $reciver_info['address'].$reciver_info['subaddress'];
}
$where = array('order_id'=>$order['order_id']);
$goods_datas = $model_order_goods->getOrderGoods($where, 'order_id, goods_name');
$goods_str = '';
if(count($goods_datas)>1) {
$goods_str .= $goods_datas[0]['goods_name'].'等' .count($goods_datas).'件商品';
} else {
$goods_str .= $goods_datas[0]['goods_name'];
}
$req_data = array('touser'=>$member['member_wxappopenid'], 'template_id'=> $msg_tpl,
'form_id'=> $order['prepay_id'],
'page'=> 'pages/orders/detail/index?id='.$order['order_id'],
'data'=>array(
'keyword1'=>array('value'=>date('Y-m-d H:i', $order['add_time'])),
'keyword2'=>array('value'=>date('Y-m-d H:i', $order['send_time'])),
'keyword3'=>array('value'=>$order['order_sn']),
'keyword4'=>array('value'=>$address),
'keyword5'=>array('value'=>$order['store_name']),
'keyword6'=>array('value'=>$goods_str),
'keyword7'=>array('value'=>number_format($order['order_amount']/100, 2).'元'),
));
// \Our\Log::getInstance()->write(json_encode($req_data), '/data/log/apptest');
$json = $wechatCommon->sendTemplateMessage($access_token, $req_data);
if($json['errmsg']=='ok') {
$model->updateByOrderId(array('msg_status'=>3), $order['order_id']);
// echo 'order[' . $order['order_id'] .'] send shipping succ'."\n";
}
} }
}
public function sendReceiveMessage($order, $msg_tpl) {
$model = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
$model_member = \DAO\MemberModel::getInstance(DbNameConst::salveDBConnectName);
$model_order_goods = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
$wechatCommon = WechatCommon::getInstance();
$access_token = $wechatCommon->getAccessToken();
$store_model = \DAO\StoreModel::getInstance();
if($access_token && ($member = $model_member->getOneByMemberId($order['buyer_id'], array('member_id', 'member_wxappopenid')
))) {
$where = array('order_id'=>$order['order_id']);
$goods_datas = $model_order_goods->getOrderGoods($where, 'order_id, goods_name');
$goods_str = '';
if(count($goods_datas)>1) {
$goods_str .= $goods_datas[0]['goods_name'].'等' .count($goods_datas).'件商品';
} else {
$goods_str .= $goods_datas[0]['goods_name'];
}
$store_data = $store_model->getFieldsInfo(array('store_id'=>$order['store_id']), 'store_phone');
$shipping_type = '';
switch ($order['shipping_type']) {
case 1:
$shipping_type .= '商家配送';
break;
case 2:
$shipping_type .= '快递配送';
break;
default:
$shipping_type .= '到店自提';
break;
}
$req_data = array('touser'=>$member['member_wxappopenid'], 'template_id'=> $msg_tpl,
'form_id'=> $order['prepay_id'],
'page'=> 'pages/orders/detail/index?id='.$order['order_id'],
'data'=>array(
'keyword1'=>array('value'=>$order['order_sn']),
'keyword2'=>array('value'=>date('Y-m-d H:i', $order['send_time'])),
'keyword3'=>array('value'=>date('Y-m-d H:i', $order['finnshed_time'])),
'keyword4'=>array('value'=>$order['store_name']),
'keyword5'=>array('value'=>$store_data['store_phone']),
'keyword6'=>array('value'=>$goods_str),
'keyword7'=>array('value'=>number_format($order['order_amount']/100, 2).'元'),
'keyword8'=>array('value'=>$shipping_type),
'keyword9'=>array('value'=>'您购买的商品已被签收，如不是您本人签收，请尽快联系商家'),
));
// \Our\Log::getInstance()->write(json_encode($req_data), '/data/log/apptest');
$json = $wechatCommon->sendTemplateMessage($access_token, $req_data);
if($json['errmsg']=='ok') {
$model->updateByOrderId(array('msg_status'=>4), $order['order_id']);
// echo 'order[' . $order['order_id'] .'] send reciver succ'."\n";
}
//开始事务 }
$r = curl_exec($curl);
curl_close($curl);
return $r;
} }
/** /**
...@@ -142,52 +245,51 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -142,52 +245,51 @@ class OrderServiceModel extends \Business\AbstractModel
public function sendTemplateMessage() public function sendTemplateMessage()
{ {
$model = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName); $model = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
$model_member = \DAO\MemberModel::getInstance(DbNameConst::salveDBConnectName);
$model_order_goods = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
$settingDAO = \DAO\SettingModel::getInstance(); $settingDAO = \DAO\SettingModel::getInstance();
$access_token = $this->getLitAccesstoken(); $wxapp_templates = $settingDAO->getListCache(array('wxapp_order_paysucc_tpl', 'wxapp_order_shipping_tpl', 'wxapp_order_receive_tpl'));
$where = array('msg_status'=>array('elt', 1), 'payment_type'=>5, 'order_state'=>array('gt',10), 'prepay_id'=> //付款7天内付款消息通知
$where = array('msg_status'=>array('elt', 1), 'payment_type'=>5, 'order_state'=>array('egt',20), 'prepay_id'=>
array('neq', array('neq',
''), 'payment_time'=>array('gt', TIMESTAMP-7*24*60*60)); ''), 'payment_time'=>array('gt', TIMESTAMP-7*24*60*60));
$wxapp_templates = $settingDAO->getListCache(array('wxapp_order_paysucc_tpl', 'wxapp_order_shipping_tpl', 'wxapp_order_receive_tpl')); if($list = $model->getList($where, 'order_id,order_sn, store_name, buyer_id, order_amount, payment_time, order_state, prepay_id', 0, 10, array('payment_time'=>'asc'))) {
if($list = $model->getList($where, 'order_id,order_sn,store_name,buyer_id,order_amount,payment_time, order_state, prepay_id', 0, 10, array('payment_time'=>'asc'))) { echo 'order count: '.count($list['list'])."\n";
echo 'order num: '.count($list)."\n"; $msg_tpl = $wxapp_templates['wxapp_order_paysucc_tpl'];
foreach ($list as $order) { foreach ($list['list'] as $order) {
if($access_token && ($member = $model_member->getOneByMemberId($order['buyer_id'], 'member_id,member_wxappopenid'))){ // \Our\Log::getInstance()->write('order:'.json_encode($order), '/data/log/apptest');
$where = array('order_id'=>$order['order_id']); $this->sendPaymentMessage($order, $msg_tpl);
$goods_datas = $model_order_goods->getOrderGoods($where, 'order_id, goods_name'); }
$msg_tpl = $wxapp_templates['wxapp_order_paysucc_tpl']; }
$goods_str = ''; echo "do payment\n";
if(count($goods_datas)>1) { //付款7天内订单发货通知
$goods_str .= $goods_datas[0]['goods_name'].'等' .count($goods_datas).'个商品'; $where = array('msg_status'=>2, 'payment_type'=>5, 'shipping_type'=> array('in', array(1, 2)), 'order_state'=>
} else { array('egt', 30), 'prepay_id'=>
$goods_str .= $goods_datas[0]['goods_name']; array('neq',
} ''), 'payment_time'=>array('gt', TIMESTAMP-7*24*60*60), 'send_time'=>array('lt',
$req_data = array('touser'=>$member['member_wxappopenid'], 'template_id'=> $msg_tpl, TIMESTAMP-10));
'form_id'=> $order['prepay_id'], if($list = $model->getList($where, 'order_id,order_sn,store_id,store_name,buyer_id,order_amount,add_time, send_time, order_state, prepay_id', 0, 10, array('send_time'=>'asc'))) {
'data'=>array( echo ' order num: '.count($list['list'])."\n";
'keyword1'=>array('value'=>$order['order_sn']), $msg_tpl = $wxapp_templates['wxapp_order_shipping_tpl'];
'keyword2'=>array('value'=>$order['store_name']), foreach ($list['list'] as $order) {
'keyword3'=>array('value'=>$goods_str), // \Our\Log::getInstance()->write('order:'.json_encode($order), '/data/log/apptest');
'keyword4'=>array('value'=>number_format($order['order_amount']/100, 2).'元'), $this->sendShippingMessage($order, $msg_tpl);
'keyword5'=>array('value'=>date('Y-m-d H:i',$order['payment_time'])), }
'keyword6'=>array('value'=>'已付款'), }
)); echo "do shipping\n";
\Our\Log::getInstance()->write(json_encode($req_data), '/data/log/apptest');
$url = 'https://api.weixin.qq.com/cgi-bin/message/wxopen/template/send?access_token=';
if($result = $this->sendurl($url, $access_token, json_encode($req_data), 'post')) {
$json = json_decode($result, true);
if($json['errmsg']=='ok') {
$model->updateByOrderId(array('msg_status'=>1), $order['order_id']);
echo 'order[' . $order['order_id'] .'] send payment succ'."\n";
}
}
} //付款7天内订单确认收货通知
$where = array('msg_status'=>3, 'payment_type'=>5, 'order_state'=>
array('egt', 40), 'prepay_id'=>
array('neq',
''), 'payment_time'=>array('gt', TIMESTAMP-7*24*60*60), 'finnshed_time' => array('lt', TIMESTAMP-15));
if($list = $model->getList($where, 'order_id,order_sn,store_id,store_name,buyer_id, shipping_type,order_amount,add_time, send_time, finnshed_time, order_state, prepay_id', 0, 10, array('finnshed_time'=>'asc'))) {
echo ' order num: '.count($list['list'])."\n";
$msg_tpl = $wxapp_templates['wxapp_order_receive_tpl'];
foreach ($list['list'] as $order) {
$this->sendReceiveMessage($order, $msg_tpl);
} }
} }
echo "do reciver\n";
} }
...@@ -563,6 +665,14 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -563,6 +665,14 @@ class OrderServiceModel extends \Business\AbstractModel
'orderId'=>$order['order_id'])); 'orderId'=>$order['order_id']));
$push->addOneToClient($pushData); $push->addOneToClient($pushData);
$push->sendTcpMessage(); $push->sendTcpMessage();
$order['finnshed_time'] =TIMESTAMP;
$settingDAO = \DAO\SettingModel::getInstance();
$wxapp_templates = $settingDAO->getListCache(array('wxapp_order_receive_tpl'));
$msg_tpl = $wxapp_templates['wxapp_order_receive_tpl'];
$this->sendReceiveMessage($order, $msg_tpl); //发送收货小程序模板消息
// \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId']))); // \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
$orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true,true); $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true,true);
$storeDao->deleteStoreCache($order['storeId'],$order['orderId']); $storeDao->deleteStoreCache($order['storeId'],$order['orderId']);
...@@ -1169,7 +1279,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -1169,7 +1279,7 @@ class OrderServiceModel extends \Business\AbstractModel
$orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName); $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);
$refundReturnDao=\DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName); $refundReturnDao=\DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
$memberDao = \DAO\MemberModel::getInstance(DbNameConst::salveDBConnectName); $memberDao = \DAO\MemberModel::getInstance(DbNameConst::salveDBConnectName);
$qmMans=$qmDeliveryMan->getListByMemberId($memberId); $qmMans=$qmDeliveryMan->getListByMemberId($memberId,true);
$diliverymanIds=array_column($qmMans,'id'); $diliverymanIds=array_column($qmMans,'id');
$diliverymanId = $memberDao->getInfo($memberId, 'diliveryman_id'); $diliverymanId = $memberDao->getInfo($memberId, 'diliveryman_id');
if (empty($diliverymanIds)) { if (empty($diliverymanIds)) {
...@@ -1257,7 +1367,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -1257,7 +1367,7 @@ class OrderServiceModel extends \Business\AbstractModel
$returnData['totalCount'] = $orders['totalCount']; $returnData['totalCount'] = $orders['totalCount'];
return $returnData; return $returnData;
} else { } else {
return new \stdClass(); return array('orders'=>array(),'totalCount'=>ApiConst::zero);
} }
} }
......
application/models/DAO/Order/Diliveryman.php
View file @ fd6c9444
...@@ -49,12 +49,15 @@ class DiliverymanModel extends \DAO\AbstractModel ...@@ -49,12 +49,15 @@ class DiliverymanModel extends \DAO\AbstractModel
$data = $this->db->from($this->_tableName)->select($this->detailField)->where($where)->fetchOne(); $data = $this->db->from($this->_tableName)->select($this->detailField)->where($where)->fetchOne();
return $data; return $data;
} }
//任务脚本方法 //任务脚本方法
public function getListByMemberId($memberId) public function getListByMemberId($memberId,$isClient=false)
{ {
$this->setDb($this->dbName); $this->setDb($this->dbName);
$where['member_id']=$memberId; $where['member_id']=$memberId;
$where['is_del']=ApiConst::zero; if(!$isClient){
$where['is_del']=ApiConst::zero;
}
$where = $this->db->getSqlWhereByArray($where); $where = $this->db->getSqlWhereByArray($where);
$list = $this->db->select($this->detailField)->from($this->_tableName)->where($where)->fetchAll(); $list = $this->db->select($this->detailField)->from($this->_tableName)->where($where)->fetchAll();
return $list; return $list;
......
scripts/crontab/order/sendTemplateMessage.php
View file @ fd6c9444
...@@ -57,7 +57,7 @@ class cliOrderSendTemplateMessage extends basecli ...@@ -57,7 +57,7 @@ class cliOrderSendTemplateMessage extends basecli
echo "*** Debug mode ***\n"; echo "*** Debug mode ***\n";
} }
// Step: 02 检查是否已有相同CLI在运行中 // Step: 02 检查是否已有相同CLI在运行中
$lockDir=$this->_getBaseFileName('orderSendTemplateMessage'); $lockDir=$this->_getBaseFileName('order');
if(!$this->mkdirs($lockDir)){ if(!$this->mkdirs($lockDir)){
echo '****create dir fail ****'; echo '****create dir fail ****';
exit; exit;
......
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