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

Merge pull request 'dev' (#141) from dev into main

Browse Source 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/141
This commit is contained in:
mkm 2024-08-18 14:39:55 +08:00
commit 9847f9fa12
6 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/admin/controller/store_order/StoreOrderController.php
View File

@ -154,22 +154,22 @@ class StoreOrderController extends BaseAdminController
$id = $this->request->post('id');
$system_store = $this->request->post('system_store');
$xlsx = new OrderDetail();
$order=StoreOrder::where('id',$id)->findOrEmpty();
$time= strtotime('+1 day', $order['pay_time']);
$order['pay_time']=date('Y-m-d H:i:s',$order['pay_time']);
$order['delivery_time']=date('Y-m-d', $time);
$data = StoreOrderCartInfo::where('oid', $id)->select();
$total_num=0;
$total_price=0;
foreach ($data as $key => &$value) {
$find=StoreProduct::where('id',$value->product_id)->find();
$value->store_name=$find['store_name']??'';
$value->store_info=$find['store_info']??'';
if(!empty($find['unit_id'])){
$value->unit_name=StoreProductUnit::where('id',$find['unit_id'])->value('name');
if(!empty($find['unit'])){
$value->unit_name=StoreProductUnit::where('id',$find['unit'])->value('name');
}else{
$value->unit_name='';
}
$total_num+=$value->cart_num;
$total_price+=$value->total_price;
}
$file_path = $xlsx->export($data,$system_store,$total_num,$total_price);
$file_path = $xlsx->export($data,$system_store,$order);
return $this->success('导出成功', ['url' => $file_path]);
}

12
app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php
View File

@ -7,6 +7,7 @@ use app\admin\controller\BaseAdminController;
use app\admin\lists\store_order_cart_info\StoreOrderCartInfoLists;
use app\admin\lists\store_order_cart_info\StoreOrderCartInfoTwoLists;
use app\admin\logic\store_order_cart_info\StoreOrderCartInfoLogic;
use app\common\model\store_order\StoreOrder;
use app\common\model\store_order_cart_info\StoreOrderCartInfo;
use app\common\model\store_product\StoreProduct;
use app\common\model\store_product_unit\StoreProductUnit;
@ -80,6 +81,9 @@ class StoreOrderCartInfoController extends BaseAdminController
$data = StoreOrderCartInfo::where($where)->select();
}
$order['pay_time']='';
$order['delivery_time']='';
$order['order_id']='';
$total_num=0;
$total_price=0;
@ -87,15 +91,17 @@ class StoreOrderCartInfoController extends BaseAdminController
$find=StoreProduct::where('id',$value->product_id)->find();
$value->store_name=$find['store_name']??'';
$value->store_info=$find['store_info']??'';
if(!empty($find['unit_id'])){
$value->unit_name=StoreProductUnit::where('id',$find['unit_id'])->value('name');
if(!empty($find['unit'])){
$value->unit_name=StoreProductUnit::where('id',$find['unit'])->value('name');
}else{
$value->unit_name='';
}
$total_num+=$value->cart_num;
$total_price+=$value->total_price;
}
$file_path = $xlsx->export($data,$system_store,$total_num,$total_price);
$order['total_num']=$total_num;
$order['total_price']=$total_price;
$file_path = $xlsx->export($data,$system_store,$order);
return $this->success('导出成功', ['url' => $file_path]);
}
}

2
app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php
View File

@ -58,7 +58,7 @@ class StoreBranchProductExchangeLists extends BaseAdminDataLists implements List
}
}
return StoreBranchProductExchange::where($this->searchWhere)->where($where)
->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'status'])
->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'bar_code','status'])
->when(!empty($this->adminInfo['store_id']), function ($query) {
$query->where('store_id', $this->adminInfo['store_id']);
})

2
app/admin/lists/store_branch_product/StoreBranchProductLists.php
View File

@ -81,7 +81,7 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI
$this->searchWhere[] = $where;
}
return StoreBranchProduct::where($this->searchWhere)
->field(['id', 'store_id', 'product_id', 'image', 'store_name', 'store_info', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'purchase', 'status', 'batch', 'vip_price', 'manufacturer_information'])
->field(['id', 'store_id', 'product_id', 'image', 'store_name', 'store_info', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'purchase', 'status', 'batch', 'vip_price','bar_code', 'manufacturer_information'])
->when(!empty($this->adminInfo['store_id']), function ($query) {
$query->where('store_id', $this->adminInfo['store_id']);
})

