From 57928387342c10f574d3594eb63ecc071853ae3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Thu, 6 Feb 2025 10:35:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/constant/CacheConstants.java | 5 + .../common/core/domain/entity/SmUser.java | 3 + .../domain/dto/StoreDailyIncomeQuery.java | 29 ++++ .../domain/vo/StoreDailyIncomeVO.java | 23 +++ .../dashboard/service/DashboardService.java | 163 ++++++++++++------ .../iot/service/impl/IotServiceImpl.java | 8 +- .../java/com/ruoyi/ss/bonus/domain/Bonus.java | 10 +- .../com/ruoyi/ss/bonus/mapper/BonusMapper.xml | 12 +- .../ss/bonus/service/BonusConverter.java | 13 +- .../service/impl/BonusConverterImpl.java | 19 +- .../bonusRefund/domain/BonusRefundQuery.java | 3 + .../bonusRefund/mapper/BonusRefundMapper.xml | 1 + .../ss/channel/service/ChannelService.java | 1 + .../domain/vo/ChannelWithdrawNameVO.java | 12 ++ .../mapper/ChannelWithdrawMapper.java | 17 +- .../mapper/ChannelWithdrawMapper.xml | 13 ++ .../service/ChannelWithdrawService.java | 9 +- .../impl/ChannelWithdrawServiceImpl.java | 74 ++++++-- .../com/ruoyi/ss/model/domain/SmModel.java | 17 +- .../com/ruoyi/ss/model/domain/SmModelBO.java | 2 + .../ruoyi/ss/model/mapper/SmModelMapper.xml | 7 +- .../ruoyi/ss/model/service/ModelService.java | 7 +- .../ss/receiveBill/domain/ReceiveBill.java | 11 +- .../receiveBill/domain/ReceiveBillQuery.java | 9 +- .../receiveBill/mapper/ReceiveBillMapper.xml | 5 + .../domain/ReconciliationDate.java | 17 +- .../domain/ReconciliationDateVO.java | 4 + .../enums/ReconciliationDateChannelType.java | 15 ++ .../mapper/ReconciliationDateMapper.java | 9 + .../mapper/ReconciliationDateMapper.xml | 55 ++++++ .../service/ReconciliationDateService.java | 9 + .../impl/ReconciliationDateServiceImpl.java | 5 + .../ss/store/service/StoreValidator.java | 13 +- .../store/service/impl/StoreServiceImpl.java | 14 ++ .../service/impl/StoreValidatorImpl.java | 31 +++- .../domain/enums/StoreStaffPermissions.java | 1 + .../storeStaff/mapper/StoreStaffMapper.java | 8 +- .../ss/storeStaff/mapper/StoreStaffMapper.xml | 33 +++- .../storeStaff/service/StoreStaffService.java | 8 +- .../service/StoreStaffValidator.java | 8 +- .../service/impl/StoreStaffServiceImpl.java | 12 +- .../service/impl/RechargePayHandler.java | 2 +- .../impl/TransactionBillServiceImpl.java | 1 + .../impl/TransactionBillValidatorImpl.java | 5 +- .../transactionBill/utils/RechargeUtils.java | 2 +- .../com/ruoyi/ss/user/domain/SmUserVO.java | 7 +- .../com/ruoyi/ss/user/mapper/SmUserMapper.xml | 5 + .../user/service/impl/UserConverterImpl.java | 1 + .../ss/vipLevel/mapper/VipLevelMapper.java | 12 +- .../ss/vipLevel/mapper/VipLevelMapper.xml | 16 +- .../ss/vipLevel/service/VipLevelService.java | 10 +- .../service/impl/VipLevelServiceImpl.java | 13 ++ .../service/impl/VipOrderServiceImpl.java | 2 +- .../ReconciliationDateTask.java | 80 ++++++++- .../app/AppDashboardController.java | 20 ++- .../controller/app/AppDeviceController.java | 2 +- .../mch/MchDashboardController.java | 25 ++- .../mch/MchStoreStaffController.java | 21 ++- .../ss/ReconciliationDateController.java | 16 ++ .../controller/ss/StoreStaffController.java | 2 +- 60 files changed, 779 insertions(+), 178 deletions(-) create mode 100644 smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/dto/StoreDailyIncomeQuery.java create mode 100644 smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/vo/StoreDailyIncomeVO.java create mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/domain/vo/ChannelWithdrawNameVO.java create mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/enums/ReconciliationDateChannelType.java diff --git a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java index 18e62367..2d7c7202 100644 --- a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java +++ b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java @@ -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"; } diff --git a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java index c986e941..1d0f4576 100644 --- a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java +++ b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java @@ -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; } diff --git a/smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/dto/StoreDailyIncomeQuery.java b/smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/dto/StoreDailyIncomeQuery.java new file mode 100644 index 00000000..e3fbdfc8 --- /dev/null +++ b/smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/dto/StoreDailyIncomeQuery.java @@ -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; +} diff --git a/smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/vo/StoreDailyIncomeVO.java b/smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/vo/StoreDailyIncomeVO.java new file mode 100644 index 00000000..6bab9f75 --- /dev/null +++ b/smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/vo/StoreDailyIncomeVO.java @@ -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; +} diff --git a/smart-switch-service/src/main/java/com/ruoyi/dashboard/service/DashboardService.java b/smart-switch-service/src/main/java/com/ruoyi/dashboard/service/DashboardService.java index 680fd4d1..56026b39 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/dashboard/service/DashboardService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/dashboard/service/DashboardService.java @@ -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 storeDailyIncome(StoreDailyIncomeQuery query) { + // 查询订单列表 + PayBillQuery billQuery = new PayBillQuery(); + billQuery.setStoreId(query.getStoreId()); + billQuery.setStatusList(PayBillStatus.payedList()); + billQuery.setPayDateStart(query.getStartDate()); + billQuery.setPayDateEnd(query.getEndDate()); + List 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 refundList = refundService.selectDailyAmount(refundQuery); + + // 构建返回结果 + List 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; + } } diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java index 1cc0b56c..bee68cbe 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/service/impl/IotServiceImpl.java @@ -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; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/Bonus.java b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/Bonus.java index b4655abf..bd867d36 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/Bonus.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/Bonus.java @@ -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; } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.xml index 0b558ba6..1088f1dd 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.xml @@ -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 @@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sb.bst_type = #{query.bstType} and date(sb.pay_time) = #{query.payDate} and date(sb.create_time) = #{query.createDate} + and sb.channel_id = #{query.channelId} and sb.refund_amount > 0 @@ -269,6 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" to_balance, by_hand, bst_type, + channel_id, #{billId}, @@ -290,6 +293,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{toBalance}, #{byHand}, #{bstType}, + #{channelId}, @@ -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 @@ -353,6 +358,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" default, #{i.bstType}, default, + #{i.channelId}, + default, @@ -467,6 +474,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" to_balance = #{data.toBalance}, by_hand = #{data.byHand}, bst_type = #{data.bstType}, + channel_id = #{data.channelId}, diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/BonusConverter.java b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/BonusConverter.java index a8e65848..fbf3ef46 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/BonusConverter.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/BonusConverter.java @@ -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 toPoList(VipOrderVO order); + List 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 toPoList(DeviceVO device, TransactionBillVO bill, String channelType); + List toPoList(DeviceVO device, TransactionBillVO bill, ChannelVO channel); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusConverterImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusConverterImpl.java index c0fbf15c..58874031 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusConverterImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusConverterImpl.java @@ -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 toPoList(VipOrderVO order) { + public List 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 toPoList(DeviceVO device, TransactionBillVO bill, String channelType) { + public List 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 buildBonusListByPlatform(List bonusList, TransactionBillVO bill) { + public List buildBonusListByPlatform(List 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 buildBonusListByCustom(TransactionBillVO bill) { + public List buildBonusListByCustom(TransactionBillVO bill, ChannelVO channel) { List 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; } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonusRefund/domain/BonusRefundQuery.java b/smart-switch-service/src/main/java/com/ruoyi/ss/bonusRefund/domain/BonusRefundQuery.java index bc2e5941..3bb88a48 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonusRefund/domain/BonusRefundQuery.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonusRefund/domain/BonusRefundQuery.java @@ -21,4 +21,7 @@ public class BonusRefundQuery extends BonusRefundVO{ @ApiModelProperty("分成类型") private List bonusArrivalTypes; + + @ApiModelProperty("渠道ID") + private Long channelId; } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/bonusRefund/mapper/BonusRefundMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/bonusRefund/mapper/BonusRefundMapper.xml index 42f2005f..e62a2120 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/bonusRefund/mapper/BonusRefundMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/bonusRefund/mapper/BonusRefundMapper.xml @@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sbr.id = #{query.id} and sbr.bonus_id = #{query.bonusId} and date(sbr.create_time) = #{query.createDate} + and sb.channel_id = #{query.channelId} and sb.arrival_type = #{query.bonusArrivalType} and sb.arrival_name like concat('%', #{query.bonusArrivalName}, '%') diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/ChannelService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/ChannelService.java index 409b513f..028c7e20 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/ChannelService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/channel/service/ChannelService.java @@ -78,4 +78,5 @@ public interface ChannelService * 查询全部充值渠道名称列表 */ List selectAllChannelNameList(); + } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/domain/vo/ChannelWithdrawNameVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/domain/vo/ChannelWithdrawNameVO.java new file mode 100644 index 00000000..f6ede9ca --- /dev/null +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/domain/vo/ChannelWithdrawNameVO.java @@ -0,0 +1,12 @@ +package com.ruoyi.ss.channelWithdraw.domain.vo; + +import lombok.Data; + +@Data +public class ChannelWithdrawNameVO { + + private Long channelId; + + private String name; + +} \ No newline at end of file diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/mapper/ChannelWithdrawMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/mapper/ChannelWithdrawMapper.java index b1923c5e..272db959 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/mapper/ChannelWithdrawMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/mapper/ChannelWithdrawMapper.java @@ -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 selectChannelNameList(@Param("query") ChannelWithdrawQuery query); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/mapper/ChannelWithdrawMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/mapper/ChannelWithdrawMapper.xml index 539ab051..84fc48ca 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/mapper/ChannelWithdrawMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/mapper/ChannelWithdrawMapper.xml @@ -102,4 +102,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{channelId} + + + + + diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/service/ChannelWithdrawService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/service/ChannelWithdrawService.java index 54db1c8d..4cc27531 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/service/ChannelWithdrawService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/service/ChannelWithdrawService.java @@ -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 selectEnabledList(); + + /** + * 查询全部渠道名称列表 + */ + List selectAllChannelNameList(); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/service/impl/ChannelWithdrawServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/service/impl/ChannelWithdrawServiceImpl.java index add489b0..cdd73e87 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/service/impl/ChannelWithdrawServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/service/impl/ChannelWithdrawServiceImpl.java @@ -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 selectAllChannelNameList() { + List 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); + } } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModel.java b/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModel.java index 3eb7162e..aab06d76 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModel.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModel.java @@ -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; } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModelBO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModelBO.java index 9aed64aa..f37b800d 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModelBO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/model/domain/SmModelBO.java @@ -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; } } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/model/mapper/SmModelMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/model/mapper/SmModelMapper.xml index 91902067..e4fc9f79 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/model/mapper/SmModelMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/model/mapper/SmModelMapper.xml @@ -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 @@ -35,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sm.model = #{model} and sm.service_type = #{serviceType} and sm.product_id = #{productId} + and sm.app_id = #{appId} and sm.deleted = false and sm.deleted = #{deleted} @@ -92,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_id, sn_prefix, sort, + app_id, #{modelName}, @@ -110,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{productId}, #{snPrefix}, #{sort}, + #{appId}, @@ -132,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_id = #{productId}, sn_prefix = #{snPrefix}, sort = #{sort}, + app_id = #{appId}, where model_id = #{modelId} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/model/service/ModelService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/model/service/ModelService.java index 1d652aea..43a8aafa 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/model/service/ModelService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/model/service/ModelService.java @@ -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); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/domain/ReceiveBill.java b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/domain/ReceiveBill.java index 12f3790f..ae209690 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/domain/ReceiveBill.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/domain/ReceiveBill.java @@ -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; } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/domain/ReceiveBillQuery.java b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/domain/ReceiveBillQuery.java index a0251247..50a9030d 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/domain/ReceiveBillQuery.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/domain/ReceiveBillQuery.java @@ -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; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/mapper/ReceiveBillMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/mapper/ReceiveBillMapper.xml index bfe05ba8..cd286aa7 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/mapper/ReceiveBillMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/mapper/ReceiveBillMapper.xml @@ -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" and sd.device_name like concat('%', #{query.deviceName}, '%') and sd.device_no like concat('%', #{query.deviceNo}, '%') and srb.description like concat('%', #{query.description}, '%') + and srb.channel_id = #{query.channelId} and date(srb.create_time) >= #{query.startDate} @@ -117,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" `description`, create_time, received_amount, + channel_id, #{userId}, @@ -128,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{description}, #{createTime}, #{receivedAmount}, + #{channelId}, @@ -143,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" `description` = #{data.description}, create_time = #{data.createTime}, received_amount = #{data.receivedAmount}, + channel_id = #{data.channelId}, where bill_id = #{billId} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/ReconciliationDate.java b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/ReconciliationDate.java index 46249888..8935f535 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/ReconciliationDate.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/ReconciliationDate.java @@ -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; + } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/ReconciliationDateVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/ReconciliationDateVO.java index 25aab2f3..4bc542d4 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/ReconciliationDateVO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/ReconciliationDateVO.java @@ -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; + } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/enums/ReconciliationDateChannelType.java b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/enums/ReconciliationDateChannelType.java new file mode 100644 index 00000000..44768ed1 --- /dev/null +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/domain/enums/ReconciliationDateChannelType.java @@ -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; +} + diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/mapper/ReconciliationDateMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/mapper/ReconciliationDateMapper.java index 8d010161..9bef2971 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/mapper/ReconciliationDateMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/mapper/ReconciliationDateMapper.java @@ -63,4 +63,13 @@ public interface ReconciliationDateMapper * @return 结果 */ public int deleteReconciliationDateByIds(Long[] ids); + + /** + * 根据查询日期对账列表并分组 + * + * @param query 查询条件 + * @param groupBy 分组字段 + * @return 日期对账列表 + */ + List selectReconciliationDateListGroupBy(@Param("query") ReconciliationDateQuery query, @Param("groupBy") String groupBy); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/mapper/ReconciliationDateMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/mapper/ReconciliationDateMapper.xml index f181c0ff..586f6408 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/mapper/ReconciliationDateMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/mapper/ReconciliationDateMapper.xml @@ -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 + + select + srd.id, + srd.date, + srd.channel_type, + srd.channel_name, + srd.channel_id, + 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 + + and srd.id = #{query.id} + and srd.channel_id = #{query.channelId} + and srd.channel_type = #{query.channelType} + and srd.channel_name like concat('%', #{query.channelName}, '%') + and srd.date = #{query.date} and date(srd.date) >= #{query.dateRange[0]} and date(srd.date) <= #{query.dateRange[1]} @@ -73,6 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" platform_income, withdraw_service_fee, channel_cost, + channel_id, + channel_name, + channel_type, #{date}, @@ -94,6 +132,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{platformIncome}, #{withdrawServiceFee}, #{channelCost}, + #{channelId}, + #{channelName}, + #{channelType}, @@ -125,6 +166,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" platform_income = #{data.platformIncome}, withdraw_service_fee = #{data.withdrawServiceFee}, channel_cost = #{data.channelCost}, + channel_id = #{data.channelId}, + channel_name = #{data.channelName}, + channel_type = #{data.channelType}, @@ -137,4 +181,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + + + + diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/service/ReconciliationDateService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/service/ReconciliationDateService.java index b1978704..5da5d1be 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/service/ReconciliationDateService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/service/ReconciliationDateService.java @@ -61,4 +61,13 @@ public interface ReconciliationDateService * @return 结果 */ public int deleteReconciliationDateById(Long id); + + /** + * 根据查询日期对账列表并分组 + * + * @param query 查询条件 + * @param groupBy 分组字段 + * @return 日期对账列表 + */ + List selectReconciliationDateListGroupBy(ReconciliationDateQuery query, String groupBy); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/service/impl/ReconciliationDateServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/service/impl/ReconciliationDateServiceImpl.java index 413795c2..37a2f194 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/service/impl/ReconciliationDateServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/reconciliationDate/service/impl/ReconciliationDateServiceImpl.java @@ -94,4 +94,9 @@ public class ReconciliationDateServiceImpl implements ReconciliationDateService { return reconciliationDateMapper.deleteReconciliationDateById(id); } + + @Override + public List selectReconciliationDateListGroupBy(ReconciliationDateQuery query, String groupBy) { + return reconciliationDateMapper.selectReconciliationDateListGroupBy(query, groupBy); + } } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/StoreValidator.java b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/StoreValidator.java index 316c2a4c..faf98e07 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/StoreValidator.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/StoreValidator.java @@ -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 storeIds, Long userId); + + /** + * 校验能否查看店铺营收 + */ + boolean canViewStoreIncome(Long storeId, Long userId); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreServiceImpl.java index e3e22524..e2ca8385 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreServiceImpl.java @@ -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); }); diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreValidatorImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreValidatorImpl.java index d4f720bf..4d8e05d4 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreValidatorImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreValidatorImpl.java @@ -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); + } + /** * 校验时间是符合规则 */ diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/domain/enums/StoreStaffPermissions.java b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/domain/enums/StoreStaffPermissions.java index 920d4594..3522ed84 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/domain/enums/StoreStaffPermissions.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/domain/enums/StoreStaffPermissions.java @@ -17,6 +17,7 @@ public enum StoreStaffPermissions { DEVICE_OPERA("4", "操作设备"), ORDER_VIEW("5", "查看订单"), ORDER_OPERA("6", "操作订单"), + STORE_INCOME_VIEW("7", "查看店铺营收"), ; private final String code; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/mapper/StoreStaffMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/mapper/StoreStaffMapper.java index 628e62f3..1be42902 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/mapper/StoreStaffMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/mapper/StoreStaffMapper.java @@ -64,7 +64,7 @@ public interface StoreStaffMapper * @param employIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteStoreStaffByEmployIds(@Param("employIds") List employIds); + public int logicDel(@Param("employIds") List employIds); /** * 查询分成比例总和 @@ -87,4 +87,10 @@ public interface StoreStaffMapper * 查询VIP分成比例总和 */ BigDecimal selectSumOfVipPoint(@Param("query") StoreStaffQuery query); + + /** + * 逻辑删除店铺的员工 + * @param storeIds 店铺ID列表 + */ + int logicDelByStoreIds(@Param("storeIds") List storeIds); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/mapper/StoreStaffMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/mapper/StoreStaffMapper.xml index 00e8c640..efe3fc44 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/mapper/StoreStaffMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/mapper/StoreStaffMapper.xml @@ -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" and ss.name like concat('%', #{query.storeName}, '%') and if(su.is_real, su.real_name, su.user_name) like concat('%', #{query.userName}, '%') and ss.user_id = #{query.mchId} + and sss.deleted = #{query.deleted} + and sss.deleted = false and find_in_set(#{query.permission}, sss.permissions); @@ -155,15 +158,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from ss_store_staff where employ_id = #{employId} - - delete from ss_store_staff where employ_id in - - #{employId} - + + + update ss_store_staff + set deleted = true + + + + + where employ_id in + + #{employId} + + and deleted = false - + + + where store_id in + + #{storeId} + + and deleted = false + + - + diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/StoreStaffService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/StoreStaffService.java index 131f9439..9675a546 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/StoreStaffService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/StoreStaffService.java @@ -54,7 +54,7 @@ public interface StoreStaffService * @param employIds 需要删除的店铺员工主键集合 * @return 结果 */ - public int deleteStoreStaffByEmployIds(List employIds); + public int logicDel(List employIds); /** * 删除店铺员工信息 @@ -108,4 +108,10 @@ public interface StoreStaffService * 根据店铺id查询店铺员工列表 */ List selectListByStoreIds(List storeIds); + + /** + * 逻辑删除店铺的员工 + * @param storeIds 店铺ID列表 + */ + int logicDelByStoreIds(List storeIds); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/StoreStaffValidator.java b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/StoreStaffValidator.java index 95a4c829..4e926137 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/StoreStaffValidator.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/StoreStaffValidator.java @@ -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 employIds, Long userId); /** - * 判断用户能否操作店铺 + * 判断用户是否拥有店铺权限 * * @param storeId 店铺ID * @param userId 员工ID - * @param permission + * @param permission 权限 */ boolean hasStorePermission(Long storeId, Long userId, StoreStaffPermissions permission); diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/impl/StoreStaffServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/impl/StoreStaffServiceImpl.java index 7b52f18a..c9a74c6b 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/impl/StoreStaffServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/impl/StoreStaffServiceImpl.java @@ -117,9 +117,9 @@ public class StoreStaffServiceImpl implements StoreStaffService * @return 结果 */ @Override - public int deleteStoreStaffByEmployIds(List employIds) + public int logicDel(List 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 storeIds) { + if (CollectionUtils.isEmptyElement(storeIds)) { + return 0; + } + return storeStaffMapper.logicDelByStoreIds(storeIds); + } } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/RechargePayHandler.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/RechargePayHandler.java index befc50a1..cfdb4554 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/RechargePayHandler.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/RechargePayHandler.java @@ -113,7 +113,7 @@ public class RechargePayHandler implements AfterPay, AfterRefund { ServiceUtil.assertion(channel == null, "支付渠道不存在"); // 构造分成数据 - List bonusList = bonusConverter.toPoList(device, bill, channel.getType()); + List bonusList = bonusConverter.toPoList(device, bill, channel); // 操作数据库 Integer result = transactionTemplate.execute(status -> { diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java index 07682285..8258e548 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java @@ -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, "创建收款失败"); diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillValidatorImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillValidatorImpl.java index 0af94204..4b29b3de 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillValidatorImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillValidatorImpl.java @@ -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 usingBill = transactionBillService.selectUsingBill(query); if (CollectionUtils.isNotEmptyElement(usingBill)) { + // 若商户未开启续单，则不允许下单 + ServiceUtil.assertion(mch.getEnabledRenew() == null || !mch.getEnabledRenew(), "您有正在使用中的订单，无法继续下单。若您需要续单，请联系商户处理。"); + // 仅允许正在使用中的用户继续下单 List 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("当前设备商户不存在或不可用，无法充值，请确认商户账号是否正常"); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/utils/RechargeUtils.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/utils/RechargeUtils.java index 5e13f701..0a8a1157 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/utils/RechargeUtils.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/utils/RechargeUtils.java @@ -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 { diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserVO.java index cb9ebb77..c3a5c428 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserVO.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/domain/SmUserVO.java @@ -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 * diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml index f2ca3ffa..eba26fdf 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml @@ -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" and su.real_id_card = #{eqRealIdCard} and su.app_id = #{appId} and su.is_real = #{isReal} + and su.enabled_renew = #{enabledRenew} and su.user_id in ( select sdt.tenant_id @@ -221,6 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" channel_ids, app_id, vip_service_rate, + enabled_renew, #{userName}, @@ -273,6 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{channelIds,typeHandler=com.ruoyi.system.mapper.typehandler.StringSplitListTypeHandler}, #{appId}, #{vipServiceRate}, + #{enabledRenew}, @@ -341,6 +345,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" channel_ids = #{channelIds,typeHandler=com.ruoyi.system.mapper.typehandler.StringSplitListTypeHandler}, app_id = #{appId}, vip_service_rate = #{vipServiceRate}, + enabled_renew = #{enabledRenew}, where user_id = #{userId} diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserConverterImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserConverterImpl.java index 493ad72a..bd6f6f06 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserConverterImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserConverterImpl.java @@ -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; } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/mapper/VipLevelMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/mapper/VipLevelMapper.java index db6adefc..84ec157c 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/mapper/VipLevelMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/mapper/VipLevelMapper.java @@ -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 ids); + /** + * 逻辑删除店铺的VIP等级 + * @param storeIds 店铺ID列表 + */ + int logicDelByStoreIds(@Param("storeIds") List storeIds); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/mapper/VipLevelMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/mapper/VipLevelMapper.xml index 5070be99..f48bf2e8 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/mapper/VipLevelMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/mapper/VipLevelMapper.xml @@ -124,13 +124,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" deleted = #{data.deleted}, - + + update ss_vip_level set deleted = true + + + + where id in #{id} and deleted = false + + + + where store_id in + + #{storeId} + + and deleted = false + diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/service/VipLevelService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/service/VipLevelService.java index f322f9af..8cd29482 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/service/VipLevelService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/service/VipLevelService.java @@ -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 ids); + + /** + * 逻辑删除店铺的VIP等级 + * @param ids 店铺ID列表 + */ + int logicDelByStoreIds(List ids); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/service/impl/VipLevelServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/service/impl/VipLevelServiceImpl.java index b7613f08..b8e6962b 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/service/impl/VipLevelServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/vipLevel/service/impl/VipLevelServiceImpl.java @@ -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 storeIds) { + if (CollectionUtils.isEmptyElement(storeIds)) { + return 0; + } + return vipLevelMapper.logicDelByStoreIds(storeIds); + } + } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/vipOrder/service/impl/VipOrderServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/vipOrder/service/impl/VipOrderServiceImpl.java index f773de42..28e2d6cc 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/vipOrder/service/impl/VipOrderServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/vipOrder/service/impl/VipOrderServiceImpl.java @@ -225,7 +225,7 @@ public class VipOrderServiceImpl implements VipOrderService, AfterPay, AfterRefu this.renewalVip(order); // 创建分成数据 - List bonusList = bonusConverter.toPoList(order); + List bonusList = bonusConverter.toPoList(order, pay.getChannelId()); int insertBonus = bonusService.batchInsert(bonusList); ServiceUtil.assertion(insertBonus != bonusList.size(), "创建分成失败"); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/task/reconciliationDate/ReconciliationDateTask.java b/smart-switch-service/src/main/java/com/ruoyi/task/reconciliationDate/ReconciliationDateTask.java index e3f6f7e2..41ab7752 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/task/reconciliationDate/ReconciliationDateTask.java +++ b/smart-switch-service/src/main/java/com/ruoyi/task/reconciliationDate/ReconciliationDateTask.java @@ -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 channelList = channelService.selectAllChannelNameList(); + // 查询所有提现渠道列表 + List 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); + } + } diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDashboardController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDashboardController.java index a2ea6ca9..fdcb87af 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDashboardController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDashboardController.java @@ -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 diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java index e0fdb413..3ac8f449 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java @@ -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, "商户开关设备")); diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchDashboardController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchDashboardController.java index ae91c590..02a8ce6a 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchDashboardController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchDashboardController.java @@ -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)); + } + } diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchStoreStaffController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchStoreStaffController.java index fbcf8f3a..bd1f4c66 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchStoreStaffController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchStoreStaffController.java @@ -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)); } } diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/ReconciliationDateController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/ReconciliationDateController.java index 8a212dce..0d940b8e 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/ReconciliationDateController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/ReconciliationDateController.java @@ -48,6 +48,22 @@ public class ReconciliationDateController extends BaseController return getDataTable(list); } + @GetMapping("/listGroupByDate") + public TableDataInfo listGroupByDate(ReconciliationDateQuery query) { + startPage(); + startOrderBy(); + List list = reconciliationDateService.selectReconciliationDateListGroupBy(query, "date"); + return getDataTable(list); + } + + @GetMapping("/listGroupByChannel") + public TableDataInfo listGroupByChannel(ReconciliationDateQuery query) { + startPage(); + startOrderBy(); + List list = reconciliationDateService.selectReconciliationDateListGroupBy(query, "date, channel_type, channel_id"); + return getDataTable(list); + } + /** * 导出日期对账列表 */ diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/StoreStaffController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/StoreStaffController.java index db60dbf6..6f20e176 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/StoreStaffController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/StoreStaffController.java @@ -106,6 +106,6 @@ public class StoreStaffController extends BaseController @DeleteMapping("/{employIds}") public AjaxResult remove(@PathVariable List employIds) { - return toAjax(storeStaffService.deleteStoreStaffByEmployIds(employIds)); + return toAjax(storeStaffService.logicDel(employIds)); } }