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-01-31 18:17:16 +08:00
parent e985a7b8c4
commit 0b0018914a
12 changed files with 196 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,16 @@
package com.ruoyi.ss.payBill.domain;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.pay.Payable;
import com.ruoyi.common.pay.wx.domain.enums.AttachEnums;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 支付订单对象 ss_pay_bill
*
@ -17,8 +18,7 @@ import java.time.LocalDateTime;
* @date 2024-07-24
*/
@Data
public class PayBill extends BaseEntity implements Payable
{
public class PayBill extends BaseEntity implements Payable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("payId")
@ -75,6 +75,10 @@ public class PayBill extends BaseEntity implements Payable
@ApiModelProperty("应用ID")
private Long appId;
@Excel(name = "店铺ID")
@ApiModelProperty("店铺ID")
private Long storeId;
/**
* 获取价格（分）
*/

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

@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
spb.refunding_amount,
spb.ip,
spb.app_id,
spb.store_id,
sc.type as channel_type,
sc.name as channel_name
from ss_pay_bill spb
@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.ip != null and query.ip != ''"> and spb.ip like concat('%',#{query.ip},'%')</if>
<if test="query.appId != null "> and spb.app_id = #{query.appId}</if>
<if test="query.payDate != null">and date(spb.pay_time) = date(#{query.payDate})</if>
<if test="query.storeId != null "> and spb.store_id = #{query.storeId}</if>
<if test="query.statusList != null and query.statusList.size() > 0">
and spb.status in
<foreach item="item" index="index" collection="query.statusList" open="(" separator="," close=")">
@ -134,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="refundingAmount != null">refunding_amount,</if>
<if test="ip != null">ip,</if>
<if test="appId != null">app_id,</if>
<if test="storeId != null">store_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="payNo != null and payNo != ''">#{payNo},</if>
@ -151,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="refundingAmount != null">#{refundingAmount},</if>
<if test="ip != null">#{ip},</if>
<if test="appId != null">#{appId},</if>
<if test="storeId != null">#{storeId},</if>
</trim>
</insert>
@ -191,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.refundingAmount != null">refunding_amount = #{data.refundingAmount},</if>
<if test="data.ip != null">ip = #{data.ip},</if>
<if test="data.appId != null">app_id = #{data.appId},</if>
<if test="data.storeId != null">store_id = #{data.storeId},</if>
</sql>
<update id="updatePayQuery">

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

@ -1,32 +1,28 @@
package com.ruoyi.ss.payBill.service.impl;
import java.math.BigDecimal;
import java.math.RoundingMode;
import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.ss.app.domain.AppVO;
import com.ruoyi.ss.app.domain.enums.AppType;
import com.ruoyi.ss.channel.domain.ChannelVO;
import com.ruoyi.ss.channel.domain.enums.ChannelPlatform;
import com.ruoyi.ss.channel.service.ChannelService;
import com.ruoyi.ss.payBill.domain.PayBill;
import com.ruoyi.ss.payBill.domain.PayBillVO;
import com.ruoyi.ss.payBill.domain.enums.PayBillBstType;
import com.ruoyi.ss.payBill.domain.enums.PayBillStatus;
import com.ruoyi.ss.payBill.service.PayBillConverter;
import com.ruoyi.ss.transactionBill.domain.bo.RechargePayDepositBO;
import com.ruoyi.ss.transactionBill.domain.dto.RechargePayBO;
import com.ruoyi.ss.transactionBill.domain.vo.TransactionBillVO;
import com.ruoyi.ss.user.domain.SmUserVO;
import com.ruoyi.ss.user.service.UserService;
import com.ruoyi.ss.vipOrder.domain.VipOrder;
import com.ruoyi.ss.vipOrder.domain.bo.AddPayVipOrderBO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
/**
* @author wjh
* 2024/8/9
* 2024/8/9
*/
@Service
public class PayBillConverterImpl implements PayBillConverter {
@ -59,6 +55,7 @@ public class PayBillConverterImpl implements PayBillConverter {
po.setBstType(PayBillBstType.RECHARGE_ORDER.getType());
po.setBstId(order.getBillId());
po.setAmount(order.getMoney());
po.setStoreId(order.getStoreId());
po.setChannelId(channel.getChannelId());
po.setStatus(PayBillStatus.WAIT_PAY.getStatus());
po.setDescription("充值订单:" + order.getBillNo());
@ -96,6 +93,7 @@ public class PayBillConverterImpl implements PayBillConverter {
pay.setBstId(order.getId());
pay.setAmount(order.getAmount());
pay.setDescription("VIP订单:" + order.getOrderNo());
pay.setStoreId(order.getLevelStoreId());
// 渠道数据
pay.setChannelId(channel.getChannelId());
pay.setChannelCost(this.calcChannelCost(channel, order.getAmount()));

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

@ -15,8 +15,7 @@ import lombok.Data;
* @date 2024-07-09
*/
@Data
public class Refund extends BaseEntity
{
public class Refund extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 退款ID */
@ -65,4 +64,7 @@ public class Refund extends BaseEntity
@ApiModelProperty("应用ID")
private Long appId;
@ApiModelProperty("店铺ID")
private Long storeId;
}

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

@ -10,7 +10,7 @@ import lombok.Data;
/**
* @author wjh
* 2024/7/9
* 2024/7/9
*/
@Data
public class RefundQuery extends RefundVO {
@ -28,9 +28,18 @@ public class RefundQuery extends RefundVO {
@ApiModelProperty("状态列表")
private List<String> statusList;
@ApiModelProperty("创建日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate createDate;
@ApiModelProperty("店铺ID列表")
private List<Long> storeIds;
@ApiModelProperty("月份")
private Integer month;
@ApiModelProperty("年份")
private Integer year;
}

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

@ -6,6 +6,7 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.common.domain.vo.LocalDateDecimalVO;
import com.ruoyi.common.domain.vo.LongDecimalVO;
import com.ruoyi.ss.refund.domain.Refund;
import com.ruoyi.ss.refund.domain.RefundQuery;
import com.ruoyi.ss.refund.domain.RefundVO;
@ -16,8 +17,7 @@ import com.ruoyi.ss.refund.domain.RefundVO;
* @author ruoyi
* @date 2024-07-09
*/
public interface RefundMapper
{
public interface RefundMapper {
/**
* 查询退款订单
*
@ -82,4 +82,9 @@ public interface RefundMapper
* 统计退款金额
*/
BigDecimal selectSumOfAmount(@Param("query") RefundQuery query);
/**
* 根据店铺ID统计退款金额
*/
List<LongDecimalVO> selectSumOfRefundAmountGroupByStoreId(@Param("query") RefundQuery query);
}

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

@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sr.bst_type,
sr.channel_id,
sr.app_id,
sr.store_id,
spb.amount as pay_amount,
spb.pay_no as pay_no,
spb.bst_type as pay_bill_bst_type
@ -41,10 +42,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.bstType != null and query.bstType != ''"> and sr.bst_type = #{query.bstType}</if>
<if test="query.channelId != null "> and sr.channel_id = #{query.channelId}</if>
<if test="query.appId != null "> and sr.app_id = #{query.appId}</if>
<if test="query.storeId != null "> and sr.store_id = #{query.storeId}</if>
<if test="query.createDateStart != null">and date(sr.create_time) >= #{query.createDateStart}</if>
<if test="query.createDateEnd != null">and date(sr.create_time) &lt;= #{query.createDateEnd}</if>
<if test="query.createDate != null">and date(sr.create_time) = #{query.createDate}</if>
<if test="query.payBillBstType != null">and spb.bst_type = #{query.payBillBstType}</if>
<if test="query.month != null">and month(sr.create_time) = #{query.month}</if>
<if test="query.year != null">and year(sr.create_time) = #{query.year}</if>
<if test="query.statusList != null and query.statusList.size() > 0">
and sr.status in
<foreach item="item" collection="query.statusList" separator="," open="(" close=")">
@ -105,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bstType != null">bst_type,</if>
<if test="channelId != null">channel_id,</if>
<if test="appId != null">app_id,</if>
<if test="storeId != null">store_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="refundNo != null and refundNo != ''">#{refundNo},</if>
@ -121,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bstType != null">#{bstType},</if>
<if test="channelId != null">#{channelId},</if>
<if test="appId != null">#{appId},</if>
<if test="storeId != null">#{storeId},</if>
</trim>
</insert>
@ -147,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="data.bstType != null">bst_type = #{data.bstType},</if>
<if test="data.channelId != null">channel_id = #{data.channelId},</if>
<if test="data.appId != null">app_id = #{data.appId},</if>
<if test="data.storeId != null">store_id = #{data.storeId},</if>
</sql>
<update id="updateByQuery">
@ -181,4 +188,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<!-- selectSumOfRefundAmountGroupByStoreId -->
<resultMap id="LongDecimalVO" type="com.ruoyi.common.domain.vo.LongDecimalVO" autoMapping="true">
<result column="value" property="value" typeHandler="com.ruoyi.system.mapper.typehandler.NonNullDecimalTypeHandler"/>
</resultMap>
<select id="selectSumOfRefundAmountGroupByStoreId" resultMap="LongDecimalVO">
select
sum(sr.amount) as `value`,
sr.store_id as `key`
from ss_refund sr
left join ss_pay_bill spb on spb.pay_id = sr.bill_id
<where>
<include refid="searchCondition"/>
</where>
group by `key`
</select>
</mapper>

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

@ -4,6 +4,7 @@ import java.math.BigDecimal;
import java.util.List;
import com.ruoyi.common.domain.vo.LocalDateDecimalVO;
import com.ruoyi.common.domain.vo.LongDecimalVO;
import com.ruoyi.ss.refund.domain.Refund;
import com.ruoyi.ss.refund.domain.RefundQuery;
import com.ruoyi.ss.refund.domain.RefundVO;
@ -14,8 +15,7 @@ import com.ruoyi.ss.refund.domain.RefundVO;
* @author ruoyi
* @date 2024-07-09
*/
public interface RefundService
{
public interface RefundService {
/**
* 查询退款订单
*
@ -104,5 +104,11 @@ public interface RefundService
/**
* 统计退款金额
*/
BigDecimal selectSumOfAmount(RefundQuery refundQuery);
BigDecimal selectSumOfAmount(RefundQuery query);
/**
* 根据店铺ID统计退款金额
*/
List<LongDecimalVO> selectSumOfRefundAmountGroupByStoreId(RefundQuery query);
}

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

@ -1,5 +1,9 @@
package com.ruoyi.ss.refund.service.impl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.ss.payBill.domain.PayBillVO;
@ -10,14 +14,12 @@ import com.ruoyi.ss.refund.domain.enums.RefundBstType;
import com.ruoyi.ss.refund.domain.enums.RefundStatus;
import com.ruoyi.ss.refund.service.RefundConverter;
import com.ruoyi.ss.transactionBill.service.TransactionBillService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @author wjh
* 2024/7/9
* 2024/7/9
*/
@Service
@Slf4j
@ -43,11 +45,12 @@ public class RefundConverterImpl implements RefundConverter {
Refund refund = new Refund();
refund.setBillId(payBill.getPayId());
refund.setChannelId(payBill.getChannelId());
refund.setAppId(payBill.getAppId());
refund.setStoreId(payBill.getStoreId());
refund.setAmount(dto.getRefundAmount());
refund.setStatus(RefundStatus.REFUNDING.getStatus());
refund.setReason(refundReason);
refund.setChannelId(payBill.getChannelId());
refund.setAppId(payBill.getAppId());
try {
LoginUser loginUser = SecurityUtils.getLoginUser();

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

@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.support.TransactionTemplate;
import com.ruoyi.common.domain.vo.LocalDateDecimalVO;
import com.ruoyi.common.domain.vo.LongDecimalVO;
import com.ruoyi.common.pay.PayApi;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServiceUtil;
@ -37,8 +38,7 @@ import com.ruoyi.ss.transactionBill.service.TransactionBillService;
* @date 2024-07-09
*/
@Service
public class RefundServiceImpl implements RefundService
{
public class RefundServiceImpl implements RefundService {
@Autowired
private RefundMapper refundMapper;
@ -63,7 +63,6 @@ public class RefundServiceImpl implements RefundService
@Autowired
private AppService appService;
/**
* 查询退款订单
*
@ -71,8 +70,7 @@ public class RefundServiceImpl implements RefundService
* @return 退款订单
*/
@Override
public RefundVO selectRefundByRefundId(Long refundId)
{
public RefundVO selectRefundByRefundId(Long refundId) {
return refundMapper.selectRefundByRefundId(refundId);
}
@ -83,8 +81,7 @@ public class RefundServiceImpl implements RefundService
* @return 退款订单
*/
@Override
public List<RefundVO> selectRefundList(RefundQuery refund)
{
public List<RefundVO> selectRefundList(RefundQuery refund) {
return refundMapper.selectRefundList(refund);
}
@ -95,8 +92,7 @@ public class RefundServiceImpl implements RefundService
* @return 结果
*/
@Override
public int insertRefund(Refund refund)
{
public int insertRefund(Refund refund) {
refund.setCreateTime(DateUtils.getNowDate());
refund.setRefundNo(String.valueOf(SnowFlakeUtil.newId()));
return refundMapper.insertRefund(refund);
@ -109,8 +105,7 @@ public class RefundServiceImpl implements RefundService
* @return 结果
*/
@Override
public int updateRefund(Refund refund)
{
public int updateRefund(Refund refund) {
return refundMapper.updateRefund(refund);
}
@ -121,8 +116,7 @@ public class RefundServiceImpl implements RefundService
* @return 结果
*/
@Override
public int deleteRefundByRefundIds(Long[] refundIds)
{
public int deleteRefundByRefundIds(Long[] refundIds) {
return refundMapper.deleteRefundByRefundIds(refundIds);
}
@ -133,8 +127,7 @@ public class RefundServiceImpl implements RefundService
* @return 结果
*/
@Override
public int deleteRefundByRefundId(Long refundId)
{
public int deleteRefundByRefundId(Long refundId) {
return refundMapper.deleteRefundByRefundId(refundId);
}
@ -240,16 +233,17 @@ public class RefundServiceImpl implements RefundService
}
// 通联微信
// if (ChannelEnum.TL_WX.getType().equals(refund.getChannelId())) {
// Map<String, String> params = sybPayService.queryByOutTradeNo(refund.getRefundNo());
// String trxStatus = params.get("trxstatus");
// if (SybTrxStatus.isSuccess(trxStatus)) {
// // 退款成功
// scheduledExecutorService.schedule(() -> {
// this.handleRefundSuccess(refund.getRefundNo());
// }, 0, TimeUnit.SECONDS);
// }
// }
// if (ChannelEnum.TL_WX.getType().equals(refund.getChannelId())) {
// Map<String, String> params =
// sybPayService.queryByOutTradeNo(refund.getRefundNo());
// String trxStatus = params.get("trxstatus");
// if (SybTrxStatus.isSuccess(trxStatus)) {
// // 退款成功
// scheduledExecutorService.schedule(() -> {
// this.handleRefundSuccess(refund.getRefundNo());
// }, 0, TimeUnit.SECONDS);
// }
// }
return 1;
}
@ -263,4 +257,9 @@ public class RefundServiceImpl implements RefundService
public BigDecimal selectSumOfAmount(RefundQuery query) {
return refundMapper.selectSumOfAmount(query);
}
@Override
public List<LongDecimalVO> selectSumOfRefundAmountGroupByStoreId(RefundQuery query) {
return refundMapper.selectSumOfRefundAmountGroupByStoreId(query);
}
}

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

@ -10,6 +10,7 @@ import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.domain.vo.LongDecimalVO;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.dashboard.domain.vo.BillCountVo;
import com.ruoyi.ss.bonus.domain.Bonus;
@ -20,6 +21,10 @@ import com.ruoyi.ss.device.domain.enums.DeviceGroupBy;
import com.ruoyi.ss.device.domain.enums.DeviceOnlineStatus;
import com.ruoyi.ss.device.domain.enums.DeviceStatus;
import com.ruoyi.ss.device.service.DeviceService;
import com.ruoyi.ss.payBill.domain.enums.PayBillBstType;
import com.ruoyi.ss.refund.domain.RefundQuery;
import com.ruoyi.ss.refund.domain.enums.RefundStatus;
import com.ruoyi.ss.refund.service.RefundService;
import com.ruoyi.ss.store.domain.StoreVo;
import com.ruoyi.ss.store.domain.vo.StoreOperatorVO;
import com.ruoyi.ss.store.service.StoreAssembler;
@ -34,7 +39,7 @@ import com.ruoyi.ss.transactionBill.service.TransactionBillService;
/**
* @author wjh
* 2024/4/29
* 2024/4/29
*/
@Service
public class StoreAssemblerImpl implements StoreAssembler {
@ -54,6 +59,9 @@ public class StoreAssemblerImpl implements StoreAssembler {
@Autowired
private BonusConverter bonusConverter;
@Autowired
private RefundService refundService;
/**
* 拼接设备数量
*
@ -64,7 +72,8 @@ public class StoreAssemblerImpl implements StoreAssembler {
if (CollectionUtils.isEmptyElement(list)) {
return;
}
Map<Long, Integer> countMap = deviceService.selectCountMapByStoreIds(list.stream().map(StoreVo::getStoreId).collect(Collectors.toList()));
Map<Long, Integer> countMap = deviceService
.selectCountMapByStoreIds(list.stream().map(StoreVo::getStoreId).collect(Collectors.toList()));
for (StoreVo store : list) {
Integer count = countMap.get(store.getStoreId());
@ -105,23 +114,38 @@ public class StoreAssemblerImpl implements StoreAssembler {
return;
}
// 查询订单信息
TransactionBillQuery query = new TransactionBillQuery();
LocalDate now = LocalDate.now();
query.setGroupBy(TransactionBillGroupBy.store_id.name());
query.setStoreIds(list.stream().map(StoreVo::getStoreId).filter(Objects::nonNull).distinct().collect(Collectors.toList()));
query.setStoreIds(CollectionUtils.map(list, StoreVo::getStoreId));
query.setStatusList(TransactionBillStatus.payedOrder());
query.setType(TransactionBillType.RECHARGE.getType());
query.setMonth(now.getMonthValue());
query.setYear(now.getYear());
Map<Long, BillCountVo> map = transactionBillService.selectCountMap(query, BillCountVo::getStoreId);
// 查询退款信息
RefundQuery refundQuery = new RefundQuery();
refundQuery.setStoreIds(CollectionUtils.map(list, StoreVo::getStoreId));
refundQuery.setMonth(now.getMonthValue());
refundQuery.setYear(now.getYear());
refundQuery.setPayBillBstType(PayBillBstType.RECHARGE_ORDER.getType());
refundQuery.setStatusList(RefundStatus.successList());
Map<Long, BigDecimal> refundMap = refundService.selectSumOfRefundAmountGroupByStoreId(refundQuery)
.stream().collect(Collectors.toMap(LongDecimalVO::getKey, LongDecimalVO::getValue));
for (StoreVo store : list) {
BillCountVo count = map.get(store.getStoreId());
BigDecimal refundAmount = refundMap.get(store.getStoreId());
BigDecimal monthIncome = BigDecimal.ZERO;
if (count != null) {
store.setMonthIncome(count.getRecharge());
} else {
store.setMonthIncome(BigDecimal.ZERO);
monthIncome = count.getRecharge();
}
if (refundAmount != null) {
monthIncome = monthIncome.subtract(refundAmount);
}
store.setMonthIncome(monthIncome);
}
}
@ -135,24 +159,45 @@ public class StoreAssemblerImpl implements StoreAssembler {
if (CollectionUtils.isEmptyElement(list)) {
return;
}
LocalDate now = LocalDate.now();
// 查询订单信息
TransactionBillQuery query = new TransactionBillQuery();
query.setGroupBy(TransactionBillGroupBy.store_id.name());
query.setStoreIds(list.stream().map(StoreVo::getStoreId).filter(Objects::nonNull).distinct().collect(Collectors.toList()));
query.setStoreIds(list.stream().map(StoreVo::getStoreId).filter(Objects::nonNull).distinct()
.collect(Collectors.toList()));
query.setStatusList(TransactionBillStatus.payedOrder());
query.setType(TransactionBillType.RECHARGE.getType());
query.setCreateDate(LocalDate.now());
query.setCreateDate(now);
Map<Long, BillCountVo> map = transactionBillService.selectCountMap(query, BillCountVo::getStoreId);
// 查询退款信息
RefundQuery refundQuery = new RefundQuery();
refundQuery.setStoreIds(CollectionUtils.map(list, StoreVo::getStoreId));
refundQuery.setCreateDate(now);
refundQuery.setPayBillBstType(PayBillBstType.RECHARGE_ORDER.getType());
refundQuery.setStatusList(RefundStatus.successList());
Map<Long, BigDecimal> refundMap = refundService.selectSumOfRefundAmountGroupByStoreId(refundQuery)
.stream().collect(Collectors.toMap(LongDecimalVO::getKey, LongDecimalVO::getValue));
for (StoreVo store : list) {
BillCountVo count = map.get(store.getStoreId());
// 本日收入
BigDecimal todayIncome = BigDecimal.ZERO;
if (count != null) {
store.setTodayIncome(count.getRecharge());
todayIncome = count.getRecharge();
store.setTodayOrderCount(count.getCount());
} else {
store.setTodayIncome(BigDecimal.ZERO);
store.setTodayOrderCount(0);
}
// 退款金额
BigDecimal refundAmount = refundMap.get(store.getStoreId());
if (refundAmount != null) {
todayIncome = todayIncome.subtract(refundAmount);
}
store.setTodayIncome(todayIncome);
}
}
@ -166,23 +211,41 @@ public class StoreAssemblerImpl implements StoreAssembler {
if (CollectionUtils.isEmptyElement(list)) {
return;
}
TransactionBillQuery query = new TransactionBillQuery();
// 上月
LocalDate lastMonth = LocalDate.now().plusMonths(-1);
// 查询订单信息
TransactionBillQuery query = new TransactionBillQuery();
query.setGroupBy(TransactionBillGroupBy.store_id.name());
query.setStoreIds(list.stream().map(StoreVo::getStoreId).filter(Objects::nonNull).distinct().collect(Collectors.toList()));
query.setStoreIds(list.stream().map(StoreVo::getStoreId).filter(Objects::nonNull).distinct()
.collect(Collectors.toList()));
query.setStatusList(TransactionBillStatus.payedOrder());
query.setType(TransactionBillType.RECHARGE.getType());
query.setMonth(lastMonth.getMonthValue());
query.setYear(lastMonth.getYear());
Map<Long, BillCountVo> map = transactionBillService.selectCountMap(query, BillCountVo::getStoreId);
// 查询退款信息
RefundQuery refundQuery = new RefundQuery();
refundQuery.setStoreIds(CollectionUtils.map(list, StoreVo::getStoreId));
refundQuery.setMonth(lastMonth.getMonthValue());
refundQuery.setYear(lastMonth.getYear());
refundQuery.setPayBillBstType(PayBillBstType.RECHARGE_ORDER.getType());
refundQuery.setStatusList(RefundStatus.successList());
Map<Long, BigDecimal> refundMap = refundService.selectSumOfRefundAmountGroupByStoreId(refundQuery)
.stream().collect(Collectors.toMap(LongDecimalVO::getKey, LongDecimalVO::getValue));
for (StoreVo store : list) {
BillCountVo count = map.get(store.getStoreId());
BigDecimal refundAmount = refundMap.get(store.getStoreId());
BigDecimal lastMonthIncome = BigDecimal.ZERO;
if (count != null) {
store.setLastMonthIncome(count.getRecharge());
} else {
store.setLastMonthIncome(BigDecimal.ZERO);
lastMonthIncome = count.getRecharge();
}
if (refundAmount != null) {
lastMonthIncome = lastMonthIncome.subtract(refundAmount);
}
store.setLastMonthIncome(lastMonthIncome);
}
}
@ -204,7 +267,7 @@ public class StoreAssemblerImpl implements StoreAssembler {
for (StoreVo store : list) {
Integer count = countMap.get(store.getStoreId());
store.setOnlineCount(count == null ? 0 :count);
store.setOnlineCount(count == null ? 0 : count);
}
}
@ -226,7 +289,7 @@ public class StoreAssemblerImpl implements StoreAssembler {
for (StoreVo store : list) {
Integer count = countMap.get(store.getStoreId());
store.setOfflineCount(count == null ? 0 :count);
store.setOfflineCount(count == null ? 0 : count);
}
}
@ -249,7 +312,7 @@ public class StoreAssemblerImpl implements StoreAssembler {
for (StoreVo store : list) {
Integer count = countMap.get(store.getStoreId());
store.setAvailableDeviceCount(count == null ? 0 :count);
store.setAvailableDeviceCount(count == null ? 0 : count);
}
}
@ -297,12 +360,13 @@ public class StoreAssemblerImpl implements StoreAssembler {
return;
}
List<StoreStaffVO> staffList = storeStaffService.selectListByStoreIds(CollectionUtils.map(list, StoreVo::getStoreId));
List<StoreStaffVO> staffList = storeStaffService
.selectListByStoreIds(CollectionUtils.map(list, StoreVo::getStoreId));
for (StoreVo store : list) {
List<StoreStaffVO> storeStaffList = staffList.stream()
.filter(staff -> Objects.equals(staff.getStoreId(), store.getStoreId()))
.collect(Collectors.toList());
.filter(staff -> Objects.equals(staff.getStoreId(), store.getStoreId()))
.collect(Collectors.toList());
store.setStaffList(storeStaffList);
}
}

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

@ -23,10 +23,10 @@ public class ReconciliationDateTask {
private ReconciliationDateService reconciliationDateService;
public void recordReconciliationDate() {
public void recordReconciliationDate(Integer lastDays) {
// 获取昨日日期
LocalDate now = LocalDate.now();
LocalDate startDay = now.minusDays(1);
LocalDate startDay = now.minusDays(lastDays);
while (now.isAfter(startDay)) {
// 获取昨日对账数据