售后金额

app/Http/Controllers/Mini/BillController.php

@@ -174,6 +174,7 @@ class BillController extends BaseMiniController
             'box_price' => $bill->box_price,
             'tray_price' => $bill->tray_price,
             'added_amount' => $bill->added_amount,
+            'after_sale' => $bill->after_sale,
             'total_amount' => $bill->total_amount,
             'status' => $bill->status,
             'status_name' => BillModel::STATUS_NAMES[$bill->status] ?? '',

app/Http/Controllers/Mini/CartController.php

@@ -145,6 +145,7 @@ class CartController extends BaseMiniController
                 'name' => $product->name ?? '',
                 'spec' => $product->spec ?? '',
                 'unit' => $product->unit ?? '',
+                'price_unit' => $product->price_unit ?? '',
                 'image' => $firstFile?->file_url ?? '',
                 'price' => $price,
                 'quantity' => $quantity,

app/Http/Controllers/Mini/OrderController.php

@@ -97,6 +97,7 @@ class OrderController extends BaseMiniController
                     'product_spec' => $product->spec,
                     'unit' => (string) $product->unit,
                     'price' => $price,
+                    'price_unit' => $product->price_unit,
                     'image_ids' => implode(',', (array) $product->image_ids),
                     'content' => (string) $product->content,
                     'shelf_life' => (int) $product->shelf_life,

app/Http/Controllers/Mini/PaymentController.php

@@ -152,7 +152,7 @@ class PaymentController extends BaseMiniController
 
         $bills = $payment->bills()
             ->orderBy('id')
-            ->get(['id', 'bill_no', 'bill_date', 'product_amount', 'delivery_fee', 'added_amount', 'total_amount', 'status'])
+            ->get(['id', 'bill_no', 'bill_date', 'product_amount', 'delivery_fee', 'added_amount', 'after_sale', 'total_amount', 'status'])
             ->toArray();
 
         $data = $payment->toArray();

app/Http/Controllers/Recon/PaymentController.php

@@ -56,7 +56,7 @@ class PaymentController extends BaseController
 
         $bills = $payment->bills()
             ->orderBy('id')
-            ->get(['id', 'bill_no', 'bill_date', 'product_amount', 'delivery_fee', 'added_amount', 'total_amount', 'status'])
+            ->get(['id', 'bill_no', 'bill_date', 'product_amount', 'delivery_fee', 'added_amount', 'after_sale', 'total_amount', 'status'])
             ->toArray();
 
         $data = $payment->toArray();

app/Http/Requests/Purchase/PurchaseBillGenerateRequest.php

@@ -5,8 +5,8 @@ namespace App\Http\Requests\Purchase;
 use Modules\Common\Http\Requests\BaseFormRequest;
 
 /**
- * 采购单生成账单 验证（按门店提交配送费/周转筐/托盘数量与售后/备注，金额由系统汇总不可修改；
- * 筐/托盘数量正数=压筐附加金额，负数=回筐抵扣金额）
+ * 采购单生成账单 验证（按门店提交配送费/周转筐/托盘数量与售后金额/备注，金额由系统汇总不可修改；
+ * 筐/托盘数量正数=压筐附加金额，负数=回筐抵扣金额；售后金额可正负，计入总金额）
  */
 class PurchaseBillGenerateRequest extends BaseFormRequest
 {
@@ -20,7 +20,7 @@ class PurchaseBillGenerateRequest extends BaseFormRequest
             'stores.*.delivery_fee' => 'required|numeric|min:0',
             'stores.*.box_num' => 'required|integer',
             'stores.*.tray_num' => 'required|integer',
-            'stores.*.after_sale' => 'nullable|string|max:255',
+            'stores.*.after_sale' => 'nullable|numeric',
             'stores.*.remark' => 'nullable|string|max:255',
         ];
     }
@@ -41,7 +41,7 @@ class PurchaseBillGenerateRequest extends BaseFormRequest
             'stores.*.box_num.integer' => '周转筐数量必须为整数（正数=压筐，负数=回筐）',
             'stores.*.tray_num.required' => '周转托盘数量不能为空',
             'stores.*.tray_num.integer' => '周转托盘数量必须为整数（正数=压筐，负数=回筐）',
-            'stores.*.after_sale.max' => '售后说明最长 255 个字符',
+            'stores.*.after_sale.numeric' => '售后金额格式错误（可正负）',
             'stores.*.remark.max' => '备注最长 255 个字符',
         ];
     }