mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into rose

Browse Source
This commit is contained in:
mkm 2024-08-02 15:53:54 +08:00
commit 57997f4a19
3 changed files with 67 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/admin/logic/statistic/TradeStatisticLogic.php
View File

@ -214,7 +214,7 @@ class TradeStatisticLogic extends BaseLogic
$OrderChain = countRate($OrderMoney, $lastOrderMoney); $OrderChain = countRate($OrderMoney, $lastOrderMoney);
$topData[2] = [ $topData[2] = [
'title' => '商品支付金额', 'title' => '商品支付金额',
'desc' => '选定条件下，用户购买商品的实际支付金额，包括微信支付、余额支付、支付宝支付、线下支付金额（拼团商品在成团之后计入，线下支付订单在后台确认支付后计入）', 'desc' => '选定条件下，用户购买商品的实际支付金额，包括微信支付、余额支付、支付宝支付、线下支付金额',
'total_money' => $OrderMoney, 'total_money' => $OrderMoney,
'rate' => $OrderChain, 'rate' => $OrderChain,
'value' => $OrderCurve['y'], 'value' => $OrderCurve['y'],
@ -328,20 +328,21 @@ class TradeStatisticLogic extends BaseLogic
]; ];
$Chain['deposit'] = $OrderDepositCurve; $Chain['deposit'] = $OrderDepositCurve;
//兑换礼品券 //兑换礼品券
$userSign = $this->getOrderTotalMoney(['pay_type' => 19, 'create_time' => $where['create_time']], 'sum'); // $userSign = $this->getOrderTotalMoney(['pay_type' => 19, 'create_time' => $where['create_time']], 'sum');
$userSignTwo = $this->getOrderTotalMoney(['pay_type' => 19, 'create_time' => $dateWhere['create_time']], 'sum', "", $isNum); // $userSignTwo = $this->getOrderTotalMoney(['pay_type' => 19, 'create_time' => $dateWhere['create_time']], 'sum', "", $isNum);
$userSignGroup = $this->getOrderTotalMoney(['pay_type' => 19, 'create_time' => $where['create_time']], 'group', 'create_time'); // $userSignGroup = $this->getOrderTotalMoney(['pay_type' => 19, 'create_time' => $where['create_time']], 'group', 'create_time');
$userSignRate = countRate($userSign, $userSignTwo); // $userSignRate = countRate($userSign, $userSignTwo);
$topData[9] = [ // $topData[9] = [
'title' => '礼品券消耗', // 'title' => '礼品券消耗',
'desc' => '用户下单时使用礼品券实际支付的金额', // 'desc' => '用户下单时使用礼品券实际支付的金额',
'total_money' => $userSign, // 'total_money' => $userSign,
'rate' => $userSignRate, // 'rate' => $userSignRate,
'value' => $userSignGroup['y'], // 'value' => $userSignGroup['y'],
'type' => 1, // 'type' => 1,
'sign' => 'user_sign', // 'sign' => 'user_sign',
]; // ];
$Chain['user_sign'] = $userSignGroup; // $Chain['user_sign'] = $userSignGroup;
/** 充值金额 */ /** 充值金额 */
$rechgeMoneyHome = $this->getRechargeTotalMoney($where, 'sum'); $rechgeMoneyHome = $this->getRechargeTotalMoney($where, 'sum');
@ -355,8 +356,8 @@ class TradeStatisticLogic extends BaseLogic
$RechgeTotalCurve = $this->totalArrData([$RechgeHomeCurve, $RechgeAdminCurve]); $RechgeTotalCurve = $this->totalArrData([$RechgeHomeCurve, $RechgeAdminCurve]);
$RechgeChain = countRate($rechgeMoneyTotal, $lastRechgeMoneyTotal); $RechgeChain = countRate($rechgeMoneyTotal, $lastRechgeMoneyTotal);
$topData[10] = [ $topData[10] = [
'title' => '充值金额', 'title' => '消费金金额',
'desc' => '选定条件下，用户成功充值的金额', 'desc' => '选定条件下，用户购买的消费金',
'total_money' => $rechgeMoneyTotal, 'total_money' => $rechgeMoneyTotal,
'rate' => $RechgeChain, 'rate' => $RechgeChain,
'value' => $RechgeTotalCurve['y'], 'value' => $RechgeTotalCurve['y'],
@ -365,6 +366,15 @@ class TradeStatisticLogic extends BaseLogic
]; ];
$Chain['rechage'] = $RechgeTotalCurve; $Chain['rechage'] = $RechgeTotalCurve;
$topData[9] = [
'title' => '微信渠道金额',
'desc' => '用户使用微信下单和购买消费金的金额',
'total_money' => bcadd($wechatOrderMoney,$rechgeMoneyTotal,2),
'rate' => 0,
'value' => [],
'type' => 1,
'sign' => 'wechat_all',
];
//支出金额 //支出金额
// $outTotalMoney = bcadd($outYeMoney, $outExtractMoney, 2); // $outTotalMoney = bcadd($outYeMoney, $outExtractMoney, 2);
// $lastOutTotalMoney = bcadd($lastOutYeMoney, $lastOutExtractMoney, 2); // $lastOutTotalMoney = bcadd($lastOutYeMoney, $lastOutExtractMoney, 2);
@ -409,7 +419,7 @@ class TradeStatisticLogic extends BaseLogic
$inTotalChain = countRate($inTotalMoney, $lastInTotalMoney); $inTotalChain = countRate($inTotalMoney, $lastInTotalMoney);
$topData[0] = [ $topData[0] = [
'title' => '营业额', 'title' => '营业额',
'desc' => '商品支付金额、充值金额、购买付费会员金额、线下收银金额', 'desc' => '商品支付金额、采购支付、线下收银金额',
'total_money' => $inTotalMoney, 'total_money' => $inTotalMoney,
'rate' => $inTotalChain, 'rate' => $inTotalChain,
'value' => $inTotalCurve['y'], 'value' => $inTotalCurve['y'],
@ -445,10 +455,10 @@ class TradeStatisticLogic extends BaseLogic
$inOrderMoney = $this->getOrderTotalMoney($where, $selectType, "", $isNum); $inOrderMoney = $this->getOrderTotalMoney($where, $selectType, "", $isNum);
//用户充值收入 //用户充值收入
$inRechargeMoneyHome = $this->getRechargeTotalMoney($where, $selectType, "", $isNum); // $inRechargeMoneyHome = $this->getRechargeTotalMoney($where, $selectType, "", $isNum);
$inrechgeMoneyAdmin = $this->getBillYeTotalMoney($where, $selectType, '', $isNum); $inrechgeMoneyAdmin = $this->getBillYeTotalMoney($where, $selectType, '', $isNum);
$inRechargeMoney = bcadd($inRechargeMoneyHome, $inrechgeMoneyAdmin, 2); $inRechargeMoney = bcadd(0, $inrechgeMoneyAdmin, 2);
//购买会员收入 //购买会员收入
$inMemberMoney = $this->getMemberTotalMoney($where, $selectType, "", $isNum); $inMemberMoney = $this->getMemberTotalMoney($where, $selectType, "", $isNum);

32
app/api/controller/IndexController.php
View File

@ -2,6 +2,7 @@
namespace app\api\controller; namespace app\api\controller;
use app\common\logic\StoreFinanceFlowLogic;
use app\admin\logic\store_product\StoreProductLogic; use app\admin\logic\store_product\StoreProductLogic;
use app\admin\validate\tools\GenerateTableValidate; use app\admin\validate\tools\GenerateTableValidate;
use app\admin\logic\tools\GeneratorLogic; use app\admin\logic\tools\GeneratorLogic;
@ -10,6 +11,7 @@ use app\common\logic\PayNotifyLogic;
use app\common\logic\store_order\StoreOrderLogic; use app\common\logic\store_order\StoreOrderLogic;
use app\common\model\Config as ModelConfig; use app\common\model\Config as ModelConfig;
use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_branch_product\StoreBranchProduct;
use app\common\model\store_finance_flow\StoreFinanceFlow;
use app\common\model\store_order\StoreOrder; use app\common\model\store_order\StoreOrder;
use app\common\model\system_store\SystemStore; use app\common\model\system_store\SystemStore;
use app\common\model\user\User; use app\common\model\user\User;
@ -38,6 +40,36 @@ class IndexController extends BaseApiController
{ {
return json([1]); return json([1]);
$financeFlow = new StoreFinanceFlow();
$order_id=544;
$store_id=3;
$staff_id=3;
Db::startTrans();
try {
// $res = $financeFlow->where('order_id', $order_id)->update(['store_id' => $store_id, 'staff_id' => $staff_id]);
// if ($res) {
// $order['store_id'] =$store_id;
// }
$financeFlowLogic = new StoreFinanceFlowLogic();
//other_uid大于0的
$select_1 = $financeFlow->where(['order_id' => $order_id, 'financial_pm' => 1,'status'=>0])->where('other_uid','>',0)->select();
foreach ($select_1 as $k => $v) {
if ($v['other_uid'] > 0) {
$financeFlowLogic->updateStatusUser($v['id'], $v['other_uid'], $v['number'], $v['order_id']);
}
}
$deposit = $financeFlow->where(['order_id' => $order_id, 'financial_pm' => 0, 'financial_type' => 11,'status'=>0])->value('number') ?? 0;
$money = $financeFlow->where(['order_id' => $order_id, 'financial_pm' => 1, 'financial_type' => 2,'status'=>0])->value('number') ?? 0;
$financeFlowLogic->updateStatusStore($order_id, $store_id, $money, $deposit);
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
d($e);
return false;
}
$all_where['paid'] = 1; $all_where['paid'] = 1;
d(OrderLogic::dayPayPrice($all_where,date('Y-m-d',time()))); d(OrderLogic::dayPayPrice($all_where,date('Y-m-d',time())));
$uid=9; $uid=9;

16
app/api/logic/order/OrderLogic.php
View File

@ -613,22 +613,16 @@ class OrderLogic extends BaseLogic
$order['store_id'] = $params['store_id']; $order['store_id'] = $params['store_id'];
} }
$financeFlowLogic = new StoreFinanceFlowLogic(); $financeFlowLogic = new StoreFinanceFlowLogic();
$select_1 = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'financial_type' => ['in' => 14, 15, 16]])->select(); //other_uid大于0的
$select_1 = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1,'status'=>0])->where('other_uid','>',0)->select();
foreach ($select_1 as $k => $v) { foreach ($select_1 as $k => $v) {
if ($v['other_uid'] > 0) { if ($v['other_uid'] > 0) {
$financeFlowLogic->updateStatusUser($v['id'], $v['other_uid'], $v['number'], $v['order_id']); $financeFlowLogic->updateStatusUser($v['id'], $v['other_uid'], $v['number'], $v['order_id']);
} }
} }
$spread_find = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'financial_type' => 12, 'other_uid' => $order['spread_uid']])->find();
if ($spread_find) { $deposit = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 0, 'financial_type' => 11,'status'=>0])->value('number') ?? 0;
$financeFlowLogic->updateStatusUser($spread_find['id'], $order['spread_uid'], $spread_find['number'], $order['id']); $money = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'financial_type' => 2,'status'=>0])->value('number') ?? 0;
}
$spread_find_two = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'financial_type' => 20])->find();
if ($spread_find_two) {
$financeFlowLogic->updateStatusUser($spread_find_two['id'], $spread_find_two['other_uid'], $spread_find_two['number'], $order['id']);
}
$deposit = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 0, 'financial_type' => 11])->value('number') ?? 0;
$money = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'financial_type' => 2])->value('number') ?? 0;
$financeFlowLogic->updateStatusStore($order['id'], $order['store_id'], $money, $deposit); $financeFlowLogic->updateStatusStore($order['id'], $order['store_id'], $money, $deposit);
//积分结算 //积分结算
if ($order['is_storage'] == 0 && $order['source'] == 0) { if ($order['is_storage'] == 0 && $order['source'] == 0) {