|
@@ -1176,11 +1176,11 @@ class WholeController extends Curd
|
|
foreach ($params['goodsContentList'] as $goods) {
|
|
foreach ($params['goodsContentList'] as $goods) {
|
|
$params['join_sheet_goods_id'] = $goods['goods_id'];
|
|
$params['join_sheet_goods_id'] = $goods['goods_id'];
|
|
if (isset($goods['goods_classify']) && in_array($goods['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD'])) {
|
|
if (isset($goods['goods_classify']) && in_array($goods['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD'])) {
|
|
- $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
|
|
$params['order_sheet_num'] = $goods['nbr'];
|
|
$params['order_sheet_num'] = $goods['nbr'];
|
|
// 预约表
|
|
// 预约表
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
- $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
|
|
// 入预约记录
|
|
// 入预约记录
|
|
$this->insertAppointment($params, $writeOffDate, $applyData);
|
|
$this->insertAppointment($params, $writeOffDate, $applyData);
|
|
}
|
|
}
|
|
@@ -1200,10 +1200,10 @@ class WholeController extends Curd
|
|
foreach ($components as $component) {
|
|
foreach ($components as $component) {
|
|
$componentJson = json_decode($component['goods_component_json'], true);
|
|
$componentJson = json_decode($component['goods_component_json'], true);
|
|
$params['join_sheet_goods_sku_id'] = $componentJson['sku_id'];
|
|
$params['join_sheet_goods_sku_id'] = $componentJson['sku_id'];
|
|
- $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
|
|
$params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
|
|
$params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
- $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(8, 'up');
|
|
|
|
|
|
+ $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
|
|
// 入预约记录
|
|
// 入预约记录
|
|
$this->insertAppointment($params, $writeOffDate);
|
|
$this->insertAppointment($params, $writeOffDate);
|
|
}
|
|
}
|
|
@@ -1621,11 +1621,11 @@ class WholeController extends Curd
|
|
foreach ($params['goodsContentList'] as $goods) {
|
|
foreach ($params['goodsContentList'] as $goods) {
|
|
$params['join_sheet_goods_id'] = $goods['goods_id'];
|
|
$params['join_sheet_goods_id'] = $goods['goods_id'];
|
|
if (isset($goods['goods_classify']) && in_array($goods['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD'])) {
|
|
if (isset($goods['goods_classify']) && in_array($goods['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD'])) {
|
|
- $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
|
|
$params['order_sheet_num'] = $goods['nbr'];
|
|
$params['order_sheet_num'] = $goods['nbr'];
|
|
// 预约表
|
|
// 预约表
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
- $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
|
|
// 入预约记录
|
|
// 入预约记录
|
|
$this->insertAppointment($params, $writeOffDate, $applyData);
|
|
$this->insertAppointment($params, $writeOffDate, $applyData);
|
|
}
|
|
}
|
|
@@ -1645,10 +1645,10 @@ class WholeController extends Curd
|
|
foreach ($components as $component) {
|
|
foreach ($components as $component) {
|
|
$componentJson = json_decode($component['goods_component_json'], true);
|
|
$componentJson = json_decode($component['goods_component_json'], true);
|
|
$params['join_sheet_goods_sku_id'] = $componentJson['sku_id'];
|
|
$params['join_sheet_goods_sku_id'] = $componentJson['sku_id'];
|
|
- $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
|
|
$params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
|
|
$params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
- $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(8, 'up');
|
|
|
|
|
|
+ $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
|
|
// 入预约记录
|
|
// 入预约记录
|
|
$this->insertAppointment($params, $writeOffDate);
|
|
$this->insertAppointment($params, $writeOffDate);
|
|
}
|
|
}
|
|
@@ -1935,7 +1935,7 @@ class WholeController extends Curd
|
|
if (Member::where('member_mobile', $params['mobile'])->exists()) {
|
|
if (Member::where('member_mobile', $params['mobile'])->exists()) {
|
|
throw new BusinessException('会员已存在');
|
|
throw new BusinessException('会员已存在');
|
|
}
|
|
}
|
|
- $params['join_order_member_id'] = $params['member_id'] = 'MR' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['join_order_member_id'] = $params['member_id'] = 'MR' . date('ymdH') . random_string(6, 'up');
|
|
// 创建会员
|
|
// 创建会员
|
|
MemberService::createMember($params);
|
|
MemberService::createMember($params);
|
|
} else if (empty($params['join_order_member_id']) && empty($params['mobile'])) {
|
|
} else if (empty($params['join_order_member_id']) && empty($params['mobile'])) {
|
|
@@ -1946,8 +1946,8 @@ class WholeController extends Curd
|
|
}
|
|
}
|
|
|
|
|
|
$qrcodePayAmount = 0;
|
|
$qrcodePayAmount = 0;
|
|
- $params['orderId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
- $params['orderGroupId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['orderId'] = 'OD' . date('ymdH') . random_string(6, 'up');
|
|
|
|
+ $params['orderGroupId'] = 'OD' . date('ymdH') . random_string(6, 'up');
|
|
|
|
|
|
$systemStatus = 'SENDING'; // 待发货
|
|
$systemStatus = 'SENDING'; // 待发货
|
|
// 立即结算
|
|
// 立即结算
|
|
@@ -2300,13 +2300,13 @@ class WholeController extends Curd
|
|
foreach ($params['goodsContentList'] as $goods) {
|
|
foreach ($params['goodsContentList'] as $goods) {
|
|
$params['join_sheet_goods_id'] = $goods['goods_id'];
|
|
$params['join_sheet_goods_id'] = $goods['goods_id'];
|
|
if (isset($goods['goods_classify']) && in_array($goods['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD'])) {
|
|
if (isset($goods['goods_classify']) && in_array($goods['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD'])) {
|
|
- $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
|
|
$params['join_sheet_goods_sku_id'] = $goods['sku_id'];
|
|
$params['join_sheet_goods_sku_id'] = $goods['sku_id'];
|
|
$params['goods_id'] = $goods['goods_id'];
|
|
$params['goods_id'] = $goods['goods_id'];
|
|
$params['order_sheet_num'] = $goods['nbr'];
|
|
$params['order_sheet_num'] = $goods['nbr'];
|
|
// 预约表
|
|
// 预约表
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
- $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
|
|
// 入预约记录
|
|
// 入预约记录
|
|
$this->insertAppointment($params, $writeOffDate, $applyData);
|
|
$this->insertAppointment($params, $writeOffDate, $applyData);
|
|
}
|
|
}
|
|
@@ -2326,10 +2326,10 @@ class WholeController extends Curd
|
|
foreach ($components as $component) {
|
|
foreach ($components as $component) {
|
|
$componentJson = json_decode($component['goods_component_json'], true);
|
|
$componentJson = json_decode($component['goods_component_json'], true);
|
|
$params['join_sheet_goods_sku_id'] = $componentJson['sku_id'];
|
|
$params['join_sheet_goods_sku_id'] = $componentJson['sku_id'];
|
|
- $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
|
|
$params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
|
|
$params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
- $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(8, 'up');
|
|
|
|
|
|
+ $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
|
|
// 入预约记录
|
|
// 入预约记录
|
|
$this->insertAppointment($params, $writeOffDate);
|
|
$this->insertAppointment($params, $writeOffDate);
|
|
}
|
|
}
|
|
@@ -2511,7 +2511,7 @@ class WholeController extends Curd
|
|
if (Member::where('member_mobile', $params['mobile'])->exists()) {
|
|
if (Member::where('member_mobile', $params['mobile'])->exists()) {
|
|
throw new BusinessException("会员已存在");
|
|
throw new BusinessException("会员已存在");
|
|
}
|
|
}
|
|
- $params['join_order_member_id'] = $params['member_id'] = 'MR' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['join_order_member_id'] = $params['member_id'] = 'MR' . date('ymdH') . random_string(6, 'up');
|
|
// 创建会员
|
|
// 创建会员
|
|
MemberService::createMember($params);
|
|
MemberService::createMember($params);
|
|
} else if (empty($params['join_order_member_id']) && empty($params['mobile'])) {
|
|
} else if (empty($params['join_order_member_id']) && empty($params['mobile'])) {
|
|
@@ -2522,9 +2522,9 @@ class WholeController extends Curd
|
|
}
|
|
}
|
|
|
|
|
|
$qrcodePayAmount = 0;
|
|
$qrcodePayAmount = 0;
|
|
- $params['orderId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
- $params['orderGroupId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
- $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['orderId'] = 'OD' . date('ymdH') . random_string(6, 'up');
|
|
|
|
+ $params['orderGroupId'] = 'OD' . date('ymdH') . random_string(6, 'up');
|
|
|
|
+ $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
|
|
|
|
|
|
$systemStatus = 'SENDING'; // 待发货
|
|
$systemStatus = 'SENDING'; // 待发货
|
|
// 立即结算
|
|
// 立即结算
|
|
@@ -2784,13 +2784,13 @@ class WholeController extends Curd
|
|
foreach ($params['goodsContentList'] as $goods) {
|
|
foreach ($params['goodsContentList'] as $goods) {
|
|
$params['join_sheet_goods_id'] = $goods['goods_id'];
|
|
$params['join_sheet_goods_id'] = $goods['goods_id'];
|
|
if (isset($goods['goods_classify']) && in_array($goods['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD'])) {
|
|
if (isset($goods['goods_classify']) && in_array($goods['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD'])) {
|
|
- $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
|
|
$params['join_sheet_goods_sku_id'] = $goods['sku_id'];
|
|
$params['join_sheet_goods_sku_id'] = $goods['sku_id'];
|
|
$params['goods_id'] = $goods['goods_id'];
|
|
$params['goods_id'] = $goods['goods_id'];
|
|
$params['order_sheet_num'] = $goods['nbr'];
|
|
$params['order_sheet_num'] = $goods['nbr'];
|
|
// 预约表
|
|
// 预约表
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
- $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
|
|
// 入预约记录
|
|
// 入预约记录
|
|
$this->insertAppointment($params, $writeOffDate, $applyData);
|
|
$this->insertAppointment($params, $writeOffDate, $applyData);
|
|
}
|
|
}
|
|
@@ -2810,10 +2810,10 @@ class WholeController extends Curd
|
|
foreach ($components as $component) {
|
|
foreach ($components as $component) {
|
|
$componentJson = json_decode($component['goods_component_json'], true);
|
|
$componentJson = json_decode($component['goods_component_json'], true);
|
|
$params['join_sheet_goods_sku_id'] = $componentJson['sku_id'];
|
|
$params['join_sheet_goods_sku_id'] = $componentJson['sku_id'];
|
|
- $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
|
|
|
|
|
|
+ $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
|
|
$params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
|
|
$params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
|
|
- $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(8, 'up');
|
|
|
|
|
|
+ $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
|
|
// 入预约记录
|
|
// 入预约记录
|
|
$this->insertAppointment($params, $writeOffDate);
|
|
$this->insertAppointment($params, $writeOffDate);
|
|
}
|
|
}
|