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

application/library/Our/ApiConst.php

@@ -423,8 +423,11 @@ class ApiConst
     const set = 2;
 
     //桌面最新版本
-    const clietnAppversion='1.0.1';
-//微信小程序是否发布
+    const xpClientAppVersion='1.0.4';
+    const winClientAppVersion='1.0.4';
+    const xpClientAppVersionOnline='1.0.0';
+    const winClientAppVersionOnline='1.0.0';
+//微信小是否发布
     const isWxPublish = 0;
 
     //消息模板类型

application/library/Our/NameConst.php

@@ -115,6 +115,7 @@ class NameConst {
 
     const authInfoPrefix = 'authInfo_';
 
+
     const allField = '*';
 
     const desc = 'desc';
@@ -156,7 +157,9 @@ class NameConst {
     const footprint = 'footprint';//足迹数量
 
     const clientUpdateUrl='shenbd.zip';
-
+    const onlineClientUpdateUrl='shenbdonline.zip';
+    const xpClientUpdateUrl='shendbxp.zip';
+    const xpOnlineClientUpdateUrl='shendbxponline.zip';
     const leftBracket = '[';
     const rightBracket = ']';
     const elasticName='elastic.master';
@@ -196,6 +199,9 @@ class NameConst {
     const Macao = '澳门';
 
     const otherCountry = '海外';
+
+    const xp='xp';
+    const win='win';
 }
 
 ?>
\ No newline at end of file

application/library/Payment/QPay.php

@@ -10,7 +10,7 @@ class QPay extends \Payment\TencentPay{
 
     public function __construct() {
         $this->appid = \Our\PayConst::qPayAppId;
-        $this->notify_url = \Our\NameConst::httpPrefix.$_SERVER['SERVER_NAME'].\Our\PayConst::qPayNotifyUrl;
+        $this->notify_url = \Our\Common::getBaseUrl().\Our\PayConst::qPayNotifyUrl;
         $this->mch_id = \Our\PayConst::qPayMchId;
         $this->key = \Our\PayConst::qPayKey;
         $this->sslcert_path = \Our\PayConst::qqSslcertPath;

application/library/Payment/WxLitePay.php

@@ -12,7 +12,7 @@ class WxLitePay extends \Payment\TencentPay{
     public function __construct()
     {
         $this->appid = \Our\PayConst::wxLiteAppId;
-        $this->notify_url = \Our\NameConst::httpPrefix.$_SERVER['SERVER_NAME'].\Our\PayConst::wxLiteNotifyUrl;
+        $this->notify_url = \Our\Common::getBaseUrl().\Our\PayConst::wxLiteNotifyUrl;
         $this->mch_id = \Our\PayConst::wxPayMchId;
         $this->key = \Our\PayConst::wxSPayKey;
         $this->sslcert_path = \Our\PayConst::wxSslcertPath;

application/library/Payment/WxPay.php

@@ -15,7 +15,7 @@ class WxPay extends \Payment\TencentPay
     public function __construct()
     {
         $this->appid = \Our\PayConst::wxPayAppId;
-        $this->notify_url = \Our\NameConst::httpPrefix . $_SERVER['SERVER_NAME'] . \Our\PayConst::wxAppNotifyUrl;
+        $this->notify_url = \Our\Common::getBaseUrl(). \Our\PayConst::wxAppNotifyUrl;
         $this->mch_id = \Our\PayConst::wxPayMchId;
         $this->key = \Our\PayConst::wxPayKey;
         $this->sslcert_path = \Our\PayConst::wxSslcertPath;

application/models/Business/Cart/CartService.php

@@ -686,10 +686,14 @@ class CartServiceModel extends \Business\AbstractModel{
             if($deliverySetting['offlinePay']){
                 $offlinePaywayArray = unserialize($store['offline_payway']);
                 if($offlinePaywayArray){
-                    foreach($offlinePaywayArray['images'] as $image){
-                        if($image){
-                            $offlinePaywayArray['imageUrls'][] = \Our\Common::getStaticFile($image, \Our\ImageConst::storeLabel);
+                    if($offlinePaywayArray['images']){
+                        foreach($offlinePaywayArray['images'] as $image){
+                            if($image){
+                                $offlinePaywayArray['imageUrls'][] = \Our\Common::getStaticFile($image, \Our\ImageConst::storeLabel);
+                            }
                         }
+                    }else{
+                        $offlinePaywayArray['imageUrls'] = array();
                     }
                     $deliverySetting['offlinePayway'] = $offlinePaywayArray;
                 }

application/models/Business/Common/SettingService.php

@@ -23,14 +23,33 @@ class SettingServiceModel extends \Business\AbstractModel{
      * 获取应用版本
      * @return array 版本信息
      */
-    public function getAppVersion(){
+    public function getAppVersion($data){
         $settingDAO = \DAO\SettingModel::getInstance();
         $version=array();
-        $version['app_version'] = ApiConst::clietnAppversion;
+        if($data['opSystem']==NameConst::xp){
+            if(APP_ENV=='pre'){
+                $version['app_version'] = ApiConst::xpClientAppVersion;
+                $fileName='/'.NameConst::xpClientUpdateUrl;
+            }
+            if(APP_ENV=='product'|| APP_ENV=='productOne'){
+                $version['app_version'] = ApiConst::xpClientAppVersionOnline;
+                $fileName='/'.NameConst::xpOnlineClientUpdateUrl;
+            }
+        }else{
+
+            if(APP_ENV=='pre'){
+                $version['app_version']=ApiConst::winClientAppVersion;
+                $fileName='/'.NameConst::clientUpdateUrl;
+            }
+            if(APP_ENV=='product'|| APP_ENV=='productOne'){
+                $version['app_version']=ApiConst::winClientAppVersionOnline;
+                $fileName='/'.NameConst::onlineClientUpdateUrl;
+            }
+
+        }
         //$version = $settingDAO->getListCache(array('app_version'));
 
         $updateUrl=\Bootstrap::getUrlIniConfig('ossHost');
-        $fileName='/'.NameConst::clientUpdateUrl;
         $updateUrl=$updateUrl.'/'.$fileName;
         return array('version'=>$version['app_version'],'updateUrl'=>$updateUrl);
     }

application/models/Business/Order/RefundService.php

@@ -216,12 +216,14 @@ class RefundServiceModel extends \Business\AbstractModel
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
         $returnDetail=$refundReturnDao->findByRefundId($refundId,$refundReturnDao->refundDetailField);
         $storeDao=\DAO\StoreModel::getInstance(DbNameConst::masterDBConnectName);
+        //$orderGoodsDao=\DAO\Order\RefundReturnModel::getInstance();
         if($returnDetail['storeId']!=$storeId){
             ErrorModel::throwException(CodeConfigModel::notExistRefund);
         }$updateData=array();
         $updateData['is_suc_refund']=ApiConst::refundSuccess;
-        $updateData['refund_type']=ApiConst::refundStateComplete;
+        $updateData['refund_state']=ApiConst::refundStateComplete;
         $res=$refundReturnDao->update(array('refund_id'=>$refundId), $updateData);
+
         \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),  array(&$refundReturnDao, 'getList'), array(), array($refundId));
         $storeDao->deleteStoreCache($storeId,$refundId);
         $storeDao->deleteStoreRefundCache($storeId,$refundId);
@@ -1037,7 +1039,8 @@ class RefundServiceModel extends \Business\AbstractModel
                 }
             } else {
 
-                $refundAmount = $orderGoods['goodsPrice']*$orderGoods['goodsNum'];
+                //$refundAmount = $orderGoods['goodsPrice']*$orderGoods['goodsNum'];
+                $refundAmount =$orderInfo['orderAmount'];
             }
             $returnData['refundAmount'] = $refundAmount - $orderInfo['refundAmount'] - $returnData['needShippingFee'] + $shippingFee;
             if((int)$returnData['refundAmount'] <ApiConst::zero){

application/models/Business/Store/DeliveryService.php

@@ -145,6 +145,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
         }
         $memberData['diliveryman_id']=$resData;
         $memberDao->saveInfo($memberData,$member['memberId']);
+
 //        $memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
 //        $memberDb0Redis->tableHSet(trim($member['diliveryman_id']),$resData,ApiConst::tenDaySecond);
         return $resData;

application/models/Business/Store/ShopkeeperService.php

@@ -276,7 +276,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                     'orderId'=>$order['order_id']));
             $push->addOneToClient($pushData);
             $push->sendTcpMessage();
-            $push->addOneToClient();
+           // $push->addOneToClient();
            // \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'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::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
             $orderDao->deleteOrderCache($order['buyer_id'], $orderId, $order['store_id'], true);

application/models/Business/Store/StoreService.php

@@ -866,11 +866,23 @@ class StoreServiceModel extends \Business\AbstractModel{
                         $returnStores['stores'][] =$purchasedStore;
                     }
                 }
+
                 if($returnStores['stores']){
+                    foreach($returnStores['stores'] as $key => $tempStore){
+                        $tempDistance[$key] = $tempStore['storeDistance'];
+                    }
+                    array_multisort($tempDistance, SORT_ASC, $returnStores['stores']);
                     $return[] = $returnStores;
                 }
             }
             if($return){
+                $tempReturn = array();
+                foreach($return as $tempVal){
+                    $distance = min(array_column($tempVal['stores'],'storeDistance'));
+                    $tempReturn[$distance] = $tempVal;
+                }
+                ksort($tempReturn);
+                $return = array_values($tempReturn);
                 return $return;
             }
         }

application/modules/Client/controllers/Delivery.php

@@ -45,6 +45,7 @@ class DeliveryController extends \Our\Controller_AbstractClient {
      */
     public function getDeliveriersAction(){
         $result = $this->shopkeeperService->getDiliveryManByStoreId($this->memberId);
+        $result=$result?$result:[];
         if($result!==false){
             $this->success($result,\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
         }
@@ -67,7 +68,9 @@ class DeliveryController extends \Our\Controller_AbstractClient {
         $deliveryService=\Business\Store\DeliveryServiceModel::getInstance();
         $trueName=$this->req['data']['trueName'];
         $memberMobile=$this->req['data']['memberMobile'];
+
         $result =$deliveryService->addDeleiveryMan($this->storeId,$memberMobile,$trueName);
+        $this->req[NameConst::data]['memberId']=$result;
         if($result!==false){
             $this->success($result,\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
         }

application/modules/Client/controllers/Shopkeeper.php

@@ -156,6 +156,9 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
     public function getDeliveriersAction(){
         $result = $this->shopkeeperService->getDiliveryManByStoreId($this->memberId);
         if($result!==false){
+            if(!$result){
+                $result=[];
+            }
             $this->success($result,\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
         }
         ErrorModel::throwException(CodeConfigModel::commonError);

application/modules/Client/controllers/User.php

@@ -37,7 +37,7 @@ class UserController extends \Our\Controller_AbstractIndex {
 
 
             if(!empty($seller)){
-                $mobile=$seller['memberMobile'];
+                $mobile=$sellerName;
                 $isStore=$this->memberService->getOneByStoreId($seller['storeId']);
                 if(empty($isStore)){
                     \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeIsRefuse);
@@ -47,8 +47,10 @@ class UserController extends \Our\Controller_AbstractIndex {
             }else{
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::errorUsernameOrPassword);
             }
-            if($this->memberService->checkUserNamePassWord($mobile,$password)){
+
+            if($this->memberService->checkUserNamePassWord($sellerName,$password)){
                 $member= $this->memberService->getOneByMobileAndPassword($mobile,$password);
+                //$member= $this->memberService->getOneByMobileAndPassword($mobile,$password);
 //                //第二步保存扫码会员信息
 //                $result = $this->memberService->saveStoreMembers($member['member_id']);
 //                if(!$result){

scripts/crontab/shopkeeper/index.php

@@ -71,7 +71,8 @@ class cliShopkeeperIndex extends basecli
         $shopkeeperService->baseDir= \Our\Common::getConfig('out.config');
         try {
             $shopkeeperService->insertStoreMemberStatics();
-            $shopkeeperService->reduceStoreMemberStatics();
+            //退货退款订单自动关闭
+           // $shopkeeperService->reduceStoreMemberStatics();
             //$shopkeeperService->storeStatictisTask();
             $shopkeeperService->updateLastId();
         } catch (Exception $ex) {