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

application/library/Our/OrderConst.php

@@ -25,6 +25,9 @@ class OrderConst {
     const express='快递配送';
     const complete="已完成";
     const close="已关闭";
+    const platformStateVerify='待审核';
+    const platformStateAgree='同意';
+    const platformStateRefuse='拒绝';
 
     const platformAudit="平台审核";
     const platFormAgree="平台同意";
@@ -50,7 +53,14 @@ class OrderConst {
     //详情
     const unpayDetailMessage="10分钟后交易自动关闭";
     const payCancelDetailMessage="10分钟可取消订单";
-
+    //商家售后状态
+    const sellerStateVerify='待审核';
+    const sellerStateAgree='同意';
+    const sellerStateRefuse='不同意';
+    //商家售后状态
+    const platStateVerify='待审核';
+    const platStateAgree='同意';
+    const platStateRefuse='不同意';
 //店铺详细文案
    const storeWaiteConfirm='请尽快确认订单';
     const storeWaiteSend='请尽快发货';

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

application/models/Business/Order/RefundService.php

@@ -702,6 +702,7 @@ class RefundServiceModel extends \Business\AbstractModel
             $orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
             $orderCommons=$orderDao->convertOrder($orderCommons,'orderId');
             foreach ($refundMerge as &$value) {
+                $value['sellerStateName']=$refundReturnDao->getSellerStateName($value['sellerState']);
                 $value['stateName'] = $refundReturnDao->getRefundTextStatus($value,true);
                 /*$value['blId'] = isset($value['blId']) ? (!is_null($value['blId']) ? $value['blId'] : ApiConst::zero) : ApiConst::zero;
                 $value['canPlatformIn'] = $refundReturnDao->isPlatformIn($value) ? ApiConst::one : ApiConst::zero;
@@ -725,7 +726,14 @@ class RefundServiceModel extends \Business\AbstractModel
                 }else{
                     $value['deliveryman']=new \stdClass();
                 }
-                $value['goodsGroup']=!empty($goodGroup)?$goodGroup:[];
+                if(!empty($goodGroup)){
+                    $value['goodsGroup']=$goodGroup;
+                    $value['goodsOriginPrice']=$goodsDao->getOriginPriceByGoodsGroup($value['goodsGroup']);
+                }else{
+                    $value['goodsGroup']=[];
+
+                }
+
                 if ($value['refundType'] == ApiConst::refundTypeGoods) {
                     if($value['refundShippingType']==ApiConst::bySeller){
                         $value['reciverInfo']=$orderCommonDao->getReciverInfo($value['reciverInfo']);
@@ -1206,7 +1214,7 @@ class RefundServiceModel extends \Business\AbstractModel
         // $value['orderAmount'] = $value['orderAmount'];
         $refundReturn['reciverInfo'] = unserialize($this->orderCommon['reciverInfo']);
         if ($refundReturn['refundType'] == ApiConst::refundTypeGoods) {
-            if($refundReturn['refundShippingType']==ApiConst::bySeller){
+            if($refundReturn['refundShippingType']==ApiConst::bySeller || $refundReturn['refundShippingType']==ApiConst::bySelf){
                 $refundReturn['reciverInfo']=$orderCommonDao->getReciverInfo($refundReturn['reciverInfo']);
             }
         } else {
@@ -1219,25 +1227,25 @@ class RefundServiceModel extends \Business\AbstractModel
         $refundReturn['refundText'] = $refundReturnDao->getRefundTextStatus($refundReturn);
         $refundReturn['stateName']=$refundReturn['refundText'];
         $refundReturn['goodsImage'] = ImageUtil::getGoodsImgUrl($refundReturn['goodsImage'], ApiConst::goodsSmallSize);
-        //$addressDao = \DAO\Order\DAddressModel::getInstance();
+        $addressDao = \DAO\Order\DAddressModel::getInstance();
         $info = $refundReturn;
-//        if ($refundReturn['refundType'] == ApiConst::refundTypeGoods) {
-//            if ($refundReturn['addressId']) {
-//                $address = $addressDao->getAddressByAddressId($refundReturn['addressId'], $this->daddressField);
-//            } else {
-//                $address = $addressDao->getAddressByStoreId($refundReturn['storeId'], $this->daddressField);
-//            }
-//            if(!empty($address)){
-//                $address['isDefault'] = (int)$address['isDefault'];
-//                $address['company']=isset( $address['company'])? $address['company']:'';
-//                $info['dAddressInfo'] = $address;
-//            }else{
-//                $info['dAddressInfo'] =new \stdClass();
-//            }
-//
-//        } else {
-//            $info['dAddressInfo'] = new \stdClass();
-//        }
+        if ($refundReturn['refundType'] == ApiConst::refundTypeGoods) {
+            if ($refundReturn['addressId']) {
+                $address = $addressDao->getAddressByAddressId($refundReturn['addressId'], $this->daddressField);
+            } else {
+                $address = $addressDao->getAddressByStoreId($refundReturn['storeId'], $this->daddressField);
+            }
+            if(!empty($address)){
+                $address['isDefault'] = (int)$address['isDefault'];
+                $address['company']=isset( $address['company'])? $address['company']:'';
+                $info['dAddressInfo'] = $address;
+            }else{
+                $info['dAddressInfo'] =new \stdClass();
+            }
+
+        } else {
+            $info['dAddressInfo'] = new \stdClass();
+        }
         $info['canPlatformIn'] = $refundReturnDao->isPlatformIn($info) ? ApiConst::one : ApiConst::zero;
         $info['canSendShippingType'] = $refundReturnDao->checkIsAddReturnShipping($info) ? ApiConst::one : ApiConst::zero;
         if($info['refundShippingType']==ApiConst::bySeller){

application/models/DAO/Goods.php

@@ -474,6 +474,14 @@ class GoodsModel extends \DAO\AbstractModel {
         }
         return $orderGoodses;
     }
+    public function getOriginPriceByGoodsGroup($goodsGroup){
+        $goodsOriginPrice=ApiConst::zero;
+        foreach( $goodsGroup as $goodsG){
+
+            $goodsOriginPrice+=    $goodsG['num']*$goodsG['goodsPrice'];
+        }
+        return $goodsOriginPrice;
+    }
     //ccw
     public function convert($goodses,$extentField=false,$refundOrders=false){
         if($refundOrders){
@@ -505,11 +513,13 @@ class GoodsModel extends \DAO\AbstractModel {
 
             if(isset($goods['goodsGroup'])&&!empty($goods['goodsGroup'])){
                 $goods['goodsGroup']=$this->getGoodsGroup($goods['goodsGroup']);
-                $goodsDiscountPrice=ApiConst::zero;
+                $goodsOriginPrice=ApiConst::zero;
                 foreach( $goods['goodsGroup'] as $goodsG){
-                    $goodsDiscountPrice+=    $goodsG['num']*$goodsG['discountPrice'];
+
+                    $goodsOriginPrice+=    $goodsG['num']*$goodsG['goodsPrice'];
                 }
-                $goods['goodsDiscountPrice']=$goodsDiscountPrice;
+                $goods['goodsOriginPrice']= $goodsOriginPrice;
+
 //                $goods['goodsDiscountPrice']=array_sum($goods['goodsGroup'],'discountPrice');
 //                $goods['goodsReduceAmount']=$goods['goodsPayPrice']-$goods['goodsDiscountPrice'];
             }else{

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