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

11

Browse Source
This commit is contained in:
dzc committed 2025-04-21 14:45:31 +08:00
1 parent 77e932ead0
commit a133b54ed3
2 files changed
+16 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
+2 -1
View File
@@ -453,7 +453,8 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
}
if (ObjectUtil.isNotEmpty(walletOnceReduceList)) {
walletOnceReduceList.stream().filter(i -> ObjectUtil.equals(i.getDeptId(), v.getDeptId())).findFirst().ifPresent(i -> {
v.setWalletOnceReducePrice(i.getSum());
// v.setWalletOnceReducePrice(i.getSum());
v.setWalletOnceReducePrice(Math.abs(i.getSum()));
v.setWalletOnceReduceCount(i.getCount());
});
}
pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
+14 -3
View File
@@ -219,7 +219,6 @@
</if>
</where>
group by a.hard_id
order by a.merchant_type asc
</select>
<select id="listCs" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderCsVo">
@@ -241,7 +240,13 @@
</if>
</where>
group by a.merchant_id
order by a.merchant_type asc
order by
CASE a.merchant_type
WHEN 1 THEN 1
WHEN 3 THEN 2
WHEN 0 THEN 3
WHEN 2 THEN 4
ELSE 5 END
</select>
<select id="listCsByDay" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderCsVo">
@@ -278,7 +283,13 @@
<include refid="whereA"/>
</where>
group by a.pay_type
order by a.merchant_type asc
CASE a.merchant_type
WHEN 10 THEN 1
WHEN 30 THEN 2
WHEN 0 THEN 3
WHEN 20 THEN 4
ELSE 5
END;
</select>
<select id="sumAndCount" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderSumAndCountVo">