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

报表更新

Browse Source
This commit is contained in:
磷叶 2025-02-02 23:30:56 +08:00
parent c3289e693e
commit 66bcfc6c77
16 changed files with 161 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/dto/BusinessStatisticsQuery.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.dashboard.domain.dto;
import com.ruoyi.ss.refund.domain.RefundQuery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@ -33,4 +34,16 @@ public class BusinessStatisticsQuery {
@ApiModelProperty("店铺名称")
private String storeName;
public RefundQuery toRefundQuery() {
RefundQuery query = new RefundQuery();
if (dateRange != null && dateRange.size() >= 2) {
query.setCreateDateStart(dateRange.get(0));
query.setCreateDateEnd(dateRange.get(1));
}
query.setStoreId(storeId);
query.setMchId(mchId);
query.setStoreName(storeName);
return query;
}
}

6
smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/vo/BusinessStatisticsByStoreVO.java
View File

@ -16,7 +16,13 @@ public class BusinessStatisticsByStoreVO {
@ApiModelProperty("订单总数")
private Integer totalOrder;
@ApiModelProperty("订单退款金额")
private BigDecimal refundAmount;
@ApiModelProperty("订单总金额")
private BigDecimal totalAmount;
@ApiModelProperty("订单总金额（扣掉退款）")
private BigDecimal totalOrderAmount;
@ApiModelProperty("明细列表")

17
smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/vo/BusinessStatisticsVO.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.dashboard.domain.vo;
import java.math.BigDecimal;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author wjh
* 2024/10/8
* 2024/10/8
*/
@Data
public class BusinessStatisticsVO {
@ -21,6 +21,9 @@ public class BusinessStatisticsVO {
@ApiModelProperty("设备名称")
private String deviceName;
@ApiModelProperty("设备ID")
private Long deviceId;
@ApiModelProperty("设备数量")
private Integer deviceCount;
@ -33,7 +36,13 @@ public class BusinessStatisticsVO {
@ApiModelProperty("总电量（度）")
private BigDecimal ele;
@ApiModelProperty("收入总金额")
@ApiModelProperty("订单金额")
private BigDecimal orderAmount;
@ApiModelProperty("实收金额")
private BigDecimal arrivalAmount;
@ApiModelProperty("退款金额")
private BigDecimal refundAmount;
}

5
smart-switch-service/src/main/java/com/ruoyi/dashboard/mapper/DashboardMapper.xml
View File

@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="orderCount" column="order_count" typeHandler="com.ruoyi.system.mapper.typehandler.NonNullIntegerTypeHandler"/>
<result property="seconds" column="seconds" typeHandler="com.ruoyi.system.mapper.typehandler.NonNullDecimalTypeHandler"/>
<result property="ele" column="ele" typeHandler="com.ruoyi.system.mapper.typehandler.NonNullDecimalTypeHandler"/>
<result property="arrivalAmount" column="arrival_amount" typeHandler="com.ruoyi.system.mapper.typehandler.NonNullDecimalTypeHandler"/>
<result property="orderAmount" column="order_amount" typeHandler="com.ruoyi.system.mapper.typehandler.NonNullDecimalTypeHandler"/>
</resultMap>
@ -17,12 +17,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
if (stb.store_id is null, -1, stb.store_id) as store_id,
if (stb.store_id is null, '未分配店铺', ss.name) as store_name,
stb.device_id as device_id,
count(distinct stb.device_id) as device_count,
sd.device_name as device_name,
count(stb.bill_id) as order_count,
sum(if(stb.suit_fee_type in ('1', '4'), timestampdiff(second, stb.suit_start_time, stb.suit_end_time), 0)) as `seconds`,
sum(if(stb.suit_fee_type in ('2', '3'), stb.suit_end_ele - stb.suit_start_ele, 0)) as `ele`,
sum(stb.arrival_amount) as arrival_amount
sum(stb.money) as order_amount
from sm_transaction_bill stb
left join sm_store ss on ss.store_id = stb.store_id
left join sm_device sd on sd.device_id = stb.device_id

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

@ -7,12 +7,14 @@ import java.util.Arrays;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.domain.vo.LocalDateDecimalVO;
import com.ruoyi.common.domain.vo.LongDecimalVO;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.MathUtils;
import com.ruoyi.common.utils.collection.CollectionUtils;
@ -274,25 +276,71 @@ public class DashboardService {
}
public BusinessStatisticsByStoreVO businessStatisticsByStore(BusinessStatisticsQuery query) {
BusinessStatisticsByStoreVO vo = new BusinessStatisticsByStoreVO();
BusinessStatisticsByStoreVO result = new BusinessStatisticsByStoreVO();
// 查询列表
query.setBillType(TransactionBillType.RECHARGE.getType());
query.setBillStatusList(TransactionBillStatus.payedOrder());
List<BusinessStatisticsVO> list = dashboardMapper.selectBusinessStatisticsByStore(query);
vo.setList(list);
result.setList(list);
// 退款金额
RefundQuery refundQuery = query.toRefundQuery();
List<LongDecimalVO> refundList = refundService.selectSumOfRefundAmountGroupByStoreId(refundQuery);
for (BusinessStatisticsVO vo : list) {
LongDecimalVO refund = refundList.stream()
.filter(item -> {
if (vo.getStoreId() == -1) {
return item.getKey() == null;
} else {
return Objects.equals(item.getKey(), vo.getStoreId());
}
})
.findFirst().orElse(null);
if (refund != null) {
vo.setRefundAmount(refund.getValue());
} else {
vo.setRefundAmount(BigDecimal.ZERO);
}
vo.setArrivalAmount(MathUtils.subtractDecimal(vo.getOrderAmount(), vo.getRefundAmount()));
}
// 统计数量、金额
vo.setTotalOrder(list.stream().mapToInt(BusinessStatisticsVO::getOrderCount).sum());
vo.setTotalOrderAmount(CollectionUtils.sumDecimal(list, BusinessStatisticsVO::getArrivalAmount));
result.setTotalOrder(list.stream().mapToInt(BusinessStatisticsVO::getOrderCount).sum());
result.setRefundAmount(CollectionUtils.sumDecimal(list, BusinessStatisticsVO::getRefundAmount));
result.setTotalAmount(CollectionUtils.sumDecimal(list, BusinessStatisticsVO::getOrderAmount));
result.setTotalOrderAmount(MathUtils.subtractDecimal(result.getTotalAmount(), result.getRefundAmount()));
return vo;
return result;
}
public List<BusinessStatisticsVO> businessStatisticsByDevice(BusinessStatisticsQuery query) {
query.setBillType(TransactionBillType.RECHARGE.getType());
query.setBillStatusList(TransactionBillStatus.payedOrder());
return dashboardMapper.selectBusinessStatisticsByDevice(query);
List<BusinessStatisticsVO> list = dashboardMapper.selectBusinessStatisticsByDevice(query);
// 退款金额
RefundQuery refundQuery = query.toRefundQuery();
List<LongDecimalVO> refundList = refundService.selectSumOfRefundAmountGroupByDeviceId(refundQuery);
for (BusinessStatisticsVO vo : list) {
LongDecimalVO refund = refundList.stream()
.filter(item -> {
if (vo.getStoreId() == -1) {
return item.getKey() == null;
} else {
return Objects.equals(item.getKey(), vo.getDeviceId());
}
})
.findFirst().orElse(null);
if (refund != null) {
vo.setRefundAmount(refund.getValue());
} else {
vo.setRefundAmount(BigDecimal.ZERO);
}
vo.setArrivalAmount(MathUtils.subtractDecimal(vo.getOrderAmount(), vo.getRefundAmount()));
}
return list;
}
/**

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

@ -79,6 +79,10 @@ public class PayBill extends BaseEntity implements Payable {
@ApiModelProperty("店铺ID")
private Long storeId;
@Excel(name = "设备ID")
@ApiModelProperty("设备ID")
private Long deviceId;
/**
* 获取价格（分）
*/

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

@ -28,8 +28,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
spb.ip,
spb.app_id,
spb.store_id,
spb.device_id,
sc.type as channel_type,
sc.name as channel_name
from ss_pay_bill spb
left join sm_channel sc on sc.channel_id = spb.channel_id
</sql>
@ -51,8 +53,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.storeId != null "> and spb.store_id = #{query.storeId}</if>
<if test="query.payMonth != null">and month(spb.pay_time) = #{query.payMonth}</if>
<if test="query.payYear != null">and year(spb.pay_time) = #{query.payYear}</if>
<if test="query.deviceId != null">and spb.device_id = #{query.deviceId}</if>
<if test="query.storeIds != null and query.storeIds.size() > 0">
and spb.store_id in
<foreach item="item" index="index" collection="query.storeIds" open="(" separator="," close=")">
#{item}
</foreach>
@ -145,9 +149,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ip != null">ip,</if>
<if test="appId != null">app_id,</if>
<if test="storeId != null">store_id,</if>
<if test="deviceId != null">device_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="payNo != null and payNo != ''">#{payNo},</if>
<if test="bstType != null and bstType != ''">#{bstType},</if>
<if test="bstId != null">#{bstId},</if>
<if test="amount != null">#{amount},</if>
@ -163,9 +169,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ip != null">#{ip},</if>
<if test="appId != null">#{appId},</if>
<if test="storeId != null">#{storeId},</if>
<if test="deviceId != null">#{deviceId},</if>
</trim>
</insert>
<insert id="addRefundingAmount">
update ss_pay_bill
set refunding_amount = refunding_amount + #{amount}
@ -204,8 +212,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="data.deviceId != null">device_id = #{data.deviceId},</if>
</sql>
<update id="updatePayQuery">
update ss_pay_bill spb
<trim prefix="SET" suffixOverrides=",">

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

@ -56,6 +56,7 @@ public class PayBillConverterImpl implements PayBillConverter {
po.setBstId(order.getBillId());
po.setAmount(order.getMoney());
po.setStoreId(order.getStoreId());
po.setDeviceId(order.getDeviceId());
po.setChannelId(channel.getChannelId());
po.setStatus(PayBillStatus.WAIT_PAY.getStatus());
po.setDescription("充值订单:" + order.getBillNo());

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

@ -67,4 +67,6 @@ public class Refund extends BaseEntity {
@ApiModelProperty("店铺ID")
private Long storeId;
@ApiModelProperty("设备ID")
private Long deviceId;
}

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

@ -42,4 +42,10 @@ public class RefundQuery extends RefundVO {
@ApiModelProperty("年份")
private Integer year;
@ApiModelProperty("商户ID")
private Long mchId;
@ApiModelProperty("店铺名称")
private String storeName;
}

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

@ -87,4 +87,9 @@ public interface RefundMapper {
* 根据店铺ID统计退款金额
*/
List<LongDecimalVO> selectSumOfRefundAmountGroupByStoreId(@Param("query") RefundQuery query);
/**
* 根据设备ID统计退款金额
*/
List<LongDecimalVO> selectSumOfRefundAmountGroupByDeviceId(@Param("query") RefundQuery query);
}

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

@ -24,15 +24,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sr.channel_id,
sr.app_id,
sr.store_id,
sr.device_id,
spb.amount as pay_amount,
spb.pay_no as pay_no,
spb.bst_type as pay_bill_bst_type
spb.bst_type as pay_bill_bst_type,
ss.name as store_name
<include refid="searchTables"/>
</sql>
<sql id="searchTables">
from ss_refund sr
left join ss_pay_bill spb on spb.pay_id = sr.bill_id
left join sm_store ss on ss.store_id = sr.store_id
</sql>
<sql id="searchCondition">
<if test="query.refundId != null "> and sr.refund_id = #{query.refundId}</if>
<if test="query.refundNo != null and query.refundNo != ''"> and sr.refund_no = #{query.refundNo}</if>
<if test="query.billId != null "> and sr.bill_id = #{query.billId}</if>
<if test="query.status != null and query.status != ''"> and sr.status = #{query.status}</if>
@ -43,6 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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.mchId != null "> and ss.user_id = #{query.mchId}</if>
<if test="query.deviceId != null "> and sr.device_id = #{query.deviceId}</if>
<if test="query.storeName != null and query.storeName != ''"> and ss.name like concat('%', #{query.storeName}, '%')</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>
@ -110,9 +121,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="channelId != null">channel_id,</if>
<if test="appId != null">app_id,</if>
<if test="storeId != null">store_id,</if>
<if test="deviceId != null">device_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="refundNo != null and refundNo != ''">#{refundNo},</if>
<if test="billId != null">#{billId},</if>
<if test="amount != null">#{amount},</if>
<if test="createTime != null">#{createTime},</if>
@ -127,9 +140,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="channelId != null">#{channelId},</if>
<if test="appId != null">#{appId},</if>
<if test="storeId != null">#{storeId},</if>
<if test="deviceId != null">#{deviceId},</if>
</trim>
</insert>
<update id="updateRefund" parameterType="Refund">
update ss_refund
<trim prefix="SET" suffixOverrides=",">
@ -154,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="data.deviceId != null">device_id = #{data.deviceId},</if>
</sql>
<update id="updateByQuery">
@ -197,11 +213,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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
<include refid="searchTables"/>
<where>
<include refid="searchCondition"/>
</where>
group by `key`
</select>
<!-- selectSumOfRefundAmountGroupByDeviceId -->
<select id="selectSumOfRefundAmountGroupByDeviceId" resultMap="LongDecimalVO">
select
sum(sr.amount) as `value`,
sr.device_id as `key`
<include refid="searchTables"/>
<where>
<include refid="searchCondition"/>
</where>
group by `key`
</select>
</mapper>

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

@ -111,4 +111,9 @@ public interface RefundService {
*/
List<LongDecimalVO> selectSumOfRefundAmountGroupByStoreId(RefundQuery query);
/**
* 根据设备ID统计退款金额
*/
List<LongDecimalVO> selectSumOfRefundAmountGroupByDeviceId(RefundQuery query);
}

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

@ -48,6 +48,7 @@ public class RefundConverterImpl implements RefundConverter {
refund.setChannelId(payBill.getChannelId());
refund.setAppId(payBill.getAppId());
refund.setStoreId(payBill.getStoreId());
refund.setDeviceId(payBill.getDeviceId());
refund.setAmount(dto.getRefundAmount());
refund.setStatus(RefundStatus.REFUNDING.getStatus());
refund.setReason(refundReason);

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

@ -262,4 +262,9 @@ public class RefundServiceImpl implements RefundService {
public List<LongDecimalVO> selectSumOfRefundAmountGroupByStoreId(RefundQuery query) {
return refundMapper.selectSumOfRefundAmountGroupByStoreId(query);
}
@Override
public List<LongDecimalVO> selectSumOfRefundAmountGroupByDeviceId(RefundQuery query) {
return refundMapper.selectSumOfRefundAmountGroupByDeviceId(query);
}
}

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

@ -379,4 +379,5 @@ public interface TransactionBillService {
* 查询每日订单金额
*/
List<LocalDateDecimalVO> selectDailyMoney(TransactionBillQuery query);
}