ccw:master_dev

application/library/Payment/WxPay.php

@@ -61,9 +61,9 @@ class WxPay extends \Payment\TencentPay
 
     public function refund($param){
         if($param['subMchId']){
-            $this->serviceRefund($param);
+            return $this->serviceRefund($param);
         }else{
-            $this->commonRefund($param);
+           return  $this->commonRefund($param);
         }
     }
 

application/models/Business/Order/RefundService.php

@@ -136,8 +136,8 @@ class RefundServiceModel extends \Business\AbstractModel
         }
         $refundReturnDao->db->doTransaction();
         $state = $refundReturnDao->editRefundReturn($whereRefund, $refund_array);
-
         if($state){ //退款记录成功
+
             //记录操作日志
             $sellerLogDAO = \DAO\SellerLogModel::getInstance();
             $sellerLogDAO->record('退货确认收货，退货编号：'.$refund['refund_sn'], array('seller_id'=>$sellerId, 'seller_name'=>$sellerName, 'store_id'=>$storeId));
@@ -159,6 +159,7 @@ class RefundServiceModel extends \Business\AbstractModel
                         if (!in_array($payment_type, array(0, 2))) {
                             $state = $refundReturnDao->storeRefund(array_merge($order_info, array('refund_order_no' => $refund['order_sn'], 'refund_amount' => $refund['refund_amount'])));
                             if (!$state) {
+                                ErrorModel::throwException(CodeConfigModel::refundMoneyError);
                                 //throw new Exception('更新订单信息失败');
                                 $refundReturnDao->db->doRollback();
                                 return false;
@@ -168,6 +169,7 @@ class RefundServiceModel extends \Business\AbstractModel
                     $refundUpdate = array('is_suc_refund' => 1, 'gmt_update' => TIMESTAMP, 'refund_state' => 3);
                     $res = $refundReturnDao->update(array('refund_id' => $refund['refund_id']), $refundUpdate);
                     if (!$res) {
+                        ErrorModel::throwException(CodeConfigModel::refundWriteError);
                         $refundReturnDao->db->doRollback();
                         //                                showDialog('退款成功,退款表写入失败,请联系工作人员!',$reload,'error');
                         return false;
@@ -184,6 +186,8 @@ class RefundServiceModel extends \Business\AbstractModel
             $refundReturnDao->deleteRefundCache($refund['buyer_id'], $refund['refund_id']);
             $orderDao->deleteOrderCache($refund['buyer_id'], $refund['order_id'], $refund['store_id']);
             $storeDAO->deleteStoreRefundCache($refund['store_id'],$refund['order_id']);
+            $orderService=\Business\Order\OrderServiceModel::getInstance();
+            $orderService->updateOrderGoodsStoregeByOrderIds($refund['order_id']);
             $refundReturnDao->db->doCommit();
             $push=\Our\Push::getInstance();
             $pushData=array('storeId'=>$storeId,
@@ -286,8 +290,6 @@ class RefundServiceModel extends \Business\AbstractModel
             if ($refund_array['seller_state'] == '2' && !$isGiveUp) {
                 $refund_array['return_type'] = '2';//退货类型:1为不用退货,2为需要退货
                 $refund_array['goods_state']=2;
-                $orderService=\Business\Order\OrderServiceModel::getInstance();
-                $orderService->updateOrderGoodsStoregeByOrderIds($return['order_id']);
             } elseif ($refund_array['seller_state'] == '3') {
 
                 $refund_array['refund_state'] = '3';//状态:1为处理中,2为待管理员处理,3为已完成

application/models/Error/CodeConfig.php

@@ -320,6 +320,8 @@ class CodeConfigModel
     const wrongRefundState=300139;
     const updateIsRefundFail=300140;
     const updateRefundStateNameFail=300141;
+    const refundMoneyError=300142;
+    const refundWriteError=300143;
     //店铺相关错误码
 
     //商品分类
@@ -821,6 +823,8 @@ class CodeConfigModel
             self::wrongRefundState=>'订单状态有误',
             self::updateIsRefundFail=>'更新is_refund失败',
             self::updateRefundStateNameFail=>'更新order表refund_state_name失败',
+            self::refundMoneyError=>'退款失败',
+            self::refundWriteError=>'退款表写入失败',
             //销售员
             self::emptySaleGoodsId => '商品id不能为空',
             self::emptySaleGoods => '销售商品不存在',

application/modules/Client/controllers/Shopkeeper.php

@@ -294,7 +294,10 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         $refundService=\Business\Order\RefundServiceModel::getInstance();
         $goodsState= intval($this->req['data']['goodsState']);
         $res = $refundService->receive($this->storeId, $this->sellerId, $this->sellerName, $refundId, $goodsState);
-        $this->success($res);
+        if($res){
+            $this->success($res);
+        }
+
 
     }