From 4b8036e1060733fca90e397eab492972a1e01423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 17 Apr 2025 10:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=9AisInvoice=E6=94=B9=E4=B8=BAInteger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/UserServiceImpl.java  | 26 +------------------
 .../gxwebsoft/shop/param/ShopOrderParam.java  |  5 ++--
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
index 757bad7..913e39c 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gxwebsoft.common.core.exception.BusinessException;
 import com.gxwebsoft.common.core.utils.CommonUtil;
-import com.gxwebsoft.common.core.utils.RedisUtil;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.*;
@@ -16,7 +15,6 @@ import com.gxwebsoft.common.system.mapper.UserMapper;
 import com.gxwebsoft.common.system.param.LoginParam;
 import com.gxwebsoft.common.system.param.UserParam;
 import com.gxwebsoft.common.system.service.*;
-import io.swagger.models.auth.In;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -49,10 +47,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Resource
     private UserService userService;
     @Resource
-    private CompanyService companyService;
-    @Resource
-    private RedisUtil redisUtil;
-    @Resource
     private OrganizationService organizationService;
     @Resource
     private UserRefereeService userRefereeService;
@@ -87,26 +81,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             user.setPassword(null);
             user.setRoles(userRoleService.listByUserId(user.getUserId()));
             user.setAuthorities(roleMenuService.listMenuByUserId(user.getUserId(), null));
-//      // 系统配置信息
-//      Map<String, Object> map = new HashMap<>();
-//      // 1)云存储
-//      String key = "setting:upload:" + user.getTenantId();
-//      final String upload = redisUtil.get(key);
-//      if(upload != null){
-//        final JSONObject object = JSONObject.parseObject(upload);
-//        map.put("uploadMethod",object.getString("uploadMethod"));
-//        map.put("bucketDomain",object.getString("bucketDomain"));
-//        map.put("fileUrl",object.getString("fileUrl") + "/");
-//        user.setSystem(map);
-//      }
-            // 企业信息
-//      final Company company = companyService.getByTenantIdRel(user.getTenantId());
-//      if (company != null) {
-//        user.setCompanyId(company.getCompanyId());
-//        user.setCompanyInfo(company);
-//      }
         }
-        return user;
+      return user;
     }
 
     @Override
diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java
index 3002845..706c5d5 100644
--- a/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java
+++ b/src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java
@@ -6,6 +6,7 @@ import com.gxwebsoft.common.core.web.BaseParam;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -121,7 +122,7 @@ public class ShopOrderParam extends BaseParam {
 
     @ApiModelProperty(value = "0未付款，1已付款")
     @QueryField(type = QueryType.EQ)
-    private Boolean payStatus;
+    private Integer payStatus;
 
     @ApiModelProperty(value = "0未使用，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款")
     @QueryField(type = QueryType.EQ)
@@ -150,7 +151,7 @@ public class ShopOrderParam extends BaseParam {
 
     @ApiModelProperty(value = "是否已开具发票：0未开发票，1已开发票，2不能开具发票")
     @QueryField(type = QueryType.EQ)
-    private Boolean isInvoice;
+    private Integer isInvoice;
 
     @ApiModelProperty(value = "发票流水号")
     private String invoiceNo;