chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单分成，还差最低收取手续费

Browse Source
This commit is contained in:
墨大叔 2024-09-27 17:48:50 +08:00
parent 43a9bb67b4
commit 3bfb58a5ba
117 changed files with 423 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-switch-service/src/main/java/com/ruoyi/common/validRule/accountExist/AccountExistValidator.java
View File

@ -4,8 +4,6 @@ import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.ss.account.domain.AccountQuery;
import com.ruoyi.ss.account.service.AccountService;
import com.ruoyi.ss.device.domain.DeviceQuery;
import com.ruoyi.ss.device.service.DeviceService;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;

5
smart-switch-service/src/main/java/com/ruoyi/common/validRule/allowSize/AllowSizeValidator.java
View File

@ -1,14 +1,9 @@
package com.ruoyi.common.validRule.allowSize;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.ss.apiPrice.domain.ApiPriceQuery;
import com.ruoyi.ss.apiPrice.service.ApiPriceService;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 2023/10/20

2
smart-switch-service/src/main/java/com/ruoyi/common/validRule/deviceNoExist/DeviceNoExistValidator.java
View File

@ -1,8 +1,6 @@
package com.ruoyi.common.validRule.deviceNoExist;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.ss.device.domain.DeviceQuery;
import com.ruoyi.ss.device.service.DeviceService;
import javax.validation.ConstraintValidator;

1
smart-switch-service/src/main/java/com/ruoyi/dashboard/DashboardService.java
View File

@ -32,7 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

4
smart-switch-service/src/main/java/com/ruoyi/iot/interfaces/IotDevice.java
View File

