refund

application/library/Our/DescribeConst.php

@@ -67,6 +67,8 @@ class DescribeConst
 
     const addCartSuccess = '加入购物车成功';
 
+    const refundDataError='退款退货数据异常';
+
     const storeCloseTimePre='次日';
     const allDay='全天';
     const setMessageSuccess='消息设置成功';

application/models/Business/Order/RefundService.php

@@ -24,7 +24,7 @@ use Zend\Validator\File\Count;
  */
 class RefundServiceModel extends \Business\AbstractModel
 {
-    private $orderField = "buyer_id as buyerId,buyer_name as buyerName,order_id as orderId,order_sn as orderSn,store_name as storeName,add_time as AddTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,need_shipping_fee as needShippingFee,payment_code as paymentCode,delay_time as delayTime,gmt_update as gmtUpdate";
+    private $orderField = "buyer_id as buyerId,buyer_name as buyerName,order_id as orderId,order_sn as orderSn,store_name as storeName,refund_amount as refundAmount,add_time as AddTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,need_shipping_fee as needShippingFee,payment_code as paymentCode,delay_time as delayTime,gmt_update as gmtUpdate";
     private $orderGoodsField = "commis_rate as commisRate,goods_type as goodsType,order_id as orderId,rec_id as recId,goods_id as goodsId,goods_name as goodsName,goods_price as goodsPrice,goods_num as goodsNum,goods_image as goodsImage,goods_pay_price as goodsPayPrice,sale_act_id as saleActId,sale_id as saleId,comment_state as commentState,is_refund as isRefund,goods_spec as goodsSpec,goods_group as goodsGroup,refund_id as refundId";
     private $refundOrderGoodsField = "rec_id as recId,goods_id as goodsId,goods_name as goodsName,goods_num as goodsNum,goods_image as goodsImage,goods_price as goodsPrice,goods_pay_price as goodsPayPrice,goods_spec as goodsSpec,goods_group as goodsGroup";
 
@@ -1057,6 +1057,7 @@ class RefundServiceModel extends \Business\AbstractModel
                         $refundAmount = $orderInfo['orderAmount']  - ApiConst::zero;;
                     }
                 }
+                $refundAmount=$refundAmount-$orderInfo['refundAmount'];
 //                if(!$alreadyRefundGoodsIds){
 //                    $refundAmount=$refundAmount-$discountAmount;
 //                }
@@ -1233,7 +1234,7 @@ 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'];
+        $updateOrderData['refund_amount']= $orderInfo['refundAmount']+ $refundArray['refund_amount'];
 
         $orderDao->deleteOrderCache($memberId,$orderInfo['orderId'],$orderInfo['storeId'],true);
         $storeDao->deleteStoreCache($orderInfo['storeId'],$orderInfo['orderId']);

application/models/DAO/Order/RefundReturn.php

@@ -551,6 +551,9 @@ class RefundReturnModel extends \DAO\AbstractModel
         if (!isset($refund_array['refund_sn']) || !$refund_array['refund_sn']) {
             $refund_array['refund_sn'] = $this->getRefundsn($order['storeId']);
         }
+        if(!$refund_array['buyer_id'] || !$refund_array['order_id']){
+            throw new \Exception(DescribeConst::refundDataError);
+        }
         $refund_id = $this->db->insert($this->_tableName)->rows($refund_array)->execute();
         // 发送商家提醒
         $param = array();