diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java index a7aaf453..071dade2 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java +++ b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java @@ -82,7 +82,7 @@ public class AuthService { * @param loginParam loginParam * @return long */ - @Transactional + @Transactional(rollbackFor = Exception.class) public YxUser wxappLogin(LoginParam loginParam) { String code = loginParam.getCode(); String encryptedData = loginParam.getEncryptedData(); @@ -171,7 +171,7 @@ public class AuthService { * @param spread 上级用户 * @return uid */ - @Transactional + @Transactional(rollbackFor = Exception.class) public YxUser wechatLogin(String code,String spread){ try { WxMpService wxService = WxMpConfiguration.getWxMpService(); @@ -257,7 +257,7 @@ public class AuthService { * 注册 * @param param RegDTO */ - @Transactional + @Transactional(rollbackFor = Exception.class) public void register(RegParam param){ String account = param.getAccount(); diff --git a/yshop-common/src/main/java/co/yixiang/print/PrintStoreOrderVO.java b/yshop-common/src/main/java/co/yixiang/print/PrintStoreOrderVO.java index e31db2d7..f00f8c9c 100644 --- a/yshop-common/src/main/java/co/yixiang/print/PrintStoreOrderVO.java +++ b/yshop-common/src/main/java/co/yixiang/print/PrintStoreOrderVO.java @@ -33,8 +33,8 @@ public class PrintStoreOrderVO implements Serializable { private String driverNo; @ApiModelProperty(value = "门店列表") private Integer storeId; -@ApiModelProperty(hidden = true) - long startSecond; @ApiModelProperty(hidden = true) - long endSecond; + Long startSecond; + @ApiModelProperty(hidden = true) + Long endSecond; } diff --git a/yshop-common/src/main/java/co/yixiang/utils/location/GetTencentLocationVO.java b/yshop-common/src/main/java/co/yixiang/utils/location/GetTencentLocationVO.java index da49de54..ce249105 100644 --- a/yshop-common/src/main/java/co/yixiang/utils/location/GetTencentLocationVO.java +++ b/yshop-common/src/main/java/co/yixiang/utils/location/GetTencentLocationVO.java @@ -13,6 +13,7 @@ import java.io.Serializable; * @modified By: * @version: */ +@SuppressWarnings("ALL") @Data @ApiModel(value="腾讯地图返回对象") public class GetTencentLocationVO implements Serializable { @@ -27,7 +28,7 @@ public class GetTencentLocationVO implements Serializable { @ApiModelProperty(value = "状态说明") private String message; @ApiModelProperty(value = "状态码,0为正常") - private int status; + private Integer status; @Data @ApiModel(value="地址解析结果") diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java index de0ba850..26d2a8d0 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java @@ -73,7 +73,7 @@ public class YxStoreProductAttrServiceImpl extends BaseServiceImpl items, List attrs, Long productId) { diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java index 58ee1d6a..94d4c195 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java @@ -18,6 +18,7 @@ import co.yixiang.tools.domain.vo.EmailVo; import co.yixiang.tools.service.VerificationCodeService; import co.yixiang.tools.service.mapper.VerificationCodeMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -26,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Collections; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; /** @@ -83,7 +85,8 @@ public class VerificationCodeServiceImpl extends BaseServiceImpl { verifyCode.setStatus(false);