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

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev

Browse Source
This commit is contained in:
luofei 2024-03-09 10:44:05 +08:00
commit 48ae67064f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -260,14 +260,14 @@ class StoreOrderRepository extends BaseRepository
$groupOrder->append(['orderList.orderProduct']);
$flag = true;
$profitsharing = [];
$userMerchantRepository = app()->make(UserMerchantRepository::class);
$storeOrderProfitsharingRepository = app()->make(StoreOrderProfitsharingRepository::class);
$userMerchantRepository = app()->make(UserMerchantRepository::class);//商户用户表
$storeOrderProfitsharingRepository = app()->make(StoreOrderProfitsharingRepository::class);//分账
$uid = $groupOrder->uid;
// $isVipCoupon = app()->make(StoreGroupOrderRepository::class)->isVipCoupon($groupOrder);
//订单记录
$storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
$storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);//订单操作
$svipDiscount = 0;
$financeDao = new FinancialDao();
$financeDao = new FinancialDao(); //商户财务申请提现
foreach ($groupOrder->orderList as $_k => $order) {
$isPickupCard = $order->source == 999;
(new StoreActivityDao())->saveOrderProduct(2, $order);
@ -280,7 +280,7 @@ class StoreOrderRepository extends BaseRepository
$presell = false;
//todo 等待付尾款
if ($order->activity_type == 2) {
$_make = app()->make(ProductPresellSkuRepository::class);
$_make = app()->make(ProductPresellSkuRepository::class);//库存
if ($order->orderProduct[0]['cart_info']['productPresell']['presell_type'] == 2) {
$order->status = 10;
$presell = true;
@ -291,7 +291,7 @@ class StoreOrderRepository extends BaseRepository
} else if ($order->activity_type == 4) {
$order->status = 9;
$order->save();
$group_buying_id = app()->make(ProductGroupBuyingRepository::class)->create(
$group_buying_id = app()->make(ProductGroupBuyingRepository::class)->create( //平团
$groupOrder->user,
$order->orderProduct[0]['cart_info']['activeSku']['product_group_id'],
$order->orderProduct[0]['activity_id'],
@ -333,7 +333,7 @@ class StoreOrderRepository extends BaseRepository
foreach ($order->orderProduct as $product) {
if ($flag && $product['cart_info']['product']['is_gift_bag']) {
app()->make(UserRepository::class)->promoter($order->uid);
app()->make(UserRepository::class)->promoter($order->uid); //推广
$flag = false;
}
}
@ -378,7 +378,7 @@ class StoreOrderRepository extends BaseRepository
if ($orderValidAmount > 0) {
/** @var MerchantRepository $merchantRepo */
$merchantRepo = app()->make(MerchantRepository::class);
$merchantRepo = app()->make(MerchantRepository::class);//商户
$merchantRepo->merId = $order['mer_id'];
$merchantRepo->forceMargin = false;
[$orderValidAmount, $financeDao] = $merchantRepo->deductDeposit($orderValidAmount, $order, $financeDao);

4
crmeb/services/ExcelService.php
View File

@ -751,9 +751,9 @@ class ExcelService
$export[] = [
$item->financial_sn,
$item->financial_account->bank_code??'',
$bankName,
$item->financial_account->name??'',//收款方户名1
$checkRes,
'',//'开户银行(行别)
$bankName,//'开户银行(行别)
'',//'开户行大额行号'
$item->financial_account->bank_branch??'',
$item->extract_money,