From c17e694eacf66bc843ff036f323b301e55306667 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 21 Feb 2022 16:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../v1/activity/StoreBargainController.php | 87 +++--
crmeb/app/api/route/v1.php | 26 +-
.../dao/activity/bargain/StoreBargainDao.php | 12 +-
.../activity/bargain/StoreBargainServices.php | 232 ++++++------
.../bargain/StoreBargainUserHelpServices.php | 169 +++++----
.../app/services/order/StoreOrderServices.php | 2 +-
.../system/config/SystemConfigServices.php | 60 ++--
crmeb/public/index.html | 2 +-
....51373553.js => chunk-vendors.b8c5c46d.js} | 2 +-
.../{index.3719ecc1.js => index.6052499b.js} | 2 +-
.../pages-activity-bargain-index.2735bebc.js | 1 +
.../pages-activity-bargain-index.d46e5d7c.js | 1 -
...s-activity-goods_bargain-index.1d089a8e.js | 1 +
...s-activity-goods_bargain-index.a5cb0465.js | 1 -
...ty-goods_bargain_details-index.0eeba14a.js | 1 -
...ty-goods_bargain_details-index.7c629e1b.js | 1 +
...tivity-goods_combination-index.3fab41c4.js | 1 -
...tivity-goods_combination-index.dc7685df.js | 1 +
...oods_combination_details-index.7e423c98.js | 1 -
...oods_combination_details-index.b6a8b3a8.js | 1 +
...goods_combination_status-index.aa32d74e.js | 1 -
...goods_combination_status-index.e2d09a10.js | 1 +
...s-activity-goods_seckill-index.d80d6720.js | 1 -
...s-activity-goods_seckill-index.e6984ac8.js | 1 +
...ty-goods_seckill_details-index.7d8c1a71.js | 1 -
...ty-goods_seckill_details-index.b5ff1803.js | 1 +
...-activity-poster-poster-index.952158ff.js} | 2 +-
.../pages-activity-presell-index.44440798.js | 1 -
.../pages-activity-presell-index.5b343d5d.js | 1 +
...pecial-index~pages-index-index.86fc2f6d.js | 1 -
...pecial-index~pages-index-index.fb1c24d9.js | 1 +
.../pages-goods_cate-goods_cate.601aba59.js | 1 +
.../pages-goods_cate-goods_cate.a0ecfa51.js | 1 -
.../js/pages-goods_details-index.2699a761.js | 1 -
.../js/pages-goods_details-index.b2c93a04.js | 1 +
.../static/js/pages-index-index.32e7348f.js | 1 -
.../static/js/pages-index-index.b6bc14f3.js | 1 +
...es-order_addcart-order_addcart.9f94c508.js | 1 +
...es-order_addcart-order_addcart.c190094e.js | 1 -
...es-points_mall-exchange_record.08152828.js | 1 -
...es-points_mall-exchange_record.11bac05c.js | 1 +
...ts_mall-integral_goods_details.1ea8f254.js | 1 -
...ts_mall-integral_goods_details.ca21f158.js | 1 +
...oints_mall-integral_goods_list.34cf0491.js | 1 -
...oints_mall-integral_goods_list.acdb950b.js | 1 +
...ges-points_mall-integral_order.7501ebc6.js | 1 -
...ges-points_mall-integral_order.96df22a3.js | 1 +
...ts_mall-integral_order_details.bf879044.js | 1 -
...ts_mall-integral_order_details.f1f7f567.js | 1 +
...nts_mall-integral_order_status.2c671fa8.js | 1 -
...nts_mall-integral_order_status.677fac1d.js | 1 +
...-points_mall-logistics_details.44a61169.js | 1 +
...-points_mall-logistics_details.63d2153d.js | 1 -
.../js/pages-users-login-index.ae588154.js | 1 +
.../js/pages-users-login-index.eaa62fb5.js | 1 -
...ges-users-message_center-index.569e28c3.js | 1 +
...ges-users-message_center-index.7a4198b8.js | 1 -
...-users-payment_on_behalf-index.daa7d257.js | 1 -
...-users-payment_on_behalf-index.eeb68daa.js | 1 +
...s-users-retrievePassword-index.123df70b.js | 1 -
...s-users-retrievePassword-index.e7fbc242.js | 1 +
.../pages-users-user_info-index.5f61d25a.js | 1 -
.../pages-users-user_info-index.bbb2ae23.js | 1 +
...sers-user_invoice_order-index.19a5a425.js} | 2 +-
crmeb/public/statics/mp_view/common/main.js | 2 +-
crmeb/public/statics/mp_view/common/vendor.js | 4 +-
.../components/addressWindow/index.json | 4 +-
.../components/couponListWindow/index.json | 4 +-
.../components/couponWindow/index.json | 4 +-
.../mp_view/components/kefuIcon/index.json | 4 +-
.../mp_view/components/payment/index.json | 4 +-
.../mp_view/components/update/app-update.js | 2 +-
.../mp_view/components/update/app-update.json | 4 +-
.../mp_view/components/update/app-update.wxml | 2 +-
.../mp_view/components/update/app-update.wxss | 2 +-
.../pages/activity/goods_bargain/index.js | 2 +-
.../activity/goods_bargain_details/index.js | 2 +-
.../activity/goods_bargain_details/index.wxml | 2 +-
.../activity/goods_seckill_details/index.js | 2 +-
.../mp_view/pages/goods_details/index.js | 2 +-
.../mp_view/pages/goods_details/index.wxml | 2 +-
.../mp_view/pages/goods_details/index.wxss | 2 +-
.../index/diy/components/articleList.json | 4 +-
.../pages/index/diy/components/blankPage.json | 4 +-
.../index/diy/components/headerSerch.json | 4 +-
.../pages/index/diy/components/titles.json | 4 +-
.../pages/order_addcart/order_addcart.js | 2 +-
.../pages/order_addcart/order_addcart.wxml | 2 +-
.../pages/order_addcart/order_addcart.wxss | 2 +-
.../mp_view/pages/users/login/index.js | 2 +-
.../mp_view/pages/users/login/index.wxss | 2 +-
.../pages/users/message_center/index.js | 2 +-
.../pages/users/message_center/index.wxml | 2 +-
.../pages/users/message_center/index.wxss | 2 +-
.../pages/users/payment_on_behalf/index.js | 2 +-
.../pages/users/payment_on_behalf/index.wxml | 2 +-
.../pages/users/payment_on_behalf/index.wxss | 2 +-
.../mp_view/pages/users/user_info/index.js | 2 +-
.../mp_view/pages/users/user_info/index.wxml | 2 +-
.../mp_view/pages/users/user_info/index.wxss | 2 +-
.../statics/mp_view/project.config.json | 4 +-
template/uni-app/App.vue | 12 +-
template/uni-app/api/activity.js | 8 +-
.../uni-app/components/update/app-update.vue | 8 +-
template/uni-app/manifest.json | 64 +++-
template/uni-app/mixins/color.js | 7 +-
.../pages/activity/goods_bargain/index.vue | 74 ++--
.../activity/goods_bargain_details/index.vue | 333 ++++++------------
.../activity/goods_seckill_details/index.vue | 10 +
.../uni-app/pages/goods_details/index.vue | 13 +-
.../pages/order_addcart/order_addcart.vue | 13 +-
template/uni-app/pages/users/login/index.vue | 14 +-
.../pages/users/message_center/index.vue | 90 ++++-
.../pages/users/payment_on_behalf/index.vue | 46 ++-
.../uni-app/pages/users/user_info/index.vue | 29 +-
115 files changed, 819 insertions(+), 650 deletions(-)
rename crmeb/public/static/js/{chunk-vendors.51373553.js => chunk-vendors.b8c5c46d.js} (99%)
rename crmeb/public/static/js/{index.3719ecc1.js => index.6052499b.js} (92%)
create mode 100644 crmeb/public/static/js/pages-activity-bargain-index.2735bebc.js
delete mode 100644 crmeb/public/static/js/pages-activity-bargain-index.d46e5d7c.js
create mode 100644 crmeb/public/static/js/pages-activity-goods_bargain-index.1d089a8e.js
delete mode 100644 crmeb/public/static/js/pages-activity-goods_bargain-index.a5cb0465.js
delete mode 100644 crmeb/public/static/js/pages-activity-goods_bargain_details-index.0eeba14a.js
create mode 100644 crmeb/public/static/js/pages-activity-goods_bargain_details-index.7c629e1b.js
delete mode 100644 crmeb/public/static/js/pages-activity-goods_combination-index.3fab41c4.js
create mode 100644 crmeb/public/static/js/pages-activity-goods_combination-index.dc7685df.js
delete mode 100644 crmeb/public/static/js/pages-activity-goods_combination_details-index.7e423c98.js
create mode 100644 crmeb/public/static/js/pages-activity-goods_combination_details-index.b6a8b3a8.js
delete mode 100644 crmeb/public/static/js/pages-activity-goods_combination_status-index.aa32d74e.js
create mode 100644 crmeb/public/static/js/pages-activity-goods_combination_status-index.e2d09a10.js
delete mode 100644 crmeb/public/static/js/pages-activity-goods_seckill-index.d80d6720.js
create mode 100644 crmeb/public/static/js/pages-activity-goods_seckill-index.e6984ac8.js
delete mode 100644 crmeb/public/static/js/pages-activity-goods_seckill_details-index.7d8c1a71.js
create mode 100644 crmeb/public/static/js/pages-activity-goods_seckill_details-index.b5ff1803.js
rename crmeb/public/static/js/{pages-activity-poster-poster-index.7758b34e.js => pages-activity-poster-poster-index.952158ff.js} (51%)
delete mode 100644 crmeb/public/static/js/pages-activity-presell-index.44440798.js
create mode 100644 crmeb/public/static/js/pages-activity-presell-index.5b343d5d.js
delete mode 100644 crmeb/public/static/js/pages-annex-special-index~pages-index-index.86fc2f6d.js
create mode 100644 crmeb/public/static/js/pages-annex-special-index~pages-index-index.fb1c24d9.js
create mode 100644 crmeb/public/static/js/pages-goods_cate-goods_cate.601aba59.js
delete mode 100644 crmeb/public/static/js/pages-goods_cate-goods_cate.a0ecfa51.js
delete mode 100644 crmeb/public/static/js/pages-goods_details-index.2699a761.js
create mode 100644 crmeb/public/static/js/pages-goods_details-index.b2c93a04.js
delete mode 100644 crmeb/public/static/js/pages-index-index.32e7348f.js
create mode 100644 crmeb/public/static/js/pages-index-index.b6bc14f3.js
create mode 100644 crmeb/public/static/js/pages-order_addcart-order_addcart.9f94c508.js
delete mode 100644 crmeb/public/static/js/pages-order_addcart-order_addcart.c190094e.js
delete mode 100644 crmeb/public/static/js/pages-points_mall-exchange_record.08152828.js
create mode 100644 crmeb/public/static/js/pages-points_mall-exchange_record.11bac05c.js
delete mode 100644 crmeb/public/static/js/pages-points_mall-integral_goods_details.1ea8f254.js
create mode 100644 crmeb/public/static/js/pages-points_mall-integral_goods_details.ca21f158.js
delete mode 100644 crmeb/public/static/js/pages-points_mall-integral_goods_list.34cf0491.js
create mode 100644 crmeb/public/static/js/pages-points_mall-integral_goods_list.acdb950b.js
delete mode 100644 crmeb/public/static/js/pages-points_mall-integral_order.7501ebc6.js
create mode 100644 crmeb/public/static/js/pages-points_mall-integral_order.96df22a3.js
delete mode 100644 crmeb/public/static/js/pages-points_mall-integral_order_details.bf879044.js
create mode 100644 crmeb/public/static/js/pages-points_mall-integral_order_details.f1f7f567.js
delete mode 100644 crmeb/public/static/js/pages-points_mall-integral_order_status.2c671fa8.js
create mode 100644 crmeb/public/static/js/pages-points_mall-integral_order_status.677fac1d.js
create mode 100644 crmeb/public/static/js/pages-points_mall-logistics_details.44a61169.js
delete mode 100644 crmeb/public/static/js/pages-points_mall-logistics_details.63d2153d.js
create mode 100644 crmeb/public/static/js/pages-users-login-index.ae588154.js
delete mode 100644 crmeb/public/static/js/pages-users-login-index.eaa62fb5.js
create mode 100644 crmeb/public/static/js/pages-users-message_center-index.569e28c3.js
delete mode 100644 crmeb/public/static/js/pages-users-message_center-index.7a4198b8.js
delete mode 100644 crmeb/public/static/js/pages-users-payment_on_behalf-index.daa7d257.js
create mode 100644 crmeb/public/static/js/pages-users-payment_on_behalf-index.eeb68daa.js
delete mode 100644 crmeb/public/static/js/pages-users-retrievePassword-index.123df70b.js
create mode 100644 crmeb/public/static/js/pages-users-retrievePassword-index.e7fbc242.js
delete mode 100644 crmeb/public/static/js/pages-users-user_info-index.5f61d25a.js
create mode 100644 crmeb/public/static/js/pages-users-user_info-index.bbb2ae23.js
rename crmeb/public/static/js/{pages-users-user_invoice_order-index.6ff83d83.js => pages-users-user_invoice_order-index.19a5a425.js} (70%)
diff --git a/crmeb/app/api/controller/v1/activity/StoreBargainController.php b/crmeb/app/api/controller/v1/activity/StoreBargainController.php
index 3bdd60681..cf65e8636 100644
--- a/crmeb/app/api/controller/v1/activity/StoreBargainController.php
+++ b/crmeb/app/api/controller/v1/activity/StoreBargainController.php
@@ -67,7 +67,10 @@ class StoreBargainController
*/
public function detail(Request $request, $id)
{
- $data = $this->services->getBargain($request, $id);
+ list($bargainUid) = $request->getMore([
+ ['bargainUid', 0]
+ ], true);
+ $data = $this->services->getBargain($request, $id, (int)$bargainUid);
return app('json')->successful($data);
}
@@ -100,9 +103,7 @@ class StoreBargainController
list($bargainId) = $request->postMore([
['bargainId', 0]
], true);
- $code = $this->services->setBargain($request->uid(), $bargainId);
- if ($code === 'subscribe') return app('json')->fail('请先关注公众号', ['code' => 'subscribe']);
- return app('json')->status($code, '参与成功');
+ return app('json')->successful($this->services->setBargain($request->uid(), $bargainId));
}
/**
@@ -120,49 +121,47 @@ class StoreBargainController
['bargainId', 0],
['bargainUserUid', 0]
], true);
- $code = $this->services->setHelpBargain($request->uid(), $bargainId, $bargainUserUid);
- if ($code === 'subscribe') return app('json')->fail('请先关注公众号', ['code' => 'subscribe']);
- return app('json')->status($code, '砍价成功');
+ return app('json')->successful($this->services->setHelpBargain($request->uid(), $bargainId, $bargainUserUid));
}
- /**
- * 砍价 砍掉金额
- * @param Request $request
- * @return mixed
- */
- public function help_price(Request $request)
- {
- list($bargainId, $bargainUserUid) = $request->postMore([
- ['bargainId', 0],
- ['bargainUserUid', 0]
- ], true);
+// /**
+// * 砍价 砍掉金额
+// * @param Request $request
+// * @return mixed
+// */
+// public function help_price(Request $request)
+// {
+// list($bargainId, $bargainUserUid) = $request->postMore([
+// ['bargainId', 0],
+// ['bargainUserUid', 0]
+// ], true);
+//
+// /** @var StoreBargainUserHelpServices $bargainUserHelp */
+// $bargainUserHelp = app()->make(StoreBargainUserHelpServices::class);
+// $price = $bargainUserHelp->getPrice($request->uid(), (int)$bargainId, (int)$bargainUserUid);
+// return app('json')->successful($price);
+// }
- /** @var StoreBargainUserHelpServices $bargainUserHelp */
- $bargainUserHelp = app()->make(StoreBargainUserHelpServices::class);
- $price = $bargainUserHelp->getPrice($request->uid(), (int)$bargainId, (int)$bargainUserUid);
- return app('json')->successful($price);
- }
-
- /**
- * 砍价 砍价帮总人数、剩余金额、进度条、已经砍掉的价格
- * @param Request $request
- * @return mixed
- * @throws \think\Exception
- * @throws \think\db\exception\DataNotFoundException
- * @throws \think\db\exception\ModelNotFoundException
- * @throws \think\exception\DbException
- */
- public function help_count(Request $request)
- {
- list($bargainId, $bargainUserUid) = $request->postMore([
- ['bargainId', 0],
- ['bargainUserUid', 0]
- ], true);
- /** @var StoreBargainUserServices $bargainUserService */
- $bargainUserService = app()->make(StoreBargainUserServices::class);
- $data = $bargainUserService->helpCount($request, (int)$bargainId, (int)$bargainUserUid);
- return app('json')->successful($data);
- }
+// /**
+// * 砍价 砍价帮总人数、剩余金额、进度条、已经砍掉的价格
+// * @param Request $request
+// * @return mixed
+// * @throws \think\Exception
+// * @throws \think\db\exception\DataNotFoundException
+// * @throws \think\db\exception\ModelNotFoundException
+// * @throws \think\exception\DbException
+// */
+// public function help_count(Request $request)
+// {
+// list($bargainId, $bargainUserUid) = $request->postMore([
+// ['bargainId', 0],
+// ['bargainUserUid', 0]
+// ], true);
+// /** @var StoreBargainUserServices $bargainUserService */
+// $bargainUserService = app()->make(StoreBargainUserServices::class);
+// $data = $bargainUserService->helpCount($request, (int)$bargainId, (int)$bargainUserUid);
+// return app('json')->successful($data);
+// }
/**
diff --git a/crmeb/app/api/route/v1.php b/crmeb/app/api/route/v1.php
index 15f9c859c..836e07274 100644
--- a/crmeb/app/api/route/v1.php
+++ b/crmeb/app/api/route/v1.php
@@ -44,9 +44,33 @@ Route::group(function () {
})->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\api\middleware\StationOpenMiddleware::class);
+
+//管理员订单操作类
+Route::group(function () {
+ Route::get('admin/order/statistics', 'v1.admin.StoreOrderController/statistics')->name('adminOrderStatistics');//订单数据统计
+ Route::get('admin/order/data', 'v1.admin.StoreOrderController/data')->name('adminOrderData');//订单每月统计数据
+ Route::get('admin/order/list', 'v1.admin.StoreOrderController/lst')->name('adminOrderList');//订单列表
+ Route::get('admin/refund_order/list', 'v1.admin.StoreOrderController/refundOrderList')->name('adminOrderRefundList');//退款订单列表
+ Route::get('admin/order/detail/:orderId', 'v1.admin.StoreOrderController/detail')->name('adminOrderDetail');//订单详情
+ Route::get('admin/refund_order/detail/:uni', 'v1.admin.StoreOrderController/refundOrderDetail')->name('RefundOrderDetail');//退款订单详情
+ Route::get('admin/order/delivery/gain/:orderId', 'v1.admin.StoreOrderController/delivery_gain')->name('adminOrderDeliveryGain');//订单发货获取订单信息
+ Route::post('admin/order/delivery/keep/:id', 'v1.admin.StoreOrderController/delivery_keep')->name('adminOrderDeliveryKeep');//订单发货
+ Route::post('admin/order/price', 'v1.admin.StoreOrderController/price')->name('adminOrderPrice');//订单改价
+ Route::post('admin/order/remark', 'v1.admin.StoreOrderController/remark')->name('adminOrderRemark');//订单备注
+ Route::post('admin/refund_order/remark', 'v1.admin.StoreOrderController/refundRemark')->name('refundRemark');//退款订单备注
+ Route::get('admin/order/time', 'v1.admin.StoreOrderController/time')->name('adminOrderTime');//订单交易额时间统计
+ Route::post('admin/order/offline', 'v1.admin.StoreOrderController/offline')->name('adminOrderOffline');//订单支付
+ Route::post('admin/order/refund', 'v1.admin.StoreOrderController/refund')->name('adminOrderRefund');//订单退款
+ Route::post('order/order_verific', 'v1.admin.StoreOrderController/order_verific')->name('order');//订单核销
+ Route::get('admin/order/delivery', 'v1.admin.StoreOrderController/getDeliveryAll')->name('getDeliveryAll');//获取配送员
+ Route::get('admin/order/delivery_info', 'v1.admin.StoreOrderController/getDeliveryInfo')->name('getDeliveryInfo');//获取电子面单默认信息
+ Route::get('admin/order/export_temp', 'v1.admin.StoreOrderController/getExportTemp')->name('getExportTemp');//获取电子面单模板获取
+ Route::get('admin/order/export_all', 'v1.admin.StoreOrderController/getExportAll')->name('getExportAll');//获取物流公司
+})->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\api\middleware\StationOpenMiddleware::class)->middleware(\app\api\middleware\AuthTokenMiddleware::class, true)->middleware(\app\api\middleware\CustomerMiddleware::class);
+
//会员授权接口
Route::group(function () {
- Route::post('order/order_verific', 'v1.admin.StoreOrderController/order_verific')->name('order');//订单核销
+
//用户修改手机号
Route::post('user/updatePhone', 'v1.LoginController/update_binding_phone')->name('updateBindingPhone');
//设置登录code
diff --git a/crmeb/app/dao/activity/bargain/StoreBargainDao.php b/crmeb/app/dao/activity/bargain/StoreBargainDao.php
index 04e7a2b87..5d30a9963 100644
--- a/crmeb/app/dao/activity/bargain/StoreBargainDao.php
+++ b/crmeb/app/dao/activity/bargain/StoreBargainDao.php
@@ -107,19 +107,20 @@ class StoreBargainDao extends BaseDao
* 砍价列表
* @param int $page
* @param int $limit
+ * @param string $field
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
- public function bargainList(int $page, int $limit)
+ public function bargainList(int $page, int $limit, string $field = '*')
{
return $this->search(['is_del' => 0, 'status' => 1])
->where('start_time', '<=', time())
->where('stop_time', '>=', time())
->where('product_id', 'IN', function ($query) {
$query->name('store_product')->where('is_show', 1)->where('is_del', 0)->field('id');
- })->with('product')->page($page, $limit)->order('sort DESC,id DESC')->select()->toArray();
+ })->with('product')->field($field)->page($page, $limit)->order('sort DESC,id DESC')->select()->toArray();
}
/**
@@ -132,7 +133,8 @@ class StoreBargainDao extends BaseDao
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
- public function DiyBargainList(array $where,int $page, int $limit){
+ public function DiyBargainList(array $where, int $page, int $limit)
+ {
return $this->search($where)
->when(isset($where['sid']) && $where['sid'], function ($query) use ($where) {
$query->whereIn('id', function ($query) use ($where) {
@@ -161,7 +163,8 @@ class StoreBargainDao extends BaseDao
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
- public function getHomeList(array $where,int $page, int $limit){
+ public function getHomeList(array $where, int $page, int $limit)
+ {
return $this->search($where)
->when(isset($where['sid']) && $where['sid'], function ($query) use ($where) {
$query->whereIn('id', function ($query) use ($where) {
@@ -229,6 +232,7 @@ class StoreBargainDao extends BaseDao
$query->name('store_product')->where('is_show', 1)->where('is_del', 0)->field('id');
})->count();
}
+
/**
* 修改砍价状态
* @param int $id
diff --git a/crmeb/app/services/activity/bargain/StoreBargainServices.php b/crmeb/app/services/activity/bargain/StoreBargainServices.php
index af83ec4b7..29e4dcbe4 100644
--- a/crmeb/app/services/activity/bargain/StoreBargainServices.php
+++ b/crmeb/app/services/activity/bargain/StoreBargainServices.php
@@ -305,55 +305,55 @@ class StoreBargainServices extends BaseServices
return $valueNew;
}
- /**
- * TODO 获取砍价表ID
- * @param int $bargainId $bargainId 砍价商品
- * @param int $bargainUserUid $bargainUserUid 开启砍价用户编号
- * @param int $status $status 砍价状态 1参与中 2 活动结束参与失败 3活动结束参与成功
- * @return mixed
- */
- public function getBargainUserTableId($bargainId = 0, $bargainUserUid = 0)
- {
- return $this->dao->value(['bargain_id' => $bargainId, 'uid' => $bargainUserUid, 'is_del' => 0], 'id');
- }
+// /**
+// * TODO 获取砍价表ID
+// * @param int $bargainId $bargainId 砍价商品
+// * @param int $bargainUserUid $bargainUserUid 开启砍价用户编号
+// * @param int $status $status 砍价状态 1参与中 2 活动结束参与失败 3活动结束参与成功
+// * @return mixed
+// */
+// public function getBargainUserTableId($bargainId = 0, $bargainUserUid = 0)
+// {
+// return $this->dao->value(['bargain_id' => $bargainId, 'uid' => $bargainUserUid, 'is_del' => 0], 'id');
+// }
- /**
- * TODO 获取用户可以砍掉的价格
- * @param $id $id 用户参与砍价表编号
- * @return float
- * @throws \think\db\exception\DataNotFoundException
- * @throws \think\db\exception\ModelNotFoundException
- * @throws \think\exception\DbException
- */
- public function getBargainUserDiffPriceFloat($id)
- {
- $price = $this->dao->get($id, ['bargain_price,bargain_price_min']);
- return (float)bcsub($price['bargain_price'], $price['bargain_price_min'], 2);
- }
+// /**
+// * TODO 获取用户可以砍掉的价格
+// * @param $id $id 用户参与砍价表编号
+// * @return float
+// * @throws \think\db\exception\DataNotFoundException
+// * @throws \think\db\exception\ModelNotFoundException
+// * @throws \think\exception\DbException
+// */
+// public function getBargainUserDiffPriceFloat($id)
+// {
+// $price = $this->dao->get($id, ['bargain_price,bargain_price_min']);
+// return (float)bcsub($price['bargain_price'], $price['bargain_price_min'], 2);
+// }
- /**
- * TODO 获取用户砍掉的价格
- * @param int $id $id 用户参与砍价表编号
- * @return float
- */
- public function getBargainUserPrice($id = 0)
- {
- return (float)$this->dao->value(['id' => $id], 'price');
- }
+// /**
+// * TODO 获取用户砍掉的价格
+// * @param int $id $id 用户参与砍价表编号
+// * @return float
+// */
+// public function getBargainUserPrice($id = 0)
+// {
+// return (float)$this->dao->value(['id' => $id], 'price');
+// }
- /**
- * 获取一条砍价商品
- * @param int $bargainId
- * @param string $field
- * @return array
- */
- public function getBargainOne($bargainId = 0, $field = 'id,product_id,title,price,min_price,image')
- {
- if (!$bargainId) return [];
- $bargain = $this->dao->getOne(['id' => $bargainId], $field);
- if ($bargain) return $bargain->toArray();
- else return [];
- }
+// /**
+// * 获取一条砍价商品
+// * @param int $bargainId
+// * @param string $field
+// * @return array
+// */
+// public function getBargainOne($bargainId = 0, $field = 'id,product_id,title,price,min_price,image')
+// {
+// if (!$bargainId) return [];
+// $bargain = $this->dao->getOne(['id' => $bargainId], $field);
+// if ($bargain) return $bargain->toArray();
+// else return [];
+// }
/**
* 砍价列表
@@ -364,7 +364,8 @@ class StoreBargainServices extends BaseServices
/** @var StoreBargainUserServices $bargainUserService */
$bargainUserService = app()->make(StoreBargainUserServices::class);
[$page, $limit] = $this->getPageValue();
- $list = $this->dao->BargainList($page, $limit);
+ $field = 'id,product_id,title,min_price,image,price';
+ $list = $this->dao->BargainList($page, $limit, $field);
foreach ($list as &$item) {
$item['people'] = $bargainUserService->getUserIdList($item['id']);
$item['price'] = floatval($item['price']);
@@ -424,47 +425,84 @@ class StoreBargainServices extends BaseServices
return $data;
}
- /**获取单条砍价
+ /**
+ * 前端获取砍价详情
* @param Request $request
* @param int $id
- * @return mixed
+ * @param int $bargainUid
+ * @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
- public function getBargain(Request $request, int $id)
+ public function getBargain(Request $request, int $id, int $bargainUid)
{
+ /** @var StoreProductAttrServices $storeProductAttrServices */
+ $storeProductAttrServices = app()->make(StoreProductAttrServices::class);
+ /** @var StoreOrderServices $orderService */
+ $orderService = app()->make(StoreOrderServices::class);
+ /** @var StoreBargainUserServices $bargainUserService */
+ $bargainUserService = app()->make(StoreBargainUserServices::class);
+
+ //获取砍价商品信息
$bargain = $this->dao->getOne(['id' => $id], '*', ['description']);
if (!$bargain) throw new ValidateException('砍价商品不存在');
- $this->dao->addBargain($id, 'look');
- $bargain['time'] = time();
if ($bargain['stop_time'] < time()) throw new ValidateException('砍价已结束');
+ list($productAttr, $productValue) = $storeProductAttrServices->getProductAttrDetail($id, $request->uid(), 0, 2, $bargain['product_id']);
+ foreach ($productValue as $v) {
+ $bargain['attr'] = $v;
+ }
+ $bargain['time'] = time();
+ $bargain = get_thumb_water($bargain);
+ $bargain['small_image'] = $bargain['image'];
+ $data['bargain'] = $bargain;
+
+ //写入查看和分享数据
+ $this->dao->addBargain($id, 'look');
+
+ //用户数据
$user = $request->user();
$data['userInfo']['uid'] = $user['uid'];
$data['userInfo']['nickname'] = $user['nickname'];
$data['userInfo']['avatar'] = $user['avatar'];
- /** @var StoreProductAttrServices $storeProductAttrServices */
- $storeProductAttrServices = app()->make(StoreProductAttrServices::class);
- list($productAttr, $productValue) = $storeProductAttrServices->getProductAttrDetail($id, $user->uid, 0, 2, $bargain['product_id']);
- foreach ($productValue as $v) {
- $bargain['attr'] = $v;
+ //砍价数据
+ $userBargainInfo = $bargainUserService->helpCount($request, $id, $bargainUid);
+ //用户已经生成砍价订单的总数
+ $userBargainInfo['bargainOrderCount'] = $orderService->count(['bargain_id' => $id, 'uid' => $user['uid']]);
+ //用户砍价的总数
+ $userBargainInfo['bargainCount'] = $bargainUserService->count(['bargain_id' => $id, 'uid' => $user['uid'], 'is_del' => 0]);
+ //判断砍价状态
+ if (($userBargainInfo['bargainCount'] == 0 || $userBargainInfo['bargainCount'] == $userBargainInfo['bargainOrderCount']) //没有发起过砍价或者发起的砍价数量等于对应砍价商品的订单数量
+ && $bargain['people_num'] > $userBargainInfo['bargainCount'] //商品的可发起砍价数量大于已经发起过的砍价数量
+ && $userBargainInfo['price'] > 0 //剩余金额大于0
+ && $request->uid() == $bargainUid) { //是自己砍价
+ $userBargainInfo['bargainType'] = 1; //用户发起砍价
+ } elseif ($userBargainInfo['bargainCount'] > $userBargainInfo['bargainOrderCount'] //发起的砍价数量大于生成的订单数量
+ && $userBargainInfo['price'] > 0 //剩余金额大于0
+ && $request->uid() == $bargainUid) { //是自己砍价
+ $userBargainInfo['bargainType'] = 2; //发送给好友邀请砍价
+ } elseif ($userBargainInfo['userBargainStatus'] //用户可以砍价
+ && $userBargainInfo['price'] > 0 //剩余金额大于0
+ && $request->uid() != $bargainUid) { //不是自己的砍价
+ $userBargainInfo['bargainType'] = 3; //帮朋友砍价
+ } elseif ($userBargainInfo['userBargainStatus'] //用户可以砍价
+ && $userBargainInfo['price'] == 0 //剩余金额大于0
+ && $request->uid() != $bargainUid) { //不是自己的砍价
+ $userBargainInfo['bargainType'] = 4; //好友已经完成
+ } elseif (!$userBargainInfo['userBargainStatus'] //用户不可以砍价
+ && $request->uid() != $bargainUid) { //不是自己的砍价
+ $userBargainInfo['bargainType'] = 5; //已经帮好友砍价
+ } elseif ($userBargainInfo['price'] == 0 //剩余金额等于0
+ && $request->uid() == $bargainUid //是自己砍价
+ && $userBargainInfo['status'] != 3) { //未生成订单
+ $userBargainInfo['bargainType'] = 6; //立即支付
}
-
- $data['bargain'] = get_thumb_water($bargain);
- $bargainNew = get_thumb_water($bargain, 'small');
- $data['bargain']['small_image'] = $bargainNew['image'];
-
- /** @var StoreOrderServices $orderService */
- $orderService = app()->make(StoreOrderServices::class);
- $data['bargainSumCount'] = $orderService->count(['bargain_id' => $id, 'uid' => $user['uid']]);
-
- /** @var StoreBargainUserServices $bargainUserService */
- $bargainUserService = app()->make(StoreBargainUserServices::class);
- $data['userBargainStatus'] = $bargainUserService->count(['bargain_id' => $id, 'uid' => $user->uid, 'is_del' => 0]);
+ $data['userBargainInfo'] = $userBargainInfo;
//用户访问事件
event('user.userVisit', [$user['uid'], $id, 'bargain', $bargain['product_id'], 'view']);
+
//浏览记录
ProductLogJob::dispatch(['visit', ['uid' => $user['uid'], 'product_id' => $bargain['product_id']]]);
return $data;
@@ -535,7 +573,7 @@ class StoreBargainServices extends BaseServices
}
/**
- * 参与砍价
+ * 发起砍价
* @param int $uid
* @param int $bargainId
* @return string
@@ -558,35 +596,29 @@ class StoreBargainServices extends BaseServices
/** @var StoreBargainUserServices $bargainUserService */
$bargainUserService = app()->make(StoreBargainUserServices::class);
$count = $bargainUserService->count(['bargain_id' => $bargainId, 'uid' => $uid, 'is_del' => 0, 'status' => 1]);
- if ((int)sys_config('bargain_subscribe')) {
- /** @var WechatServices $wechat */
- $wechat = app()->make(WechatServices::class);
- $subscribe = $wechat->get(['uid' => $uid, 'subscribe' => 1]);
- if (!$subscribe) return 'subscribe';
- }
if ($count === false) {
throw new ValidateException('参数错误');
- } elseif ($count) {
- return 'SUCCESSFUL';
} else {
- $count = $bargainUserService->count(['uid' => $uid, 'bargain_id' => $bargainId, 'type' => 1]);
+ /** @var StoreBargainUserHelpServices $bargainUserHelpService */
+ $bargainUserHelpService = app()->make(StoreBargainUserHelpServices::class);
+ $count = $bargainUserService->count(['uid' => $uid, 'bargain_id' => $bargainId, 'is_del' => 0]);
if ($count >= $bargainInfo['num']) throw new ValidateException('您不能再发起此件商品砍价');
- $res = $bargainUserService->setBargain($bargainId, $uid, $bargainInfo);
- }
- if (!$res) {
- throw new ValidateException('参与失败');
- } else {
- return 'SUCCESS';
+ return $this->transaction(function () use ($bargainUserService, $bargainUserHelpService, $bargainId, $uid, $bargainInfo) {
+ $bargainUserInfo = $bargainUserService->setBargain($bargainId, $uid, $bargainInfo);
+ $price = $bargainUserHelpService->setBargainRecord($uid, $bargainUserInfo->toArray(), $bargainInfo);
+ return ['bargainUserInfo' => $bargainUserInfo, 'price' => $price];
+ });
}
}
/**
- * @param Request $request
+ * 参与砍价
+ * @param int $uid
* @param int $bargainId
* @param int $bargainUserUid
- * @return string
- * @throws \think\Exception
+ * @return array
* @throws \think\db\exception\DataNotFoundException
+ * @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function setHelpBargain(int $uid, int $bargainId, int $bargainUserUid)
@@ -600,32 +632,23 @@ class StoreBargainServices extends BaseServices
['id', '=', $bargainId],
]);
if (!$bargainInfo) throw new ValidateException('砍价已结束');
- if ((int)sys_config('bargain_subscribe')) {
- /** @var WechatServices $wechat */
- $wechat = app()->make(WechatServices::class);
- $subscribe = $wechat->get(['uid' => $uid, 'subscribe' => 1]);
- if (!$subscribe) return 'subscribe';
- }
+ $bargainInfo = $bargainInfo->toArray();
/** @var StoreBargainUserHelpServices $userHelpService */
$userHelpService = app()->make(StoreBargainUserHelpServices::class);
/** @var StoreBargainUserServices $bargainUserService */
$bargainUserService = app()->make(StoreBargainUserServices::class);
$bargainUserTableId = $bargainUserService->getBargainUserTableId($bargainId, $bargainUserUid);
if (!$bargainUserTableId) throw new ValidateException('该分享未开启砍价');
+ $bargainUserInfo = $bargainUserService->get($bargainUserTableId)->toArray();
$count = $userHelpService->isBargainUserHelpCount($bargainId, $bargainUserTableId, $uid);
- if (!$count) return 'SUCCESSFUL';
- $res = $userHelpService->setBargainUserHelp($bargainId, $bargainUserTableId, $uid);
-
- if ($res) {
+ if (!$count) throw new ValidateException('您已经帮砍过此砍价');
+ $price = $userHelpService->setBargainRecord($uid, $bargainUserInfo, $bargainInfo);
+ if ($price) {
if (!$bargainUserService->getSurplusPrice($bargainUserTableId, 1)) {
- $bargainInfo = $this->dao->get($bargainId);//TODO 获取砍价商品信息
- $bargainUserInfo = $bargainUserService->get($bargainUserTableId);// TODO 获取用户参与砍价信息
- //用户发送消息
event('notice.notice', [['uid' => $bargainUserUid, 'bargainInfo' => $bargainInfo, 'bargainUserInfo' => $bargainUserInfo,], 'bargain_success']);
-
}
- return 'SUCCESS';
- } else throw new ValidateException('砍价失败');
+ }
+ return ['bargainUserInfo' => $bargainUserInfo, 'price' => $price];
}
/**
@@ -697,6 +720,7 @@ class StoreBargainServices extends BaseServices
}
/**
+ * 砍价分享
* @param $bargainId
* @param $user
* @return bool|string
diff --git a/crmeb/app/services/activity/bargain/StoreBargainUserHelpServices.php b/crmeb/app/services/activity/bargain/StoreBargainUserHelpServices.php
index 2122de4a9..83640b301 100644
--- a/crmeb/app/services/activity/bargain/StoreBargainUserHelpServices.php
+++ b/crmeb/app/services/activity/bargain/StoreBargainUserHelpServices.php
@@ -39,25 +39,25 @@ class StoreBargainUserHelpServices extends BaseServices
$this->dao = $dao;
}
- /**
- * TODO 获取用户还剩余的砍价金额
- * @param int $bargainId $bargainId 砍价商品编号
- * @param int $bargainUserUid $bargainUserUid 开启砍价用户编号
- * @return float
- * @throws \think\db\exception\DataNotFoundException
- * @throws \think\db\exception\ModelNotFoundException
- * @throws \think\exception\DbException
- */
- public function getSurplusPrice($bargainId = 0, $bargainUserUid = 0)
- {
- /** @var StoreBargainServices $bargainUserService */
- $bargainUserService = app()->make(StoreBargainServices::class);
- $bargainUserTableId = $bargainUserService->getBargainUserTableId($bargainId, $bargainUserUid);// TODO 获取用户参与砍价表编号
- $coverPrice = $bargainUserService->getBargainUserDiffPriceFloat($bargainUserTableId);//TODO 获取用户可以砍掉的金额 好友砍价之后获取砍价金额
- $alreadyPrice = $bargainUserService->getBargainUserPrice($bargainUserTableId);//TODO 用户已经砍掉的价格 好友砍价之后获取用户已经砍掉的价格
- $surplusPrice = (float)bcsub((string)$coverPrice, (string)$alreadyPrice, 2);//TODO 用户剩余要砍掉的价格
- return $surplusPrice;
- }
+// /**
+// * TODO 获取用户还剩余的砍价金额
+// * @param int $bargainId $bargainId 砍价商品编号
+// * @param int $bargainUserUid $bargainUserUid 开启砍价用户编号
+// * @return float
+// * @throws \think\db\exception\DataNotFoundException
+// * @throws \think\db\exception\ModelNotFoundException
+// * @throws \think\exception\DbException
+// */
+// public function getSurplusPrice($bargainId = 0, $bargainUserUid = 0)
+// {
+// /** @var StoreBargainServices $bargainUserService */
+// $bargainUserService = app()->make(StoreBargainServices::class);
+// $bargainUserTableId = $bargainUserService->getBargainUserTableId($bargainId, $bargainUserUid);// TODO 获取用户参与砍价表编号
+// $coverPrice = $bargainUserService->getBargainUserDiffPriceFloat($bargainUserTableId);//TODO 获取用户可以砍掉的金额 好友砍价之后获取砍价金额
+// $alreadyPrice = $bargainUserService->getBargainUserPrice($bargainUserTableId);//TODO 用户已经砍掉的价格 好友砍价之后获取用户已经砍掉的价格
+// $surplusPrice = (float)bcsub((string)$coverPrice, (string)$alreadyPrice, 2);//TODO 用户剩余要砍掉的价格
+// return $surplusPrice;
+// }
/**
* 获取砍价帮列表
@@ -89,30 +89,30 @@ class StoreBargainUserHelpServices extends BaseServices
return array_values($list);
}
- /**
- * 获取砍价金额
- * @param int $uid
- * @param int $bargainId
- * @param int $bargainUserUid
- * @return array
- */
- public function getPrice(int $uid, int $bargainId, int $bargainUserUid)
- {
- if (!$bargainId || !$bargainUserUid) throw new ValidateException('参数错误');
- /** @var StoreBargainUserServices $bargainUserService */
- $bargainUserService = app()->make(StoreBargainUserServices::class);
- $bargainUserTable = $bargainUserService->get(['bargain_id' => $bargainId, 'uid' => $bargainUserUid, 'is_del' => 0], ['id', 'status', 'bargain_price_min', 'bargain_price', 'price']);//TODO 获取用户参与砍价表编号
- if (!$bargainUserTable) {
- throw new ValidateException('砍价信息没有查询到');
- }
- if (bcsub($bargainUserTable['bargain_price'], $bargainUserTable['price'], 2) == $bargainUserTable['bargain_price_min']) {
- $status = true;
- } else {
- $status = false;
- }
- $price = $this->dao->value(['uid' => $uid, 'bargain_id' => $bargainId, 'bargain_user_id' => $bargainUserTable['id']], 'price');
- return ['price' => $price, 'status' => $status];
- }
+// /**
+// * 获取砍价金额
+// * @param int $uid
+// * @param int $bargainId
+// * @param int $bargainUserUid
+// * @return array
+// */
+// public function getPrice(int $uid, int $bargainId, int $bargainUserUid)
+// {
+// if (!$bargainId || !$bargainUserUid) throw new ValidateException('参数错误');
+// /** @var StoreBargainUserServices $bargainUserService */
+// $bargainUserService = app()->make(StoreBargainUserServices::class);
+// $bargainUserTable = $bargainUserService->get(['bargain_id' => $bargainId, 'uid' => $bargainUserUid, 'is_del' => 0], ['id', 'status', 'bargain_price_min', 'bargain_price', 'price']);//TODO 获取用户参与砍价表编号
+// if (!$bargainUserTable) {
+// throw new ValidateException('砍价信息没有查询到');
+// }
+// if (bcsub($bargainUserTable['bargain_price'], $bargainUserTable['price'], 2) == $bargainUserTable['bargain_price_min']) {
+// $status = true;
+// } else {
+// $status = false;
+// }
+// $price = $this->dao->value(['uid' => $uid, 'bargain_id' => $bargainId, 'bargain_user_id' => $bargainUserTable['id']], 'price');
+// return ['price' => $price, 'status' => $status];
+// }
/**
* 判断是否能砍价
@@ -129,65 +129,54 @@ class StoreBargainUserHelpServices extends BaseServices
}
/**
- * TODO 帮忙砍价
- * @param int $bargainId
- * @param int $bargainUserTableId
- * @param int $uid
- * @return bool
- * @throws \think\Exception
- * @throws \think\db\exception\DataNotFoundException
- * @throws \think\db\exception\ModelNotFoundException
- * @throws \think\exception\DbException
+ * 用户砍价，写入砍价记录
+ * @param $uid
+ * @param $bargainUserInfo
+ * @param $bargainInfo
+ * @return false|string
*/
- public function setBargainUserHelp($bargainId, $bargainUserTableId, $uid)
+ public function setBargainRecord($uid, $bargainUserInfo, $bargainInfo)
{
- /** @var StoreBargainServices $bargainService */
- $bargainService = app()->make(StoreBargainServices::class);
- $bargainInfo = $bargainService->get($bargainId);
-
- /** @var StoreBargainUserServices $bargainUserService */
- $bargainUserService = app()->make(StoreBargainUserServices::class);
- $alreadyPrice = $bargainUserService->value(['id' => $bargainUserTableId], 'price');//TODO 用户已经砍掉的价格
-
- $people = $this->dao->count(['bargain_user_id' => $bargainUserTableId]);//已经参与砍价的人数
-
- $coverPrice = bcsub((string)$bargainInfo->price, (string)$bargainInfo->min_price, 2);
- $surplusPrice = bcsub((string)$coverPrice, (string)$alreadyPrice, 2);//TODO 用户剩余要砍掉的价格
- if (0.00 === (float)$surplusPrice) return false;
-
- $data['uid'] = $uid;
- $data['bargain_id'] = $bargainId;
- $data['bargain_user_id'] = $bargainUserTableId;
- if (($bargainInfo->people_num - $people) == 1) {
- $data['price'] = $surplusPrice;
+ //已经参与砍价的人数
+ $people = $this->dao->count(['bargain_user_id' => $bargainUserInfo['id']]);
+ //剩余砍价金额
+ $coverPrice = bcsub((string)$bargainUserInfo['bargain_price'], (string)$bargainUserInfo['bargain_price_min'], 2);
+ $surplusPrice = bcsub((string)$coverPrice, (string)$bargainUserInfo['price'], 2);//TODO 用户剩余要砍掉的价格
+ if (0.00 === (float)$surplusPrice) throw new ValidateException('砍价已结束');
+ if (($bargainInfo['people_num'] - $people) == 1) {
+ $price = $surplusPrice;
} else {
/** @var UserServices $userServices */
$userServices = app()->make(UserServices::class);
$userInfo = $userServices->get($uid);
- $data['price'] = $this->randomFloat($surplusPrice, $bargainInfo->people_num - $people, $userInfo->add_time == $userInfo->last_time && !$this->dao->count(['uid' => $uid]));
+ $price = $this->randomFloat($surplusPrice, $bargainInfo['people_num'] - $people, $userInfo->add_time == $userInfo->last_time && !$this->dao->count(['uid' => $uid]));
}
- $data['add_time'] = time();
- if ($bargainUserService->value(['id' => $bargainUserTableId], 'uid') == $uid) {
- $data['type'] = 1;
+ $allPrice = bcadd((string)$bargainUserInfo['price'], (string)$price, 2);
+ if ($bargainUserInfo['uid'] == $uid) {
+ $type = 1;
} else {
//帮砍次数限制
- $count = $this->dao->count(['uid' => $uid, 'bargain_id' => $bargainId, 'type' => 0]);
- if ($count >= $bargainInfo->bargain_num) throw new ValidateException('您不能再帮砍此件商品');
- $data['type'] = 0;
+ $count = $this->dao->count(['uid' => $uid, 'bargain_id' => $bargainInfo['id'], 'type' => 0]);
+ if ($count >= $bargainInfo['bargain_num']) throw new ValidateException('您不能再帮砍此件商品');
+ $type = 0;
}
-
- $price = bcadd((string)$alreadyPrice, (string)$data['price'], 2);
- $bargainUserData['price'] = $price;
- return $this->transaction(function () use ($bargainUserService, $bargainUserTableId, $bargainUserData, $data) {
- $res1 = $bargainUserService->update($bargainUserTableId, $bargainUserData);
- $res2 = $this->dao->save($data);
- $res = $res1 && $res2;
- if (!$res) throw new ValidateException('砍价失败');
- return $res;
- });
-
+ /** @var StoreBargainUserServices $bargainUserService */
+ $bargainUserService = app()->make(StoreBargainUserServices::class);
+ $res1 = $bargainUserService->update($bargainUserInfo['id'], ['price' => $allPrice]);
+ $res2 = $this->dao->save([
+ 'uid' => $uid,
+ 'bargain_id' => $bargainInfo['id'],
+ 'bargain_user_id' => $bargainUserInfo['id'],
+ 'price' => $price,
+ 'add_time' => time(),
+ 'type' => $type,
+ ]);
+ $res = $res1 && $res2;
+ if (!$res) throw new ValidateException('砍价失败');
+ return $price;
}
+
/**
* 随机金额
* @param $price
diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php
index 33d80b275..de76b1af2 100644
--- a/crmeb/app/services/order/StoreOrderServices.php
+++ b/crmeb/app/services/order/StoreOrderServices.php
@@ -1532,7 +1532,7 @@ HTML;
$data['bargain_id'] = $bargain_id;
$data['advance_id'] = $advance_id;
$data['cartInfo'] = $cartGroup['cartInfo'];
- $data['custom_form'] = json_decode($cartGroup['cartInfo'][0]['productInfo']['custom_form'], true);
+ $data['custom_form'] = json_decode($cartGroup['cartInfo'][0]['productInfo']['custom_form'], true) ?? [];
$data['priceGroup'] = $priceGroup;
$data['orderKey'] = $this->cacheOrderInfo($user['uid'], $validCartInfo, $priceGroup, $other);
$data['offlinePostage'] = $other['offlinePostage'];
diff --git a/crmeb/app/services/system/config/SystemConfigServices.php b/crmeb/app/services/system/config/SystemConfigServices.php
index f8cfebd28..9a619f85d 100644
--- a/crmeb/app/services/system/config/SystemConfigServices.php
+++ b/crmeb/app/services/system/config/SystemConfigServices.php
@@ -100,15 +100,15 @@ class SystemConfigServices extends BaseServices
],
'show_value' => 1
],
-// 'pay_success_printing_switch' => [
-// 'son_type' => [
-// 'develop_id' => '',
-// 'printing_api_key' => '',
-// 'printing_client_id' => '',
-// 'terminal_number' => '',
-// ],
-// 'show_value' => 1
-// ],
+ 'pay_success_printing_switch' => [
+ 'son_type' => [
+ 'develop_id' => '',
+ 'printing_api_key' => '',
+ 'printing_client_id' => '',
+ 'terminal_number' => '',
+ ],
+ 'show_value' => 1
+ ],
'wss_open' => [
'son_type' => [
'wss_local_cert' => '',
@@ -138,18 +138,18 @@ class SystemConfigServices extends BaseServices
],
'show_value' => 1
],
-// 'system_product_copy_type' => [
-// 'son_type' => [
-// 'copy_product_apikey' => '',
-// ],
-// 'show_value' => 2
-// ],
-// 'logistics_type' => [
-// 'son_type' => [
-// 'system_express_app_code' => '',
-// ],
-// 'show_value' => 2
-// ],
+ 'system_product_copy_type' => [
+ 'son_type' => [
+ 'copy_product_apikey' => '',
+ ],
+ 'show_value' => 2
+ ],
+ 'logistics_type' => [
+ 'son_type' => [
+ 'system_express_app_code' => '',
+ ],
+ 'show_value' => 2
+ ],
'ali_pay_status' => [
'son_type' => [
'ali_pay_appid' => '',
@@ -168,15 +168,15 @@ class SystemConfigServices extends BaseServices
],
'show_value' => 1
],
-// 'config_export_open' => [
-// 'son_type' => [
-// 'config_export_to_name' => '',
-// 'config_export_to_tel' => '',
-// 'config_export_to_address' => '',
-// 'config_export_siid' => '',
-// ],
-// 'show_value' => 1
-// ],
+ 'config_export_open' => [
+ 'son_type' => [
+ 'config_export_to_name' => '',
+ 'config_export_to_tel' => '',
+ 'config_export_to_address' => '',
+ 'config_export_siid' => '',
+ ],
+ 'show_value' => 1
+ ],
'image_watermark_status' => [
'son_type' => [
'watermark_type' => [
diff --git a/crmeb/public/index.html b/crmeb/public/index.html
index f845ef052..5286ec530 100644
--- a/crmeb/public/index.html
+++ b/crmeb/public/index.html
@@ -1,2 +1,2 @@
加载中
\ No newline at end of file
+ document.write('')