feat : refund and catering

This commit is contained in:
2025-03-07 16:20:57 +08:00
parent d41b758d55
commit 4358491905
9 changed files with 351 additions and 7 deletions

View File

@@ -45,7 +45,7 @@ class RefundOrderService extends BaseService
if ($orderInfo->status != OrderCode::PAYED) throw new ErrException('该订单状态已变更,请勿重复操作,刷新后无法退款请联系客服');
//立即取消
$this->joinRefundQueue($orderId, $type, $orderInfo->amount, '用户主动取消订单');
$this->joinRefundQueue($orderId, $type, $orderInfo->actual_price, '用户主动取消订单');
return $this->return->success();
}

View File

@@ -9,6 +9,8 @@ use App\Service\ServiceTrait\Api\GoodOrderTrait;
use App\Service\ServiceTrait\Api\OrderTrait;
use App\Service\ServiceTrait\Api\PayFinishTrait;
use App\Service\ServiceTrait\Api\RefundOrderTrait;
use App\Service\ServiceTrait\CateringTrait;
use App\Service\ServiceTrait\Common\OrderChangeStatusTrait;
use Hyperf\DbConnection\Db;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
@@ -22,7 +24,9 @@ class WxJsRechargeOrderService extends WxJsRechargeBaseService
GoodOrderTrait,
PayFinishTrait,
RefundOrderTrait,
OrderTrait;
OrderTrait,
OrderChangeStatusTrait,
CateringTrait;
/**
*
@@ -55,6 +59,11 @@ class WxJsRechargeOrderService extends WxJsRechargeBaseService
*/
protected mixed $refundInfo;
/**
* @var bool 是否加入配餐数据
*/
protected bool $isCatering = true;
/**
* @return ResponseInterface
* @throws ContainerExceptionInterface
@@ -73,8 +82,13 @@ class WxJsRechargeOrderService extends WxJsRechargeBaseService
$this->manageOrder();
$this->manageWxOrder();
//
$this->isCatering = $this->manageAddCateringLog();
});
//已经截单 自动退款
if (!$this->isCatering) $this->joinRefundQueue($this->orderId,OrderCode::ORDER_TYPE_GOOD,$this->orderInfo->actual_price,'已截单,系统自动退款');
//todo 发送订阅通知
// $this->sendGainCoinMsg();
@@ -105,6 +119,8 @@ class WxJsRechargeOrderService extends WxJsRechargeBaseService
$this->manageRefundOrder();
$this->manageOrderByRefund();
$this->manageSubCateringLog();
});
$this->sendStockMq($this->orderInfo->id,$this->orderInfo->status);

View File

@@ -7,6 +7,9 @@ use App\Constants\Common\PayCode;
use App\Constants\Common\RefundCode;
use App\Exception\ErrException;
use App\Model\Order;
use App\Model\OrderGood;
use App\Model\OrderMealCateringLog;
use App\Model\OrderOptionCateringLog;
use App\Model\PayOrder;
use App\Model\RefundOrder;
use Exception;
@@ -35,6 +38,24 @@ trait GoodOrderTrait
#[Inject]
protected RefundOrder $refundOrderModel;
/**
* @var OrderGood
*/
#[Inject]
protected OrderGood $orderGoodModel;
/**
* @var OrderOptionCateringLog
*/
#[Inject]
protected OrderOptionCateringLog $orderOptionCateringLogModel;
/**
* @var OrderMealCateringLog
*/
#[Inject]
protected OrderMealCateringLog $orderMealCateringLogModel;
/**
* @return void
* @throws ContainerExceptionInterface
@@ -61,8 +82,6 @@ trait GoodOrderTrait
}
}
/**
* @return void
* @throws ContainerExceptionInterface
@@ -79,5 +98,4 @@ trait GoodOrderTrait
throw new ErrException($e->getMessage());
}
}
}

View File

@@ -0,0 +1,163 @@
<?php
namespace App\Service\ServiceTrait;
use App\Constants\Common\OrderCode;
use App\Model\OrderMealCateringLog;
use App\Model\OrderOptionCateringLog;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
trait CateringTrait
{
/**
* @return bool 添加失败需要退款
*/
private function manageAddCateringLog(): bool
{
return match ($this->orderInfo->type) {
OrderCode::ORDER_TYPE_MEAL => $this->manageAddMealCateringLog(),
OrderCode::ORDER_TYPE_OPTIONAL => $this->manageAddOptionCateringLog(),
default => true,
};
}
/**
* @return void 减少失败不影响退款数据
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
private function manageSubCateringLog(): void
{
match ($this->orderInfo->type) {
OrderCode::ORDER_TYPE_MEAL => $this->manageSubMealCateringLog(),
OrderCode::ORDER_TYPE_OPTIONAL => $this->manageSubOptionCateringLog(),
};
}
/**
* @return void
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
private function manageSubOptionCateringLog(): void
{
// todo 减少可以不减少根据订单 cycle_id 获取加一碗米饭 的数量 减少查询压力
// $addStapleFoodNum = 0;
$logInfo = $this->orderOptionCateringLogModel->getInfoBySiteIdAndCycleId($this->orderInfo->site_id, $this->orderInfo->cycle_id);
if (empty($logInfo)) {
$this->log->error(__CLASS__.':Function:refundCallBackHandle:manageSubOptionCateringLog:订单套餐配餐记录不存在,订单信息:'.json_encode($this->orderInfo->toArray()));
return;
}
if ($logInfo->status == 2) {
$this->log->error(__CLASS__.':Function:refundCallBackHandle:manageSubOptionCateringLog:已经截单不需要修改,订单信息:'.json_encode($this->orderInfo->toArray()));
return;
}
$logInfo->quantity = $logInfo->quantity + $this->orderInfo->copies;
// $logInfo->add_staple_food_num = $this->orderInfo->add_staple_food_num - $addStapleFoodNum;
if (!$logInfo->save()) {
$this->log->error(__CLASS__.':Function:refundCallBackHandle:manageSubOptionCateringLog:修改配餐记录失败,订单信息:'.json_encode($this->orderInfo->toArray()));
}
}
/**
* @return void
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
private function manageSubMealCateringLog(): void
{
$orderGoods = $this->orderGoodModel->where('order_id',$this->orderInfo->id)->pluck('copies','sku_id')->toArray();
foreach ($orderGoods as $key => $orderGood) {
$logInfo = $this->orderMealCateringLogModel->getInfoBySiteIdAndCycleIdAndSkuId($this->orderInfo->site_id,$this->orderInfo->cycle_id,(int)$key);
if (empty($logInfo)) {
$this->log->error(__CLASS__.':Function:refundCallBackHandle:manageSubMealCateringLog:订单套餐配餐记录不存在,订单信息:'.json_encode($this->orderInfo->toArray()).':订单商品信息:'.json_encode($orderGoods));
continue;
}
if ($logInfo->status == 2) {
$this->log->error(__CLASS__.':Function:refundCallBackHandle:manageSubMealCateringLog:已经截单不需要修改,订单信息:'.json_encode($this->orderInfo->toArray()).':订单商品信息:'.json_encode($orderGoods));
continue;
}
$logInfo->quantity = $logInfo->quantity - $orderGood;
if (!$logInfo->save()) {
$this->log->error(__CLASS__.':Function:refundCallBackHandle:manageSubMealCateringLog:修改配餐记录失败,订单信息:'.json_encode($this->orderInfo->toArray()).':订单商品信息:'.json_encode($orderGoods));
}
}
}
/**
* 添加自选配餐数据
* @return bool
*/
private function manageAddOptionCateringLog(): bool
{
//todo 根据订单 cycle_id 获取加一碗米饭 的数量
$addStapleFoodNum = 0;
$logInfo = $this->orderOptionCateringLogModel->getInfoBySiteIdAndCycleId($this->orderInfo->site_id, $this->orderInfo->cycle_id);
if (empty($logInfo)) {
$logInfo = new OrderOptionCateringLog();
$logInfo->site_id = $this->orderInfo->site_id;
$logInfo->cycle_id = $this->orderInfo->cycle_id;
$logInfo->quantity = 0;
$logInfo->add_staple_food_num = 0;
$logInfo->status = 1;
}
if ($logInfo->status == 2) return false;
$logInfo->quantity = $logInfo->quantity + $this->orderInfo->copies;
$logInfo->add_staple_food_num = $this->orderInfo->add_staple_food_num + $addStapleFoodNum;
if (!$logInfo->save()) return false;
return true;
}
/**
* 添加套餐配餐数据
* @return bool
*/
private function manageAddMealCateringLog(): bool
{
$orderGoods = $this->orderGoodModel->where('order_id',$this->orderInfo->id)->pluck('copies','sku_id')->toArray();
foreach ($orderGoods as $key => $orderGood) {
$logInfo = $this->orderMealCateringLogModel->getInfoBySiteIdAndCycleIdAndSkuId($this->orderInfo->site_id,$this->orderInfo->cycle_id,(int)$key);
if (empty($logInfo)) {
$logInfo = new OrderMealCateringLog();
$logInfo->site_id = $this->orderInfo->site_id;
$logInfo->cycle_id = $this->orderInfo->cycle_id;
$logInfo->sku_id = (int)$key;
$logInfo->quantity = 0;
$logInfo->status = 1;
}
if ($logInfo->status == 2) return false;
$logInfo->quantity = $logInfo->quantity + $orderGood;
if (!$logInfo->save()) return false;
}
return true;
}
}