Skip to content

semour / semour_admin

Go to a project
Commit 80d7717d by 孙龙
Options

深茂订单

parent 343d9e01
Inline Side-by-side
Showing with 6 additions and 4 deletions
app/Admin/Service/OrderService.php
...@@ -157,12 +157,14 @@ class OrderService extends BaseService ...@@ -157,12 +157,14 @@ class OrderService extends BaseService
} }
}else{ }else{
$createOrEdit = true; if(in_array($insertReturnItemData["type"],[1,2]) && $insertReturnItemData["return_price"] || $insertReturnItemData["return_num"]){
$createOrEdit = true;
}
} }
if($createOrEdit){ if($createOrEdit){
$insertReturnItemData["return_amount"] = decimal_number_format($orderItem["return_goods_number"] * $orderItem["return_goods_price"]); $insertReturnItemData["return_amount"] = decimal_number_format($insertReturnItemData["return_price"] * $insertReturnItemData["return_num"]);
} }
$createOrEdit && OrderReturnItems::create(array_merge($insertReturnItemData,["create_time"=>time()])); $createOrEdit && OrderReturnItems::create(array_merge($insertReturnItemData,["create_time"=>time()]));
} }
......
resources/views/admin/pages/order-page.blade.php
...@@ -415,8 +415,8 @@ ...@@ -415,8 +415,8 @@
<div class="layui-input-block"> <div class="layui-input-block">
<div class="layui-form-mid">{{$info["settlementInfo"]["order_user_pay_type_cn"]}}</div> <div class="layui-form-mid">{{$info["settlementInfo"]["order_user_pay_type_cn"]}}</div>
<div class="show" style="display: none"> <div class="show" style="display: none">
<input type="radio" name="order_user_pay_type" value="0" title="Paypal" checked> <input type="radio" name="order_user_pay_type" value="1" title="Paypal" checked>
<input type="radio" name="order_user_pay_type" value="1" title="TT"> <input type="radio" name="order_user_pay_type" value="2" title="TT">
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment