pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

调整端

release
vine_liutk 2022-01-08 13:38:34 +08:00
parent 55b389ffd7
commit 9c22fad094
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Admin/Controllers/AppVersionController.php
View File

@ -140,10 +140,7 @@ class AppVersionController extends AdminController
$form->hidden('apk_link'); $form->hidden('apk_link');
$form->saving(function (Form $form) { $form->saving(function (Form $form) {
if ($form->cate && $form->cate ==3) { $apk_link = 'apk_link'.($form->cate != 3 ??2);
$form->cate = 2;
}
$apk_link = 'apk_link'.$form->cate;
$form->apk_link = $form->$apk_link; $form->apk_link = $form->$apk_link;
$form->deleteInput('apk_link1'); $form->deleteInput('apk_link1');

2
app/Admin/Forms/AfterSaleShippingFill.php
View File

@ -48,7 +48,7 @@ class AfterSaleShippingFill extends Form implements LazyRenderable
/** 处理补发逻辑 **/ /** 处理补发逻辑 **/
//获取售后商品数量 //获取售后商品数量
$fillQuantity = $afterSale->num; $fillQuantity = $afterSale->num;
$packageProduct = OrderPackageProduct::where('order_product_id', $afterSale->order_product_id)->where('quantity', '>', $fillQuantity)->first(); $packageProduct = OrderPackageProduct::where('order_product_id', $afterSale->order_product_id)->where('quantity', '>=', $fillQuantity)->first();
if (!$packageProduct) { if (!$packageProduct) {
throw new BizException('补发包裹未找到或者售后补发数量异常'); throw new BizException('补发包裹未找到或者售后补发数量异常');
} }

10
app/Admin/Forms/AfterSaleVerify.php
View File

@ -43,7 +43,15 @@ class AfterSaleVerify extends Form implements LazyRenderable
$afterSale = AfterSale::where('state', AfterSale::STATE_VERIFY)->findOrFail($this->payload['id']); $afterSale = AfterSale::where('state', AfterSale::STATE_VERIFY)->findOrFail($this->payload['id']);
if ($input['state'] == 3) {//审核通过 if ($input['state'] == 3) {//审核通过
$amount = Arr::get($input, 'amount', 0); $amount = Arr::get($input, 'amount', 0);
if ($amount > $afterSale->orderProduct->total_amount) { $afterSale->load(['order', 'order.afterSales']);
$finishedAfterSale = $afterSale->order->afterSales->filter(function ($items) {
if ($items->state == AfterSale::STATE_FINISH && in_array($items->type, [AfterSale::TYPE_REFUND_AND_RETURN, AfterSale::TYPE_REFUND, Aftersale::TYPE_CHANGE])) {
return true;
} else {
return false;
}
});
if ($amount > ($afterSale->orderProduct->total_amount - $finishedAfterSale->sum('amount'))) {
throw new BizException('退款金额不能大于商品实付金额'); throw new BizException('退款金额不能大于商品实付金额');
} }
$afterSaleService->verify($afterSale, $input['remarks3'], (int) Arr::get($input, 'amount', 0)); $afterSaleService->verify($afterSale, $input['remarks3'], (int) Arr::get($input, 'amount', 0));