From a05ccb61244c4d0ab802a336d06d0d2145d91362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Sat, 18 Feb 2023 14:09:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=80=92=E5=8F=99=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php b/crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php index e2ff43131..6eb390921 100644 --- a/crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php +++ b/crmeb/app/dao/activity/integral/StoreIntegralOrderStatusDao.php @@ -43,7 +43,7 @@ class StoreIntegralOrderStatusDao extends BaseDao */ public function getStatusList(array $where, int $page, int $limit) { - return $this->search($where)->page($page, $limit)->select()->toArray(); + return $this->search($where)->page($page, $limit)->order('change_time desc')->select()->toArray(); } } From a1e95884c8d97c7d70883958639cc0c58fd49cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Sat, 18 Feb 2023 14:09:59 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=87=AA=E5=B8=A6?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A2=9E=E5=8A=A0=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/agent/AgentLevelServices.php | 3 +++ crmeb/app/services/user/UserServices.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/crmeb/app/services/agent/AgentLevelServices.php b/crmeb/app/services/agent/AgentLevelServices.php index afa3569c2..498d79c1f 100644 --- a/crmeb/app/services/agent/AgentLevelServices.php +++ b/crmeb/app/services/agent/AgentLevelServices.php @@ -90,6 +90,9 @@ class AgentLevelServices extends BaseServices $this->checkUserLevelFinish($uid); $list = $this->dao->getList(['is_del' => 0, 'status' => 1]); + foreach ($list as &$item) { + $item['image'] = set_file_url($item['image']); + } $agent_level = $user['agent_level'] ?? 0; //没等级默认最低等级 if (!$agent_level) { diff --git a/crmeb/app/services/user/UserServices.php b/crmeb/app/services/user/UserServices.php index 34c9e5944..728951607 100644 --- a/crmeb/app/services/user/UserServices.php +++ b/crmeb/app/services/user/UserServices.php @@ -1461,7 +1461,7 @@ class UserServices extends BaseServices $user['vip'] = (bool)$userLevel; if ($user['vip']) { $user['vip_id'] = $userLevel['id'] ?? 0; - $user['vip_icon'] = $userLevel['icon'] ?? ''; + $user['vip_icon'] = set_file_url($userLevel['icon']) ?? ''; $user['vip_name'] = $userLevel['name'] ?? ''; } } From 3a12ad7b6102f4dc9b94b15a24ed33ffc6e9a5e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Sat, 18 Feb 2023 14:10:22 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=95=86=E5=93=81=E9=80=80=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=88=B8=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/order/StoreOrderRefundServices.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php index 9e646ea2b..b7d7f0246 100644 --- a/crmeb/app/services/order/StoreOrderRefundServices.php +++ b/crmeb/app/services/order/StoreOrderRefundServices.php @@ -430,17 +430,23 @@ class StoreOrderRefundServices extends BaseServices */ public function integralAndCouponBack($order) { + /** @var StoreOrderStatusServices $statusService */ + $statusService = app()->make(StoreOrderStatusServices::class); $res = true; //回退优惠卷 拆分子订单不退优惠券 if (!$order['pid'] && $order['coupon_id'] && $order['coupon_price']) { /** @var StoreCouponUserServices $coumonUserServices */ $coumonUserServices = app()->make(StoreCouponUserServices::class); $res = $res && $coumonUserServices->recoverCoupon((int)$order['coupon_id']); + $statusService->save([ + 'oid' => $order['id'], + 'change_type' => 'coupon_back', + 'change_message' => '商品退优惠券', + 'change_time' => time() + ]); } //回退积分 $order = $this->regressionIntegral($order); - /** @var StoreOrderStatusServices $statusService */ - $statusService = app()->make(StoreOrderStatusServices::class); $statusService->save([ 'oid' => $order['id'], 'change_type' => 'integral_back', From 2e0326b5d925bb5c8a84131f1fe7f8766de8d69c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Sat, 18 Feb 2023 14:10:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/order/StoreOrderTakeServices.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/crmeb/app/services/order/StoreOrderTakeServices.php b/crmeb/app/services/order/StoreOrderTakeServices.php index 39eff14de..72694e597 100644 --- a/crmeb/app/services/order/StoreOrderTakeServices.php +++ b/crmeb/app/services/order/StoreOrderTakeServices.php @@ -65,15 +65,7 @@ class StoreOrderTakeServices extends BaseServices throw new ApiException(410266); } $order->status = 2; - /** @var StoreOrderStatusServices $statusService */ - $statusService = app()->make(StoreOrderStatusServices::class); - $res = $order->save() && $statusService->save([ - 'oid' => $order['id'], - 'change_type' => 'user_take_delivery', - 'change_message' => '用户已收货', - 'change_time' => time() - ]); - $res = $res && $this->storeProductOrderUserTakeDelivery($order); + $res = $order->save() && $this->storeProductOrderUserTakeDelivery($order); if (!$res) { throw new ApiException(410205); } From aff05dc85cce7a9f560d54f5f7b5068433a5bcb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Sat, 18 Feb 2023 14:11:43 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=97=B6=E5=80=99=E9=80=89=E6=8B=A9=E8=BF=90?= =?UTF-8?q?=E8=B4=B9=E8=AE=BE=E7=BD=AE=E4=B8=8D=E4=BF=AE=E6=94=B9=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E7=B1=BB=E5=9E=8B=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/product/StoreProductServices.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/crmeb/app/services/product/product/StoreProductServices.php b/crmeb/app/services/product/product/StoreProductServices.php index e37745d78..1ea506ab0 100644 --- a/crmeb/app/services/product/product/StoreProductServices.php +++ b/crmeb/app/services/product/product/StoreProductServices.php @@ -2017,13 +2017,15 @@ class StoreProductServices extends BaseServices break; case 2: foreach ($ids as $product_id) { - $batchData[] = [ - 'id' => $product_id, - 'logistics' => implode(',', $data['logistics']), - 'freight' => $data['freight'], - 'postage' => $data['freight'] == 2 ? $data['postage'] : 0, - 'temp_id' => $data['freight'] == 3 ? $data['temp_id'] : 0 - ]; + if ($this->dao->value(['id' => $product_id], 'virtual_type') == 0) { + $batchData[] = [ + 'id' => $product_id, + 'logistics' => implode(',', $data['logistics']), + 'freight' => $data['freight'], + 'postage' => $data['freight'] == 2 ? $data['postage'] : 0, + 'temp_id' => $data['freight'] == 3 ? $data['temp_id'] : 0 + ]; + } } if (count($batchData)) $this->dao->saveAll($batchData); break; From c0dddf30071fb9dc6d429dba33322eafe7d2b0aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Sat, 18 Feb 2023 14:12:10 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=96=87=E5=AD=97=E9=94=99=E8=AF=AF=EF=BC=8C=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/setting/membershipLevel/index.vue | 4 ++-- template/uni-app/pages/goods/admin_order_detail/index.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/template/admin/src/pages/setting/membershipLevel/index.vue b/template/admin/src/pages/setting/membershipLevel/index.vue index db9721f2f..26fc98d88 100644 --- a/template/admin/src/pages/setting/membershipLevel/index.vue +++ b/template/admin/src/pages/setting/membershipLevel/index.vue @@ -78,8 +78,8 @@
是否显示： - + diff --git a/template/uni-app/pages/goods/admin_order_detail/index.vue b/template/uni-app/pages/goods/admin_order_detail/index.vue index ebe94947f..8d7e81962 100644 --- a/template/uni-app/pages/goods/admin_order_detail/index.vue +++ b/template/uni-app/pages/goods/admin_order_detail/index.vue @@ -107,7 +107,7 @@ {{$t(`￥`)}}{{orderInfo.pay_postage}} - {{$t(`real_payment`)}}：{{$t(`￥`)}}{{ orderInfo.pay_price }} + {{$t(`实际支付`)}}：{{$t(`￥`)}}{{ orderInfo.pay_price }}