github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 05:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

【程序目录】优化代码

Browse Source
This commit is contained in:
wuhaotian 2025-09-02 14:16:55 +08:00
parent ed01079229
commit c65642db29
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/app/api/controller/v1/order/StoreOrderController.php
View File

@ -258,7 +258,7 @@ class StoreOrderController
CacheService::set('PAY_LOCK_' . $uni, 'PAY_LOCK', 2);
if (!$uni) return app('json')->fail(100100);
$orderInfo = $this->services->get(['order_id' => $uni]);
if ($orderInfo->is_del == 1 || $orderInfo->is_system_del == 1) return app('json')->fail('订单已经超过系统支付时间，无法支付，请重新下单');
if ($orderInfo->is_cancel == 1 || $orderInfo->is_del == 1 || $orderInfo->is_system_del == 1) return app('json')->fail('订单已经超过系统支付时间，无法支付，请重新下单');
$uid = $type == 1 ? (int)$request->uid() : $orderInfo->uid;
$orderInfo->is_channel = $this->getChennel[$request->getFromType()] ?? ($request->isApp() ? 0 : 1);
$orderInfo->order_id = $uid != $orderInfo->pay_uid ? app()->make(StoreOrderCreateServices::class)->getNewOrderId('cp') : $uni;

4
crmeb/app/services/message/notice/RoutineTemplateListService.php
View File

@ -138,7 +138,7 @@ class RoutineTemplateListService extends NoticeService
'thing2' => $storeTitle,
'amount3' => $order['pay_price'],
'character_string6' => $data['order_id']
], '/pages/goods/order_details/index?order_id=' . $data['order_id'] . '&isReturen=1');
], '/pages/goods/order_details/index?order_id=' . $data['order_id'] . '&isReturn=1');
}
/**
@ -155,7 +155,7 @@ class RoutineTemplateListService extends NoticeService
'thing2' => $storeTitle,
'amount3' => $order['pay_price'],
'character_string6' => $order['order_id']
], '/pages/goods/order_details/index?order_id=' . $order['order_id'] . '&isReturen=1');
], '/pages/goods/order_details/index?order_id=' . $order['order_id'] . '&isReturn=1');
}
/**

4
crmeb/app/services/message/notice/WechatTemplateListService.php
View File

@ -151,7 +151,7 @@ class WechatTemplateListService extends NoticeService
'time5' => date('Y-m-d H:i:s', time()),
'thing2' => $title,
'amount3' => $order['refund_price'],
], '/pages/goods/order_details/index?order_id=' . $order['refund_no'] . '&isReturen=1');
], '/pages/goods/order_details/index?order_id=' . $order['refund_no'] . '&isReturn=1');
}
/**
@ -168,7 +168,7 @@ class WechatTemplateListService extends NoticeService
'thing2' => $title,
'amount3' => $order['refund_price'],
'thing4' => $order['refuse_reason'],
], '/pages/goods/order_details/index?order_id=' . $order['refund_no'] . '&isReturen=1');
], '/pages/goods/order_details/index?order_id=' . $order['refund_no'] . '&isReturn=1');
}
/**

3
crmeb/app/services/product/product/StoreProductServices.php
View File

@ -954,7 +954,7 @@ class StoreProductServices extends BaseServices
$res = $this->dao->update($id, $data);
$storeProductCateServices->update(['product_id' => $id], ['status' => 0]);
if (!$res) throw new AdminException(100008);
return 100002;
return '移动回收站成功';
}
}
@ -994,6 +994,7 @@ class StoreProductServices extends BaseServices
foreach ($attrs as $items) {
$item['attrs'][$key] = $items;
$item['attrs'][$key]['suk'] = implode(',', $items['detail']);
$item['attrs'][$key]['product_price'] = $items['price'];
$key += 1;
}
}

2
template/admin/src/libs/request.js
View File

@ -15,7 +15,7 @@ import Setting from '@/setting';
import router from '@/router';
const service = axios.create({
baseURL: Setting.apiBaseURL,
timeout: 10000, // 请求超时时间
timeout: 100000, // 请求超时时间
});
axios.defaults.withCredentials = true; // 携带cookie

2
template/admin/src/pages/marketing/lottery/create.vue
View File

@ -629,7 +629,7 @@ export default {
attends_user: 1, //参与用户1：所有 2：部分
user_level: [], //参与用户等级
user_label: [], //参与用户标签
is_svip: '-1', //参与用户是否付费会员
is_svip: '', //参与用户是否付费会员
prize_num: 0, //奖品数量
period: [], //活动时间
prize: [], //奖品数组

1
template/admin/src/pages/marketing/storeSeckill/createMore.vue
View File

@ -659,7 +659,6 @@ export default {
item.attrs.forEach((value) => {
value.cate_name = item.cate_name;
value.store_label = item.store_label;
value.product_price = item.price;
value.status = 1;
});
});