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(); } } 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/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', 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); } 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; 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'] ?? ''; } } 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 @@