更新

app-ghs/controllers/RefundController.php

@@ -9,6 +9,7 @@ use bizGhs\shop\classes\ShopClass;
 use bizHd\cg\classes\CgRefundClass;
 use bizHd\notice\classes\NoticeClass;
 use bizHd\purchase\classes\PurchaseClearClass;
+use common\components\dateUtil;
 use common\components\imgUtil;
 use Yii;
 use bizGhs\order\classes\RefundOrderClass;
@@ -193,6 +194,19 @@ class RefundController extends BaseController
             $productIds = array_keys($itemList);
             $where['productId'] = ['in', $productIds];
         }
+
+        $searchTime = isset($get['searchTime']) && !empty($get['searchTime']) ? $get['searchTime'] : 'today';
+        $startTime = $get['startTime'] ?? '';
+        $endTime = $get['endTime'] ?? '';
+        $period = dateUtil::formatTime($searchTime, $startTime, $endTime, true);
+        $start = $period['startTime'];
+        $end = $period['endTime'];
+        $currentStartDate = date('Y-m-d', strtotime($start));
+        $currentEndDate = date('Y-m-d', strtotime($end));
+        $currentStartTime = $currentStartDate . ' 00:00:00';
+        $currentEndTime = $currentEndDate . ' 23:59:59';
+        $where['addTime'] = ['between', [$currentStartTime, $currentEndTime]];
+
         $list = RefundOrderItemClass::getRefundItemList($where);
         util::success($list);
     }

biz-ghs/order/classes/RefundOrderItemClass.php

@@ -32,7 +32,15 @@ class RefundOrderItemClass extends BaseClass
             unset($where2['productId']);
             $where2['productId'] = $newIds;
         }
-        $totalAmount = RefundOrderItem::find()->where($where2)->sum('xhPrice');
+
+        if (isset($where2['addTime'])) {
+            $start = $where2['addTime'][1][0];
+            $end = $where2['addTime'][1][1];
+            unset($where2['addTime']);
+            $totalAmount = RefundOrderItem::find()->where($where2)->andWhere(['between', 'addTime', $start, $end])->sum('xhPrice');
+        } else {
+            $totalAmount = RefundOrderItem::find()->where($where2)->sum('xhPrice');
+        }
         $data['totalAmount'] = $totalAmount;
         return $data;
     }

console/controllers/RefundController.php

@@ -28,12 +28,16 @@ class RefundController extends Controller
                 try {
                     $orderSn = $refund['orderSn'] ?? '';
                     $status = $refund['status'] ?? 0;
-                    RefundOrderItemClass::updateByCondition(['orderSn' => $orderSn], ['status' => $status]);
+                    $addTime = $refund['addTime'] ?? '';
+                    $updateTime = $refund['updateTime'] ?? '';
+                    RefundOrderItemClass::updateByCondition(['orderSn' => $orderSn], ['status' => $status, 'addTime' => $addTime, 'updateTime' => $updateTime]);
                     $cgRefundId = $refund['cgRefundId'] ?? 0;
                     $cgRefund = CgRefundClass::getById($cgRefundId, true);
                     $cgRefundStatus = $cgRefund->status;
                     $cgOrderSn = $cgRefund->orderSn ?? '';
-                    CgRefundItemClass::updateByCondition(['orderSn' => $cgOrderSn], ['status' => $cgRefundStatus]);
+                    $addTime = $cgRefund->addTime;
+                    $updateTime = $cgRefund->updateTime;
+                    CgRefundItemClass::updateByCondition(['orderSn' => $cgOrderSn], ['status' => $cgRefundStatus, 'addTime' => $addTime, 'updateTime' => $updateTime]);
                     $transaction->commit();
                     echo "ok\n";
                 } catch (\Exception $e) {