Skip to content

semour / semour_admin

Go to a project
Commit 45e72bdc by 孙龙
Options

订单取消 和 审核

parent 97532c3e
Inline Side-by-side
Showing with 323 additions and 193 deletions
app/Admin/Actions/OrderCancelAction.php
......@@ -3,6 +3,9 @@
namespace App\Admin\Actions;
use App\Admin\Service\OrderService;
use App\Exceptions\InvalidRequestException;
use App\Models\Order;
use App\Models\Order as OrderModel;
use Dcat\Admin\Grid\BatchAction;
use Dcat\Admin\Grid\Tools\AbstractTool;
......@@ -69,8 +72,15 @@ class OrderCancelAction extends RowAction
// 获取 parameters 方法传递的参数
$rowData = $request->get('rowData');
$orderInfo = Order::getOne($rowData["order_id"]??0);
if(empty($orderInfo)){
$this->response()->error('没找到相关的订单数据')->refresh();
}
try{
OrderService::cancelOrder($rowData["order_id"]??0);
}catch (InvalidRequestException $e){
$this->response()->error($e->getMessage())->refresh();
}
return $this->response()->success('取消成功')->refresh();
}
......
app/Admin/Controllers/Api/OrderApiController.php
......@@ -21,11 +21,14 @@ class OrderApiController extends Controller
$order_id = 1;
$orderAddressList = OrderService::getOrderAddress($order_id);
$orderAddressList = arrayChangeKeyByField($orderAddressList,"order_address_type");
dump($orderAddressList);
// dump($orderAddressList);
$info["sn"] = OrderService::getSn($type);
if(empty($info["sn"])){
abort(500, '获取编码失败');
}
$info["orderList"] = OrderService::getOrderList($order_id);
if($type == "1"){
//PI
return view('export.order_contract_PI',[
......@@ -35,10 +38,18 @@ class OrderApiController extends Controller
]);
}elseif($type == "2"){
//CI
return view('export.order_contract_CI');
return view('export.order_contract_CI',[
"ship"=>$orderAddressList[1]??[],
"bill"=>$orderAddressList[2]??[],
"info"=>$info
]);
}else{
//PL
return view('export.order_contract_PL');
return view('export.order_contract_PL',[
"ship"=>$orderAddressList[1]??[],
"bill"=>$orderAddressList[2]??[],
"info"=>$info
]);
}
}
......@@ -70,7 +81,23 @@ class OrderApiController extends Controller
public function orderDownload(Request $request){
// $params = $request->all();
// return Excel::download(new \App\Exports\ContractExport(),'PI.xlsx');
$params = $request->all();
$type = arrayGet($params, "type");
$order_id = 1;
$orderAddressList = OrderService::getOrderAddress($order_id);
$orderAddressList = arrayChangeKeyByField($orderAddressList,"order_address_type");
$info["sn"] = OrderService::getSn($type);
if(empty($info["sn"])){
abort(500, '获取编码失败');
}
$info["orderList"] = OrderService::getOrderList($order_id);
return Excel::download(new \App\Exports\ContractExport([
"ship"=>$orderAddressList[1]??[],
"bill"=>$orderAddressList[2]??[],
"info"=>$info
]),'PI.xlsx');
}
}
app/Admin/Controllers/OrderController.php
......@@ -128,12 +128,26 @@ class OrderController extends AdminController
// 获取当前行主键值
$id = $actions->getKey();
//取消按钮
if(in_array($rowArray["status"],[1,2])){
$actions->append(new OrderCancelAction());
}
//下载
if($rowArray["status"] >= 2){
$options = [
'PI',
];
if($rowArray["status"] > 2){
array_push($options,"CI","PL");
}
$actions->prepend(
\App\Admin\Controllers\OrderController::down($id)
\App\Admin\Controllers\OrderController::down($id,$options)
);
}
});
......@@ -144,16 +158,12 @@ class OrderController extends AdminController
}
public static function down($id){
public static function down($id,$optoins=[]){
$menu1 = Dropdown::make()
->button('下载')
->buttonClass('btn btn-primary btn-sm btn-mini') // 设置按钮样式
->options([
'PI',
'CI',
'PL',
])->map(function ($v, $k) use($id) {
->options($optoins)->map(function ($v, $k) use($id) {
$k++;
return "<a style='min-width: 5rem' class='test_item' data-orderid='$id' data-id='$k', data-value='{$v}' data-test='Hello world.' href='javascript:void(0)'>$v</a>";
});
......
app/Admin/Service/OrderService.php
......@@ -2,13 +2,16 @@
namespace App\Admin\Service;
use App\Exceptions\InvalidRequestException;
use App\Models\Cms\CmsUser;
use App\Models\Increasid;
use App\Models\Order;
use App\Models\OrderAddress;
use App\Models\OrderItem;
use App\Models\OrderPrice;
use Dcat\Admin\Grid;
class OrderService
class OrderService extends BaseService
{
......@@ -19,7 +22,37 @@ class OrderService
* @param $orderId
*/
public static function getOrderList($orderId=0){
$orderList = Order::getOrderList($orderId);
$orderItems = $orderList["order_items"]??[];
$orderPrice = $orderList["order_price"]??[];
$orderList["total_qty"] = 0;
foreach($orderItems as $k=>$item){
$orderList["total_qty"] += $item["goods_number"];
$orderItems[$k]["total_amount"] = decimal_number_format($item["goods_price"]*$item["goods_number"]);
$orderItems[$k]["total_amount_format"] = decimal_number_format($item["goods_price"]*$item["goods_number"],DIGITS_TWO,2);
}
$orderList["payServiceFee"] = 0;//支付手续费
$orderList["carriage"] = 0;//运费
foreach($orderPrice as $item){
switch ($item["price_type"]){
case OrderPrice::$PRICE_TYPE_LIST["支付手续费"]:
$orderList["payServiceFee"] += $item["price"];
break;
case OrderPrice::$PRICE_TYPE_LIST["运费"]:
$orderList["carriage"] += $item["price"];
break;
}
}
$orderList["order_items"] = $orderItems;
$orderList["total_amount"] = $orderList["order_amount"]+$orderList["payServiceFee"]+$orderList["carriage"]+$orderList["carriage"];
//支付手续费
$orderList["payServiceFee_format"] = decimal_number_format($orderList["payServiceFee"],DIGITS_TWO,2);
//运费
$orderList["carriage_format"] = decimal_number_format($orderList["carriage"],DIGITS_TWO,2);
$orderList["total_amount"] = decimal_number_format($orderList["total_amount"]);
$orderList["total_amount_format"] = decimal_number_format($orderList["total_amount"],DIGITS_TWO,2);
return $orderList;
}
......@@ -50,5 +83,18 @@ class OrderService
public static function orderIitemList($order_id=0){
}
public static function cancelOrder($order_id=0){
(new self)->startTransaction();
try{
Order::canelOrder($order_id);
OrderItem::canelOrder($order_id);
}catch (\Exception $e){
(new self)->rollBackTransaction();
throw new InvalidRequestException(sprintf("取消订单失败:%s",$e->getMessage()));
}
(new self)->commitTransaction();
}
}
app/Exports/ContractExport.php
......@@ -22,7 +22,7 @@ class ContractExport implements FromView, WithColumnWidths, WithDefaultStyles, W
public function view(): View
{
return view('export.order_contract', $this->order_info);
return view('export.order_contract_PI', $this->order_info);
}
public function columnWidths(): array
......@@ -32,11 +32,13 @@ class ContractExport implements FromView, WithColumnWidths, WithDefaultStyles, W
'B' => 23,
'C' => 22,
'D' => 10,
'E' => 10,
'E' => 23,
'F' => 10,
'G' => 12,
'H' => 12,
'I' => 15,
'J' => 15,
'K' => 15,
];
}
......@@ -49,11 +51,11 @@ class ContractExport implements FromView, WithColumnWidths, WithDefaultStyles, W
{
return [
AfterSheet::class => function (AfterSheet $event) {
// $cellRange = $this->specific_cells;
// foreach ($cellRange as $cell) {
// // 单个单元格设置格式
// $event->sheet->getDelegate()->getStyle($cell)->getNumberFormat()->setFormatCode('0.000000');
// }
// $cellRange = $this->specific_cells;
// foreach ($cellRange as $cell) {
// // 单个单元格设置格式
// $event->sheet->getDelegate()->getStyle($cell)->getNumberFormat()->setFormatCode('0.000000');
// }
// 垂直居中
// $last_line = $this->order_item_num + 8; // 最后行 = 明细数量 + (起始行 - 1)
......
app/Models/Order.php
......@@ -23,6 +23,19 @@ class Order extends Model
public static $STATUS_WAIT_PAY = 2;//待付款
public static $STATUS_FORAMT=[
"已取消"=>-1,
"审核不通过"=>-2,
"待审核"=>1,
"待付款"=>2,
"待付尾款"=>3,
"待发货"=>4,
"部分发货"=>7,
"待收货"=>8,
"交易成功"=>10,
];
public function scmUser()
{
return $this->belongsTo(ScmUser::class, 'user_id', 'id');
......@@ -33,6 +46,11 @@ class Order extends Model
return $this->hasMany(OrderItem::class, 'order_id', 'order_id');
}
public function order_price()
{
return $this->hasMany(OrderPrice::class, 'order_id', 'order_id');
}
//审核订单
......@@ -41,11 +59,27 @@ class Order extends Model
}
//获取订单数据
public static function getOrderList($orderId=0){
self::where("order_id",$orderId)->whereHas("order_items",function ($q){
if(empty($orderId)){
return [];
}
$info = self::where("order_id",$orderId)->whereHas("order_items",function ($q){
$q->where("status",1);
})->get()->toArray();
})->with("order_items")->with("order_price")->with("scmUser")->first();
return $info ? $info->toArray() : [];
}
public static function getOne($orderId=0){
$orderInfo = self::where("order_id",$orderId)->first();
return $orderInfo ? $orderInfo->toArray() : [];
}
//取消
public static function canelOrder($orderId=0){
return self::where("order_id",$orderId)->update([
"status"=>self::$STATUS_FORAMT["已取消"],
]);
}
}
app/Models/OrderAddress.php
......@@ -25,6 +25,12 @@ class OrderAddress extends Model
return $this->belongsTo(Order::class, 'order_id', 'order_id');
}
public function country()
{
return $this->belongsTo(Country::class, 'country_name', 'id');
}
public static function getOrderAddress($orderId=0){
return self::where("order_id",$orderId)->get()->toArray();
}
......
app/Models/OrderItem.php
......@@ -17,6 +17,11 @@ class OrderItem extends Model
public $timestamps = false;
public static $STATUS_FORMAT=[
"已删除"=>-1,
"正常"=>1,
];
public static function getOrderItems($order_id=0){
return self::where("order_id",$order_id)->get()->toArray();
......@@ -24,5 +29,11 @@ class OrderItem extends Model
}
//取消
public static function canelOrder($orderId=0){
return self::where("order_id",$orderId)->update([
"status"=>self::$STATUS_FORMAT["已删除"],
]);
}
}
app/helpers.php
......@@ -100,7 +100,7 @@ if (!function_exists('decimal_number_format')) {
if($currency){
$minus = $amount < 0 ? '-' : '';
$numerical = number_format(abs($amount),$digits,".",$thousandsSymbol);
$sign = \Arr::get(config("field.currency_sign"),intval($currency),"");
$sign = Arr::get(config("field.currency_sign"),intval($currency),"");
if (!empty($sign)) {
$numerical = $sign . $numerical;
}
......
resources/views/export/order_contract_PI.blade.php
<style>
* {
margin: 0;
padding: 0;
}
<table style="width: 80%" border="1">
.page {
padding: 10px 0;
width: 1000px;
margin: 0 auto;
}
.page p {
color: #000;
}
table {
width: 100%;
border-collapse: collapse;
border-spacing: 0;
margin: 10px 0;
}
table td, table th {
position: relative;
padding: 3px 15px;
min-height: 20px;
line-height: 20px;
font-size: 12px;
border: 1px solid #000;
color: #000;
white-space: nowrap;
}
.no-border td, .no-border th {
border: 1px solid transparent;
}
.tc {
text-align: center;
}
.text {
margin-top: 20px;
text-align: left;
}
.text p {
line-height: 20px;
}
</style>
<section class="page">
<h2 class="tc">SEMOUR ELECTRONICS CO.，LIMITED</h2>
<p class="tc">Flat Rm 1210, 12/F Sunbeam Centre #27, Shing Yip Street, Kwun Tong, Kowloon Hong Kong</p>
<p class="tc">SELLER /CONTACT:Joanna Email:Joanna@ichunt.com Tel: (+86)755-3580 8309 Fax: (+86)755-3580 0650 Mob: +8613600403130</p>
<br>
<h2 class="tc">Proforma Invoice</h2>
<table class="no-border">
<tbody>
<tr >
<td rowspan="4">图片</td>
</tr>
<tr>
<td>
<p>Ship to：</p>
<p>
@if(!empty($ship))
{{$ship["consignee"]}}
@endif
</p>
</td>
<td>
<p>Bill to:</p>
<p>the United States of America</p>
</td>
<td>
<p>INV No.</p>
<p>{{@$info["sn"]}}</p>
</td>
<td>
<p>Date：</p>
<p>2022/6/8</p>
<td colspan="10">SEMOUR ELECTRONICS CO.，LIMITED</td>
</tr>
<tr>
<td colspan="10">Flat Rm 1210, 12/F Sunbeam Centre #27, Shing Yip Street, Kwun Tong, Kowloon Hong Kong</td>
</tr>
<tr>
<td colspan="10">
SELLER /CONTACT:Joanna Email:Joanna@ichunt.com Tel: (+86)755-3580 8309 Fax: (+86)755-3580 0650 Mob:
+8613600403130
</td>
</tr>
<tr>
<td colspan="2">
<p>Company Name：</p>
<p>
@if(!empty($ship))
<td colspan="10">Proforma Invoice</td>
</tr>
{{$ship["company_name"]}}
</table>
<table style="width: 80%" border="1">
<tbody>
<tr>
<td width="8%">Ship to：</td>
<td width="20%">
{{@$ship["consignee"]}}
</td>
<td width="8%">Bill to:</td>
<td width="20%">{{@$bill["consignee"]}}</td>
<td>INV No.</td>
<td>Date：</td>
<!-- <td>{{@$info["sn"]}}</td>-->
<!-- <td>Date：</td>-->
<!-- <td>{{date("Y-m-d")}}</td>-->
</tr>
<tr>
<td>Company Name：</td>
<td>{{@$ship["company_name"]}}</td>
<td>Company Name：</td>
<td>{{@$bill["company_name"]}}</td>
<td>{{@$info["sn"]}}</td>
<td>{{date("Y-m-d")}}</td>
</tr>
<tr>
@endif</p>
</td>
<td colspan="2">
<p>Company Name：</p>
<p>XXXXXXXXXXXXXXXXXXXXXXXX（收货公司）</p>
</td>
<td rowspan="2">Address:</td>
<td rowspan="2">{{@$ship["country_name"]}} {{@$ship["province"]}} {{@$ship["city"]}} {{@$ship["detail_address"]}}</td>
<td rowspan="2">Address:</td>
<td rowspan="2"style="width:100px;word-wrap: break-word">{{@$bill["country_name"]}} {{@$bill["province"]}}
{{@$bill["city"]}} {{@$bill["detail_address"]}}
</td>
<td>Payment terms：</td>
<td>Delivery terms：</td>
<!-- <td>100%advance</td>-->
<!-- <td>-->
<!-- <td>Delivery terms：</td>-->
<!-- <td>EXW HK</td>-->
</tr>
<tr>
<td>
<p>Address:</p>
<p>XXXXXXXXXXXXXXXXXX</p>
</td>
<td>
<p>Address:</p>
<p>XXXXXXXXXXXXXXXXXX</p>
</td>
<td>
<p>Payment terms：</p>
<p>100%advance</p>
</td>
<td>
<p>Delivery terms：</p>
<p>EXW HK</p>
</td>
<td>100%advance</td>
<td>EXW HK</td>
</tr>
<tr>
<td>
<p>Tel:</p>
<p>XXXXXXXXXXXXXXXXXX</p>
</td>
<td>
<p>Tel:</p>
<p>XXXXXXXXXXXXXXXXXX</p>
</td>
<td>
<p>Buyer:</p>
<p>XXXXXXXXXXXXXXXXXX</p>
</td>
<td>
<p>Courier Account No.</p>
<p>XXXXXXXXXXXXXXXXXX</p>
</td>
<td>Tel:</td>
<td>{{@$ship["phone"]}}</td>
<td>Tel:</td>
<td>{{@$bill["phone"]}}</td>
<td>Buyer:</td>
<td>Courier Account No.</td>
</tr>
<tr>
<td>Attn:</td>
<td>{{@$ship["consignee"]}}</td>
<td>Attn:</td>
<td>{{@$bill["consignee"]}}</td>
<td>
<p>Attn:</p>
<p>XXXXX（即收货人）</p>
</td>
<td>
<p>Attn:</p>
<p>XXXXX（即收货人）</p>
</td>
<td colspan="2">
<p>公司名/客户名:</p>
<p>XXXXXXXXXXXXXXXXXX</p>
@if(!empty($info["orderList"]["scm_user"]))
@if($info["orderList"]["scm_user"]["name"])
{{$info["orderList"]["scm_user"]["name"]}}
@else
{{$info["orderList"]["scm_user"]["company_name"]}}
@endif
@endif
</td>
<td></td>
</tr>
</tbody>
</table>
<table>
</table>
<table style="width: 80%" border="1">
<tbody>
<tr>
<td>Slno</td>
<td width="100">Slno</td>
<td>CUSTOMER P/N</td>
<td>Manufacturer</td>
<td>Description</td>
......@@ -160,50 +105,89 @@
<td>CURRENCY</td>
<td>AMOUNT</td>
</tr>
@if(!empty($info["orderList"]["order_items"]))
@foreach($info["orderList"]["order_items"] as $k=>$item)
<tr>
<td>1</td>
<td>型号</td>
<td>制造商</td>
<td>IC（二级分类）</td>
<td>200</td>
<td>pcs（固定单位）</td>
<td>6.00000</td>
<td>USD（固定币种）</td>
<td>1200.00</td>
<td>{{$k+1}}</td>
<td>{{$item["goods_name"]}}</td>
<td>{{$item["brand_name"]}}</td>
<td>{{$item["class_id2_name"]}}</td>
<td>{{$item["goods_number"]}}</td>
<td>pcs</td>
<td>{{$item["goods_number"]}}</td>
<td>USD</td>
<td>{{$item["total_amount"]}}</td>
</tr>
@endforeach
@endif
<tr>
<td colspan="8">Bank Charge</td>
<td>$40.00</td>
<td>{{$info["orderList"]["payServiceFee_format"] ?? ""}}</td>
</tr>
<tr>
<td colspan="8">Freight Cost</td>
<td>$40.00</td>
<td>{{$info["orderList"]["carriage_format"] ?? ""}}</td>
</tr>
<tr>
<td colspan="2">TOTAL:</td>
<td colspan="2">$40.00</td>
<td colspan="2">Total Amount</td>
<td colspan="3">$40.00</td>
<td colspan="1">TOTAL:</td>
<td colspan="3"></td>
<td colspan="1">{{$info["orderList"]["total_qty"] ?? ""}}</td>
<td colspan="3">Total Amount</td>
<td colspan="1">{{$info["orderList"]["total_amount_format"] ?? ""}}</td>
</tr>
</tbody>
</table>
<p>Remark:1.Once received the goods, please sign on the invoice and packing list and send back the scan copy for record, if we didn't receive any feedback with in 3 days we will not entertain any claim regarding this shipment.2.All bank fees are the responsibility of the customer.</p>
<div class="text">
<p>Bank Information（支付账号）</p>
<p>Bank Name HSBC Hong Kong</p>
<p>Bank address 1 Queen's Road Central, Hong Kong</p>
<p>Swift Code HSBCHKHHHKH</p>
<p>Company Name SEMOUR ELECTRONICS CO., LIMITED</p>
<p>Account No 819-847187-838</p>
<p>Terms & Conditions</p>
<p>1.Your order is NCNR.</p>
<p>2.All Claims of shortage or shipment errors or shipment damage must be made within 15 days of after delivery.</p>
<p>3.Our liability shall be limited to the invoiced value of the materials or its replacement.</p>
<p>4.Parts are warranty 6 month form, fit, and function guarantee. All returns must be authorized by our sales department within 6 month of receipts of shipment.</p>
<p>5.VAT and Bank transfer charger is excluded in the invoice amount. Buyer will be responsible for TAX and Bank Charges if there is any.</p>
</div>
</section>
</table>
<table style="width:80%;table-layout: fixed;" border="1">
<tbody>
<tr>
<td style="word-break: break-all; word-wrap:break-word;">Remark:1.Once received the goods, please sign on the invoice and packing list and send back the scan copy for record, if we didn't receive any feedback with in 3 days we will not entertain any claim regarding this shipment.2.All bank fees are the responsibility of the customer.</td>
</tr>
</tbody>
</table>
<table style="width:80%;table-layout: fixed;" border="1">
<tbody>
<tr>
<td>&nbsp;</td>
</tr>
<tr><td>Bank Information</td></tr>
<tr><td> Bank Name HSBC Hong Kong</td></tr>
<tr><td> Bank address 1 Queen's Road Central, Hong Kong</td></tr>
<tr><td> Swift Code HSBCHKHHHKH</td></tr>
<tr><td> Company Name SEMOUR ELECTRONICS CO., LIMITED</td></tr>
<tr><td> Account No 819-847187-838</td></tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td>Terms &amp; Conditions</td>
</tr>
<tr>
<td>1.Your order is NCNR.</td>
</tr>
<tr>
<td>2.All Claims of shortage or shipment errors or shipment damage must be made within 15 days of after
delivery.
</td>
</tr>
<tr>
<td>3.Our liability shall be limited to the invoiced value of the materials or its replacement.</td>
</tr>
<tr>
<td>4.Parts are warranty 6 month form, fit, and function guarantee. All returns must be authorized by our sales
department within 6 month of receipts of shipment.
</td>
</tr>
<tr>
<td>5.VAT and Bank transfer charger is excluded in the invoice amount. Buyer will be responsible for TAX and
Bank Charges if there is any.
</td>
</tr>
</tbody>
</table>
<script type="text/javascript">
</script>
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