|
|
@@ -36,7 +36,6 @@ class TestController extends PublicController
|
|
|
$period = dateUtil::formatTime($searchTime, $startTime, $endTime, true);
|
|
|
$start = $period['startTime'];
|
|
|
$end = $period['endTime'];
|
|
|
- $where['time'] = ['between', [$start, $end]];
|
|
|
|
|
|
$currentStartDate = date('Y-m-d', strtotime($start));
|
|
|
$currentEndDate = date('Y-m-d', strtotime($end));
|
|
|
@@ -48,7 +47,7 @@ class TestController extends PublicController
|
|
|
$pfSendCost = 0;
|
|
|
$where = ['mainId' => $mainId, 'status' => ['in', [OrderClass::ORDER_STATUS_UN_SEND, OrderClass::ORDER_STATUS_SENDING, OrderClass::ORDER_STATUS_COMPLETE]]];
|
|
|
$where['payTime'] = ['between', [$currentStartTime, $currentEndTime]];
|
|
|
-
|
|
|
+print_r($where);
|
|
|
$ghsOrderList = OrderClass::getAllByCondition($where, null, '*');
|
|
|
if (!empty($ghsOrderList)) {
|
|
|
foreach ($ghsOrderList as $ghsKey => $ghsOrder) {
|
|
|
@@ -66,8 +65,6 @@ class TestController extends PublicController
|
|
|
$shop = ShopClass::getById($shopId, true);
|
|
|
$mainId = $shop->mainId ?? 0;
|
|
|
|
|
|
- $ghsShopId = $shop->id ?? 0;
|
|
|
- $lsShopId = $shop->lsShopId ?? 0;
|
|
|
|
|
|
//批发开单 pf 零售开单 ls 批发结账 pfJz 零售尾款 lsWk
|
|
|
|
|
|
@@ -193,7 +190,7 @@ class TestController extends PublicController
|
|
|
//批发开单
|
|
|
$where = ['mainId' => $mainId, 'status' => ['in', [OrderClass::ORDER_STATUS_UN_SEND, OrderClass::ORDER_STATUS_SENDING, OrderClass::ORDER_STATUS_COMPLETE]]];
|
|
|
$where['payTime'] = ['between', [$currentStartTime, $currentEndTime]];
|
|
|
-
|
|
|
+print_r($where);
|
|
|
$ghsOrderList = OrderClass::getAllByCondition($where, null, '*');
|
|
|
if (!empty($ghsOrderList)) {
|
|
|
foreach ($ghsOrderList as $ghsKey => $ghsOrder) {
|
shish