diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java index de3808c..42d5a70 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java @@ -60,7 +60,8 @@ public class MybatisPlusConfig { "sys_email_record", "sys_plug", "sys_version", - "sys_order" + "sys_order", + "sys_white_domain" ).contains(tableName); } }; diff --git a/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java b/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java index 134b404..4aa5cc8 100644 --- a/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java @@ -40,14 +40,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers( "/api/login", "/api/register", + "/api/existence", "/api/oss/upload", "/druid/**", - "/swagger-ui.html", "/swagger-resources/**", "/webjars/**", - "/v2/api-docs", - "/v3/api-docs", - "/swagger-ui/**", "/hxz/v1/**", "/api/sendSmsCaptcha", "/api/parseToken/*", diff --git a/src/main/java/com/gxwebsoft/common/system/controller/OrderController.java b/src/main/java/com/gxwebsoft/common/system/controller/OrderController.java index 9abd141..1c2f570 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/OrderController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/OrderController.java @@ -1,7 +1,10 @@ package com.gxwebsoft.common.system.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.Company; import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.CompanyService; import com.gxwebsoft.common.system.service.OrderService; import com.gxwebsoft.common.system.entity.Order; import com.gxwebsoft.common.system.param.OrderParam; @@ -16,6 +19,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -30,6 +34,8 @@ import java.util.List; public class OrderController extends BaseController { @Resource private OrderService orderService; + @Resource + private CompanyService companyService; @PreAuthorize("hasAuthority('sys:order:list')") @OperationLog @@ -69,6 +75,12 @@ public class OrderController extends BaseController { order.setUserId(loginUser.getUserId()); } if (orderService.save(order)) { + System.out.println("order = " + order); + // 延长到期时间 + final Company company = companyService.getByTenantIdRel(order.getTenantId()); + company.setStatus(1); +// company.setExpirationTime(new Date()); + companyService.updateById(company); return success("添加成功"); } return fail("添加失败"); diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java index 522111a..3f8317c 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java @@ -238,7 +238,6 @@ public class UserController extends BaseController { } } - @PreAuthorize("hasAuthority('sys:user:list')") @ApiOperation("检查用户是否存在") @GetMapping("/existence") public ApiResult existence(ExistenceParam param) { diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Order.java b/src/main/java/com/gxwebsoft/common/system/entity/Order.java index 984e2dc..61d681d 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Order.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Order.java @@ -67,7 +67,7 @@ public class Order implements Serializable { private String phone; @ApiModelProperty(value = "付款时间") - private LocalDateTime payTime; + private Date payTime; @ApiModelProperty(value = "支付流水号") private String transactionId; @@ -79,7 +79,7 @@ public class Order implements Serializable { private String payMethod; @ApiModelProperty(value = "到期时间") - private LocalDateTime expirationTime; + private Date expirationTime; @ApiModelProperty(value = "所在省份") private String province; @@ -134,4 +134,8 @@ public class Order implements Serializable { @TableField(exist = false) private String tenantName; + @ApiModelProperty(value = "企业ID") + @TableField(exist = false) + private Integer companyId; + } diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/OrderServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/OrderServiceImpl.java index 715c23c..75625f5 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/OrderServiceImpl.java @@ -23,7 +23,7 @@ public class OrderServiceImpl extends ServiceImpl implements @Override public PageResult pageRel(OrderParam param) { PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("create_time desc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); } diff --git a/src/test/java/com/gxwebsoft/generator/SysGenerator.java b/src/test/java/com/gxwebsoft/generator/SysGenerator.java index c8ec9f7..4df4e6e 100644 --- a/src/test/java/com/gxwebsoft/generator/SysGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/SysGenerator.java @@ -65,8 +65,10 @@ public class SysGenerator { // "sys_app_url", // "sys_app_renew" // "sys_version", +// "sys_website", + "sys_website_field", // "sys_white_domain" - "sys_order" +// "sys_order" }; // 需要去除的表前缀 private static final String[] TABLE_PREFIX = new String[]{