From 9109a60d73507e411020c32c8f66fb5ba6fef80c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 十一月 2022 16:43:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
index 368bc3c..93d37d7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
@@ -415,7 +415,7 @@
@ApiOperation(value = "退款订单分页查询 用户", response = ComShopFlowerRefundOrderVO.class)
public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if (loginUserInfo.getBackstageType() == 5){
+ if (null != loginUserInfo.getBackstageType() && 5 == loginUserInfo.getBackstageType()){
pageComOrderRefundDTO.setStoreId(loginUserInfo.getStoreIdId());
}else {
pageComOrderRefundDTO.setUserId(this.getUserId());
--
Gitblit v1.7.1