소스 검색

账单日期

shish 10 달 전
부모
커밋
f2e7e8568d
3개의 변경된 파일18개의 추가작업 그리고 4개의 파일을 삭제
  1. 6 0
      app-hd/controllers/OrderController.php
  2. 6 2
      biz-hd/order/classes/OrderClass.php
  3. 6 2
      biz-hd/order/services/OrderService.php

+ 6 - 0
app-hd/controllers/OrderController.php

@@ -601,6 +601,12 @@ class OrderController extends BaseController
             if ($hasPay != 1) {
                 util::fail('售后付款单只能走线下转账');
             }
+            $historyDate = $post['historyDate'] ?? '';
+            if (!empty($historyDate)) {
+                if ($historyDate != date("Y-m-d")) {
+                    util::fail('售后付款单不能修改账单日期,只能今天');
+                }
+            }
         } else {
             //如果不是售后付款单,并且选的不是余额支付,余额又够付当前订单,则自动切到余额支付
             $balance = $custom->balance ?? 0;

+ 6 - 2
biz-hd/order/classes/OrderClass.php

@@ -396,7 +396,7 @@ class OrderClass extends BaseClass
     }
 
     //订单完成 ssh 2021.4.20
-    public static function payAfter($order, $payWay)
+    public static function payAfter($order, $payWay, $params)
     {
         if (empty($order)) {
             util::fail('没有找到订单');
@@ -436,7 +436,11 @@ class OrderClass extends BaseClass
         $order->status = self::ORDER_STATUS_UN_SEND; // 付款后,订单状态设置为:已付款(待配送)
         $order->payWay = $payWay;
         $order->payStatus = 1;
-        $order->payTime = date("Y-m-d H:i:s");
+        if (!empty($params['historyDate'])) {
+            $order->payTime = $params['historyDate'] . ' ' . date("H:i:s");
+        } else {
+            $order->payTime = date("Y-m-d H:i:s");
+        }
         $order->stockChange = 1;
         $order->save();
 

+ 6 - 2
biz-hd/order/services/OrderService.php

@@ -279,9 +279,13 @@ class OrderService extends BaseService
 
         //欠款、已付款、余额支付的直接完成,另外客服下的单要走配送流程,所以是待配送状态
         if (in_array($hasPay, [dict::getDict('hasPay', 'payed'), dict::getDict('hasPay', 'debt'), dict::getDict('hasPay', 'balance')])) {
-            OrderClass::payAfter($returnOrder, $payWay);
+            $params = [];
+            if (!empty($data['historyDate'])) {
+                //后台开单传账单日期
+                $params['historyDate'] = $data['historyDate'];
+            }
+            OrderClass::payAfter($returnOrder, $payWay, $params);
         }
-
         return $returnOrder;
     }