dilivery

application/library/OSS/Common.php

@@ -20,7 +20,7 @@ class Common
 
 
     const endpointPre=SecretKeys::ossEndpointPre;
-    const  buketPre=SecretKeys::ossBucket;
+    const  buketPre=SecretKeys::ossBucketPre;
 
     public static function getOssClientOnline(){
         try {

application/models/Business/Order/RefundService.php

@@ -441,8 +441,9 @@ class RefundServiceModel extends \Business\AbstractModel
             //获取订单
             $order_id = $refund['order_id'];
             $order_info = $orderDao->find( array('order_id'=>$order_id));
-
             $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
+            $orderData['refund_amount']=$refundAmount;
+            $orderDao->updateByOrderId($orderData,$order_id);
             $refund_array = array();
             $refund_array['seller_time'] = time();
             $refund_array['seller_state'] = $seller_state;//卖家处理状态:1为待审核,2为同意,3为不同意
@@ -1057,7 +1058,12 @@ class RefundServiceModel extends \Business\AbstractModel
                     $refundAmount=$refundAmount-$discountAmount;
                 }
             }
-            $returnData['refundAmount'] = $refundAmount - $orderInfo['refundAmount'] - $returnData['needShippingFee'] + $shippingFee;
+            $liveMoney=$orderInfo['orderAmount']-$orderInfo['refundAmount'];
+            if($refundAmount>$liveMoney){
+                $refundAmount=$liveMoney;
+            }
+           // $returnData['refundAmount'] = $refundAmount - $orderInfo['refundAmount'] - $returnData['needShippingFee'] + $shippingFee;
+            $returnData['refundAmount'] = $refundAmount - $returnData['needShippingFee'] + $shippingFee;
             if((int)$returnData['refundAmount'] <ApiConst::zero){
                 $returnData['refundAmount']=ApiConst::zero;
             }
@@ -1116,6 +1122,8 @@ class RefundServiceModel extends \Business\AbstractModel
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
         $orderInfo = $orderDao->findByMemberIdAndOrderId($memberId, $refund['orderId'], $this->orderField);
         $storeDao=\DAO\StoreModel::getInstance();
+        $orderDao->setDb(DbNameConst::masterDBConnectName);
+        $orderDao->db->doTransaction();
         if($refund['refundType']==ApiConst::refundTypeGoods){
             $refund['refundAmount']-=$orderInfo['needShippingFee'];
         }
@@ -1192,15 +1200,22 @@ class RefundServiceModel extends \Business\AbstractModel
         $refundArray['refund_shipping_type']=isset($refund['refundShippingType'])?$refund['refundShippingType']:ApiConst::zero;
         $refundArrayUnLine=Common::convertUnderline($refundArray);
         $state = $refundReturnDao->addRefundReturn($refundArray,$orderInfo,$orderGoods);
+        $updateOrderData['refund_amount']=  $refundArray['refund_amount'];
+
         $orderDao->deleteOrderCache($memberId,$orderInfo['orderId'],$orderInfo['storeId'],true);
         $storeDao->deleteStoreCache($orderInfo['storeId'],$orderInfo['orderId']);
         $storeDao->deleteStoreRefundCache($orderInfo['storeId'],$orderInfo['orderId']);
         if ($state) {
+            $orderDao->update(array('order_id'=>$orderInfo['orderId']),$updateOrderData);
             $refundStateName=$refundReturnDao->getRefundTextStatus($refundArrayUnLine);
             $orderGoodsDao->update(array('rec_id'=>$orderGoods['recId']),array('refund_state_name'=>$refundStateName,'refund_id'=>$state));
             $refundReturnDao->deleteRefundCache($memberId);
             $storeDao->deleteStoreRefundCache($refundOne['storeId']);
             $orderLogDao->addRefundOrderLog($orderInfo['orderId'],$refundArray['refund_type'],DescribeConst::buyer,$orderInfo['buyerName'],$orderInfo['orderState']);
+            if ($orderInfo['orderState'] == ApiConst::orderStateWaitRecieve) {
+                $orderDao->editOrderLock($orderInfo['orderId']);
+            }
+            $orderDao->db->doCommit();
             $push=\Our\Push::getInstance();
             $pushData=array('storeId'=>$orderInfo['storeId'],
                 'type'=>ApiConst::messageRefund,
@@ -1219,11 +1234,10 @@ class RefundServiceModel extends \Business\AbstractModel
             $push->sendTcpMessage();
 
             //\Our\RedisHelper::rpush('client_push',array('storeId'=>$refund['storeId'],'type'=>ApiConst::messageRefundProccessing,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'getRefundDetail','refundId'=>$refund['refundId'])));
-            if ($orderInfo['orderState'] == ApiConst::orderStateWaitRecieve) {
-                $orderDao->editOrderLock($orderInfo['orderId']);
-            }
+
             return $state;
         } else {
+            $orderDao->db->doRollback();
             ErrorModel::throwException(CodeConfigModel::refundRefuseByStore);
         }
     }

application/modules/Client/controllers/Shopkeeper.php

@@ -303,7 +303,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
             ErrorModel::throwException(CodeConfigModel::notExistRefund);
         }
         $refundService=\Business\Order\RefundServiceModel::getInstance();
-        $goodsState= intval($this->req['data']['goodsState']);
+        $goodsState=isset($this->req['data']['goodsState'])?intval($this->req['data']['goodsState']):\Our\ApiConst::goodsStateRecieved;
         $res = $refundService->receive($this->storeId, $this->sellerId, $this->sellerName, $refundId, $goodsState);
         if($res){
             $this->success($res);