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:
磷叶 2025-02-06 10:35:55 +08:00
parent 66bcfc6c77
commit 5792838734
60 changed files with 779 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java
View File

@ -85,4 +85,9 @@ public class CacheConstants
* 充值渠道名称列表
*/
public static final String CHANNEL_NAME_LIST = "channel_name_list";
/**
* 提现渠道名称列表
*/
public static final String CHANNEL_WITHDRAW_NAME_LIST = "channel_withdraw_name_list";
}

3
smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java
View File

@ -269,4 +269,7 @@ public class SmUser extends BaseEntity
@NotNull(message = "VIP服务费不允许为空", groups = {ValidGroup.Create.class})
@Min(value = 0, message = "VIP服务费不能小于0")
private BigDecimal vipServiceRate;
@ApiModelProperty("是否开启续单")
private Boolean enabledRenew;
}

29
smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/dto/StoreDailyIncomeQuery.java Normal file
View File

@ -0,0 +1,29 @@
package com.ruoyi.dashboard.domain.dto;
import java.time.LocalDate;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class StoreDailyIncomeQuery {
@ApiModelProperty("店铺ID")
@NotBlank(message = "店铺ID不能为空")
private Long storeId;
@ApiModelProperty("开始时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@NotNull(message = "开始时间不能为空")
private LocalDate startDate;
@ApiModelProperty("结束时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@NotNull(message = "结束时间不能为空")
private LocalDate endDate;
}

23
smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/vo/StoreDailyIncomeVO.java Normal file
View File

@ -0,0 +1,23 @@
package com.ruoyi.dashboard.domain.vo;
import java.math.BigDecimal;
import java.time.LocalDate;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class StoreDailyIncomeVO {
@ApiModelProperty("日期")
private LocalDate date;
@ApiModelProperty("订单金额")
private BigDecimal billMoney;
@ApiModelProperty("退款金额")
private BigDecimal refundMoney;
@ApiModelProperty("实收金额")
private BigDecimal realAmount;
}

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

@ -21,6 +21,7 @@ import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.dashboard.domain.dto.BusinessStatisticsQuery;
import com.ruoyi.dashboard.domain.dto.DailyIncomeGroupByStoreQuery;
import com.ruoyi.dashboard.domain.dto.ServiceIncomeQuery;
import com.ruoyi.dashboard.domain.dto.StoreDailyIncomeQuery;
import com.ruoyi.dashboard.domain.vo.BonusTrendDetailVO;
import com.ruoyi.dashboard.domain.vo.BonusTrendVO;
import com.ruoyi.dashboard.domain.vo.BusinessStatisticsByStoreVO;
@ -29,6 +30,7 @@ import com.ruoyi.dashboard.domain.vo.DailyIncomeGroupByStoreVO;
import com.ruoyi.dashboard.domain.vo.DashboardBonusGroupByMchVO;
import com.ruoyi.dashboard.domain.vo.MchRevenueVO;
import com.ruoyi.dashboard.domain.vo.ServiceIncomeVO;
import com.ruoyi.dashboard.domain.vo.StoreDailyIncomeVO;
import com.ruoyi.dashboard.domain.vo.TodoListVO;
import com.ruoyi.dashboard.mapper.DashboardMapper;
import com.ruoyi.ss.abnormal.domain.AbnormalQuery;
@ -60,6 +62,7 @@ import com.ruoyi.ss.receiveBill.domain.enums.ReceiveBillType;
import com.ruoyi.ss.receiveBill.domain.vo.ReceiveAmountVO;
import com.ruoyi.ss.receiveBill.service.ReceiveBillService;
import com.ruoyi.ss.reconciliationDate.domain.ReconciliationDate;
import com.ruoyi.ss.reconciliationDate.domain.enums.ReconciliationDateChannelType;
import com.ruoyi.ss.recordBalance.service.RecordBalanceService;
import com.ruoyi.ss.refund.domain.RefundQuery;
import com.ruoyi.ss.refund.domain.enums.RefundStatus;
@ -448,71 +451,84 @@ public class DashboardService {
}
// 获取昨日对账数据
public ReconciliationDate selectReconciliationDateByDate(LocalDate date) {
public ReconciliationDate selectReconciliationDateByDate(LocalDate date, Long channelId, ReconciliationDateChannelType channelType, String channelName) {
if (date == null) {
return null;
}
ReconciliationDate result = new ReconciliationDate();
result.setDate(date);
result.setChannelId(channelId);
result.setChannelType(channelType.getCode());
result.setChannelName(channelName);
// 渠道成本
PayBillQuery payQuery = new PayBillQuery();
payQuery.setPayDate(date);
payQuery.setStatusList(PayBillStatus.payedList());
result.setChannelCost(payBillService.selectSumOfChannelCost(payQuery));
if (ReconciliationDateChannelType.PAYMENT.equals(channelType)) {
// 渠道成本
PayBillQuery payQuery = new PayBillQuery();
payQuery.setPayDate(date);
payQuery.setStatusList(PayBillStatus.payedList());
payQuery.setChannelId(channelId);
result.setChannelCost(payBillService.selectSumOfChannelCost(payQuery));
// 充值订单金额
payQuery.setBstType(PayBillBstType.RECHARGE_ORDER.getType());
result.setOrderAmount(payBillService.selectSumOfAmount(payQuery));
// 充值订单金额
payQuery.setBstType(PayBillBstType.RECHARGE_ORDER.getType());
result.setOrderAmount(payBillService.selectSumOfAmount(payQuery));
// VIP订单金额
payQuery.setBstType(PayBillBstType.VIP_ORDER.getType());
result.setVipOrderAmount(payBillService.selectSumOfAmount(payQuery));
// VIP订单金额
payQuery.setBstType(PayBillBstType.VIP_ORDER.getType());
result.setVipOrderAmount(payBillService.selectSumOfAmount(payQuery));
// 充值订单退款金额
RefundQuery refundQuery = new RefundQuery();
refundQuery.setCreateDate(date);
refundQuery.setStatusList(RefundStatus.successList());
refundQuery.setPayBillBstType(PayBillBstType.RECHARGE_ORDER.getType());
result.setRefundAmount(refundService.selectSumOfAmount(refundQuery));
// 充值订单退款金额
RefundQuery refundQuery = new RefundQuery();
refundQuery.setCreateDate(date);
refundQuery.setStatusList(RefundStatus.successList());
refundQuery.setPayBillBstType(PayBillBstType.RECHARGE_ORDER.getType());
refundQuery.setChannelId(channelId);
result.setRefundAmount(refundService.selectSumOfAmount(refundQuery));
// 用户总分成
BonusQuery bonusQuery = new BonusQuery();
bonusQuery.setCreateDate(date);
bonusQuery.setStatusList(BonusStatus.validList());
bonusQuery.setArrivalTypes(BonusArrivalType.userList());
result.setUserBonus(bonusService.selectSumOfAmount(bonusQuery));
// 用户总分成
BonusQuery bonusQuery = new BonusQuery();
bonusQuery.setCreateDate(date);
bonusQuery.setStatusList(BonusStatus.validList());
bonusQuery.setChannelId(channelId);
bonusQuery.setArrivalTypes(BonusArrivalType.userList());
result.setUserBonus(bonusService.selectSumOfAmount(bonusQuery));
// 平台总分成
bonusQuery.setArrivalTypes(BonusArrivalType.deptList());
result.setPlatformBonus(bonusService.selectSumOfAmount(bonusQuery));
// 平台总分成
bonusQuery.setArrivalTypes(BonusArrivalType.deptList());
result.setPlatformBonus(bonusService.selectSumOfAmount(bonusQuery));
// 用户分成退款
BonusRefundQuery bonusRefundQuery = new BonusRefundQuery();
bonusRefundQuery.setCreateDate(date);
bonusRefundQuery.setBonusArrivalTypes(BonusArrivalType.userList());
result.setUserBonusRefund(bonusRefundService.selectSumOfAmount(bonusRefundQuery));
// 用户分成退款
BonusRefundQuery bonusRefundQuery = new BonusRefundQuery();
bonusRefundQuery.setCreateDate(date);
bonusRefundQuery.setBonusArrivalTypes(BonusArrivalType.userList());
bonusRefundQuery.setChannelId(channelId);
result.setUserBonusRefund(bonusRefundService.selectSumOfAmount(bonusRefundQuery));
// 平台分成退款
bonusRefundQuery.setBonusArrivalTypes(BonusArrivalType.deptList());
result.setPlatformBonusRefund(bonusRefundService.selectSumOfAmount(bonusRefundQuery));
// 提现金额
TransactionBillQuery withdrawQuery = new TransactionBillQuery();
withdrawQuery.setCreateDate(date);
withdrawQuery.setType(TransactionBillType.WITHDRAW.getType());
withdrawQuery.setStatusList(TransactionBillStatus.validWithdrawList());
result.setWithdrawAmount(transactionBillService.selectSumOfMoney(withdrawQuery));
// 提现服务费
result.setWithdrawServiceFee(transactionBillService.selectSumOfServiceCharge(withdrawQuery));
// 应收账金额
ReceiveBillQuery receiveQuery = new ReceiveBillQuery();
receiveQuery.setBillDate(date);
result.setReceiveAmount(receiveBillService.selectSumOfReceivedAmount(receiveQuery));
// 平台分成退款
bonusRefundQuery.setBonusArrivalTypes(BonusArrivalType.deptList());
result.setPlatformBonusRefund(bonusRefundService.selectSumOfAmount(bonusRefundQuery));
// 应收账金额
ReceiveBillQuery receiveQuery = new ReceiveBillQuery();
receiveQuery.setBillDate(date);
receiveQuery.setChannelId(channelId);
result.setReceiveAmount(receiveBillService.selectSumOfReceivedAmount(receiveQuery));
}
else if (ReconciliationDateChannelType.WITHDRAW.equals(channelType)) {
// 提现金额
TransactionBillQuery withdrawQuery = new TransactionBillQuery();
withdrawQuery.setCreateDate(date);
withdrawQuery.setType(TransactionBillType.WITHDRAW.getType());
withdrawQuery.setStatusList(TransactionBillStatus.validWithdrawList());
withdrawQuery.setChannelId(channelId);
result.setWithdrawAmount(transactionBillService.selectSumOfMoney(withdrawQuery));
// 提现服务费
result.setWithdrawServiceFee(transactionBillService.selectSumOfServiceCharge(withdrawQuery));
}
// 构建数据
// 总分成
result.setTotalBonus(MathUtils.addDecimal(result.getUserBonus(), result.getPlatformBonus()));
// 分成总退款
@ -578,4 +594,51 @@ public class DashboardService {
}
return result;
}
public List<StoreDailyIncomeVO> storeDailyIncome(StoreDailyIncomeQuery query) {
// 查询订单列表
PayBillQuery billQuery = new PayBillQuery();
billQuery.setStoreId(query.getStoreId());
billQuery.setStatusList(PayBillStatus.payedList());
billQuery.setPayDateStart(query.getStartDate());
billQuery.setPayDateEnd(query.getEndDate());
List<LocalDateDecimalVO> billList = payBillService.selectDailyAmount(billQuery);
// 查询退款列表
RefundQuery refundQuery = new RefundQuery();
refundQuery.setStoreId(query.getStoreId());
refundQuery.setCreateDateStart(query.getStartDate());
refundQuery.setCreateDateEnd(query.getEndDate());
refundQuery.setStatusList(RefundStatus.successList());
List<LocalDateDecimalVO> refundList = refundService.selectDailyAmount(refundQuery);
// 构建返回结果
List<StoreDailyIncomeVO> result = new ArrayList<>();
if (query.getStartDate() != null && query.getEndDate() != null) {
result = CollectionUtils.fillVoids(result, StoreDailyIncomeVO::getDate, (date) -> {
StoreDailyIncomeVO vo = new StoreDailyIncomeVO();
vo.setDate(date);
// 订单金额
LocalDateDecimalVO dailyBill = billList.stream().filter(item -> item.getKey().isEqual(date))
.findFirst().orElse(null);
if (dailyBill == null || dailyBill.getValue() == null) {
vo.setBillMoney(BigDecimal.ZERO);
} else {
vo.setBillMoney(dailyBill.getValue());
}
// 退款金额
LocalDateDecimalVO dailyRefund = refundList.stream().filter(item -> item.getKey().isEqual(date))
.findFirst().orElse(null);
if (dailyRefund == null || dailyRefund.getValue() == null) {
vo.setRefundMoney(BigDecimal.ZERO);
} else {
vo.setRefundMoney(dailyRefund.getValue());
}
// 实收金额
vo.setRealAmount(MathUtils.subtractDecimal(vo.getBillMoney(), vo.getRefundMoney()));
return vo;
}, query.getStartDate(), query.getEndDate());
}
return result;
}
}

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

@ -100,10 +100,10 @@ public class IotServiceImpl implements IotService {
if (res != null && res.isNotOnline()) {
status = DeviceOnlineStatus.OFFLINE.getStatus();
}
// 若是命令超时，则累加redis数据，超过3次则判断为离线
// 若是命令超时，则累加redis数据，超过1次则判断为离线
else if (res == null || res.isCmdTimeout()) {
long offlineCount = redisCache.incrementCacheValue(incrementCacheKey, 60, TimeUnit.SECONDS);
if (offlineCount >= 3) {
if (offlineCount >= 1) {
status = DeviceOnlineStatus.OFFLINE.getStatus();
} else {
status = DeviceOnlineStatus.ONLINE.getStatus();
@ -115,8 +115,8 @@ public class IotServiceImpl implements IotService {
redisCache.deleteObject(incrementCacheKey);
}
// 缓存结果10秒
redisCache.setCacheObject(cacheKey, status, 10, TimeUnit.SECONDS);
// 缓存结果30秒
redisCache.setCacheObject(cacheKey, status, 30, TimeUnit.SECONDS);
}
return status;

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

@ -1,16 +1,17 @@
package com.ruoyi.ss.bonus.domain;
import java.math.BigDecimal;
import java.time.LocalDateTime;
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 java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 分成明细对象 ss_bonus
*
@ -105,4 +106,7 @@ public class Bonus extends BaseEntity
@ApiModelProperty("业务类型")
private String bstType;
@ApiModelProperty("渠道ID")
private Long channelId;
}

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

@ -27,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sb.wait_amount,
sb.to_balance,
sb.by_hand,
sb.bst_type
sb.bst_type,
sb.channel_id
<include refid="searchTables"/>
</sql>
@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.bstType != null "> and sb.bst_type = #{query.bstType}</if>
<if test="query.payDate != null "> and date(sb.pay_time) = #{query.payDate}</if>
<if test="query.createDate != null "> and date(sb.create_time) = #{query.createDate}</if>
<if test="query.channelId != null "> and sb.channel_id = #{query.channelId}</if>
<if test="query.hasRefund != null ">
<if test="query.hasRefund">
and sb.refund_amount > 0
@ -269,6 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="toBalance != null">to_balance,</if>
<if test="byHand != null">by_hand,</if>
<if test="bstType != null and bstType != ''">bst_type,</if>
<if test="channelId != null">channel_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="billId != null">#{billId},</if>
@ -290,6 +293,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="toBalance != null">#{toBalance},</if>
<if test="byHand != null">#{byHand},</if>
<if test="bstType != null and bstType != ''">#{bstType},</if>
<if test="channelId != null">#{channelId},</if>
</trim>
</insert>
@ -312,7 +316,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
payed_amount,
wait_amount,
to_balance,
bst_type
bst_type,
channel_id
)
values
<foreach collection="list" item="i" separator=",">
@ -353,6 +358,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="i.toBalance == null">default,</if>
<if test="i.bstType != null and i.bstType != ''">#{i.bstType},</if>
<if test="i.bstType == null or i.bstType == ''">default,</if>
<if test="i.channelId != null">#{i.channelId},</if>
<if test="i.channelId == null">default,</if>
</trim>
</foreach>
</insert>
@ -467,6 +474,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.toBalance != null">to_balance = #{data.toBalance},</if>
<if test="data.byHand != null">by_hand = #{data.byHand},</if>
<if test="data.bstType != null">bst_type = #{data.bstType},</if>
<if test="data.channelId != null">channel_id = #{data.channelId},</if>
</sql>
<delete id="deleteBonusById" parameterType="Long">

13
smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/BonusConverter.java
View File

@ -4,6 +4,8 @@ import java.util.List;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.ss.bonus.domain.Bonus;
import com.ruoyi.ss.channel.domain.Channel;
import com.ruoyi.ss.channel.domain.ChannelVO;
import com.ruoyi.ss.device.domain.vo.DeviceVO;
import com.ruoyi.ss.store.domain.StoreVo;
import com.ruoyi.ss.storeStaff.domain.StoreStaffVO;
@ -23,7 +25,7 @@ public interface BonusConverter {
/**
* 转为分成数据
*/
List<Bonus> toPoList(VipOrderVO order);
List<Bonus> toPoList(VipOrderVO order, Long channelId);
/**
* 转为分成数据
@ -32,9 +34,10 @@ public interface BonusConverter {
/**
* 转为分成数据
* @param device 设备
* @param bill 充值订单
* @param channelType 渠道类型
*
* @param device 设备
* @param bill 充值订单
* @param channel 渠道类型
*/
List<Bonus> toPoList(DeviceVO device, TransactionBillVO bill, String channelType);
List<Bonus> toPoList(DeviceVO device, TransactionBillVO bill, ChannelVO channel);
}

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

@ -9,6 +9,8 @@ import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.ruoyi.ss.channel.domain.Channel;
import com.ruoyi.ss.channel.domain.ChannelVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -144,7 +146,7 @@ public class BonusConverterImpl implements BonusConverter {
}
@Override
public List<Bonus> toPoList(VipOrderVO order) {
public List<Bonus> toPoList(VipOrderVO order, Long channelId) {
if (order == null) {
return Collections.emptyList();
}
@ -161,6 +163,7 @@ public class BonusConverterImpl implements BonusConverter {
bonus.setBillId(order.getId());
bonus.setBillNo(order.getOrderNo());
bonus.setToBalance(isPlatform);
bonus.setChannelId(channelId);
}
// 分钱
@ -201,28 +204,29 @@ public class BonusConverterImpl implements BonusConverter {
}
@Override
public List<Bonus> toPoList(DeviceVO device, TransactionBillVO bill, String channelType) {
public List<Bonus> toPoList(DeviceVO device, TransactionBillVO bill, ChannelVO channel) {
// 只有通过平台渠道支付的才需要分成给余额
if (ChannelType.PLATFORM.getType().equals(channelType)) {
if (ChannelType.PLATFORM.getType().equals(channel.getType())) {
// 获取设备分成数据
deviceAssembler.assembleBonusList(device);
// 构造分成列表
return this.buildBonusListByPlatform(device.getBonusList(), bill);
return this.buildBonusListByPlatform(device.getBonusList(), bill, channel);
}
// 其他只需要记录分成数据即可
else {
return this.buildBonusListByCustom(bill);
return this.buildBonusListByCustom(bill, channel);
}
}
public List<Bonus> buildBonusListByPlatform(List<Bonus> bonusList, TransactionBillVO bill) {
public List<Bonus> buildBonusListByPlatform(List<Bonus> bonusList, TransactionBillVO bill, ChannelVO channel) {
// 设置分成基础数据
for (Bonus bonus : bonusList) {
bonus.setBstType(BonusBstType.RECHARGE.getType());
bonus.setBillId(bill.getBillId());
bonus.setBillNo(bill.getBillNo());
bonus.setToBalance(true);
bonus.setChannelId(channel.getChannelId());
}
// 计算分成金额
bonusService.partBonus(bonusList, bill.getMoney());
@ -231,7 +235,7 @@ public class BonusConverterImpl implements BonusConverter {
}
public List<Bonus> buildBonusListByCustom(TransactionBillVO bill) {
public List<Bonus> buildBonusListByCustom(TransactionBillVO bill, ChannelVO channel) {
List<Bonus> bonusList = new ArrayList<>();
Bonus bonus = new BonusVO();
bonus.setBstType(BonusBstType.RECHARGE.getType());
@ -251,6 +255,7 @@ public class BonusConverterImpl implements BonusConverter {
bonus.setPayedAmount(bill.getMoney());
bonus.setWaitAmount(BigDecimal.ZERO);
bonus.setToBalance(false);
bonus.setChannelId(channel.getChannelId());
bonusList.add(bonus);
return bonusList;
}

3
smart-switch-service/src/main/java/com/ruoyi/ss/bonusRefund/domain/BonusRefundQuery.java
View File

@ -21,4 +21,7 @@ public class BonusRefundQuery extends BonusRefundVO{
@ApiModelProperty("分成类型")
private List<String> bonusArrivalTypes;
@ApiModelProperty("渠道ID")
private Long channelId;
}

1
smart-switch-service/src/main/java/com/ruoyi/ss/bonusRefund/mapper/BonusRefundMapper.xml
View File

@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.id != null "> and sbr.id = #{query.id}</if>
<if test="query.bonusId != null "> and sbr.bonus_id = #{query.bonusId}</if>
<if test="query.createDate != null "> and date(sbr.create_time) = #{query.createDate}</if>
<if test="query.channelId != null "> and sb.channel_id = #{query.channelId}</if>
<if test="query.bonusArrivalType != null and query.bonusArrivalType != '' "> and sb.arrival_type = #{query.bonusArrivalType}</if>
<if test="query.bonusArrivalName != null and query.bonusArrivalName != '' "> and sb.arrival_name like concat('%', #{query.bonusArrivalName}, '%')</if>
<if test="query.bonusArrivalTypes != null ">

1
smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/ChannelService.java
View File

@ -78,4 +78,5 @@ public interface ChannelService
* 查询全部充值渠道名称列表
*/
List<ChannelNameVO> selectAllChannelNameList();
}

12
smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/domain/vo/ChannelWithdrawNameVO.java Normal file
View File

@ -0,0 +1,12 @@
package com.ruoyi.ss.channelWithdraw.domain.vo;
import lombok.Data;
@Data
public class ChannelWithdrawNameVO {
private Long channelId;
private String name;
}

17
smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/mapper/ChannelWithdrawMapper.java
View File

@ -1,11 +1,14 @@
package com.ruoyi.ss.channelWithdraw.mapper;
import java.util.List;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdraw;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawVO;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawQuery;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdraw;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawQuery;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawVO;
import com.ruoyi.ss.channelWithdraw.domain.vo.ChannelWithdrawNameVO;
/**
* 提现渠道Mapper接口
*
@ -61,4 +64,12 @@ public interface ChannelWithdrawMapper
* @return 结果
*/
public int deleteChannelWithdrawByChannelIds(Long[] channelIds);
/**
* 查询全部渠道名称列表
*
* @param query 渠道查询条件
* @return 渠道名称列表
*/
List<ChannelWithdrawNameVO> selectChannelNameList(@Param("query") ChannelWithdrawQuery query);
}

13
smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/mapper/ChannelWithdrawMapper.xml
View File

@ -102,4 +102,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{channelId}
</foreach>
</delete>
<!-- selectChannelNameList -->
<select id="selectChannelNameList" parameterType="ChannelWithdrawQuery" resultType="ChannelWithdrawNameVO">
select
channel_id,
`name`
from ss_channel_withdraw
<where>
<include refid="searchCondition"/>
</where>
</select>
</mapper>

9
smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/service/ChannelWithdrawService.java
View File

@ -2,10 +2,10 @@ package com.ruoyi.ss.channelWithdraw.service;
import java.util.List;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdraw;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawVO;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawQuery;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawVO;
import com.ruoyi.ss.channelWithdraw.domain.vo.ChannelWithdrawNameVO;
/**
* 提现渠道Service接口
@ -73,4 +73,9 @@ public interface ChannelWithdrawService
* @return
*/
List<ChannelWithdrawVO> selectEnabledList();
/**
* 查询全部渠道名称列表
*/
List<ChannelWithdrawNameVO> selectAllChannelNameList();
}

74
smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/service/impl/ChannelWithdrawServiceImpl.java
View File

@ -2,20 +2,21 @@ package com.ruoyi.ss.channelWithdraw.service.impl;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
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.ChannelQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.ss.channelWithdraw.mapper.ChannelWithdrawMapper;
import org.springframework.transaction.support.TransactionTemplate;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.ss.account.domain.AccountVO;
import com.ruoyi.ss.account.service.AccountService;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdraw;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawVO;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawQuery;
import com.ruoyi.ss.channelWithdraw.domain.ChannelWithdrawVO;
import com.ruoyi.ss.channelWithdraw.domain.vo.ChannelWithdrawNameVO;
import com.ruoyi.ss.channelWithdraw.mapper.ChannelWithdrawMapper;
import com.ruoyi.ss.channelWithdraw.service.ChannelWithdrawService;
/**
@ -33,6 +34,12 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService
@Autowired
private AccountService accountService;
@Autowired
private RedisCache redisCache;
@Autowired
private TransactionTemplate transactionTemplate;
/**
* 查询提现渠道
*
@ -66,7 +73,14 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService
@Override
public int insertChannelWithdraw(ChannelWithdraw channelWithdraw)
{
return channelWithdrawMapper.insertChannelWithdraw(channelWithdraw);
Integer result = transactionTemplate.execute(status -> {
int insert = channelWithdrawMapper.insertChannelWithdraw(channelWithdraw);
if (insert > 0) {
clearCache();
}
return insert;
});
return result;
}
/**
@ -78,7 +92,11 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService
@Override
public int updateChannelWithdraw(ChannelWithdraw channelWithdraw)
{
return channelWithdrawMapper.updateChannelWithdraw(channelWithdraw);
int result = channelWithdrawMapper.updateChannelWithdraw(channelWithdraw);
if (result > 0) {
clearCache();
}
return result;
}
/**
@ -90,7 +108,14 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService
@Override
public int deleteChannelWithdrawByChannelIds(Long[] channelIds)
{
return channelWithdrawMapper.deleteChannelWithdrawByChannelIds(channelIds);
Integer result = transactionTemplate.execute(status -> {
int delete = channelWithdrawMapper.deleteChannelWithdrawByChannelIds(channelIds);
if (delete > 0) {
clearCache();
}
return delete;
});
return result;
}
/**
@ -102,7 +127,14 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService
@Override
public int deleteChannelWithdrawByChannelId(Long channelId)
{
return channelWithdrawMapper.deleteChannelWithdrawByChannelId(channelId);
Integer result = transactionTemplate.execute(status -> {
int delete = channelWithdrawMapper.deleteChannelWithdrawByChannelId(channelId);
if (delete > 0) {
clearCache();
}
return delete;
});
return result;
}
@Override
@ -126,4 +158,20 @@ public class ChannelWithdrawServiceImpl implements ChannelWithdrawService
query.setEnabled(true);
return this.selectChannelWithdrawList(query);
}
@Override
public List<ChannelWithdrawNameVO> selectAllChannelNameList() {
List<ChannelWithdrawNameVO> list = redisCache.getCacheList(CacheConstants.CHANNEL_WITHDRAW_NAME_LIST);
if (CollectionUtils.isEmptyElement(list)) {
list = channelWithdrawMapper.selectChannelNameList(new ChannelWithdrawQuery());
if (CollectionUtils.isNotEmptyElement(list)) {
redisCache.setCacheList(CacheConstants.CHANNEL_WITHDRAW_NAME_LIST, list);
}
}
return list;
}
private void clearCache() {
redisCache.deleteObject(CacheConstants.CHANNEL_WITHDRAW_NAME_LIST);
}
}

17
smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModel.java
View File

@ -1,19 +1,21 @@
package com.ruoyi.ss.model.domain;
import java.math.BigDecimal;
import java.util.List;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
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.system.valid.DictValid;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.math.BigDecimal;
import java.util.List;
/**
* 型号列表对象 sm_model
*
@ -75,4 +77,7 @@ public class SmModel extends BaseEntity
@ApiModelProperty("排序字段")
private Integer sort;
@ApiModelProperty("应用ID")
private Long appId;
}

2
smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModelBO.java
View File

@ -22,6 +22,7 @@ public class SmModelBO extends SmModel {
bo.setProductId(getProductId());
bo.setSnPrefix(getSnPrefix());
bo.setSort(getSort());
bo.setAppId(getAppId());
return bo;
}
@ -40,6 +41,7 @@ public class SmModelBO extends SmModel {
bo.setProductId(getProductId());
bo.setSnPrefix(getSnPrefix());
bo.setSort(getSort());
bo.setAppId(getAppId());
return bo;
}
}

7
smart-switch-service/src/main/java/com/ruoyi/ss/model/mapper/SmModelMapper.xml
View File

@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sm.service_rate,
sm.product_id,
sm.sn_prefix,
sm.sort
sm.sort,
sm.app_id
from sm_model sm
</sql>
@ -35,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="model != null and model != ''"> and sm.model = #{model}</if>
<if test="serviceType != null and serviceType != ''"> and sm.service_type = #{serviceType}</if>
<if test="productId != null and productId != ''"> and sm.product_id = #{productId}</if>
<if test="appId != null and appId != ''"> and sm.app_id = #{appId}</if>
<if test="deleted == null">and sm.deleted = false</if>
<if test="deleted != null">and sm.deleted = #{deleted}</if>
<if test="keyword != null">
@ -92,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productId != null">product_id,</if>
<if test="snPrefix != null">sn_prefix,</if>
<if test="sort != null">sort,</if>
<if test="appId != null">app_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="modelName != null">#{modelName},</if>
@ -110,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productId != null">#{productId},</if>
<if test="snPrefix != null">#{snPrefix},</if>
<if test="sort != null">#{sort},</if>
<if test="appId != null">#{appId},</if>
</trim>
</insert>
@ -132,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productId != null">product_id = #{productId},</if>
<if test="snPrefix != null">sn_prefix = #{snPrefix},</if>
<if test="sort != null">sort = #{sort},</if>
<if test="appId != null">app_id = #{appId},</if>
</trim>
where model_id = #{modelId}
</update>

7
smart-switch-service/src/main/java/com/ruoyi/ss/model/service/ModelService.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.ss.model.service;
import java.util.List;
import com.ruoyi.iot.domain.IotDeviceInfo;
import com.ruoyi.ss.model.domain.SmModelBO;
import com.ruoyi.ss.model.domain.SmModelQuery;
import com.ruoyi.ss.model.domain.SmModelVO;
import java.util.List;
/**
* 型号列表Service接口
*
@ -86,5 +86,8 @@ public interface ModelService
*/
int addInitModel(IotDeviceInfo deviceInfo);
/**
* 查询单个型号
*/
SmModelVO selectOne(SmModelQuery query);
}

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

@ -1,15 +1,16 @@
package com.ruoyi.ss.receiveBill.domain;
import java.math.BigDecimal;
import java.time.LocalDateTime;
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 java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 应收账单对象 ss_receive_bill
*
@ -63,4 +64,8 @@ public class ReceiveBill extends BaseEntity
@ApiModelProperty("已收金额")
@JsonView(JsonViewProfile.App.class)
private BigDecimal receivedAmount;
@Excel(name = "渠道ID")
@JsonView(JsonViewProfile.App.class)
private Long channelId;
}

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

@ -1,17 +1,18 @@
package com.ruoyi.ss.receiveBill.domain;
import java.time.LocalDate;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
/**
* @author wjh
* 2024/7/22
*/
@Data
public class ReceiveBillQuery extends ReceiveBill{
public class ReceiveBillQuery extends ReceiveBill {
@ApiModelProperty("账单年份")
private Integer billYear;

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

@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
srb.description,
srb.create_time,
srb.received_amount,
srb.channel_id,
if(su.is_real, su.real_name, su.user_name) as user_name,
sd.device_name as device_name,
sd.device_no as device_no
@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.deviceName != null and query.deviceName != ''"> and sd.device_name like concat('%', #{query.deviceName}, '%')</if>
<if test="query.deviceNo != null and query.deviceNo != ''"> and sd.device_no like concat('%', #{query.deviceNo}, '%')</if>
<if test="query.description != null and query.description != ''"> and srb.description like concat('%', #{query.description}, '%')</if>
<if test="query.channelId != null"> and srb.channel_id = #{query.channelId}</if>
<if test="query.startDate != null">
and date(srb.create_time) >= #{query.startDate}
</if>
@ -117,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="description != null and description != ''">`description`,</if>
<if test="createTime != null">create_time,</if>
<if test="receivedAmount != null">received_amount,</if>
<if test="channelId != null">channel_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">#{userId},</if>
@ -128,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="description != null and description != ''">#{description},</if>
<if test="createTime != null">#{createTime},</if>
<if test="receivedAmount != null">#{receivedAmount},</if>
<if test="channelId != null">#{channelId},</if>
</trim>
</insert>
@ -143,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.description != null and data.description != ''">`description` = #{data.description},</if>
<if test="data.createTime != null">create_time = #{data.createTime},</if>
<if test="data.receivedAmount != null">received_amount = #{data.receivedAmount},</if>
<if test="data.channelId != null">channel_id = #{data.channelId},</if>
</trim>
where bill_id = #{billId}
</update>

17
smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/ReconciliationDate.java
View File

@ -24,8 +24,8 @@ public class ReconciliationDate extends BaseEntity
private Long id;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("日期")
private LocalDate date;
@ -100,4 +100,17 @@ public class ReconciliationDate extends BaseEntity
@Excel(name = "渠道成本")
@ApiModelProperty("渠道成本")
private BigDecimal channelCost;
@Excel(name = "渠道类型")
@ApiModelProperty("渠道类型")
private Integer channelType;
@Excel(name = "渠道ID")
@ApiModelProperty("渠道ID")
private Long channelId;
@Excel(name = "渠道名称")
@ApiModelProperty("渠道名称")
private String channelName;
}

4
smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/ReconciliationDateVO.java
View File

@ -1,8 +1,12 @@
package com.ruoyi.ss.reconciliationDate.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ReconciliationDateVO extends ReconciliationDate{
@ApiModelProperty("渠道名称")
private String channelName;
}

15
smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/enums/ReconciliationDateChannelType.java Normal file
View File

@ -0,0 +1,15 @@
package com.ruoyi.ss.reconciliationDate.domain.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public enum ReconciliationDateChannelType {
PAYMENT(1, "支付渠道"),
WITHDRAW(2, "提现渠道");
private final Integer code;
private final String name;
}

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

@ -63,4 +63,13 @@ public interface ReconciliationDateMapper
* @return 结果
*/
public int deleteReconciliationDateByIds(Long[] ids);
/**
* 根据查询日期对账列表并分组
*
* @param query 查询条件
* @param groupBy 分组字段
* @return 日期对账列表
*/
List<ReconciliationDateVO> selectReconciliationDateListGroupBy(@Param("query") ReconciliationDateQuery query, @Param("groupBy") String groupBy);
}

55
smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/mapper/ReconciliationDateMapper.xml
View File

@ -10,6 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
srd.id,
srd.date,
srd.channel_id,
srd.channel_name,
srd.channel_type,
srd.order_amount,
srd.vip_order_amount,
srd.refund_amount,
@ -31,8 +34,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from ss_reconciliation_date srd
</sql>
<sql id="selectReconciliationDateGroupVo">
select
srd.id,
srd.date,
<if test="groupBy.contains('channel_type')"> srd.channel_type,</if>
<if test="groupBy.contains('channel_id')"> srd.channel_name,</if>
<if test="groupBy.contains('channel_id')"> srd.channel_id,</if>
sum(srd.order_amount) as order_amount,
sum(srd.vip_order_amount) as vip_order_amount,
sum(srd.refund_amount) as refund_amount,
sum(srd.user_bonus) as user_bonus,
sum(srd.platform_bonus) as platform_bonus,
sum(srd.withdraw_amount) as withdraw_amount,
sum(srd.receive_amount) as receive_amount,
sum(srd.user_bonus_refund) as user_bonus_refund,
sum(srd.platform_bonus_refund) as platform_bonus_refund,
sum(srd.total_bonus_refund) as total_bonus_refund,
sum(srd.order_receive_amount) as order_receive_amount,
sum(srd.total_bonus) as total_bonus,
sum(srd.difference) as difference,
sum(srd.order_total_amount) as order_total_amount,
sum(srd.actual_bonus) as actual_bonus,
sum(srd.platform_income) as platform_income,
sum(srd.withdraw_service_fee) as withdraw_service_fee,
sum(srd.channel_cost) as channel_cost
from ss_reconciliation_date srd
</sql>
<sql id="searchCondition">
<if test="query.id != null "> and srd.id = #{query.id}</if>
<if test="query.channelId != null "> and srd.channel_id = #{query.channelId}</if>
<if test="query.channelType != null "> and srd.channel_type = #{query.channelType}</if>
<if test="query.channelName != null and query.channelName != ''"> and srd.channel_name like concat('%', #{query.channelName}, '%')</if>
<if test="query.date != null"> and srd.date = #{query.date}</if>
<if test="query.dateRange != null and query.dateRange.size() >= 2">
and date(srd.date) >= #{query.dateRange[0]} and date(srd.date) &lt;= #{query.dateRange[1]}
</if>
@ -73,6 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="platformIncome != null">platform_income,</if>
<if test="withdrawServiceFee != null">withdraw_service_fee,</if>
<if test="channelCost != null">channel_cost,</if>
<if test="channelId != null">channel_id,</if>
<if test="channelName != null">channel_name,</if>
<if test="channelType != null">channel_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="date != null">#{date},</if>
@ -94,6 +132,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="platformIncome != null">#{platformIncome},</if>
<if test="withdrawServiceFee != null">#{withdrawServiceFee},</if>
<if test="channelCost != null">#{channelCost},</if>
<if test="channelId != null">#{channelId},</if>
<if test="channelName != null">#{channelName},</if>
<if test="channelType != null">#{channelType},</if>
</trim>
</insert>
@ -125,6 +166,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.platformIncome != null">platform_income = #{data.platformIncome},</if>
<if test="data.withdrawServiceFee != null">withdraw_service_fee = #{data.withdrawServiceFee},</if>
<if test="data.channelCost != null">channel_cost = #{data.channelCost},</if>
<if test="data.channelId != null">channel_id = #{data.channelId},</if>
<if test="data.channelName != null">channel_name = #{data.channelName},</if>
<if test="data.channelType != null">channel_type = #{data.channelType},</if>
</sql>
<delete id="deleteReconciliationDateById" parameterType="Long">
@ -137,4 +181,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<!-- selectReconciliationDateListGroupBy -->
<select id="selectReconciliationDateListGroupBy" parameterType="ReconciliationDateQuery" resultMap="ReconciliationDateResult">
<include refid="selectReconciliationDateGroupVo"/>
<where>
<include refid="searchCondition"/>
</where>
group by ${groupBy}
</select>
</mapper>

9
smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/service/ReconciliationDateService.java
View File

@ -61,4 +61,13 @@ public interface ReconciliationDateService
* @return 结果
*/
public int deleteReconciliationDateById(Long id);
/**
* 根据查询日期对账列表并分组
*
* @param query 查询条件
* @param groupBy 分组字段
* @return 日期对账列表
*/
List<ReconciliationDateVO> selectReconciliationDateListGroupBy(ReconciliationDateQuery query, String groupBy);
}

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

@ -94,4 +94,9 @@ public class ReconciliationDateServiceImpl implements ReconciliationDateService
{
return reconciliationDateMapper.deleteReconciliationDateById(id);
}
@Override
public List<ReconciliationDateVO> selectReconciliationDateListGroupBy(ReconciliationDateQuery query, String groupBy) {
return reconciliationDateMapper.selectReconciliationDateListGroupBy(query, groupBy);
}
}

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

@ -1,13 +1,13 @@
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.time.LocalTime;
import java.util.Collections;
import java.util.List;
import com.ruoyi.common.core.domain.ValidateResult;
import com.ruoyi.ss.store.domain.Store;
import com.ruoyi.ss.store.domain.StoreVo;
/**
* 2024/4/27
*
@ -135,4 +135,9 @@ public interface StoreValidator {
* 校验是否能操作所有店铺
*/
boolean canOperaAllStore(List<Long> storeIds, Long userId);
/**
* 校验能否查看店铺营收
*/
boolean canViewStoreIncome(Long storeId, Long userId);
}

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

@ -34,6 +34,8 @@ import com.ruoyi.ss.store.service.StoreValidator;
import com.ruoyi.ss.storeApply.domain.enums.StoreApplyType;
import com.ruoyi.ss.storeApply.service.StoreApplyConverter;
import com.ruoyi.ss.storeApply.service.StoreApplyService;
import com.ruoyi.ss.storeStaff.service.StoreStaffService;
import com.ruoyi.ss.vipLevel.service.VipLevelService;
import lombok.extern.slf4j.Slf4j;
@ -68,6 +70,12 @@ public class StoreServiceImpl implements StoreService
@Autowired
private StoreValidator storeValidator;
@Autowired
private VipLevelService vipLevelService;
@Autowired
private StoreStaffService storeStaffService;
/**
* 查询店铺
*
@ -235,6 +243,12 @@ public class StoreServiceImpl implements StoreService
}
}
// 删除店铺的VIP等级
vipLevelService.logicDelByStoreIds(ids);
// 删除店铺的员工
storeStaffService.logicDelByStoreIds(ids);
// 执行逻辑删除
return storeMapper.logicDel(ids);
});

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

@ -1,8 +1,15 @@
package com.ruoyi.ss.store.service.impl;
import java.time.LocalTime;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
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.ss.device.domain.DeviceQuery;
@ -16,14 +23,6 @@ import com.ruoyi.ss.store.service.StoreValidator;
import com.ruoyi.ss.storeStaff.domain.enums.StoreStaffPermissions;
import com.ruoyi.ss.storeStaff.service.StoreStaffValidator;
import com.ruoyi.ss.user.service.UserValidator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalTime;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.stream.Collectors;
/**
* 2024/4/27
@ -367,6 +366,20 @@ public class StoreValidatorImpl extends BaseValidator implements StoreValidator
return true;
}
@Override
public boolean canViewStoreIncome(Long storeId, Long userId) {
return isMch(storeId, userId)
|| storeStaffValidator.hasStorePermission(storeId, userId, StoreStaffPermissions.STORE_INCOME_VIEW);
}
/**
* 判断是否是商户
*/
private boolean isMch(Long storeId, Long userId) {
StoreVo store = storeService.selectSmStoreById(storeId);
return this.isMch(store, userId);
}
/**
* 校验时间是符合规则
*/

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

@ -17,6 +17,7 @@ public enum StoreStaffPermissions {
DEVICE_OPERA("4", "操作设备"),
ORDER_VIEW("5", "查看订单"),
ORDER_OPERA("6", "操作订单"),
STORE_INCOME_VIEW("7", "查看店铺营收"),
;
private final String code;

8
smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/mapper/StoreStaffMapper.java
View File

@ -64,7 +64,7 @@ public interface StoreStaffMapper
* @param employIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteStoreStaffByEmployIds(@Param("employIds") List<Long> employIds);
public int logicDel(@Param("employIds") List<Long> employIds);
/**
* 查询分成比例总和
@ -87,4 +87,10 @@ public interface StoreStaffMapper
* 查询VIP分成比例总和
*/
BigDecimal selectSumOfVipPoint(@Param("query") StoreStaffQuery query);
/**
* 逻辑删除店铺的员工
* @param storeIds 店铺ID列表
*/
int logicDelByStoreIds(@Param("storeIds") List<Long> storeIds);
}

33
smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/mapper/StoreStaffMapper.xml
View File

@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sss.create_by,
sss.create_id,
sss.vip_point,
sss.deleted,
ss.name as store_name,
ss.user_id as mch_id,
if(su.is_real, su.real_name, su.user_name) as user_name
@ -42,6 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.storeName != null and query.storeName != ''">and ss.name like concat('%', #{query.storeName}, '%')</if>
<if test="query.userName != null and query.userName != ''">and if(su.is_real, su.real_name, su.user_name) like concat('%', #{query.userName}, '%')</if>
<if test="query.mchId != null">and ss.user_id = #{query.mchId}</if>
<if test="query.deleted != null">and sss.deleted = #{query.deleted}</if>
<if test="query.deleted == null">and sss.deleted = false</if>
<if test="query.permission != null and query.permission != ''">
and find_in_set(#{query.permission}, sss.permissions);
</if>
@ -155,15 +158,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from ss_store_staff where employ_id = #{employId}
</delete>
<delete id="deleteStoreStaffByEmployIds" parameterType="String">
delete from ss_store_staff where employ_id in
<foreach item="employId" collection="employIds" open="(" separator="," close=")">
#{employId}
</foreach>
<sql id="logicDelAction">
update ss_store_staff
set deleted = true
</sql>
<delete id="logicDel" parameterType="String">
<include refid="logicDelAction"/>
where employ_id in
<foreach item="employId" collection="employIds" open="(" separator="," close=")">
#{employId}
</foreach>
and deleted = false
</delete>
<!-- selectSumOfVipPoint -->
<update id="logicDelByStoreIds" parameterType="String">
<include refid="logicDelAction"/>
where store_id in
<foreach item="storeId" collection="storeIds" open="(" separator="," close=")">
#{storeId}
</foreach>
and deleted = false
</update>
<!-- selectSumOfVipPoint -->
<select id="selectSumOfVipPoint" resultType="java.math.BigDecimal">
select sum(sss.vip_point)
from ss_store_staff sss
@ -171,5 +190,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="searchCondition"/>
</where>
</select>
</mapper>

8
smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/StoreStaffService.java
View File

@ -54,7 +54,7 @@ public interface StoreStaffService
* @param employIds 需要删除的店铺员工主键集合
* @return 结果
*/
public int deleteStoreStaffByEmployIds(List<Long> employIds);
public int logicDel(List<Long> employIds);
/**
* 删除店铺员工信息
@ -108,4 +108,10 @@ public interface StoreStaffService
* 根据店铺id查询店铺员工列表
*/
List<StoreStaffVO> selectListByStoreIds(List<Long> storeIds);
/**
* 逻辑删除店铺的员工
* @param storeIds 店铺ID列表
*/
int logicDelByStoreIds(List<Long> storeIds);
}

8
smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/StoreStaffValidator.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.ss.storeStaff.service;
import java.util.List;
import com.ruoyi.ss.storeStaff.domain.StoreStaff;
import com.ruoyi.ss.storeStaff.domain.StoreStaffVO;
import com.ruoyi.ss.storeStaff.domain.enums.StoreStaffPermissions;
import java.util.List;
/**
* @author wjh
* 2024/11/13
@ -28,11 +28,11 @@ public interface StoreStaffValidator {
boolean isMch(List<Long> employIds, Long userId);
/**
* 判断用户能否操作店铺
* 判断用户是否拥有店铺权限
*
* @param storeId 店铺ID
* @param userId 员工ID
* @param permission
* @param permission 权限
*/
boolean hasStorePermission(Long storeId, Long userId, StoreStaffPermissions permission);

12
smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/impl/StoreStaffServiceImpl.java
View File

@ -117,9 +117,9 @@ public class StoreStaffServiceImpl implements StoreStaffService
* @return 结果
*/
@Override
public int deleteStoreStaffByEmployIds(List<Long> employIds)
public int logicDel(List<Long> employIds)
{
return storeStaffMapper.deleteStoreStaffByEmployIds(employIds);
return storeStaffMapper.logicDel(employIds);
}
/**
@ -220,5 +220,13 @@ public class StoreStaffServiceImpl implements StoreStaffService
query.setStoreIds(storeIds);
return storeStaffMapper.selectStoreStaffList(query);
}
@Override
public int logicDelByStoreIds(List<Long> storeIds) {
if (CollectionUtils.isEmptyElement(storeIds)) {
return 0;
}
return storeStaffMapper.logicDelByStoreIds(storeIds);
}
}

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

@ -113,7 +113,7 @@ public class RechargePayHandler implements AfterPay, AfterRefund {
ServiceUtil.assertion(channel == null, "支付渠道不存在");
// 构造分成数据
List<Bonus> bonusList = bonusConverter.toPoList(device, bill, channel.getType());
List<Bonus> bonusList = bonusConverter.toPoList(device, bill, channel);
// 操作数据库
Integer result = transactionTemplate.execute(status -> {

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

@ -348,6 +348,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
receive.setAmount(bill.getMchShowMobilePrice());
receive.setDescription("商户获取用户手机号订单：" + bill.getBillNo());
receive.setReceivedAmount(bill.getMchShowMobilePrice());
receive.setChannelId(8L); // 暂时固定为8（余额）
int insert = receiveBillService.insertReceiveBill(receive);
ServiceUtil.assertion(insert != 1, "创建收款失败");

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

@ -104,6 +104,7 @@ public class TransactionBillValidatorImpl extends BaseValidator implements Trans
// 用户
SmUserVO user = bo.getUser();
SmUserVO mch = bo.getMch();
// 检查设备是否符合条件
DeviceVO device = bo.getDevice();
@ -122,6 +123,9 @@ public class TransactionBillValidatorImpl extends BaseValidator implements Trans
query.setDeviceId(device.getDeviceId());
List<TransactionBillVO> usingBill = transactionBillService.selectUsingBill(query);
if (CollectionUtils.isNotEmptyElement(usingBill)) {
// 若商户未开启续单，则不允许下单
ServiceUtil.assertion(mch.getEnabledRenew() == null || !mch.getEnabledRenew(), "您有正在使用中的订单，无法继续下单。若您需要续单，请联系商户处理。");
// 仅允许正在使用中的用户继续下单
List<Long> allowUserIds = usingBill.stream().map(TransactionBillVO::getUserId).collect(Collectors.toList());
ServiceUtil.assertion(!allowUserIds.contains(user.getUserId()), "该设备有正在使用中的订单，暂时无法下单");
@ -137,7 +141,6 @@ public class TransactionBillValidatorImpl extends BaseValidator implements Trans
}
// 商户检查
SmUserVO mch = bo.getMch();
if (!userValidator.isUsage(device.getUserId())) {
return error("当前设备商户不存在或不可用，无法充值，请确认商户账号是否正常");
}

2
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/utils/RechargeUtils.java
View File

@ -65,7 +65,7 @@ public class RechargeUtils {
// 普通充值
if (SuitFeeType.singleList().contains(bill.getSuitFeeType())) {
long round = calcRound(bill);
return toSecondSuitTime(bill) * round;
return toSecondSuitTime(bill) * round + 3; // 增加3秒，用于弥补时间差
}
// 分时段充值
else {

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

@ -1,5 +1,8 @@
package com.ruoyi.ss.user.domain;
import java.math.BigDecimal;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonView;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Sensitive;
@ -7,12 +10,10 @@ import com.ruoyi.common.core.domain.JsonViewProfile;
import com.ruoyi.common.core.domain.entity.SmUser;
import com.ruoyi.common.enums.DesensitizedType;
import com.ruoyi.ss.channel.domain.ChannelVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* 用户列表VO
*

5
smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml
View File

@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
su.channel_ids,
su.app_id,
su.vip_service_rate,
su.enabled_renew,
if(su.is_real, su.real_name, su.user_name) as real_or_user_name,
sa.name as app_name
from sm_user su
@ -103,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="eqRealIdCard != null and eqRealIdCard != ''">and su.real_id_card = #{eqRealIdCard}</if>
<if test="appId != null "> and su.app_id = #{appId}</if>
<if test="isReal != null "> and su.is_real = #{isReal}</if>
<if test="enabledRenew != null "> and su.enabled_renew = #{enabledRenew}</if>
<if test="tenantDeviceId != null">
and su.user_id in (
select sdt.tenant_id
@ -221,6 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="channelIds != null">channel_ids,</if>
<if test="appId != null">app_id,</if>
<if test="vipServiceRate != null">vip_service_rate,</if>
<if test="enabledRenew != null">enabled_renew,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userName != null and userName != ''">#{userName},</if>
@ -273,6 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="channelIds != null">#{channelIds,typeHandler=com.ruoyi.system.mapper.typehandler.StringSplitListTypeHandler},</if>
<if test="appId != null">#{appId},</if>
<if test="vipServiceRate != null">#{vipServiceRate},</if>
<if test="enabledRenew != null">#{enabledRenew},</if>
</trim>
</insert>
@ -341,6 +345,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="channelIds != null">channel_ids = #{channelIds,typeHandler=com.ruoyi.system.mapper.typehandler.StringSplitListTypeHandler},</if>
<if test="appId != null">app_id = #{appId},</if>
<if test="vipServiceRate != null">vip_service_rate = #{vipServiceRate},</if>
<if test="enabledRenew != null">enabled_renew = #{enabledRenew},</if>
</trim>
where user_id = #{userId}
</update>

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

@ -57,6 +57,7 @@ public class UserConverterImpl implements UserConverter {
po.setChannelIds(data.getChannelIds());
po.setRemark(data.getRemark());
po.setVipServiceRate(data.getVipServiceRate());
po.setEnabledRenew(data.getEnabledRenew());
return po;
}

12
smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/mapper/VipLevelMapper.java
View File

@ -1,11 +1,12 @@
package com.ruoyi.ss.vipLevel.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.ss.vipLevel.domain.VipLevel;
import com.ruoyi.ss.vipLevel.domain.VipLevelQuery;
import com.ruoyi.ss.vipLevel.domain.VipLevelVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* VIP等级定价Mapper接口
@ -55,4 +56,9 @@ public interface VipLevelMapper
*/
public int logicDel(@Param("ids") List<Long> ids);
/**
* 逻辑删除店铺的VIP等级
* @param storeIds 店铺ID列表
*/
int logicDelByStoreIds(@Param("storeIds") List<Long> storeIds);
}

16
smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/mapper/VipLevelMapper.xml
View File

@ -124,13 +124,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.deleted != null">deleted = #{data.deleted},</if>
</sql>
<update id="logicDel" parameterType="String">
<sql id="logicDelAction">
update ss_vip_level
set deleted = true
</sql>
<update id="logicDel" parameterType="String">
<include refid="logicDelAction"/>
where id in
<foreach item="id" collection="ids" open="(" separator="," close=")">
#{id}
</foreach>
and deleted = false
</update>
<update id="logicDelByStoreIds">
<include refid="logicDelAction"/>
where store_id in
<foreach item="storeId" collection="storeIds" open="(" separator="," close=")">
#{storeId}
</foreach>
and deleted = false
</update>
</mapper>

10
smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/service/VipLevelService.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.ss.vipLevel.service;
import java.util.List;
import com.ruoyi.ss.vipLevel.domain.VipLevel;
import com.ruoyi.ss.vipLevel.domain.VipLevelQuery;
import com.ruoyi.ss.vipLevel.domain.VipLevelVO;
import java.util.List;
/**
* VIP等级定价Service接口
*
@ -53,4 +53,10 @@ public interface VipLevelService
* @return 结果
*/
public int logicDel(List<Long> ids);
/**
* 逻辑删除店铺的VIP等级
* @param ids 店铺ID列表
*/
int logicDelByStoreIds(List<Long> ids);
}

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

@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.support.TransactionTemplate;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.ss.vipLevel.domain.VipLevel;
import com.ruoyi.ss.vipLevel.domain.VipLevelQuery;
import com.ruoyi.ss.vipLevel.domain.VipLevelVO;
@ -118,4 +119,16 @@ public class VipLevelServiceImpl implements VipLevelService
return vipLevelMapper.logicDel(ids);
}
/**
* 逻辑删除店铺的VIP等级
* @param storeIds 店铺ID列表
*/
@Override
public int logicDelByStoreIds(List<Long> storeIds) {
if (CollectionUtils.isEmptyElement(storeIds)) {
return 0;
}
return vipLevelMapper.logicDelByStoreIds(storeIds);
}
}

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

@ -225,7 +225,7 @@ public class VipOrderServiceImpl implements VipOrderService, AfterPay, AfterRefu
this.renewalVip(order);
// 创建分成数据
List<Bonus> bonusList = bonusConverter.toPoList(order);
List<Bonus> bonusList = bonusConverter.toPoList(order, pay.getChannelId());
int insertBonus = bonusService.batchInsert(bonusList);
ServiceUtil.assertion(insertBonus != bonusList.size(), "创建分成失败");
}

80
smart-switch-service/src/main/java/com/ruoyi/task/reconciliationDate/ReconciliationDateTask.java
View File

@ -1,12 +1,20 @@
package com.ruoyi.task.reconciliationDate;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.dashboard.service.DashboardService;
import com.ruoyi.ss.channel.domain.vo.ChannelNameVO;
import com.ruoyi.ss.channel.service.ChannelService;
import com.ruoyi.ss.channelWithdraw.domain.vo.ChannelWithdrawNameVO;
import com.ruoyi.ss.channelWithdraw.service.ChannelWithdrawService;
import com.ruoyi.ss.reconciliationDate.domain.ReconciliationDate;
import com.ruoyi.ss.reconciliationDate.domain.enums.ReconciliationDateChannelType;
import com.ruoyi.ss.reconciliationDate.service.ReconciliationDateService;
import lombok.extern.slf4j.Slf4j;
@ -22,28 +30,82 @@ public class ReconciliationDateTask {
@Autowired
private ReconciliationDateService reconciliationDateService;
@Autowired
private ChannelService channelService;
@Autowired
private ChannelWithdrawService channelWithdrawService;
public void recordReconciliationDate(Integer lastDays) {
// 获取昨日日期
LocalDate now = LocalDate.now();
LocalDate startDay = now.minusDays(lastDays);
// 查询所有支付渠道列表
List<ChannelNameVO> channelList = channelService.selectAllChannelNameList();
// 查询所有提现渠道列表
List<ChannelWithdrawNameVO> channelWithdrawList = channelWithdrawService.selectAllChannelNameList();
if (CollectionUtils.isEmptyElement(channelList) && CollectionUtils.isEmptyElement(channelWithdrawList)) {
log.error("渠道列表为空");
return;
}
while (now.isAfter(startDay)) {
// 获取昨日对账数据
ReconciliationDate po = dashboardService.selectReconciliationDateByDate(startDay);
if (po == null) {
log.error("{}对账数据不存在", startDay);
return;
// 支付渠道
for (ChannelNameVO channel : channelList) {
if (channel == null) {
continue;
}
this.insertReconciliationDate(startDay, channel.getChannelId(), ReconciliationDateChannelType.PAYMENT, channel.getName());
}
// 保存对账数据
int insert = reconciliationDateService.insertReconciliationDate(po);
if (insert != 1) {
log.error("保存对账数据失败，{}", po);
// 提现渠道
for (ChannelWithdrawNameVO channelWithdraw : channelWithdrawList) {
if (channelWithdraw == null) {
continue;
}
this.insertReconciliationDate(startDay, channelWithdraw.getChannelId(), ReconciliationDateChannelType.WITHDRAW, channelWithdraw.getName());
}
startDay = startDay.plusDays(1);
}
}
private void insertReconciliationDate(LocalDate startDay, Long channelId, ReconciliationDateChannelType channelType, String channelName) {
// 获取日期对账数据
ReconciliationDate po = dashboardService.selectReconciliationDateByDate(startDay, channelId, channelType, channelName);
if (po == null) {
log.error("{}对账数据不存在", startDay);
return;
}
if (this.isEmpty(po)) {
log.error("{}对账数据不存在", startDay);
return;
}
// 保存对账数据
int insert = reconciliationDateService.insertReconciliationDate(po);
if (insert != 1) {
log.error("保存对账数据失败，{}", po);
}
}
private boolean isEmpty(ReconciliationDate po) {
// 所有数值类型都为空或者0,则认为对账数据为空
return (po.getActualBonus() == null || po.getActualBonus().compareTo(BigDecimal.ZERO) == 0)
&& (po.getChannelCost() == null || po.getChannelCost().compareTo(BigDecimal.ZERO) == 0)
&& (po.getOrderAmount() == null || po.getOrderAmount().compareTo(BigDecimal.ZERO) == 0)
&& (po.getOrderReceiveAmount() == null || po.getOrderReceiveAmount().compareTo(BigDecimal.ZERO) == 0)
&& (po.getOrderTotalAmount() == null || po.getOrderTotalAmount().compareTo(BigDecimal.ZERO) == 0)
&& (po.getPlatformIncome() == null || po.getPlatformIncome().compareTo(BigDecimal.ZERO) == 0)
&& (po.getReceiveAmount() == null || po.getReceiveAmount().compareTo(BigDecimal.ZERO) == 0)
&& (po.getRefundAmount() == null || po.getRefundAmount().compareTo(BigDecimal.ZERO) == 0)
&& (po.getTotalBonus() == null || po.getTotalBonus().compareTo(BigDecimal.ZERO) == 0)
&& (po.getTotalBonusRefund() == null || po.getTotalBonusRefund().compareTo(BigDecimal.ZERO) == 0)
&& (po.getWithdrawAmount() == null || po.getWithdrawAmount().compareTo(BigDecimal.ZERO) == 0)
&& (po.getWithdrawServiceFee() == null || po.getWithdrawServiceFee().compareTo(BigDecimal.ZERO) == 0);
}
}

20
smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDashboardController.java
View File

@ -1,5 +1,15 @@
package com.ruoyi.web.controller.app;
import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.domain.vo.LocalDateDecimalVO;
@ -9,16 +19,8 @@ import com.ruoyi.ss.bonus.domain.BonusQuery;
import com.ruoyi.ss.bonus.domain.enums.BonusArrivalType;
import com.ruoyi.ss.bonus.domain.enums.BonusStatus;
import com.ruoyi.ss.bonus.service.BonusService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import io.swagger.annotations.ApiOperation;
/**
* @author wjh

2
smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java
View File

@ -146,7 +146,7 @@ public class AppDeviceController extends BaseController {
ServiceUtil.assertion(!device.getAllowSwitch(), "您无权操作此设备");
// 获取最新数据
smDeviceService.pullDeviceInfo(device, IotConstants.ONLINE_TYPE_COMMAND);
smDeviceService.pullDeviceInfo(device, null);
DevicePowerStatus powerStatus = DevicePowerStatus.parse(status);
return toAjax(smDeviceService.switchDevice(device, powerStatus, "商户开关设备"));

25
smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchDashboardController.java
View File

@ -1,14 +1,19 @@
package com.ruoyi.web.controller.mch;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.dashboard.domain.dto.BusinessStatisticsQuery;
import com.ruoyi.dashboard.domain.dto.StoreDailyIncomeQuery;
import com.ruoyi.dashboard.service.DashboardService;
import com.ruoyi.ss.store.service.StoreValidator;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author wjh
@ -21,6 +26,9 @@ public class MchDashboardController extends BaseController {
@Autowired
private DashboardService dashboardService;
@Autowired
private StoreValidator storeValidator;
@ApiOperation("商户获取店铺维度的订单统计")
@GetMapping("/businessStatisticsByStore")
public AjaxResult businessStatisticsByStore(BusinessStatisticsQuery query) {
@ -35,4 +43,13 @@ public class MchDashboardController extends BaseController {
return success(dashboardService.businessStatisticsByDevice(query));
}
@ApiOperation("获取店铺每日营收数据")
@GetMapping("/storeDailyIncome")
public AjaxResult storeDailyIncome(@Validated StoreDailyIncomeQuery query) {
if (!storeValidator.canViewStoreIncome(query.getStoreId(), getUserId())) {
return error("您没有权限查看该店铺的营收数据");
}
return success(dashboardService.storeDailyIncome(query));
}
}

21
smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchStoreStaffController.java
View File

@ -1,5 +1,18 @@
package com.ruoyi.web.controller.mch;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@ -13,12 +26,8 @@ import com.ruoyi.ss.storeStaff.domain.StoreStaffVO;
import com.ruoyi.ss.storeStaff.service.StoreStaffConverter;
import com.ruoyi.ss.storeStaff.service.StoreStaffService;
import com.ruoyi.ss.storeStaff.service.StoreStaffValidator;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import io.swagger.annotations.ApiOperation;
/**
* @author wjh
@ -95,7 +104,7 @@ public class MchStoreStaffController extends BaseController {
if (!storeStaffValidator.isMch(employIds, getUserId())) {
return error("您只能操作自己店铺的员工");
}
return toAjax(storeStaffService.deleteStoreStaffByEmployIds(employIds));
return toAjax(storeStaffService.logicDel(employIds));
}
}

16
smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/ReconciliationDateController.java
View File

@ -48,6 +48,22 @@ public class ReconciliationDateController extends BaseController
return getDataTable(list);
}
@GetMapping("/listGroupByDate")
public TableDataInfo listGroupByDate(ReconciliationDateQuery query) {
startPage();
startOrderBy();
List<ReconciliationDateVO> list = reconciliationDateService.selectReconciliationDateListGroupBy(query, "date");
return getDataTable(list);
}
@GetMapping("/listGroupByChannel")
public TableDataInfo listGroupByChannel(ReconciliationDateQuery query) {
startPage();
startOrderBy();
List<ReconciliationDateVO> list = reconciliationDateService.selectReconciliationDateListGroupBy(query, "date, channel_type, channel_id");
return getDataTable(list);
}
/**
* 导出日期对账列表
*/

2
smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/StoreStaffController.java
View File

@ -106,6 +106,6 @@ public class StoreStaffController extends BaseController
@DeleteMapping("/{employIds}")
public AjaxResult remove(@PathVariable List<Long> employIds)
{
return toAjax(storeStaffService.deleteStoreStaffByEmployIds(employIds));
return toAjax(storeStaffService.logicDel(employIds));
}
}