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

Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store

Browse Source
This commit is contained in:
luofei 2024-06-04 17:22:02 +08:00
commit 522b826da6
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/admin/controller/WorkbenchController.php
View File

@ -488,7 +488,7 @@ class WorkbenchController extends BaseAdminController
"changes" => "0.06",
"repeats" => "0.28",
"store_name" => "瞌睡兔 美式复古圆领卫衣外套女春秋款小个子宽松百搭休闲上衣",
"image" => "https=>//multi-store.crmeb.net/uploads/attach/2024/02/19/2f3f938d720fc4212216ab855808bf85.jpg",
"image" => "https://multi-store.crmeb.net/uploads/attach/2024/02/19/2f3f938d720fc4212216ab855808bf85.jpg",
"product_price" => "100.00",
"stock" => 16777213,
"is_show" => 1
@ -507,7 +507,7 @@ class WorkbenchController extends BaseAdminController
"changes" => "0.13",
"repeats" => "0.14",
"store_name" => "ECOK2024年春秋季美式复古美拉德风高级感撞色领拉链夹克外套女潮",
"image" => "https=>//multi-store.crmeb.net/uploads/attach/2024/02/19/5bf089c30da5bdddd815fbf2cba148e6.jpg",
"image" => "https://multi-store.crmeb.net/uploads/attach/2024/02/19/5bf089c30da5bdddd815fbf2cba148e6.jpg",
"product_price" => "169.90",
"stock" => 2980,
"is_show" => 1
@ -526,7 +526,7 @@ class WorkbenchController extends BaseAdminController
"changes" => "0.04",
"repeats" => "0.50",
"store_name" => "【618抢先购】CT四色眼影盘新色枕边话哑光亮片粉棕彩妆官方正品",
"image" => "https=>//multi-store.crmeb.net/uploads/attach/2024/05/24/fc63ee052b9dc66bd70a1e013510ded2.jpg",
"image" => "https://multi-store.crmeb.net/uploads/attach/2024/05/24/fc63ee052b9dc66bd70a1e013510ded2.jpg",
"product_price" => "490.00",
"stock" => 139994,
"is_show" => 1

1
app/admin/controller/store_branch_product/StoreBranchProductController.php
View File

@ -55,6 +55,7 @@ class StoreBranchProductController extends BaseAdminController
*/
public function edit()
{
d(1);
$params = (new StoreProductValidate())->post()->goCheck('edit');
$result = StoreProductLogic::edit($params);
if (true === $result) {

11
app/admin/logic/store_order/StoreOrderLogic.php
View File

@ -5,6 +5,7 @@ namespace app\admin\logic\store_order;
use app\common\model\store_order\StoreOrder;
use app\common\logic\BaseLogic;
use app\common\model\store_order_cart_info\StoreOrderCartInfo;
use think\facade\Db;
@ -89,6 +90,14 @@ class StoreOrderLogic extends BaseLogic
*/
public static function detail($params): array
{
return StoreOrder::findOrEmpty($params['id'])->toArray();
$data= StoreOrder::findOrEmpty($params['id'])->toArray();
if($data){
$data['_info']=StoreOrderCartInfo::where('oid',$data['id'])->field('cart_info')
->select()->each(function ($item){
$item['cart_info']=json_decode($item['cart_info'],true);//将json字符串转换为数组，方便使用其中的数据。
return $item;//返回处理后的数据。
});
}
return $data;
}
}

8
app/api/logic/order/OrderLogic.php
View File

@ -65,10 +65,9 @@ class OrderLogic extends BaseLogic
$cart_select[$k]['verify_code'] = $params['verify_code'] ?? '';
$cart_select[$k]['cart_info'] = json_encode($cart_select[$k]);
//理论上每笔都是拆分了
// $cart_select[$k]['name'] = $find['store_name'];
// $cart_select[$k]['imgs'] = $find['image'];
// $cart_select[$k]['unit_name'] = StoreProductUnit::where(['id' => $find['unit']])->value('name');
$cart_select[$k]['name'] = $find['store_name'];
$cart_select[$k]['imgs'] = $find['image'];
$cart_select[$k]['unit_name'] = StoreProductUnit::where(['id' => $find['unit']])->value('name');
self::$total = bcadd(self::$total, $cart_select[$k]['total'], 2);
}
$order = [
@ -82,7 +81,6 @@ class OrderLogic extends BaseLogic
'cart_id' => implode(',', $cartId),
'store_id' => $params['store_id'] ?? 0,
'shipping_type' => $params['shipping_type'] ?? 1//配送方式 1=快递 ，2=门店自提
// 'delivery_msg'=>' 预计48小时发货 '
];
} catch (\Exception $e) {
self::setError($e->getMessage());