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

application/library/Order/OrderConfirmUtil.php

@@ -850,6 +850,12 @@ class OrderConfirmUtil {
                 $storeTopSaleGoodsDao = \DAO\Goods\StoreTopSaleGoodsModel::getInstance();
                 $storeTopSaleGoodsDao->pushChangeSaleStore($storeId);
             }
+            //删除购物车缓存
+
+            $cartRedis = \Redis\Db7\CartRedisModel::getInstance();
+            $memberCartKey = \Our\NameConst::memberStoreCartsPrefix.'*_'.$storeId;
+            \Our\Log::getInstance()->write(json_encode($cartRedis->tableKeys($memberCartKey)),'/data/log/apptest');
+            $cartRedis->tableDelAll($cartRedis->tableKeys($memberCartKey));
         }
         $this->updateGoodsStorageToDBAndCache($goodsCommonIds,$goodsIds,$blIds,$goodsNewList,$op,$updateSaleNumFlag);
         return true;

application/models/Business/Goods/EvaluationService.php

@@ -73,7 +73,17 @@ class EvaluationServiceModel extends \Business\AbstractModel {
                 $evaluation['memberAvatar'] = $memberAvatar;
                 //$images = $this->_upload($v['images']);
                 $images = $v['images'];
+                //兼容安卓传参
                 if(!is_array($images)) $images = json_decode($images, true);
+                if(is_array($images) && $images) {
+                    foreach ($images as $k=>$v) {
+                        if(empty($v)) {
+                            unset($images[$k]);
+                        }
+                    }
+                }else{
+                    $images = null;
+                }
                 if(empty($images)) $images = null;
                 $images ? $data['goods'][$k]['haveImg'] = 1 : $data['goods'][$k]['haveImg'] = 0;
                 if($data['goods'][$k]['haveImg'] == 1) {

conf/url.ini

@@ -91,7 +91,7 @@ config.url.resourcesHost = "http://test.qm.com"
 config.url.userHost = ""
 
 ; oss 域名
-config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+config.url.ossHost = "https://img.shenbd.com"
 
 ;推送域名
 config.url.pushHost="127.0.0.1:9503";