gxwebsoft/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改字段类型：isInvoice改为Integer

Browse Source
This commit is contained in:
赵忠林
2025-04-17 10:20:42 +08:00
parent 832531dc56
commit 4b8036e106
2 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
View File

@@ -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,24 +81,6 @@ 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;
}

5
src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java
View File

@@ -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;