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

application/controllers/Index.php

@@ -71,6 +71,13 @@ class IndexController extends \Our\Controller_Abstract  {
             }
 
         }
+        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){
             $this->_view->display('index/plat.phtml');

application/models/Business/Goods/EvaluationService.php

@@ -53,6 +53,7 @@ class EvaluationServiceModel extends \Business\AbstractModel {
         $memberName = $member['memberName'];
         $memberAvatar = $member['memberAvatar'];
         foreach ($data['goods'] as $k=>$v){
+            \Our\Log::getInstance()->write(json_encode($orderGoods));
             if($orderGoods[$v['goodsId']]['goods_commonid'] > 0) {//=0是组合
                 $evaluation = array();
                 $evaluation['geval_orderid'] = $order['order_id'];
@@ -71,6 +72,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,13 +97,12 @@ 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;
             }
         }
+        \Our\Log::getInstance()->write(json_encode($evaluations));
         $result = \DAO\EvaluateGoodsModel::getInstance()->insertAll($evaluations);
         if(!$result){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::commonError);

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/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";