Merge branch 'dev' of shop/php into master

app/common/repositories/store/order/StoreOrderRepository.php

@@ -2426,7 +2426,7 @@ class StoreOrderRepository extends BaseRepository
 
                             ['type' => 'a1', 'price' => $orderpri, 'other' => 0, 'note' => "VR"],//VR支付
                             ['type' => 'a2', 'price' => $orderpri, 'other' => 0, 'note' => "现金"],//现金支付
-                            ['type' => 'a3', 'price' => strval($vr_payment), 'other' => $cash_payment, 'note' => "现金+VR"],//现金支付
+                            ['type' => 'a3', 'price' => strval($vr_payment), 'other' => strval($cash_payment), 'note' => "现金+VR"],//现金支付
                         ];
                     }