@ -7,10 +7,10 @@ package com.ruoyi.iot.interfaces;
public interface IotDevice {
// 获取MAC-1
String getMac1();
String iotMac1();
// 获取MAC-2
String getMac2();
String iotMac2();
// 获取OneNet产品ID
String getProductId();

48
smart-switch-service/src/main/java/com/ruoyi/iot/service/IotServiceImpl.java
View File

@ -80,12 +80,12 @@ public class IotServiceImpl implements IotService {
return status;
}
// 优先使用mac1判断
if (StringUtils.hasText(device.getMac1())) {
status = this.getOnlineStatus(device.getMac1(), device.getProductId());
if (StringUtils.hasText(device.iotMac1())) {
status = this.getOnlineStatus(device.iotMac1(), device.getProductId());
}
// 若还是离线，则判断mac2是否在线
if (status == DeviceOnlineStatus.OFFLINE && StringUtils.hasText(device.getMac2())) {
status = this.getOnlineStatus(device.getMac2(), device.getProductId());
if (status == DeviceOnlineStatus.OFFLINE && StringUtils.hasText(device.iotMac2())) {
status = this.getOnlineStatus(device.iotMac2(), device.getProductId());
}
return status;
}
@ -113,13 +113,13 @@ public class IotServiceImpl implements IotService {
// 尝试用mac1通电
try {
result = this.open(device.getMac1(), device.getProductId());
result = this.open(device.iotMac1(), device.getProductId());
if (!result) {
throw new ServiceException("mac1通电失败");
}
} catch (Exception e) {
log.info("mac1通电失败，尝试用mac2通电");
result = this.open(device.getMac2(), device.getProductId());
result = this.open(device.iotMac2(), device.getProductId());
}
return result;
@ -145,13 +145,13 @@ public class IotServiceImpl implements IotService {
// 尝试用mac1断电
try {
result = this.close(device.getMac1(), device.getProductId());
result = this.close(device.iotMac1(), device.getProductId());
if (!result) {
throw new ServiceException("mac1断电失败");
}
} catch (Exception e) {
log.info("mac1断电失败，尝试用mac2断电");
result = this.close(device.getMac2(), device.getProductId());
result = this.close(device.iotMac2(), device.getProductId());
}
return result;
@ -253,11 +253,11 @@ public class IotServiceImpl implements IotService {
}
CommandResponse res = null;
if (StringUtils.hasText(device.getMac1())) {
res = this.setTime(device.getMac1(), seconds, device.getProductId());
if (StringUtils.hasText(device.iotMac1())) {
res = this.setTime(device.iotMac1(), seconds, device.getProductId());
}
if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.getMac2())) {
res = this.setTime(device.getMac2(), seconds, device.getProductId());
if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.iotMac2())) {
res = this.setTime(device.iotMac2(), seconds, device.getProductId());
}
return res;
@ -279,11 +279,11 @@ public class IotServiceImpl implements IotService {
}
CommandResponse res = null;
if (StringUtils.hasText(device.getMac1())) {
res = this.addEle(device.getMac1(), ele, device.getProductId());
if (StringUtils.hasText(device.iotMac1())) {
res = this.addEle(device.iotMac1(), ele, device.getProductId());
}
if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.getMac2())) {
res = this.addEle(device.getMac2(), ele, device.getProductId());
if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.iotMac2())) {
res = this.addEle(device.iotMac2(), ele, device.getProductId());
}
return res;
@ -304,11 +304,11 @@ public class IotServiceImpl implements IotService {
}
CommandResponse res = null;
if (StringUtils.hasText(device.getMac1())) {
res = this.setEle(device.getMac1(), ele, device.getProductId());
if (StringUtils.hasText(device.iotMac1())) {
res = this.setEle(device.iotMac1(), ele, device.getProductId());
}
if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.getMac2())) {
res = this.setEle(device.getMac2(), ele, device.getProductId());
if ((res == null || !res.isSuccess()) && StringUtils.hasText(device.iotMac2())) {
res = this.setEle(device.iotMac2(), ele, device.getProductId());
}
return res;
@ -333,11 +333,11 @@ public class IotServiceImpl implements IotService {
return info;
}
if (StringUtils.hasText(device.getMac1())) {
info = getDeviceInfo(device.getMac1(), device.getProductId());
if (StringUtils.hasText(device.iotMac1())) {
info = getDeviceInfo(device.iotMac1(), device.getProductId());
}
if (info == null && StringUtils.hasText(device.getMac2())) {
info = getDeviceInfo(device.getMac2(), device.getProductId());
if (info == null && StringUtils.hasText(device.iotMac2())) {
info = getDeviceInfo(device.iotMac2(), device.getProductId());
}
return info;

5
smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/domain/AbnormalVO.java
View File

@ -1,13 +1,8 @@
package com.ruoyi.ss.abnormal.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.ValidGroup;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
* @author wjh
* 2024/4/30

3
smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/service/AbnormalValidator.java
View File

@ -1,8 +1,5 @@
package com.ruoyi.ss.abnormal.service;
import com.ruoyi.common.core.domain.ValidateResult;
import com.ruoyi.ss.abnormal.domain.dto.AbnormalSubmitDTO;
/**
* @author wjh
* 2024/4/30

6
smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/service/impl/AbnormalValidatorImpl.java
View File

@ -1,16 +1,12 @@
package com.ruoyi.ss.abnormal.service.impl;
import com.ruoyi.common.core.domain.BaseValidator;
import com.ruoyi.common.core.domain.ValidateResult;
import com.ruoyi.ss.abnormal.domain.dto.AbnormalSubmitDTO;
import com.ruoyi.ss.abnormal.service.AbnormalValidator;
import com.ruoyi.ss.device.service.DeviceValidator;
import com.ruoyi.ss.device.service.DeviceService;
import com.ruoyi.ss.device.service.DeviceValidator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
/**
* @author wjh
* 2024/4/30

6
smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/Access.java
View File

@ -1,13 +1,11 @@
package com.ruoyi.ss.access.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Sensitive;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.enums.DesensitizedType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.time.LocalDateTime;

1
smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/dto/AccessLoginDTO.java
View File

@ -1,7 +1,6 @@
package com.ruoyi.ss.access.domain.dto;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.Data;
/**

1
smart-switch-service/src/main/java/com/ruoyi/ss/access/domain/vo/AccessApplyVO.java
View File

@ -1,7 +1,6 @@
package com.ruoyi.ss.access.domain.vo;
import com.ruoyi.ss.access.domain.Access;
import com.ruoyi.ss.access.domain.AccessVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

3
smart-switch-service/src/main/java/com/ruoyi/ss/access/mapper/AccessMapper.java
View File

@ -1,11 +1,12 @@
package com.ruoyi.ss.access.mapper;
import java.util.List;
import com.ruoyi.ss.access.domain.Access;
import com.ruoyi.ss.access.domain.AccessQuery;
import com.ruoyi.ss.access.domain.AccessVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 第三方API秘钥对Mapper接口
*

4
smart-switch-service/src/main/java/com/ruoyi/ss/access/service/AccessService.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.ss.access.service;
import java.util.List;
import com.ruoyi.ss.access.domain.Access;
import com.ruoyi.ss.access.domain.AccessQuery;
import com.ruoyi.ss.access.domain.AccessVO;
import com.ruoyi.ss.access.domain.vo.AccessApplyVO;
import com.ruoyi.ss.user.domain.SmUserVo;
import java.util.List;
/**
* 第三方API秘钥对Service接口
*

11
smart-switch-service/src/main/java/com/ruoyi/ss/access/service/impl/AccessServiceImpl.java
View File

@ -1,26 +1,25 @@
package com.ruoyi.ss.access.service.impl;
import java.util.List;
import java.util.concurrent.TimeUnit;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.redis.RedisLock;
import com.ruoyi.common.core.redis.enums.RedisLockKey;
import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.ss.access.domain.Access;
import com.ruoyi.ss.access.domain.AccessQuery;
import com.ruoyi.ss.access.domain.AccessVO;
import com.ruoyi.ss.access.domain.vo.AccessApplyVO;
import com.ruoyi.ss.access.mapper.AccessMapper;
import com.ruoyi.ss.access.service.AccessService;
import com.ruoyi.ss.user.domain.SmUserVo;
import com.ruoyi.ss.user.service.ISmUserService;
import org.eclipse.jetty.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.ruoyi.ss.access.mapper.AccessMapper;
import com.ruoyi.ss.access.domain.Access;
import com.ruoyi.ss.access.service.AccessService;
import java.util.List;
/**
* 第三方API秘钥对Service业务层处理

1
smart-switch-service/src/main/java/com/ruoyi/ss/account/service/impl/AccountServiceImpl.java
View File

@ -11,7 +11,6 @@ import com.ruoyi.ss.account.domain.enums.AccountType;
import com.ruoyi.ss.account.mapper.AccountMapper;
import com.ruoyi.ss.account.service.AccountAssembler;
import com.ruoyi.ss.account.service.AccountService;
import com.ruoyi.ss.channel.service.ChannelService;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawVO;
import com.ruoyi.ss.channelWithdraw.service.ChannelWithdrawService;
import org.apache.commons.lang3.StringUtils;

8
smart-switch-service/src/main/java/com/ruoyi/ss/ad/domain/Ad.java
View File

@ -1,15 +1,11 @@
package com.ruoyi.ss.ad.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.valid.EnumValid;
import com.ruoyi.ss.ad.domain.enums.AdUrlType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import javax.validation.constraints.NotNull;
/**
* 广告对象 ss_ad

3
smart-switch-service/src/main/java/com/ruoyi/ss/ad/mapper/AdMapper.java
View File

@ -1,11 +1,12 @@
package com.ruoyi.ss.ad.mapper;
import java.util.List;
import com.ruoyi.ss.ad.domain.Ad;
import com.ruoyi.ss.ad.domain.AdQuery;
import com.ruoyi.ss.ad.domain.AdVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 广告Mapper接口
*

3
smart-switch-service/src/main/java/com/ruoyi/ss/ad/service/IAdService.java
View File

@ -1,10 +1,11 @@
package com.ruoyi.ss.ad.service;
import java.util.List;
import com.ruoyi.ss.ad.domain.Ad;
import com.ruoyi.ss.ad.domain.AdQuery;
import com.ruoyi.ss.ad.domain.AdVO;
import java.util.List;
/**
* 广告Service接口
*

9
smart-switch-service/src/main/java/com/ruoyi/ss/ad/service/impl/AdServiceImpl.java
View File

@ -1,14 +1,15 @@
package com.ruoyi.ss.ad.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.ss.ad.domain.Ad;
import com.ruoyi.ss.ad.domain.AdQuery;
import com.ruoyi.ss.ad.domain.AdVO;
import com.ruoyi.ss.ad.mapper.AdMapper;
import com.ruoyi.ss.ad.service.IAdService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.ss.ad.mapper.AdMapper;
import com.ruoyi.ss.ad.domain.Ad;
import com.ruoyi.ss.ad.service.IAdService;
import java.util.List;
/**
* 广告Service业务层处理

13
smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/domain/ApiBill.java
View File

@ -1,14 +1,13 @@
package com.ruoyi.ss.apiBill.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* API收费订单对象 ss_api_bill

5
smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/mapper/ApiBillMapper.java
View File

@ -1,11 +1,12 @@
package com.ruoyi.ss.apiBill.mapper;
import java.util.List;
import com.ruoyi.ss.apiBill.domain.ApiBill;
import com.ruoyi.ss.apiBill.domain.ApiBillVO;
import com.ruoyi.ss.apiBill.domain.ApiBillQuery;
import com.ruoyi.ss.apiBill.domain.ApiBillVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* API收费订单Mapper接口
*

5
smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/service/ApiBillService.java
View File

@ -1,9 +1,10 @@
package com.ruoyi.ss.apiBill.service;
import java.util.List;
import com.ruoyi.ss.apiBill.domain.ApiBill;
import com.ruoyi.ss.apiBill.domain.ApiBillVO;
import com.ruoyi.ss.apiBill.domain.ApiBillQuery;
import com.ruoyi.ss.apiBill.domain.ApiBillVO;
import java.util.List;
/**
* API收费订单Service接口

13
smart-switch-service/src/main/java/com/ruoyi/ss/apiBill/service/impl/ApiBillServiceImpl.java
View File

@ -1,14 +1,15 @@
package com.ruoyi.ss.apiBill.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.ss.apiBill.domain.ApiBill;
import com.ruoyi.ss.apiBill.domain.ApiBillQuery;
import com.ruoyi.ss.apiBill.domain.ApiBillVO;
import com.ruoyi.ss.apiBill.mapper.ApiBillMapper;
import com.ruoyi.ss.apiBill.service.ApiBillService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.ss.apiBill.mapper.ApiBillMapper;
import com.ruoyi.ss.apiBill.domain.ApiBill;
import com.ruoyi.ss.apiBill.domain.ApiBillVO;
import com.ruoyi.ss.apiBill.domain.ApiBillQuery;
import com.ruoyi.ss.apiBill.service.ApiBillService;
import java.util.List;
/**
* API收费订单Service业务层处理

9
smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/domain/ApiPrice.java
View File

@ -1,22 +1,19 @@
package com.ruoyi.ss.apiPrice.domain;
import java.math.BigDecimal;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.constants.DictTypeConstants;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.ValidGroup;
import com.ruoyi.common.validRule.apiPriceExist.ApiPriceExist;
import com.ruoyi.system.valid.DictValid;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.math.BigDecimal;
/**
* API收费标准对象 ss_api_price

5
smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/mapper/ApiPriceMapper.java
View File

@ -1,11 +1,12 @@
package com.ruoyi.ss.apiPrice.mapper;
import java.util.List;
import com.ruoyi.ss.apiPrice.domain.ApiPrice;
import com.ruoyi.ss.apiPrice.domain.ApiPriceVO;
import com.ruoyi.ss.apiPrice.domain.ApiPriceQuery;
import com.ruoyi.ss.apiPrice.domain.ApiPriceVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* API收费标准Mapper接口
*

5
smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/service/ApiPriceService.java
View File

@ -1,9 +1,10 @@
package com.ruoyi.ss.apiPrice.service;
import java.util.List;
import com.ruoyi.ss.apiPrice.domain.ApiPrice;
import com.ruoyi.ss.apiPrice.domain.ApiPriceVO;
import com.ruoyi.ss.apiPrice.domain.ApiPriceQuery;
import com.ruoyi.ss.apiPrice.domain.ApiPriceVO;
import java.util.List;
/**
* API收费标准Service接口

13
smart-switch-service/src/main/java/com/ruoyi/ss/apiPrice/service/impl/ApiPriceServiceImpl.java
View File

@ -1,14 +1,15 @@
package com.ruoyi.ss.apiPrice.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.ss.apiPrice.domain.ApiPrice;
import com.ruoyi.ss.apiPrice.domain.ApiPriceQuery;
import com.ruoyi.ss.apiPrice.domain.ApiPriceVO;
import com.ruoyi.ss.apiPrice.mapper.ApiPriceMapper;
import com.ruoyi.ss.apiPrice.service.ApiPriceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.ss.apiPrice.mapper.ApiPriceMapper;
import com.ruoyi.ss.apiPrice.domain.ApiPrice;
import com.ruoyi.ss.apiPrice.domain.ApiPriceVO;
import com.ruoyi.ss.apiPrice.domain.ApiPriceQuery;
import com.ruoyi.ss.apiPrice.service.ApiPriceService;
import java.util.List;
/**
* API收费标准Service业务层处理

12
smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/Bonus.java
View File

@ -1,17 +1,15 @@
package com.ruoyi.ss.bonus.domain;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonView;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.JsonViewProfile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 分成明细对象 ss_bonus

1
smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/BonusProvideQuery.java
View File

@ -2,7 +2,6 @@ package com.ruoyi.ss.bonus.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import nonapi.io.github.classgraph.utils.LogNode;
import java.util.List;

11
smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.java
View File

@ -1,21 +1,20 @@
package com.ruoyi.ss.bonus.mapper;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import com.ruoyi.common.domain.vo.CommonCountVO;
import com.ruoyi.common.domain.vo.CommonSumVO;
import com.ruoyi.ss.bonus.domain.Bonus;
import com.ruoyi.ss.bonus.domain.BonusProvideQuery;
import com.ruoyi.ss.bonus.domain.BonusVO;
import com.ruoyi.ss.bonus.domain.BonusQuery;
import com.ruoyi.ss.bonus.domain.BonusVO;
import com.ruoyi.ss.bonus.domain.vo.BonusDailyAmountVO;
import com.ruoyi.ss.bonus.domain.vo.BonusMonthAmountVO;
import com.ruoyi.ss.bonus.domain.vo.ProvideBonusVO;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
/**
* 分成明细Mapper接口
*

8
smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.xml
View File

@ -231,7 +231,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
create_time,
pay_time,
dept_id,
pre_pay_time
pre_pay_time,
payed_amount,
wait_amount
)
values
<foreach collection="list" item="i" separator=",">
@ -264,6 +266,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="i.deptId == null">default,</if>
<if test="i.prePayTime != null">#{i.prePayTime},</if>
<if test="i.prePayTime == null">default,</if>
<if test="i.payedAmount != null">#{i.payedAmount},</if>
<if test="i.payedAmount == null">default,</if>
<if test="i.waitAmount != null">#{i.waitAmount},</if>
<if test="i.waitAmount == null">default,</if>
</trim>
</foreach>
</insert>

9
smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/BonusService.java
View File

@ -1,18 +1,17 @@
package com.ruoyi.ss.bonus.service;
import java.math.BigDecimal;
import java.util.List;
import com.ruoyi.common.domain.vo.CommonCountVO;
import com.ruoyi.common.domain.vo.CommonSumVO;
import com.ruoyi.ss.bonus.domain.Bonus;
import com.ruoyi.ss.bonus.domain.BonusProvideQuery;
import com.ruoyi.ss.bonus.domain.BonusVO;
import com.ruoyi.ss.bonus.domain.BonusQuery;
import com.ruoyi.ss.bonus.domain.BonusVO;
import com.ruoyi.ss.bonus.domain.vo.BonusDailyAmountVO;
import com.ruoyi.ss.bonus.domain.vo.BonusMonthAmountVO;
import com.ruoyi.ss.bonus.domain.vo.ProvideBonusVO;
import com.ruoyi.ss.transactionBill.domain.vo.TransactionBillVO;
import java.math.BigDecimal;
import java.util.List;
/**
* 分成明细Service接口

49
smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusConverterImpl.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.ss.bonus.service.impl;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.enums.ServiceType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.ss.bonus.domain.Bonus;
import com.ruoyi.ss.bonus.domain.enums.BonusArrivalType;
@ -26,7 +27,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -145,11 +151,52 @@ public class BonusConverterImpl implements BonusConverter {
if (bill == null) {
return Collections.emptyList();
}
LocalDateTime payTime = DateUtils.toLocalDateTime(bill.getPayTime());
List<Bonus> result = new ArrayList<>();
BigDecimal decimal100 = new BigDecimal("100");
// TODO 平台
// 平台百分比
BigDecimal platformPoint = bill.getServiceCharge().multiply(decimal100).divide(bill.getMoney(), 2, RoundingMode.HALF_UP);
Bonus platformBonus = new Bonus();
platformBonus.setBillId(bill.getBillId());
platformBonus.setBillNo(bill.getBillNo());
platformBonus.setStatus(BonusStatus.DIVIDEND.getStatus());
platformBonus.setArrivalId(Constants.ROOT_DEPT);
platformBonus.setArrivalName("创特科技");
platformBonus.setArrivalType(BonusArrivalType.PLATFORM.getType());
platformBonus.setPoint(platformPoint);
platformBonus.setAmount(bill.getServiceCharge());
platformBonus.setRefundAmount(bill.getRefundServiceAmount());
platformBonus.setAncestors("");
platformBonus.setDeptId(Constants.ROOT_DEPT);
platformBonus.setPayTime(payTime);
platformBonus.setPrePayTime(payTime);
platformBonus.setPayedAmount(bill.getServiceCharge().subtract(bill.getRefundServiceAmount()));
platformBonus.setWaitAmount(BigDecimal.ZERO);
result.add(platformBonus);
// TODO 商户
// 商户百分比
BigDecimal mchPoint = decimal100.subtract(platformPoint);
Bonus mchBonus = new Bonus();
mchBonus.setBillId(bill.getBillId());
mchBonus.setBillNo(bill.getBillNo());
mchBonus.setStatus(BonusStatus.DIVIDEND.getStatus());
mchBonus.setArrivalId(bill.getMchId());
mchBonus.setArrivalName(bill.getMchName());
mchBonus.setArrivalType(BonusArrivalType.MCH.getType());
mchBonus.setPoint(mchPoint);
mchBonus.setAmount(bill.getArrivalAmount());
mchBonus.setRefundAmount(bill.getRefundMchAmount());
mchBonus.setAncestors(bill.getMchId().toString());
mchBonus.setDeptId(Constants.ROOT_DEPT);
mchBonus.setPayTime(payTime);
mchBonus.setPrePayTime(payTime);
mchBonus.setPayedAmount(bill.getArrivalAmount().subtract(bill.getRefundMchAmount()));
mchBonus.setWaitAmount(BigDecimal.ZERO);
result.add(mchBonus);
return result;
}

24
smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusServiceImpl.java
View File

@ -1,12 +1,5 @@
package com.ruoyi.ss.bonus.service.impl;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.domain.vo.CommonCountVO;
import com.ruoyi.common.domain.vo.CommonSumVO;
@ -15,12 +8,17 @@ import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.ss.bonus.domain.Bonus;
import com.ruoyi.ss.bonus.domain.BonusProvideQuery;
import com.ruoyi.ss.bonus.domain.BonusQuery;
import com.ruoyi.ss.bonus.domain.BonusVO;
import com.ruoyi.ss.bonus.domain.enums.BonusArrivalType;
import com.ruoyi.ss.bonus.domain.enums.BonusStatus;
import com.ruoyi.ss.bonus.domain.vo.BonusDailyAmountVO;
import com.ruoyi.ss.bonus.domain.vo.BonusMonthAmountVO;
import com.ruoyi.ss.bonus.domain.vo.ProvideBonusVO;
import com.ruoyi.ss.bonus.mapper.BonusMapper;
import com.ruoyi.ss.bonus.service.BonusService;
import com.ruoyi.ss.recordBalance.domain.enums.RecordBalanceBstType;
import com.ruoyi.ss.store.service.StoreService;
import com.ruoyi.ss.user.domain.SmUserVo;
@ -30,13 +28,15 @@ import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.ss.bonus.mapper.BonusMapper;
import com.ruoyi.ss.bonus.domain.Bonus;
import com.ruoyi.ss.bonus.domain.BonusVO;
import com.ruoyi.ss.bonus.domain.BonusQuery;
import com.ruoyi.ss.bonus.service.BonusService;
import org.springframework.transaction.support.TransactionTemplate;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* 分成明细Service业务层处理
*

6
smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelServiceImpl.java
View File

@ -1,8 +1,6 @@
package com.ruoyi.ss.channel.service.impl;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.ss.account.domain.AccountVO;
import com.ruoyi.ss.account.domain.enums.AccountType;
import com.ruoyi.ss.account.service.AccountService;
import com.ruoyi.ss.channel.domain.Channel;
import com.ruoyi.ss.channel.domain.ChannelQuery;
@ -12,7 +10,9 @@ import com.ruoyi.ss.channel.service.ChannelService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;

2
smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/impl/ChannelValidatorImpl.java
View File

@ -2,8 +2,8 @@ package com.ruoyi.ss.channel.service.impl;
import com.ruoyi.common.core.domain.BaseValidator;
import com.ruoyi.ss.channel.domain.Channel;
import com.ruoyi.ss.channel.service.ChannelValidator;
import com.ruoyi.ss.channel.service.ChannelService;
import com.ruoyi.ss.channel.service.ChannelValidator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

1
smart-switch-service/src/main/java/com/ruoyi/ss/dashboard/ServiceIncomeQuery.java
View File

@ -5,7 +5,6 @@ import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import java.util.List;
/**
* @author wjh

1
smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java
View File

@ -3,7 +3,6 @@ package com.ruoyi.ss.device.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Set;
/**

1
smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/dto/DeviceRegisterDTO.java
View File

@ -4,7 +4,6 @@ import com.ruoyi.common.validRule.modelExist.ModelExist;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @author wjh

8
smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/vo/DeviceVO.java
View File

@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonView;
import com.ruoyi.common.core.domain.JsonViewProfile;
import com.ruoyi.iot.interfaces.IotDevice;
import com.ruoyi.ss.device.domain.DeviceView;
import com.ruoyi.ss.device.domain.Device;
import com.ruoyi.ss.device.domain.DeviceView;
import com.ruoyi.ss.suit.domain.SuitVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -76,9 +76,13 @@ public class DeviceVO extends Device implements IotDevice {
private String modelProductId;
@Override
public String getMac1() {
public String iotMac1() {
return getMac();
}
@Override
public String iotMac2() {
return getMac2();
}
@Override
public String getProductId() {

1
smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceValidator.java
View File

@ -5,7 +5,6 @@ import com.ruoyi.ss.device.domain.DeviceBO;
import java.util.Collection;
import java.util.List;
import java.util.Set;
/**
* @author wjh

1
smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceConverterImpl.java
View File

@ -1,7 +1,6 @@
package com.ruoyi.ss.device.service.impl;
import com.ruoyi.ss.device.service.DeviceConverter;
import lombok.Data;
import org.springframework.stereotype.Service;
/**

5
smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
View File

@ -5,7 +5,6 @@ import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisLock;
import com.ruoyi.common.core.redis.enums.RedisLockKey;
import com.ruoyi.common.enums.LoginType;
import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.collection.CollectionUtils;
@ -26,8 +25,8 @@ import com.ruoyi.ss.device.domain.vo.DeviceMacSnVO;
import com.ruoyi.ss.device.domain.vo.DeviceVO;
import com.ruoyi.ss.device.mapper.DeviceMapper;
import com.ruoyi.ss.device.service.DeviceAssembler;
import com.ruoyi.ss.device.service.DeviceValidator;
import com.ruoyi.ss.device.service.DeviceService;
import com.ruoyi.ss.device.service.DeviceValidator;
import com.ruoyi.ss.deviceBindRecord.service.ISmDeviceBindRecordService;
import com.ruoyi.ss.deviceSuit.service.DeviceSuitConverter;
import com.ruoyi.ss.deviceSuit.service.DeviceSuitService;
@ -825,7 +824,7 @@ public class DeviceServiceImpl implements DeviceService
String onlineStatus = iotService.getOnlineStatus(device).getStatus();
data.setOnlineStatus(onlineStatus);
if (DeviceOnlineStatus.ONLINE.getStatus().equals(onlineStatus)) {
device.setLastOnlineTime(now);
data.setLastOnlineTime(now);
}
deviceMapper.updateSmDevice(data);

5
smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceValidatorImpl.java
View File

@ -2,16 +2,15 @@ package com.ruoyi.ss.device.service.impl;
import com.ruoyi.common.core.domain.BaseValidator;
import com.ruoyi.common.core.domain.ValidateResult;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.ss.device.domain.DeviceBO;
import com.ruoyi.ss.device.domain.DeviceQuery;
import com.ruoyi.ss.device.domain.vo.DeviceVO;
import com.ruoyi.ss.device.service.DeviceValidator;
import com.ruoyi.ss.device.service.DeviceService;
import com.ruoyi.ss.device.service.DeviceValidator;
import com.ruoyi.ss.store.service.StoreValidator;
import com.ruoyi.ss.suit.service.SuitValidator;
import com.ruoyi.ss.user.service.UserValidator;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jetty.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;

6
smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/domain/DeviceSuit.java
View File

@ -1,12 +1,10 @@
package com.ruoyi.ss.deviceSuit.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 设备套餐关联对象 ss_device_suit

5
smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/mapper/DeviceSuitMapper.java
View File

@ -1,11 +1,12 @@
package com.ruoyi.ss.deviceSuit.mapper;
import java.util.List;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuit;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitQuery;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 设备套餐关联Mapper接口
*

1
smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/DeviceSuitConverter.java
View File

@ -2,7 +2,6 @@ package com.ruoyi.ss.deviceSuit.service;
import com.ruoyi.ss.device.domain.DeviceBO;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuit;
import com.ruoyi.ss.suit.domain.Suit;
import com.ruoyi.ss.suit.domain.SuitBO;
import java.util.List;

5
smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/DeviceSuitService.java
View File

@ -1,11 +1,12 @@
package com.ruoyi.ss.deviceSuit.service;
import java.util.List;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuit;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitQuery;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 设备套餐关联Service接口
*

18
smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/impl/DeviceSuitServiceImpl.java
View File

@ -1,17 +1,17 @@
package com.ruoyi.ss.deviceSuit.service.impl;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuit;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitQuery;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO;
import com.ruoyi.ss.deviceSuit.mapper.DeviceSuitMapper;
import com.ruoyi.ss.deviceSuit.service.DeviceSuitService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
import com.ruoyi.common.utils.collection.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.ss.deviceSuit.mapper.DeviceSuitMapper;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuit;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitQuery;
import com.ruoyi.ss.deviceSuit.service.DeviceSuitService;
/**
* 设备套餐关联Service业务层处理
*

3
smart-switch-service/src/main/java/com/ruoyi/ss/model/service/ModelValidator.java
View File

@ -1,8 +1,5 @@
package com.ruoyi.ss.model.service;
import com.ruoyi.common.core.domain.ValidateResult;
import com.ruoyi.ss.model.domain.SmModelBO;
import java.util.List;
/**

10
smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBill.java
View File

@ -1,14 +1,14 @@
package com.ruoyi.ss.payBill.domain;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.pay.wx.domain.Payable;
import com.ruoyi.common.pay.wx.domain.enums.AttachEnums;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 支付订单对象 ss_pay_bill

1
smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBillQuery.java
View File

@ -3,7 +3,6 @@ package com.ruoyi.ss.payBill.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;

1
smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/bo/PayBillRefundBO.java
View File

@ -1,6 +1,5 @@
package com.ruoyi.ss.payBill.domain.bo;
import com.ruoyi.ss.payBill.domain.PayBill;
import com.ruoyi.ss.payBill.domain.PayBillVO;
import com.ruoyi.ss.payBill.domain.dto.PayBillRefundDTO;
import lombok.Data;

2
smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/enums/PayBillBstType.java
View File

@ -3,8 +3,8 @@ package com.ruoyi.ss.payBill.domain.enums;
import com.ruoyi.ss.payBill.interfaces.AfterPay;
import com.ruoyi.ss.payBill.interfaces.AfterRefund;
import com.ruoyi.ss.timeBill.service.impl.TimeBillServiceImpl;
import com.ruoyi.ss.transactionBill.service.impl.RechargePayHandler;
import com.ruoyi.ss.transactionBill.service.impl.RechargeDepositAfterPay;
import com.ruoyi.ss.transactionBill.service.impl.RechargePayHandler;
import lombok.AllArgsConstructor;
import lombok.Getter;

9
smart-switch-service/src/main/java/com/ruoyi/ss/payBill/mapper/PayBillMapper.java
View File

@ -1,11 +1,12 @@
package com.ruoyi.ss.payBill.mapper;
import com.ruoyi.ss.payBill.domain.PayBill;
import com.ruoyi.ss.payBill.domain.PayBillQuery;
import com.ruoyi.ss.payBill.domain.PayBillVO;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
import com.ruoyi.ss.payBill.domain.PayBill;
import com.ruoyi.ss.payBill.domain.PayBillVO;
import com.ruoyi.ss.payBill.domain.PayBillQuery;
import org.apache.ibatis.annotations.Param;
/**
* 支付订单Mapper接口

14
smart-switch-service/src/main/java/com/ruoyi/ss/payBill/service/PayBillService.java
View File

@ -1,16 +1,16 @@
package com.ruoyi.ss.payBill.service;
import com.ruoyi.ss.payBill.domain.PayBill;
import com.ruoyi.ss.payBill.domain.PayBillQuery;
import com.ruoyi.ss.payBill.domain.PayBillVO;
import com.ruoyi.ss.payBill.domain.dto.PayBillRefundDTO;
import com.ruoyi.ss.payBill.domain.vo.DoPayVO;
import com.ruoyi.ss.refund.domain.RefundVO;
import java.time.LocalDateTime;
import java.util.List;
import java.util.concurrent.TimeUnit;
import com.ruoyi.ss.payBill.domain.PayBill;
import com.ruoyi.ss.payBill.domain.PayBillVO;
import com.ruoyi.ss.payBill.domain.PayBillQuery;
import com.ruoyi.ss.payBill.domain.dto.PayBillRefundDTO;
import com.ruoyi.ss.payBill.domain.vo.DoPayVO;
import com.ruoyi.ss.refund.domain.RefundVO;
/**
* 支付订单Service接口
*

10
smart-switch-service/src/main/java/com/ruoyi/ss/realName/domain/RealName.java
View File

@ -1,15 +1,13 @@
package com.ruoyi.ss.realName.domain;
import java.math.BigDecimal;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Sensitive;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.enums.DesensitizedType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.math.BigDecimal;
/**
* 实名认证对象 ss_real_name

5
smart-switch-service/src/main/java/com/ruoyi/ss/realName/mapper/RealNameMapper.java
View File

@ -1,11 +1,12 @@
package com.ruoyi.ss.realName.mapper;
import java.util.List;
import com.ruoyi.ss.realName.domain.RealName;
import com.ruoyi.ss.realName.domain.RealNameVO;
import com.ruoyi.ss.realName.domain.RealNameQuery;
import com.ruoyi.ss.realName.domain.RealNameVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 实名认证Mapper接口
*

5
smart-switch-service/src/main/java/com/ruoyi/ss/realName/service/IRealNameService.java
View File

@ -1,9 +1,10 @@
package com.ruoyi.ss.realName.service;
import java.util.List;
import com.ruoyi.ss.realName.domain.RealName;
import com.ruoyi.ss.realName.domain.RealNameVO;
import com.ruoyi.ss.realName.domain.RealNameQuery;
import com.ruoyi.ss.realName.domain.RealNameVO;
import java.util.List;
/**
* 实名认证Service接口

13
smart-switch-service/src/main/java/com/ruoyi/ss/realName/service/impl/RealNameServiceImpl.java
View File

@ -1,14 +1,15 @@
package com.ruoyi.ss.realName.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.ss.realName.domain.RealName;
import com.ruoyi.ss.realName.domain.RealNameQuery;
import com.ruoyi.ss.realName.domain.RealNameVO;
import com.ruoyi.ss.realName.mapper.RealNameMapper;
import com.ruoyi.ss.realName.service.IRealNameService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.ss.realName.mapper.RealNameMapper;
import com.ruoyi.ss.realName.domain.RealName;
import com.ruoyi.ss.realName.domain.RealNameVO;
import com.ruoyi.ss.realName.domain.RealNameQuery;
import com.ruoyi.ss.realName.service.IRealNameService;
import java.util.List;
/**
* 实名认证Service业务层处理

13
smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/domain/ReceiveBill.java
View File

@ -1,17 +1,14 @@
package com.ruoyi.ss.receiveBill.domain;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonView;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.JsonViewProfile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 应收账单对象 ss_receive_bill

11
smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/mapper/ReceiveBillMapper.java
View File

@ -1,12 +1,13 @@
package com.ruoyi.ss.receiveBill.mapper;
import com.ruoyi.ss.receiveBill.domain.ReceiveBill;
import com.ruoyi.ss.receiveBill.domain.ReceiveBillQuery;
import com.ruoyi.ss.receiveBill.domain.ReceiveBillVO;
import com.ruoyi.ss.receiveBill.domain.vo.ReceiveAmountVO;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
import com.ruoyi.ss.receiveBill.domain.ReceiveBill;
import com.ruoyi.ss.receiveBill.domain.ReceiveBillVO;
import com.ruoyi.ss.receiveBill.domain.ReceiveBillQuery;
import com.ruoyi.ss.receiveBill.domain.vo.ReceiveAmountVO;
import org.apache.ibatis.annotations.Param;
/**
* 应收账单Mapper接口

8
smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/service/ReceiveBillService.java
View File

@ -1,15 +1,15 @@
package com.ruoyi.ss.receiveBill.service;
import java.math.BigDecimal;
import java.util.List;
import com.ruoyi.ss.device.domain.vo.DeviceVO;
import com.ruoyi.ss.receiveBill.domain.ReceiveBill;
import com.ruoyi.ss.receiveBill.domain.ReceiveBillVO;
import com.ruoyi.ss.receiveBill.domain.ReceiveBillQuery;
import com.ruoyi.ss.receiveBill.domain.ReceiveBillVO;
import com.ruoyi.ss.receiveBill.domain.vo.ReceiveAmountVO;
import com.ruoyi.ss.user.domain.SmUserVo;
import java.math.BigDecimal;
import java.util.List;
/**
* 应收账单Service接口
*

20
smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/service/impl/ReceiveBillServiceImpl.java
View File

@ -1,30 +1,30 @@
package com.ruoyi.ss.receiveBill.service.impl;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import java.util.concurrent.TimeUnit;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.ss.device.domain.vo.DeviceVO;
import com.ruoyi.ss.device.service.DeviceService;
import com.ruoyi.ss.receiveBill.domain.ReceiveBill;
import com.ruoyi.ss.receiveBill.domain.ReceiveBillQuery;
import com.ruoyi.ss.receiveBill.domain.ReceiveBillVO;
import com.ruoyi.ss.receiveBill.domain.enums.ReceiveBillStatus;
import com.ruoyi.ss.receiveBill.domain.enums.ReceiveBillType;
import com.ruoyi.ss.receiveBill.domain.vo.ReceiveAmountVO;
import com.ruoyi.ss.receiveBill.mapper.ReceiveBillMapper;
import com.ruoyi.ss.receiveBill.service.ReceiveBillService;
import com.ruoyi.ss.recordBalance.domain.enums.RecordBalanceBstType;
import com.ruoyi.ss.transactionBill.service.impl.TransactionBillServiceImpl;
import com.ruoyi.ss.user.domain.SmUserVo;
import com.ruoyi.ss.user.service.ISmUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.ss.receiveBill.mapper.ReceiveBillMapper;
import com.ruoyi.ss.receiveBill.domain.ReceiveBill;
import com.ruoyi.ss.receiveBill.domain.ReceiveBillVO;
import com.ruoyi.ss.receiveBill.domain.ReceiveBillQuery;
import com.ruoyi.ss.receiveBill.service.ReceiveBillService;
import org.springframework.transaction.support.TransactionTemplate;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import java.util.concurrent.TimeUnit;
/**
* 应收账单Service业务层处理
*

11
smart-switch-service/src/main/java/com/ruoyi/ss/record/time/domain/RecordTime.java
View File

@ -1,15 +1,12 @@
package com.ruoyi.ss.record.time.domain;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 设备时长变化记录对象 ss_record_time

1
smart-switch-service/src/main/java/com/ruoyi/ss/record/time/domain/RecordTimeVO.java
View File

@ -1,6 +1,5 @@
package com.ruoyi.ss.record.time.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**

3
smart-switch-service/src/main/java/com/ruoyi/ss/record/time/mapper/RecordTimeMapper.java
View File

@ -1,10 +1,11 @@
package com.ruoyi.ss.record.time.mapper;
import java.util.List;
import com.ruoyi.ss.record.time.domain.RecordTime;
import com.ruoyi.ss.record.time.domain.RecordTimeQuery;
import com.ruoyi.ss.record.time.domain.RecordTimeVO;
import java.util.List;
/**
* 设备时长变化记录Mapper接口
*

3
smart-switch-service/src/main/java/com/ruoyi/ss/record/time/service/IRecordTimeService.java
View File

@ -1,10 +1,11 @@
package com.ruoyi.ss.record.time.service;
import java.util.List;
import com.ruoyi.ss.record.time.domain.RecordTime;
import com.ruoyi.ss.record.time.domain.RecordTimeQuery;
import com.ruoyi.ss.record.time.domain.RecordTimeVO;
import java.util.List;
/**
* 设备时长变化记录Service接口
*

10
smart-switch-service/src/main/java/com/ruoyi/ss/record/time/service/impl/RecordTimeServiceImpl.java
View File

@ -1,14 +1,14 @@
package com.ruoyi.ss.record.time.service.impl;
import java.util.List;
import com.ruoyi.ss.record.time.domain.RecordTime;
import com.ruoyi.ss.record.time.domain.RecordTimeQuery;
import com.ruoyi.ss.record.time.domain.RecordTimeVO;
import com.ruoyi.ss.record.time.mapper.RecordTimeMapper;
import com.ruoyi.ss.record.time.service.IRecordTimeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.ss.record.time.mapper.RecordTimeMapper;
import com.ruoyi.ss.record.time.domain.RecordTime;
import com.ruoyi.ss.record.time.service.IRecordTimeService;
import java.util.List;
/**
* 设备时长变化记录Service业务层处理

10
smart-switch-service/src/main/java/com/ruoyi/ss/recordBalance/domain/RecordBalance.java
View File

@ -1,13 +1,11 @@
package com.ruoyi.ss.recordBalance.domain;
import java.math.BigDecimal;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* 余额变动记录对象 ss_record_balance

8
smart-switch-service/src/main/java/com/ruoyi/ss/refund/domain/Refund.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.ss.refund.domain;
import java.math.BigDecimal;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* 退款订单对象 ss_refund

3
smart-switch-service/src/main/java/com/ruoyi/ss/refund/mapper/RefundMapper.java
View File

@ -1,11 +1,12 @@
package com.ruoyi.ss.refund.mapper;
import java.util.List;
import com.ruoyi.ss.refund.domain.Refund;
import com.ruoyi.ss.refund.domain.RefundQuery;
import com.ruoyi.ss.refund.domain.RefundVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 退款订单Mapper接口
*

1
smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/RefundConverter.java
View File

@ -2,7 +2,6 @@ package com.ruoyi.ss.refund.service;
import com.ruoyi.ss.payBill.domain.bo.PayBillRefundBO;
import com.ruoyi.ss.refund.domain.Refund;
import com.ruoyi.ss.transactionBill.domain.dto.BillRefundDTO;
/**
* @author wjh

3
smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/RefundService.java
View File

@ -1,10 +1,11 @@
package com.ruoyi.ss.refund.service;
import java.util.List;
import com.ruoyi.ss.refund.domain.Refund;
import com.ruoyi.ss.refund.domain.RefundQuery;
import com.ruoyi.ss.refund.domain.RefundVO;
import java.util.List;
/**
* 退款订单Service接口
*

7
smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundConverterImpl.java
View File

@ -2,7 +2,6 @@ package com.ruoyi.ss.refund.service.impl;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.ss.payBill.domain.PayBillVO;
import com.ruoyi.ss.payBill.domain.bo.PayBillRefundBO;
import com.ruoyi.ss.payBill.domain.dto.PayBillRefundDTO;
@ -10,18 +9,12 @@ import com.ruoyi.ss.refund.domain.Refund;
import com.ruoyi.ss.refund.domain.enums.RefundBstType;
import com.ruoyi.ss.refund.domain.enums.RefundStatus;
import com.ruoyi.ss.refund.service.RefundConverter;
import com.ruoyi.ss.transactionBill.domain.vo.TransactionBillVO;
import com.ruoyi.ss.transactionBill.domain.dto.BillRefundDTO;
import com.ruoyi.ss.transactionBill.service.TransactionBillService;
import lombok.extern.slf4j.Slf4j;
import lombok.extern.slf4j.XSlf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
/**
* @author wjh
* 2024/7/9

21
smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundServiceImpl.java
View File

@ -1,10 +1,5 @@
package com.ruoyi.ss.refund.service.impl;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.pay.syb.enums.SybTrxStatus;
import com.ruoyi.common.pay.syb.service.SybPayService;
@ -13,24 +8,24 @@ import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.SnowFlakeUtil;
import com.ruoyi.ss.payBill.service.PayBillService;
import com.ruoyi.ss.refund.domain.Refund;
import com.ruoyi.ss.refund.domain.RefundQuery;
import com.ruoyi.ss.refund.domain.RefundVO;
import com.ruoyi.ss.refund.domain.enums.RefundStatus;
import com.ruoyi.ss.transactionBill.domain.TransactionBill;
import com.ruoyi.ss.transactionBill.domain.TransactionBillQuery;
import com.ruoyi.ss.refund.mapper.RefundMapper;
import com.ruoyi.ss.refund.service.RefundService;
import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillPayType;
import com.ruoyi.ss.transactionBill.domain.vo.TransactionBillVO;
import com.ruoyi.ss.transactionBill.domain.enums.TransactionBillStatus;
import com.ruoyi.ss.transactionBill.service.TransactionBillService;
import com.ruoyi.ss.user.service.ISmUserService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.ss.refund.mapper.RefundMapper;
import com.ruoyi.ss.refund.domain.Refund;
import com.ruoyi.ss.refund.service.RefundService;
import org.springframework.transaction.support.TransactionTemplate;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
/**
* 退款订单Service业务层处理
*

1
smart-switch-service/src/main/java/com/ruoyi/ss/store/domain/enums/StoreStatus.java
View File

@ -1,7 +1,6 @@
package com.ruoyi.ss.store.domain.enums;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Getter;
/**

1
smart-switch-service/src/main/java/com/ruoyi/ss/store/service/StoreValidator.java
View File

@ -2,7 +2,6 @@ package com.ruoyi.ss.store.service;
import com.ruoyi.common.core.domain.ValidateResult;
import com.ruoyi.ss.store.domain.Store;
import com.ruoyi.ss.store.domain.StoreVo;
import java.util.List;

2
smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.ss.store.service.impl;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.ss.dashboard.vo.BillCountVo;
import com.ruoyi.ss.device.domain.DeviceCountVO;
import com.ruoyi.ss.device.domain.DeviceQuery;

4
smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreServiceImpl.java
View File

@ -1,17 +1,17 @@
package com.ruoyi.ss.store.service.impl;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.ss.device.domain.DeviceQuery;
import com.ruoyi.ss.device.service.DeviceService;
import com.ruoyi.ss.store.domain.*;
import com.ruoyi.ss.store.domain.enums.StoreGroupBy;
import com.ruoyi.ss.store.domain.enums.StoreStatus;
import com.ruoyi.ss.store.mapper.StoreMapper;
import com.ruoyi.ss.store.service.StoreService;
import com.ruoyi.ss.store.service.StoreAssembler;
import com.ruoyi.ss.store.service.StoreService;
import com.ruoyi.ss.storeApply.domain.enums.StoreApplyType;
import com.ruoyi.ss.storeApply.service.StoreApplyConverter;
import com.ruoyi.ss.storeApply.service.StoreApplyService;

4
smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreValidatorImpl.java
View File

@ -2,9 +2,8 @@ package com.ruoyi.ss.store.service.impl;
import com.ruoyi.common.core.domain.BaseValidator;
import com.ruoyi.common.core.domain.ValidateResult;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.ss.device.domain.DeviceQuery;
import com.ruoyi.ss.device.service.DeviceService;
import com.ruoyi.ss.store.domain.Store;
@ -21,7 +20,6 @@ import java.time.LocalTime;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**

6
smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/domain/StoreApply.java
View File

@ -1,14 +1,12 @@
package com.ruoyi.ss.storeApply.domain;
import com.fasterxml.jackson.annotation.JsonView;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.JsonViewProfile;
import com.ruoyi.ss.store.domain.Store;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.time.LocalDateTime;

1
smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/domain/bo/StoreApplyApprovalBO.java
View File

@ -2,7 +2,6 @@ package com.ruoyi.ss.storeApply.domain.bo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.ss.store.domain.StoreVo;
import com.ruoyi.ss.storeApply.domain.StoreApply;
import com.ruoyi.ss.storeApply.domain.StoreApplyVO;
import com.ruoyi.ss.storeApply.domain.dto.StoreApplyApprovalDTO;
import lombok.Data;

5
smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/mapper/StoreApplyMapper.java
View File

@ -1,11 +1,12 @@
package com.ruoyi.ss.storeApply.mapper;
import java.util.List;
import com.ruoyi.ss.storeApply.domain.StoreApply;
import com.ruoyi.ss.storeApply.domain.StoreApplyVO;
import com.ruoyi.ss.storeApply.domain.StoreApplyQuery;
import com.ruoyi.ss.storeApply.domain.StoreApplyVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 店铺审核Mapper接口
*

7
smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/StoreApplyService.java
View File

@ -1,13 +1,12 @@
package com.ruoyi.ss.storeApply.service;
import java.util.List;
import com.ruoyi.ss.store.domain.StoreBO;
import com.ruoyi.ss.storeApply.domain.StoreApply;
import com.ruoyi.ss.storeApply.domain.StoreApplyVO;
import com.ruoyi.ss.storeApply.domain.StoreApplyQuery;
import com.ruoyi.ss.storeApply.domain.StoreApplyVO;
import com.ruoyi.ss.storeApply.domain.bo.StoreApplyApprovalBO;
import java.util.List;
/**
* 店铺审核Service接口
*

19
smart-switch-service/src/main/java/com/ruoyi/ss/storeApply/service/impl/StoreApplyServiceImpl.java
View File

@ -1,29 +1,26 @@
package com.ruoyi.ss.storeApply.service.impl;
import java.time.LocalDateTime;
import java.util.List;
import com.github.pagehelper.PageHelper;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.ss.store.domain.Store;
import com.ruoyi.ss.store.domain.StoreBO;
import com.ruoyi.ss.store.domain.StoreQuery;
import com.ruoyi.ss.store.domain.enums.StoreStatus;
import com.ruoyi.ss.store.service.StoreService;
import com.ruoyi.ss.storeApply.domain.StoreApply;
import com.ruoyi.ss.storeApply.domain.StoreApplyQuery;
import com.ruoyi.ss.storeApply.domain.StoreApplyVO;
import com.ruoyi.ss.storeApply.domain.bo.StoreApplyApprovalBO;
import com.ruoyi.ss.storeApply.domain.dto.StoreApplyApprovalDTO;
import com.ruoyi.ss.storeApply.domain.enums.StoreApplyStatus;
import com.ruoyi.ss.storeApply.mapper.StoreApplyMapper;
import com.ruoyi.ss.storeApply.service.StoreApplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.ss.storeApply.mapper.StoreApplyMapper;
import com.ruoyi.ss.storeApply.domain.StoreApply;
import com.ruoyi.ss.storeApply.domain.StoreApplyVO;
import com.ruoyi.ss.storeApply.domain.StoreApplyQuery;
import com.ruoyi.ss.storeApply.service.StoreApplyService;
import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.util.List;
/**
* 店铺审核Service业务层处理

7
smart-switch-service/src/main/java/com/ruoyi/ss/suit/domain/Suit.java
View File

@ -8,12 +8,15 @@ import com.ruoyi.common.core.domain.JsonViewProfile;
import com.ruoyi.common.core.domain.ValidGroup;
import com.ruoyi.common.validRule.allowSize.AllowSize;
import com.ruoyi.common.validRule.suitExist.SuitExist;
import com.ruoyi.system.valid.DictValid;
import com.ruoyi.ss.device.domain.DeviceView;
import com.ruoyi.system.valid.DictValid;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.math.BigDecimal;
import java.util.List;

5
smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/SuitConverter.java
View File

@ -1,10 +1,5 @@
package com.ruoyi.ss.suit.service;
import com.ruoyi.ss.suit.domain.Suit;
import com.ruoyi.ss.suit.domain.dto.SuitCopyDTO;
import java.util.List;
/**
* @author wjh
* 2024/7/15

8
smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitAssemblerImpl.java
View File

@ -1,18 +1,18 @@
package com.ruoyi.ss.suit.service.impl;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.ss.device.domain.vo.DeviceVO;
import com.ruoyi.ss.device.service.DeviceService;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitQuery;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO;
import com.ruoyi.ss.deviceSuit.service.DeviceSuitService;
import com.ruoyi.ss.suit.domain.SuitVO;
import com.ruoyi.ss.suit.service.SuitAssembler;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
/**

9
smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitConverterImpl.java
View File

@ -1,19 +1,10 @@
package com.ruoyi.ss.suit.service.impl;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.ss.suit.domain.Suit;
import com.ruoyi.ss.suit.domain.SuitQuery;
import com.ruoyi.ss.suit.domain.SuitVO;
import com.ruoyi.ss.suit.domain.dto.SuitCopyDTO;
import com.ruoyi.ss.suit.service.SuitConverter;
import com.ruoyi.ss.suit.service.SuitService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* @author wjh
* 2024/7/15

2
smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.ss.suit.service.impl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitQuery;
import com.ruoyi.ss.deviceSuit.domain.DeviceSuitVO;
import com.ruoyi.ss.deviceSuit.service.DeviceSuitConverter;

7
smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitValidatorImpl.java
View File

@ -2,9 +2,9 @@ package com.ruoyi.ss.suit.service.impl;
import com.ruoyi.common.core.domain.BaseValidator;
import com.ruoyi.common.core.domain.ValidateResult;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.ss.device.service.DeviceValidator;
import com.ruoyi.ss.suit.domain.SuitBO;
@ -20,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/**
* 2024/4/26

13
smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/domain/TimeBill.java
View File

@ -1,15 +1,12 @@
package com.ruoyi.ss.timeBill.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 时长订单对象 ss_time_bill

2
smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/domain/dto/TimeBillAddOrderDTO.java
View File

@ -1,13 +1,11 @@
package com.ruoyi.ss.timeBill.domain.dto;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.constants.DictTypeConstants;
import com.ruoyi.ss.device.domain.vo.DeviceVO;
import com.ruoyi.system.valid.DictValid;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

5
smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/mapper/TimeBillMapper.java
View File

@ -1,11 +1,12 @@
package com.ruoyi.ss.timeBill.mapper;
import java.util.List;
import com.ruoyi.ss.timeBill.domain.TimeBill;
import com.ruoyi.ss.timeBill.domain.TimeBillVO;
import com.ruoyi.ss.timeBill.domain.TimeBillQuery;
import com.ruoyi.ss.timeBill.domain.TimeBillVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 时长订单Mapper接口
*

7
smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/TimeBillService.java
View File

@ -1,15 +1,14 @@
package com.ruoyi.ss.timeBill.service;
import java.util.List;
import com.ruoyi.ss.payBill.domain.PayBillVO;
import com.ruoyi.ss.payBill.domain.vo.DoPayVO;
import com.ruoyi.ss.timeBill.domain.TimeBill;
import com.ruoyi.ss.timeBill.domain.TimeBillVO;
import com.ruoyi.ss.timeBill.domain.TimeBillQuery;
import com.ruoyi.ss.timeBill.domain.TimeBillVO;
import com.ruoyi.ss.timeBill.domain.dto.TimeBillAddOrderDTO;
import com.ruoyi.ss.timeBill.domain.dto.TimeBillPayDTO;
import java.util.List;
/**
* 时长订单Service接口
*

22
smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/impl/TimeBillServiceImpl.java
View File

@ -1,12 +1,8 @@
package com.ruoyi.ss.timeBill.service.impl;
import java.math.BigDecimal;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.List;
import com.ruoyi.common.core.redis.RedisLock;
import com.ruoyi.common.core.redis.enums.RedisLockKey;
import com.ruoyi.common.pay.wx.service.WxPayService;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.SnowFlakeUtil;
@ -20,20 +16,24 @@ import com.ruoyi.ss.payBill.interfaces.AfterPay;
import com.ruoyi.ss.payBill.service.PayBillConverter;
import com.ruoyi.ss.payBill.service.PayBillService;
import com.ruoyi.ss.suit.domain.enums.SuitTimeUnit;
import com.ruoyi.ss.timeBill.domain.TimeBill;
import com.ruoyi.ss.timeBill.domain.TimeBillQuery;
import com.ruoyi.ss.timeBill.domain.TimeBillVO;
import com.ruoyi.ss.timeBill.domain.dto.TimeBillAddOrderDTO;
import com.ruoyi.ss.timeBill.domain.dto.TimeBillPayDTO;
import com.ruoyi.ss.timeBill.domain.enums.TimeBillStatus;
import com.ruoyi.ss.timeBill.mapper.TimeBillMapper;
import com.ruoyi.ss.timeBill.service.TimeBillConverter;
import com.ruoyi.common.pay.wx.service.WxPayService;
import com.ruoyi.ss.timeBill.service.TimeBillService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.ss.timeBill.mapper.TimeBillMapper;
import com.ruoyi.ss.timeBill.domain.TimeBill;
import com.ruoyi.ss.timeBill.domain.TimeBillVO;
import com.ruoyi.ss.timeBill.domain.TimeBillQuery;
import com.ruoyi.ss.timeBill.service.TimeBillService;
import org.springframework.transaction.support.TransactionTemplate;
import java.math.BigDecimal;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.List;
/**
* 时长订单Service业务层处理
*

1
smart-switch-service/src/main/java/com/ruoyi/ss/timeBill/service/impl/TimeBillValidatorImpl.java
View File

@ -6,7 +6,6 @@ import com.ruoyi.ss.device.domain.vo.DeviceVO;
import com.ruoyi.ss.timeBill.domain.TimeBillVO;
import com.ruoyi.ss.timeBill.domain.dto.TimeBillAddOrderDTO;
import com.ruoyi.ss.timeBill.service.TimeBillValidator;
import lombok.Data;
import org.springframework.stereotype.Service;
import java.util.Objects;

2
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillStatus.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.ss.transactionBill.domain.enums;
import com.ruoyi.common.enums.UserType;
import lombok.AllArgsConstructor;
import lombok.Getter;
@ -85,4 +86,5 @@ public enum TransactionBillStatus {
public static List<String> serviceIncome() {
return asList(SUCCESS, REFUNDED, REFUNDING, WITHDRAW_SUCCESS);
}
}

Some files were not shown because too many files have changed in this diff Show More