Ver Fonte

退换货能选择已确认以后的合同进行退换货,
退换货确认以后,将退换货金额加到回款中

cqpCow há 1 ano atrás
pai
commit
d627072c1f

+ 1 - 1
app/Service/PurchaseOrderService.php

@@ -276,7 +276,7 @@ class PurchaseOrderService extends Service
         //回款单信息
         $order['payment_receipt_list'] = (new PaymentReceiptService())->getPaymentReceiptDataList($order);
         //总回款金额 = 采购金额 - 退换货金额
-        $total = $order['purchase_total'] - $sales['return_exchange_amount'];
+        $total = $order['purchase_total'] - $order['return_exchange_amount'];
         $order['payment_receipt_list']['not_receipt_amount'] = $total - $order['payment_receipt_list']['receipt_amount'];
         $order['not_payment_receipt_amount'] = $order['payment_receipt_list']['not_receipt_amount'];
 

+ 1 - 1
app/Service/ReturnExchangeOrderService.php

@@ -375,7 +375,7 @@ class ReturnExchangeOrderService extends Service
             if(empty($sale)) return [false,'合同不存在或已被删除'];
             $sale = $sale->toArray();
             if($sale['sales_order_type'] != SalesOrder::Order_type_one) return [false, '非安装件合同'];
-            if($sale['state'] < SalesOrder::State_two) return [false,'合同未施工,不能进行退换货操作'];
+            if($sale['state'] < SalesOrder::State_two) return [false,'合同未确认,不能进行退换货操作'];
             $order_number = $sale['order_number'];
         }elseif ($data['type'] == ReturnExchangeOrder::Order_type2){
             $purchase = PurchaseOrder::where('del_time',0)->where('id',$data['data_id'])->first();