zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:部门报表逻辑修改

Browse Source
This commit is contained in:
dzc committed 2025-03-24 17:24:29 +08:00
1 parent 50e0dfd758
commit 2fffce5db5
5 files changed
+12 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java
+1 -1
View File
@@ -8,7 +8,7 @@ import java.util.List;
@Data
public class HardOrderSumAndCountDto {
private List<Long> deptIds;
private List<Long> userDeptIds;
private List<String> orderStatusCodes;
pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
+3 -3
View File
@@ -321,7 +321,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
// 查询订单支付流水
CompletableFuture<List<HardOrderSumAndCountVo>> payFuture = CompletableFuture.supplyAsync(() -> {
HardOrderSumAndCountDto payDto = new HardOrderSumAndCountDto();
payDto.setDeptIds(deptIds);
payDto.setUserDeptIds(deptIds);
payDto.setOrderStatusCodes(HardOrderStatusEnum.getPayPrice());
if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) {
payDto.setCreateTimeList(dto.getCreateTimeList());
@@ -334,7 +334,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
// 查询订单退款流水
CompletableFuture<List<HardOrderSumAndCountVo>> refundFuture = CompletableFuture.supplyAsync(() -> {
HardOrderSumAndCountDto refundDto = new HardOrderSumAndCountDto();
refundDto.setDeptIds(deptIds);
refundDto.setUserDeptIds(deptIds);
refundDto.setOrderStatusCodes(HardOrderStatusEnum.getPayErrorCodes());
if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) {
refundDto.setCreateTimeList(dto.getCreateTimeList());
@@ -347,7 +347,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
// 查看盈利流水
CompletableFuture<List<HardOrderSumAndCountVo>> profitFuture = CompletableFuture.supplyAsync(() -> {
HardOrderSumAndCountDto refundDto = new HardOrderSumAndCountDto();
refundDto.setDeptIds(deptIds);
refundDto.setUserDeptIds(deptIds);
refundDto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) {
refundDto.setCreateTimeList(dto.getCreateTimeList());
pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
+5 -3
View File
@@ -6,6 +6,7 @@
<id property="id" column="id"/>
<result property="orderNo" column="order_no"/>
<result property="userId" column="user_id"/>
<result property="userDeptId" column="user_dept_id"/>
<result property="merchantId" column="merchant_id"/>
<result property="hardId" column="hard_id"/>
<result property="deptId" column="dept_id"/>
@@ -42,6 +43,7 @@
select a.id,
a.order_no,
a.user_id,
a.user_dept_id,
a.merchant_id,
a.hard_id,
a.dept_id,
@@ -217,9 +219,9 @@
#{v}
</foreach>
</if>
<if test="dto.deptIds != null and dto.deptIds.size() != 0">
and a.dept_id in
<foreach collection="dto.deptIds" item="v" open="(" close=")" separator=",">
<if test="dto.setUserDeptIds != null and dto.setUserDeptIds.size() != 0">
and a.user_dept_id in
<foreach collection="dto.setUserDeptIds" item="v" open="(" close=")" separator=",">
#{v}
</foreach>
</if>
pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java
+1 -1
View File
@@ -5,7 +5,7 @@ import lombok.Data;
import java.util.List;
@Data
public class DeptAllListDto {
public class DeptAllListDto {
private Long deptId;
pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionSumAndCountDto.java
+2
View File
@@ -21,6 +21,8 @@ public class WalletTransactionSumAndCountDto {
private List<Long> deptIds;
private List<Long> userDeptIds;
private List<String> bizTypes;
private LocalDateTime[] createTimeList;