4
app/api/controller/order/OrderController.php
View File

@ -197,7 +197,7 @@ class OrderController extends BaseApiController
Db::name('wechat_micropay')->insert(['order_id' => $order['order_id'], 'create_time' => time(), 'update_time' => time()]);
Redis::send('send-code-pay', ['order_id' => $order['order_id']]);
try{
$arr = ["msgtype" => "markdown", "markdown" => ["content" => "有新的条码支付订单"]];
$arr = ["msgtype" => "markdown", "markdown" => ["content" => "有新的条码支付订单|".$order['order_id']]];
$url = 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=b538e44b-940b-445f-afe0-97320942d959';
(new Curl())->postJson($url, json_encode($arr));
}catch(Exception $e){
@ -315,7 +315,7 @@ class OrderController extends BaseApiController
Db::name('wechat_micropay')->insert(['order_id' => $order['order_id'], 'create_time' => time(), 'update_time' => time()]);
Redis::send('send-code-pay', ['order_id' => $order['order_id']]);
try{
$arr = ["msgtype" => "markdown", "markdown" => ["content" => "有新的条码支付订单"]];
$arr = ["msgtype" => "markdown", "markdown" => ["content" => "有新的条码支付订单|".$order['order_id']]];
$url = 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=b538e44b-940b-445f-afe0-97320942d959';
(new Curl())->postJson($url, json_encode($arr));
}catch(Exception $e){

13
app/common/service/xlsx/OrderDetail.php
View File

@ -14,9 +14,9 @@ class OrderDetail
public $company='共投里海';
public $address='泸州龙马潭区海吉星122栋';
public $phone='08302669767';
public $tel='08302669767';
public $tel='17309099881';
public function export($data,$system_store,$total_num,$total_price)
public function export($data,$system_store,$order)
{
$spreadsheet = new Spreadsheet();
$sheet = $spreadsheet->getActiveSheet();
@ -32,8 +32,11 @@ class OrderDetail
$sheet->setCellValue('A2', '店铺名称');
$sheet->setCellValue('B2', $system_store);
$sheet->setCellValue('F2', '送货时间');
$sheet->setCellValue('G2', $order['delivery_time']??'');
$sheet->setCellValue('A3', '开单日期');
$sheet->setCellValue('B3', $order['pay_time']??'');
$sheet->setCellValue('F3', '单号');
$sheet->setCellValue('G3', $order['order_id']??'');
$sheet->setCellValue('A4', '序号');
$sheet->setCellValue('B4', '商品名称');
$sheet->setCellValue('D4', '规格');
@ -71,10 +74,10 @@ class OrderDetail
$sheet->mergeCells('B' . ($count + 6) . ':E' . $count + 6);
$sheet->setCellValue('A' . $count + 6, '合计数量');
$sheet->setCellValue('B' . $count + 6,$total_num);
$sheet->setCellValue('B' . $count + 6,$order['total_num']);
$sheet->mergeCells('G' . ($count + 6) . ':J' . $count + 6);
$sheet->setCellValue('F' . $count + 6, '合计价格');
$sheet->setCellValue('G' . $count + 6, $total_price);
$sheet->setCellValue('G' . $count + 6, $order['total_price']);
$sheet->mergeCells('A' . ($count + 7) . ':J' . $count + 7);
@ -97,7 +100,7 @@ class OrderDetail
$sheet->mergeCells('A' . ($count + 10) . ':J' . $count + 10);
$sheet->setCellValue('A' . $count + 11, '仓库',);
$sheet->setCellValue('B' . $count + 11, $this->warehouse);
// $sheet->setCellValue('B' . $count + 11, $this->warehouse);
$sheet->mergeCells('B' . ($count + 11) . ':C' . $count + 11);
$sheet->setCellValue('D' . $count + 11, '送货');
$sheet->mergeCells('E' . ($count + 11) . ':F' . $count + 11);