moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

充值明细fixed

Browse Source
This commit is contained in:
hokli
2025-08-19 17:51:06 +08:00
parent 70887963fa
commit 3c78ec1efd
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
accompany-admin/accompany-admin-service/src/main/resources/mapper/ChargeRecordAdminMapper.xml
View File

@@ -153,9 +153,19 @@
where cr.create_time >= #{startTime}
and cr.create_time <= #{endTime}
and cr.charge_status in (2,6)
and cr.channel = #{channel}
<if test="channel != null and channel != ''">
<choose>
<when test="channel == 'company'">
and cr.charge_prod_id = 'company'
</when>
<otherwise>
and cr.channel = #{channel}
</otherwise>
</choose>
</if>
and u.partition_id = #{partitionId}
GROUP BY r.id
order by `usd` desc
</select>
<select id="getChargeCount" resultType="com.accompany.payment.model.ChargeRecord">

5
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/ChargeRecordAdminController.java
View File

@@ -338,8 +338,9 @@ public class ChargeRecordAdminController extends BaseController {
}
@RequestMapping(value = "/partitionRegionDetail")
public List<ChargeRecordPartitionRegionVo> partitionRegionDetail(Integer partitionId, String beginDate, String channel) {
return chargeRecordAdminService.partitionRegionGoldDetail(partitionId, beginDate, channel);
public BusiResult<List<ChargeRecordPartitionRegionVo>> partitionRegionDetail(Integer partitionId, String beginDate, String channel) {
List<ChargeRecordPartitionRegionVo> chargeRecordPartitionRegionVos = chargeRecordAdminService.partitionRegionGoldDetail(partitionId, beginDate, channel);
return BusiResult.success(chargeRecordPartitionRegionVos);
}
@RequestMapping(value = "/exportPartitionDetail")