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

application/library/Our/ApiConst.php

@@ -24,7 +24,7 @@ class ApiConst
 
     const halfHour = 1800;
     //预警时间
-    const storageAlarmHour = 60;
+    const storageAlarmHour = 30;
 
     const twoMinSecond = 120;
 

application/models/Business/Order/RefundService.php

@@ -966,6 +966,7 @@ class RefundServiceModel extends \Business\AbstractModel
             $shippingFee == ApiConst::zero;
         }
         $orderGoodsConvert = $orderGoodsDao->getRefundOrderGoods($orderGoods);
+
         $returnData = array(
             'orderId' => (int)$orderId,
             'orderSn'=>$orderInfo['orderSn'],
@@ -983,7 +984,9 @@ class RefundServiceModel extends \Business\AbstractModel
         );
         $refundCondition = $orderInfo['refundCondition'] ? unserialize($orderInfo['refundCondition']) : array();
         $returnData['needShippingFee'] = $orderInfo['needShippingFee'];
-
+        if($orderInfo['shippingType']==ApiConst::bySelf){
+            $returnData['needShippingFee']=ApiConst::zero;
+        }
         if ($orderInfo['paymentTime']) {
             $orderConfirmUtil = \Order\OrderConfirmUtil::getInstance();
 

application/models/Business/Store/StoreService.php

@@ -28,7 +28,6 @@ class StoreServiceModel extends \Business\AbstractModel{
         $beginTime = file_get_contents($this->baseDir . \Our\PathConst::storeStatTime, TIMESTAMP);
         $beginTime = $beginTime ? $beginTime : ApiConst::zero;
         $endTime = TIMESTAMP;
-
         $result = true;
         $storeDao = \DAO\StoreModel::getInstance();
         $statDao = \DAO\StatStoreModel::getInstance(DbNameConst::masterDBConnectName);

application/models/DAO/Goods.php

@@ -505,8 +505,13 @@ class GoodsModel extends \DAO\AbstractModel {
 
             if(isset($goods['goodsGroup'])&&!empty($goods['goodsGroup'])){
                 $goods['goodsGroup']=$this->getGoodsGroup($goods['goodsGroup']);
-                $goods['goodsDiscountPrice']=array_sum($goods['goodsGroup'],'discountPrice');
-                $goods['goodsReduceAmount']=$goods['goodsPayPrice']-$goods['goodsDiscountPrice'];
+                $goodsDiscountPrice=ApiConst::zero;
+                foreach( $goods['goodsGroup'] as $goodsG){
+                    $goodsDiscountPrice+=    $goodsG['num']*$goodsG['discountPrice'];
+                }
+                $goods['goodsDiscountPrice']=$goodsDiscountPrice;
+//                $goods['goodsDiscountPrice']=array_sum($goods['goodsGroup'],'discountPrice');
+//                $goods['goodsReduceAmount']=$goods['goodsPayPrice']-$goods['goodsDiscountPrice'];
             }else{
                 $goods['goodsGroup']=array();
             }

application/modules/Client/controllers/User.php

@@ -84,7 +84,7 @@ class UserController extends \Our\Controller_AbstractIndex {
                     //通知退出
 
                     $this->memberService->saveMember($member,'seller');
-                    $this->success(array('key'=>$this->key,'memberName'=>$member['member_name'],'memberMobile'=>$member['member_mobile'],'memberAvatar'=>$member['memberAvatarUrl'],'memberId'=>(int)$member['member_id'],'storeId'=>(int)$seller['storeId'],'storeLabel'=>$storeOne['storeLabel']));
+                    $this->success(array('key'=>$this->key,'memberName'=>$member['member_name'],'memberMobile'=>$member['member_mobile'],'memberAvatar'=>$member['memberAvatarUrl'],'memberId'=>(int)$member['member_id'],'storeId'=>(int)$seller['storeId'],'storeLabel'=>$storeOne['storeLabel'],'storeName'=>$storeOne['storeName']));
                 }else{
                     ErrorModel::throwException(CodeConfigModel::errorUsernameOrPassword);
                 }

scripts/crontab/push/jpush.php

@@ -87,13 +87,13 @@ class cliOrderClose extends basecli
                     $push=\Our\Push::getInstance();
                     $pushData=array('storeId'=>$store['storeId'],
                         'type'=>\Our\ApiConst::messageGoodsAlert,
-                        'waitReceiveCount'=>ApiConst::zero,
+                        'waitReceiveCount'=>\Our\ApiConst::zero,
                         'waitDeliveryCount'=>0,
                         'waitGetCount'=>0,
-                        'orderCount'=>ApiConst::zero,
-                        'waitRefundProccessCount'=>ApiConst::zero,
-                        'waitRefundReceiveCount'=>ApiConst::zero,
-                        'refundCount'=>ApiConst::zero,
+                        'orderCount'=>\Our\ApiConst::zero,
+                        'waitRefundProccessCount'=>\Our\ApiConst::zero,
+                        'waitRefundReceiveCount'=>\Our\ApiConst::zero,
+                        'refundCount'=>\Our\ApiConst::zero,
                         'alertCount'=>$store['count'],
                         'params'=>array('c'=>'shopkeeper',
                             'm'=>'orderDetail',
@@ -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/store/stat.php

@@ -68,7 +68,7 @@ class cliStoreStat extends basecli
             echo "*** Debug mode ***\n";
         }
         // Step: 02 检查是否已有相同CLI在运行中
-        $lockDir=$this->_getBaseFileName('goods');
+        $lockDir=$this->_getBaseFileName('store');
         if(!$this->mkdirs($lockDir)){
             echo '****create dir fail  ****';
             exit;