Merge branch 'clear-cg' into dev

biz-ghs/order/services/OrderService.php

@@ -297,8 +297,8 @@ class OrderService extends BaseService
                 self::payAfter($returnOrder, $payWay);
                 $purchase = PurchaseClass::getLockById($purchaseId);
                 if (!empty($purchase)) {
-                    $purchase->remainDebtPrice = $returnOrder->remainDebtPrice;
-                    $purchase->debtPrice = $returnOrder->debtPrice;
+                    $purchase->remainDebtPrice = $returnOrder->remainDebtPrice ?? '0.00';
+                    $purchase->debtPrice = $returnOrder->debtPrice ?? '0.00';
                     $purchase->debt = ($returnOrder->debt ?? 0) == OrderClass::DEBT_YES
                         ? PurchaseClass::DEBT_YES : PurchaseClass::DEBT_NO;
                     $purchase->save(false, ['remainDebtPrice', 'debtPrice', 'debt']);