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

application/library/Our/ApiConst.php

@@ -11,7 +11,7 @@ class ApiConst
     const randLengh = 8;
 
     //10天数秒
-    const tenDaySecond = 86400;
+    const tenDaySecond = 864000;
     //const tenDaySecond = 300;
     //一天
     const oneDaySecond = 86400;

application/library/Our/NameConst.php

@@ -156,7 +156,7 @@ class NameConst {
     const rightBracket = ']';
     const elasticName='elastic.master';
 
-    const shopkeeper='orders';
+    const shopkeeper='shenbdindex';
 
     const cancelUnPayedOrderTimePrefix = 'cancelUnPayedOrderTime';
     const cancelUnReceivedOrderTimePrefix = 'cancelUnReceivedOrderTime';

application/models/Business/Goods/GoodsCommonService.php

@@ -350,14 +350,24 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         //商品图片表
         $goodsImagesInstance = \DAO\GoodsImagesModel::getInstance();
         $image = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsImagesRedisModel::getInstance(),array(&$goodsImagesInstance, 'getListByCommonId'),array($goodsCommonId,'attr_name,attr_value,goods_image'),\Our\ApiConst::oneDaySecond,array($goodsCommonId));
-        $attrImage = [];
+
         $images = [];
+        $haveImg = false;
+        $goodsImageGroup = unserialize($commonInfo['goods_image_group']);
+        if($goodsImageGroup) {
+            $haveImg = true;
+            foreach ($goodsImageGroup as $v) {
+                $images[] = \Our\ImageUtil::getGoodsImgUrl($v,\Our\ImageConst::goodsDetailImgSize);
+            }
+        }
+        $attrImage = [];
+
         if($image && is_array($image)){
             $i = 0;
             foreach ($image as $k=>$v){
                 $image[$k]['goods_image'] = \Our\ImageUtil::getGoodsImgUrl($v['goods_image'],\Our\ImageConst::SpecSelectGoodsImgSize);
                 $attrImage[$v['attr_name']][$v['attr_value']][] = $image[$k]['goods_image'];
-                if($i < 5 ){
+                if($i < 5 && !$haveImg){
                     $images[] = \Our\ImageUtil::getGoodsImgUrl($v['goods_image'],\Our\ImageConst::goodsDetailImgSize);
                 }
                 $i += 1;

application/models/Business/Order/RefundService.php

@@ -398,14 +398,15 @@ class RefundServiceModel extends \Business\AbstractModel
         $refundArrayUnLine=Common::convertUnderline($refundArray);
         $state = $refundReturnDao->addRefundReturn($refundArray,$orderInfo,$orderGoods);
         if ($state) {
-            $orderDao->deleteOrderCache($memberId,$refund['orderId'],$refund['storeId'],true);
-            $refundReturnDao->deleteRefundCache($memberId);
             $refundStateName=$refundReturnDao->getRefundTextStatus($refundArrayUnLine);
             $orderGoodsDao->update(array('rec_id'=>$orderGoods['recId']),array('refund_state_name'=>$refundStateName,'refund_id'=>$state));
             $orderLogDao->addRefundOrderLog($orderInfo['orderId'],$refundArray['refund_type'],DescribeConst::buyer,$orderInfo['buyerName'],$orderInfo['orderState']);
             if ($orderInfo['orderState'] == ApiConst::orderStateWaitRecieve) {
                 $orderDao->editOrderLock($orderInfo['orderId']);
             }
+            $orderDao->deleteOrderCache($memberId,$orderInfo['orderId'],$orderInfo['storeId'],true);
+            $refundReturnDao->deleteRefundCache($memberId);
+
             return $state;
         } else {
             ErrorModel::throwException(CodeConfigModel::refundRefuseByStore);

application/models/Business/Store/ShopkeeperService.php

@@ -529,7 +529,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
     {
 
         $elasticsTool = ElasticsToolModel::getInstance('orders');
-       // $elasticsTool->deleteIndex();
+        $elasticsTool->deleteIndex();
         $indexsFiled = array(
             'goodsName' => array(
                 'type' => 'string',

application/models/DAO/Order/OrderGoods.php

@@ -108,14 +108,14 @@ class OrderGoodsModel extends \DAO\AbstractModel {
     }
 
     public function deleteOrderGoodsCache($memberId,$orderIds,$storeId=false){
-        if($memberId){
-            return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsByOrderIds'), array($memberId));
-        }
+//        if($memberId){
+//            return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsByOrderIds'), array($memberId));
+//        }
         if($orderIds){
-            return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsByOrderIds'), array($orderIds));
+            return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsByOrderIds'), array($orderIds),array($orderIds));
         }
         if(!empty($storeId)){
-            return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsCountByStoreId'), array($storeId));
+            return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsCountByStoreId'), array($storeId),array($storeId));
         }
     }
     public function getIsRefundMoney($orderGoodses,$promotionsId){
@@ -140,7 +140,7 @@ class OrderGoodsModel extends \DAO\AbstractModel {
     public function getRefundOrderGoodsIds($orderGoods){
         $orderGoods=array_values($orderGoods);
         for($i=ApiConst::zero;$i<count($orderGoods);$i++){
-            if($orderGoods[$i]['isRefund']==ApiConst::refundSuccess){
+            if($orderGoods[$i]['refundId']==ApiConst::zero){
                 unset($orderGoods[$i]);
             }
         }