diff --git a/crmeb/app/api/controller/v1/admin/StoreOrderController.php b/crmeb/app/api/controller/v1/admin/StoreOrderController.php index 2bdcd8f91..f966fd6c4 100644 --- a/crmeb/app/api/controller/v1/admin/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/admin/StoreOrderController.php @@ -113,7 +113,7 @@ class StoreOrderController public function detail(Request $request, StoreOrderServices $services, UserServices $userServices, $orderId) { $economizeServices = app()->make(StoreOrderEconomizeServices::class); - $orderData = $services->getUserOrderByKey($economizeServices, $orderId, (int)$request->uid()); + $orderData = $services->getUserOrderByKey($economizeServices, $orderId, 0); $orderData['nickname'] = $userServices->value(['uid' => $orderData['uid']], 'nickname'); return app('json')->success($orderData); } diff --git a/crmeb/app/dao/activity/combination/StorePinkDao.php b/crmeb/app/dao/activity/combination/StorePinkDao.php index d6b18ffca..042272623 100644 --- a/crmeb/app/dao/activity/combination/StorePinkDao.php +++ b/crmeb/app/dao/activity/combination/StorePinkDao.php @@ -138,6 +138,7 @@ class StorePinkDao extends BaseDao /** * 获取拼团完成的个数 * @return float + * @throws \ReflectionException */ public function getPinkOkSumTotalNum() { diff --git a/crmeb/app/dao/order/StoreOrderDao.php b/crmeb/app/dao/order/StoreOrderDao.php index cb9c12c51..166e5a6df 100644 --- a/crmeb/app/dao/order/StoreOrderDao.php +++ b/crmeb/app/dao/order/StoreOrderDao.php @@ -446,8 +446,9 @@ class StoreOrderDao extends BaseDao /** * 获取订单详情 - * @param $uid - * @param $key + * @param string $key + * @param int $uid + * @param array $with * @return array|\think\Model|null * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException @@ -455,7 +456,9 @@ class StoreOrderDao extends BaseDao */ public function getUserOrderDetail(string $key, int $uid, $with = []) { - return $this->getOne(['order_id|unique' => $key, 'uid' => $uid, 'is_del' => 0], '*', $with); + $where = ['order_id|unique' => $key, 'is_del' => 0]; + if ($uid > 0) $where = $where + ['uid' => $uid]; + return $this->getOne($where, '*', $with); } /** diff --git a/crmeb/app/services/activity/combination/StorePinkServices.php b/crmeb/app/services/activity/combination/StorePinkServices.php index 3033ddbeb..535ab831b 100644 --- a/crmeb/app/services/activity/combination/StorePinkServices.php +++ b/crmeb/app/services/activity/combination/StorePinkServices.php @@ -88,6 +88,9 @@ class StorePinkServices extends BaseServices * 参团人员 * @param int $id * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function getPinkMember(int $id) { @@ -96,8 +99,11 @@ class StorePinkServices extends BaseServices /** * 拼团退款 - * @param $id + * @param $order * @return bool + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function setRefundPink($order) { diff --git a/template/uni-app/pages/goods/goods_return/index.vue b/template/uni-app/pages/goods/goods_return/index.vue index c1984e250..9062265cd 100644 --- a/template/uni-app/pages/goods/goods_return/index.vue +++ b/template/uni-app/pages/goods/goods_return/index.vue @@ -10,7 +10,7 @@ {{item.productInfo.store_name}} - {{$t(`¥`)}}{{(parseFloat(item.truePrice)+parseFloat(item.postage_price)).toFixed(2)}} + {{$t(`¥`)}}{{(parseFloat(item.truePrice)+parseFloat(item.postage_price/item.cart_num)).toFixed(2)}} x{{item.cart_num}}