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

调整供应链订单数量统计，添加转售帖子修改

Browse Source
This commit is contained in:
luofei 2023-07-14 16:49:57 +08:00
parent d77397e21c
commit 48376c007c
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/common/repositories/community/CommunityRepository.php
View File

@ -354,9 +354,13 @@ class CommunityRepository extends BaseRepository
Db::transaction(function () use($id, $data) { Db::transaction(function () use($id, $data) {
$spuId = $data['spu_id']; $spuId = $data['spu_id'];
unset($data['spu_id']); $productInfo = $data['product_info'];
unset($data['spu_id'], $data['product_info']);
$community = $this->dao->update($id, $data); $community = $this->dao->update($id, $data);
if ($spuId) $this->joinProduct($id, $spuId); if ($spuId) $this->joinProduct($id, $spuId);
if ($productInfo && $data['is_type'] == self::COMMUNITY_TYPE_RESALE) {
$this->resale($id, $productInfo);
}
event('community.update.before',compact('id','community')); event('community.update.before',compact('id','community'));
}); });
} }
@ -548,6 +552,12 @@ class CommunityRepository extends BaseRepository
{ {
$insert = []; $insert = [];
foreach ($data as $value) { foreach ($data as $value) {
if (isset($value['id'])) {
$resale = Resale::find($value['id']);
unset($value['purchase_record_id']);
$resale->update($value);
continue;
}
$purchaseRecord = PurchaseRecord::find($value['purchase_record_id']); $purchaseRecord = PurchaseRecord::find($value['purchase_record_id']);
$exist = Resale::where('purchase_record_id', $purchaseRecord['id'])->find(); $exist = Resale::where('purchase_record_id', $purchaseRecord['id'])->find();
if ($exist) { if ($exist) {

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

@ -804,10 +804,10 @@ class StoreOrderRepository extends BaseRepository
//1: 未支付 2: 未发货 3: 待收货 4: 待评价 5: 交易完成 6: 已退款 7: 已删除 //1: 未支付 2: 未发货 3: 待收货 4: 待评价 5: 交易完成 6: 已退款 7: 已删除
$all = $this->dao->search($where, $sysDel)->where($this->getOrderType(0))->count(); $all = $this->dao->search($where, $sysDel)->where($this->getOrderType(0))->count();
$statusAll = $all; $statusAll = $all;
$unpaid = $this->dao->search($where, $sysDel)->where($this->getOrderType(1))->count(); $unpaid = $this->dao->search($where, $sysDel)->where($this->getOrderType(1))->whereRaw("(StoreOrder.paid=0 and StoreOrder.status!=12) or (StoreOrder.paid=1 and StoreOrder.pay_type=8 and StoreOrder.status=2)")->count();
$unshipped = $this->dao->search($where, $sysDel)->where($this->getOrderType(2))->count(); $unshipped = $this->dao->search($where, $sysDel)->where($this->getOrderType(2))->count();
$untake = $this->dao->search($where, $sysDel)->where($this->getOrderType(3))->count(); $untake = $this->dao->search($where, $sysDel)->where($this->getOrderType(3))->count();
$unevaluate = $this->dao->search($where, $sysDel)->where($this->getOrderType(4))->count(); $unevaluate = $this->dao->search($where, $sysDel)->where($this->getOrderType(4))->where('paid', 1)->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY)->count();
$complete = $this->dao->search($where, $sysDel)->where($this->getOrderType(5))->count(); $complete = $this->dao->search($where, $sysDel)->where($this->getOrderType(5))->count();
$refund = $this->dao->search($where, $sysDel)->where($this->getOrderType(6))->count(); $refund = $this->dao->search($where, $sysDel)->where($this->getOrderType(6))->count();
$del = $this->dao->search($where, $sysDel)->where($this->getOrderType(7))->count(); $del = $this->dao->search($where, $sysDel)->where($this->getOrderType(7))->count();

2
app/controller/api/server/StoreOrder.php
View File

@ -36,10 +36,10 @@ class StoreOrder extends BaseController
public function orderStatistics($merId, StoreOrderRepository $repository) public function orderStatistics($merId, StoreOrderRepository $repository)
{ {
$product_type=$this->request->param('product_type',0); $product_type=$this->request->param('product_type',0);
$order = $repository->OrderTitleNumber($merId, null,$product_type); $order = $repository->OrderTitleNumber($merId, null,$product_type);
$order['refund'] = app()->make(StoreRefundOrderRepository::class)->getWhereCount(['is_system_del' => 0, 'mer_id' => $merId]); $order['refund'] = app()->make(StoreRefundOrderRepository::class)->getWhereCount(['is_system_del' => 0, 'mer_id' => $merId]);
/** @var Common $common */
$common = app()->make(Common::class); $common = app()->make(Common::class);
$data = []; $data = [];
$data['today'] = $common->mainGroup('today', $merId); $data['today'] = $common->mainGroup('today', $merId);