|
|
@@ -7,6 +7,7 @@ use biz\stat\classes\StatRefundClass;
|
|
|
use bizGhs\order\classes\OrderClass;
|
|
|
use bizHd\order\classes\SettleClass;
|
|
|
use common\components\dateUtil;
|
|
|
+use common\components\dict;
|
|
|
use Yii;
|
|
|
use common\components\util;
|
|
|
use bizHd\order\classes\OrderClass as HdOrderClass;
|
|
|
@@ -24,20 +25,119 @@ class StatKdController extends BaseController
|
|
|
$todayStartTime = $todayDate . ' 00:00:00';
|
|
|
$todayEndTime = $todayDate . ' 23:59:59';
|
|
|
|
|
|
+ $arr = [
|
|
|
+ //系统收入
|
|
|
+ 'system' => [
|
|
|
+ 'value' => 100,
|
|
|
+ 'num' => 3,
|
|
|
+ 'category' => [
|
|
|
+ ['name' => '批发', 'num' => 2, 'amount' => 100],
|
|
|
+ ['name' => '零售', 'num' => 2, 'amount' => 100],
|
|
|
+ ['name' => '批发结账', 'num' => 2, 'amount' => 100],
|
|
|
+ ['name' => '零售结账', 'num' => 2, 'amount' => 100],
|
|
|
+ ],
|
|
|
+ ],
|
|
|
+ 'kfWx' => [
|
|
|
+ 'value' => 100,
|
|
|
+ 'num' => 3,
|
|
|
+ 'category' => [
|
|
|
+ ['name' => '客1', 'num' => 3, 'amount' => 100],
|
|
|
+ ['name' => '客2', 'num' => 3, 'amount' => 100],
|
|
|
+ ],
|
|
|
+ ],
|
|
|
+ 'debt' => [
|
|
|
+ 'value' => 100,
|
|
|
+ 'num' => 3,
|
|
|
+ 'category' => [
|
|
|
+ ['name' => '批发欠款', 'num' => 3, 'amount' => 30],
|
|
|
+ ['name' => '零售欠款', 'num' => 3, 'amount' => 30],
|
|
|
+ ],
|
|
|
+ ],
|
|
|
+ 'cash' => [
|
|
|
+ 'value' => 100,
|
|
|
+ 'num' => 3,
|
|
|
+ 'category' => [
|
|
|
+ ['name' => '批发', 'num' => 3, 'amount' => 30],
|
|
|
+ ['name' => '零售', 'num' => 3, 'amount' => 30],
|
|
|
+ ['name' => '批发结账', 'num' => 2, 'amount' => 100],
|
|
|
+ ['name' => '零售结账', 'num' => 2, 'amount' => 100],
|
|
|
+ ],
|
|
|
+ ],
|
|
|
+ 'aliPay' => [
|
|
|
+ 'value' => 100,
|
|
|
+ 'num' => 3,
|
|
|
+ 'category' => [
|
|
|
+ ['name' => '批发', 'num' => 3, 'amount' => 30],
|
|
|
+ ['name' => '零售', 'num' => 3, 'amount' => 30],
|
|
|
+ ['name' => '批发结账', 'num' => 2, 'amount' => 100],
|
|
|
+ ['name' => '零售结账', 'num' => 2, 'amount' => 100],
|
|
|
+ ],
|
|
|
+ ],
|
|
|
+ 'bankCard' => [
|
|
|
+ 'value' => 100,
|
|
|
+ 'num' => 3,
|
|
|
+ 'category' => [
|
|
|
+ ['name' => '批发', 'num' => 3, 'amount' => 30],
|
|
|
+ ['name' => '零售', 'num' => 3, 'amount' => 30],
|
|
|
+ ['name' => '批发结账', 'num' => 2, 'amount' => 100],
|
|
|
+ ['name' => '零售结账', 'num' => 2, 'amount' => 100],
|
|
|
+ ],
|
|
|
+ ],
|
|
|
+ 'mt' => ['value' => 100, 'num' => 3,],
|
|
|
+ 'other' => [
|
|
|
+ 'value' => 100,
|
|
|
+ 'num' => 3,
|
|
|
+ 'category' => [
|
|
|
+ ['name' => '批发', 'num' => 3, 'amount' => 30],
|
|
|
+ ['name' => '零售', 'num' => 3, 'amount' => 30],
|
|
|
+ ['name' => '批发结账', 'num' => 2, 'amount' => 100],
|
|
|
+ ['name' => '零售结账', 'num' => 2, 'amount' => 100],
|
|
|
+ ],
|
|
|
+ ],
|
|
|
+ ];
|
|
|
+
|
|
|
//批发开单
|
|
|
$where = ['shopId' => $this->shopId, 'status' => ['in', [OrderClass::ORDER_STATUS_UN_SEND, OrderClass::ORDER_STATUS_SENDING, OrderClass::ORDER_STATUS_COMPLETE]]];
|
|
|
- $where['addTime'] = ['between', [$todayStartTime, $todayEndTime]];
|
|
|
+ $where['payTime'] = ['between', [$todayStartTime, $todayEndTime]];
|
|
|
$ghsOrderList = OrderClass::getAllByCondition($where, null, '*');
|
|
|
if (!empty($ghsOrderList)) {
|
|
|
foreach ($ghsOrderList as $ghsKey => $ghsOrder) {
|
|
|
$payWay = $ghsOrder['payWay'] ?? 0;
|
|
|
$actPrice = $ghsOrder['actPrice'] ?? 0;
|
|
|
+ $debtPrice = $ghsOrder['debtPrice'] ?? 0;
|
|
|
+ $onlinePay = $ghsOrder['onlinePay'] ?? dict::getDict('onlinePay', 'not');
|
|
|
+ if ($debtPrice > 0) {
|
|
|
+ //不管是否结清,只要$debtPrice > 0,说明曾经订单是欠款
|
|
|
+
|
|
|
+ } else {
|
|
|
+ if ($onlinePay == dict::getDict('onlinePay', 'yes')) {
|
|
|
+
|
|
|
+ } else {
|
|
|
+ //使用支付方式的
|
|
|
+ switch ($payWay) {
|
|
|
+ case dict::getDict('payWay', 'wxPay'):
|
|
|
+
|
|
|
+ //要记录是客服几收的钱
|
|
|
+
|
|
|
+ break;
|
|
|
+ case dict::getDict('payWay', 'alipay'):
|
|
|
+ break;
|
|
|
+ case dict::getDict('payWay', 'cash'):
|
|
|
+ break;
|
|
|
+ case dict::getDict('payWay', 'bankCard'):
|
|
|
+ break;
|
|
|
+ case dict::getDict('payWay', 'unknown'):
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//零售开单
|
|
|
$hdWhere = ['shopId' => $this->shop['lsShopId'], 'status' => ['in', [HdOrderClass::ORDER_STATUS_UN_SEND, HdOrderClass::ORDER_STATUS_SENDING, HdOrderClass::ORDER_STATUS_COMPLETE]]];
|
|
|
- $hdWhere['addTime'] = ['between', [$todayStartTime, $todayEndTime]];
|
|
|
+ $hdWhere['payTime'] = ['between', [$todayStartTime, $todayEndTime]];
|
|
|
$hdOrderList = HdOrderClass::getAllByCondition($hdWhere, null, '*');
|
|
|
foreach ($hdOrderList as $hdKey => $hdOrder) {
|
|
|
$payWay = $hdOrder['payWay'] ?? 0;
|
|
|
@@ -47,7 +147,7 @@ class StatKdController extends BaseController
|
|
|
|
|
|
//批发结帐收入
|
|
|
$clearWhere = ['ghsShopId' => $this->shopId, 'status' => 2];
|
|
|
- $clearWhere['addTime'] = ['between', [$todayStartTime, $todayEndTime]];
|
|
|
+ $clearWhere['payTime'] = ['between', [$todayStartTime, $todayEndTime]];
|
|
|
$clearList = ClearClass::getAllByCondition($clearWhere, null, '*');
|
|
|
if (!empty($clearList)) {
|
|
|
foreach ($clearList as $cKey => $clear) {
|
|
|
@@ -58,7 +158,7 @@ class StatKdController extends BaseController
|
|
|
|
|
|
//零售结账收入
|
|
|
$settleWhere = ['shopId' => $this->shopId, 'status' => 2];
|
|
|
- $settleWhere['addTime'] = ['between', [$todayStartTime, $todayEndTime]];
|
|
|
+ $settleWhere['payTime'] = ['between', [$todayStartTime, $todayEndTime]];
|
|
|
$settleList = SettleClass::getAllByCondition($settleWhere, null, '*');
|
|
|
if (!empty($settleList)) {
|
|
|
foreach ($settleList as $sKey => $settle) {
|