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

application/controllers/Index.php

@@ -66,10 +66,20 @@ class IndexController extends \Our\Controller_Abstract  {
         if($paramsStr['type']==\Our\ApiConst::shareStore || $paramsStr['type']==\Our\ApiConst::shareSaler){
             $begin=strtotime($paramsStr['storeStartTime']);
             $end=strtotime($paramsStr['storeCloseTime']);
-            if($begin>=$end){
+            if($begin>$end){
                 $paramsStr['storeCloseTime']=\Our\DescribeConst::storeCloseTimePre.date('H:i',$end+\Our\ApiConst::oneDaySecond);
             }
+            if($begin==$end){
+                $paramsStr['storeCloseTime']=\Our\DescribeConst::allDay;
+            }
+
+        }
+        if($paramsStr['startShippingPrice']){
+            $paramsStr['startShippingPrice']=ceil(\Our\Common::getDivNum($paramsStr['startShippingPrice']));
+        }
+        if($paramsStr['freeShippingPrice']){
 
+            $paramsStr['freeShippingPrice']=ceil(\Our\Common::getDivNum($paramsStr['freeShippingPrice']));
         }
         $this->_view->assign("params", $paramsStr);
         if($paramsStr['type']==\Our\ApiConst::sharePlat){

application/library/Our/ApiConst.php

@@ -423,7 +423,9 @@ class ApiConst
     const set = 2;
 
     //桌面最新版本
-    const clietnAppversion='1.0.1';
+    const xpClietnAppVersion='1.0.4';
+    const winClientAppVersion='1.0.4';
+
 //微信小程序是否发布
     const isWxPublish = 0;
 

application/library/Our/Common.php

@@ -459,7 +459,7 @@ class Common
         return $str;
     }
     //合并一对多列表
-    public static function intergrateOneToMany($list1,$list2,$mergekey1,$mergekey2,$listName='orderGoods'){
+    public static function intergrateOneToMany($list1,$list2,$mergekey1,$mergekey2,$listName='orderGoods',$sortField='gmtUpdate'){
         $mergeArray=array();
         $list2key=array();
         foreach($list1 as $value){
@@ -472,7 +472,7 @@ class Common
             }
         }
         $orders=array_values($list2key);
-        array_multisort(array_column($orders,'gmtUpdate'),SORT_DESC,$orders);
+        array_multisort(array_column($orders,$sortField),SORT_DESC,$orders);
         return $orders;
     }
 //    //合并一对多列表

application/library/Our/DescribeConst.php

@@ -68,6 +68,7 @@ class DescribeConst
     const addCartSuccess = '加入购物车成功';
 
     const storeCloseTimePre='次日';
+    const allDay='全天';
     const setMessageSuccess='消息设置成功';
 
     const editCartSuccess = '编辑购物车成功';

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/models/Business/Common/SettingService.php

@@ -23,14 +23,31 @@ 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;
+        $version['app_version'] = ApiConst::xpClietnAppVersion;
+        if($data['opSystem']==NameConst::xp){
+            $version['app_version']=ApiConst::xpClietnAppVersion;
+            if(APP_ENV=='pre'){
+                $fileName='/'.NameConst::xpClientUpdateUrl;
+            }
+            if(APP_ENV=='product'|| APP_ENV=='productOne'){
+                $fileName='/'.NameConst::xpOnlineClientUpdateUrl;
+            }
+        }else{
+            $version['app_version']=ApiConst::winClientAppVersion;
+            if(APP_ENV=='pre'){
+                $fileName='/'.NameConst::clientUpdateUrl;
+            }
+            if(APP_ENV=='product'|| APP_ENV=='productOne'){
+                $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/Goods/EvaluationService.php

@@ -71,6 +71,8 @@ class EvaluationServiceModel extends \Business\AbstractModel {
                 $evaluation['geval_frommemberid'] = $memberId;
                 $evaluation['geval_frommembername'] = $memberName;
                 $evaluation['memberAvatar'] = $memberAvatar;
+                $evaluation['geval_goods_commonid'] = $orderGoods[$v['goodsId']]['goods_commonid'];
+                $evaluation['goods_spec'] = $orderGoods[$v['goodsId']]['goods_spec'];
                 //$images = $this->_upload($v['images']);
                 $images = $v['images'];
                 //兼容安卓传参
@@ -94,9 +96,7 @@ class EvaluationServiceModel extends \Business\AbstractModel {
                     }
                 }
                 $evaluation['geval_image'] = serialize($images);
-                $goodsInstance = \DAO\GoodsModel::getInstance();
-                $evaluation['geval_goods_commonid'] = $orderGoods[$v['goodsId']]['goods_commonid'];
-                $evaluation['goods_spec'] = $orderGoods[$v['goodsId']]['goods_spec'];
+
                 $data['goods'][$k]['goodsCommonId'] = $evaluation['geval_goods_commonid'];
                 $evaluations[] = $evaluation;
             }

application/models/Business/Order/OrderService.php

@@ -1029,7 +1029,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $data['order_amount']=$newOrderAmount;
         $res=$orderDao->updateByOrderId($data,$orderId);
         $push=\Our\Push::getInstance();
-        $push->updateOrderAmount($orderDetail['storeId'], $orderDetail['orderId'], $orderDetail['orderSn']);
+        $push->updateOrderAmount($orderDetail['buyerId'], $orderDetail['orderId'], $orderDetail['orderSn']);
         $push->sendTcpMessage();
         $messageService->addMessageCenterToDb();
         $orderDao->deleteOrderCache($orderDetail['memberId'], $orderId, $storeId, true);

application/models/Business/Order/RefundService.php

@@ -1121,8 +1121,9 @@ class RefundServiceModel extends \Business\AbstractModel
         }
         $refundAmount = $refund['refundAmount'];//退款金额
         if ($orderInfo['paymentTime']) {
-            if (($refundAmount < ApiConst::zero) || ($refundAmount > $orderGoods['goodsPayPrice'])) {
-                $refundAmount = $orderGoods['goodsPayPrice'];
+            $maxRefundAmount=$orderGoods['goodsPayPrice']*$orderGoods['goodsNum'];
+            if (($refundAmount < ApiConst::zero) || ($refundAmount > $maxRefundAmount)) {
+                $refundAmount = $maxRefundAmount;
             }
         } else {
             $refundAmount = ApiConst::zero;

application/models/Business/Store/ShopkeeperService.php

@@ -320,7 +320,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
                 //$orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
                 $ordersOrderCommons = Common::intergrateOneToOne($orders, $qmDeliveryManLogs['list'], 'orderId', 'orderId');
                 $ordersOrderCommons=Common::intergrateOneToOne($ordersOrderCommons, $orderCommons, 'orderId', 'orderId');
-                $orderMerge = \Our\Common::intergrateOneToMany($ordersOrderCommons, $orderGoods, 'orderId', 'orderId', 'orderGoods');
+                $orderMerge = \Our\Common::intergrateOneToMany($ordersOrderCommons, $orderGoods, 'orderId', 'orderId', 'orderGoods','addTime');
                 foreach ($orderMerge as &$value) {
                     $value['orderStateName'] = $orderDao->getStatusText($value);
                     $value['orderText'] = $orderDao->getText($value, ApiConst::orderListDescribe);

application/models/Business/Store/StoreService.php

@@ -354,9 +354,16 @@ class StoreServiceModel extends \Business\AbstractModel{
         }
         $address = preg_replace("/\s/",'',$address);
         //营业时间
-        $openingHours = '';
-        if($storeInfo['store_start_time'] && $storeInfo['store_close_time']){
-            $openingHours = $storeInfo['store_start_time'].'-'.$storeInfo['store_close_time'];
+        if($storeInfo['store_start_time'] && $storeInfo['store_close_time']) {
+            if($storeInfo['store_start_time'] == $storeInfo['store_close_time']) {
+                $businessHours = '全天';
+            }elseif ($storeInfo['store_start_time'] > $storeInfo['store_close_time']) {
+                $businessHours = $storeInfo['store_start_time'].' - 次日'.$storeInfo['store_close_time'];
+            }else{
+                $businessHours = $storeInfo['store_start_time'].' - '.$storeInfo['store_close_time'];
+            }
+        }else{
+            $businessHours = '';
         }
         //店铺经营分类
         $goodsClassInstance = \DAO\GoodsClassModel::getInstance();
@@ -370,7 +377,7 @@ class StoreServiceModel extends \Business\AbstractModel{
             }
         }
         list($qualificationPics,$detailImg) = $this->getStoreQualification($storeId,$storeInfo['member_id']);
-        return array('storeName'=>$storeInfo['store_name'],'storeLabel'=>$storeLabel,'fansCount'=>\DAO\FavoritesStoreModel::getInstance()->getFavoritesStoreCountByStoreId($storeId),'clazz'=>$returnClass,'address'=>$address,'storePhone'=>$storeInfo['store_phone'],'openingHours'=>$openingHours,'storeService'=>$storeInfo['store_notice'],"qualificationImage"=>$qualificationPics,'showImage'=>$detailImg);
+        return array('storeName'=>$storeInfo['store_name'],'storeLabel'=>$storeLabel,'fansCount'=>\DAO\FavoritesStoreModel::getInstance()->getFavoritesStoreCountByStoreId($storeId),'clazz'=>$returnClass,'address'=>$address,'storePhone'=>$storeInfo['store_phone'],'openingHours'=>$businessHours,'storeService'=>$storeInfo['store_notice'],"qualificationImage"=>$qualificationPics,'showImage'=>$detailImg);
     }
     public function getRecommendGoodsCache($param,$memberId){
         $storeId = intval($param['storeId']);

application/models/DAO/EvaluateGoods.php

@@ -62,10 +62,10 @@ class EvaluateGoodsModel extends \DAO\AbstractModel {
     public function insertAll($datas){
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
         $error = 0;
-        $baseSql = "insert IGNORE into {$this->_tableName}(geval_orderid,geval_orderno,geval_ordergoodsid,geval_goodsid,geval_goodsname,geval_goodsprice,geval_goodsimage,geval_scores,geval_content,geval_isanonymous,geval_addtime,geval_storeid,geval_storename,geval_frommemberid,geval_frommembername,geval_image,geval_goods_commonid) values";
+        $baseSql = "insert IGNORE into {$this->_tableName}(geval_orderid,geval_orderno,geval_ordergoodsid,geval_goodsid,geval_goodsname,geval_goodsprice,geval_goodsimage,geval_scores,geval_content,geval_isanonymous,geval_addtime,geval_storeid,geval_storename,geval_frommemberid,geval_frommembername,geval_image,geval_goods_commonid,goods_spec) values";
         $insertAllSql = $baseSql;
         for ($i = 0; $i < count($datas); $i++) {
-            $addSql = \Our\Common::format("('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}','{10}','{11}','{12}','{13}','{14}','{15}','{16}'),", $datas[$i]['geval_orderid'], $datas[$i]['geval_orderno'], $datas[$i]['geval_ordergoodsid'], $datas[$i]['geval_goodsid'], $datas[$i]['geval_goodsname'], $datas[$i]['geval_goodsprice'], $datas[$i]['geval_goodsimage'], $datas[$i]['geval_scores'], $datas[$i]['geval_content'], $datas[$i]['geval_isanonymous'], $datas[$i]['geval_addtime'], $datas[$i]['geval_storeid'], $datas[$i]['geval_storename'], $datas[$i]['geval_frommemberid'], $datas[$i]['geval_frommembername'], $datas[$i]['geval_image'],$datas[$i]['geval_goods_commonid']);
+            $addSql = \Our\Common::format("('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}','{10}','{11}','{12}','{13}','{14}','{15}','{16}','{17}'),", $datas[$i]['geval_orderid'], $datas[$i]['geval_orderno'], $datas[$i]['geval_ordergoodsid'], $datas[$i]['geval_goodsid'], $datas[$i]['geval_goodsname'], $datas[$i]['geval_goodsprice'], $datas[$i]['geval_goodsimage'], $datas[$i]['geval_scores'], $datas[$i]['geval_content'], $datas[$i]['geval_isanonymous'], $datas[$i]['geval_addtime'], $datas[$i]['geval_storeid'], $datas[$i]['geval_storename'], $datas[$i]['geval_frommemberid'], $datas[$i]['geval_frommembername'], $datas[$i]['geval_image'],$datas[$i]['geval_goods_commonid'],$datas[$i]['goods_spec']);
             $insertAllSql .= $addSql;
             if ($i % 1000 == 0 && $i != 0) {
                 $insertAllSql = rtrim($insertAllSql, ',');

scripts/crontab/push/jpush.php

@@ -138,8 +138,8 @@ class cliOrderClose extends basecli
         if(APP_ENV =='pre' || APP_ENV=='product'){
             file_put_contents($this->lockFileName ,"running" ); // CLI 独占锁
         }
-//        $this->autoPushMessage();
-//        echo date('Y-m-d H:i:s',TIMESTAMP).'消息推送成功'."\r\n";
+        $this->autoPushMessage();
+        echo date('Y-m-d H:i:s',TIMESTAMP).'消息推送成功'."\r\n";
         $this->autoPushClient();
         echo date('Y-m-d H:i:s',TIMESTAMP).'客户端消息推送成功'."\r\n";
 

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) {