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

主播薪资操作后台添加官方操作

Browse Source
This commit is contained in:
hokli
2025-07-25 16:42:40 +08:00
parent c68176819d
commit b05e85f023
4 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/guild/GuildSalaryBillDateCycle.java
View File

@@ -85,6 +85,12 @@ public class GuildSalaryBillDateCycle implements Serializable {
@TableField("official_withdram")
private Double officialWithdram;
/**
* 平台操作钻石
*/
@TableField("platform_operation_usb")
private Double platformOperationUsb;
/**
* 遗留钻石
*/

6
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/AnchorSalaryBillAdminVo.java
View File

@@ -114,5 +114,9 @@ public class AnchorSalaryBillAdminVo {
@ExcelIgnore
private String dateCycle;
/**
* 官方操作
*/
@ExcelIgnore
private Double platformOperationUsb;
}

3
accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildSalaryBillDateCycleMapper.xml
View File

@@ -9,7 +9,8 @@
usb_to_gold usbToGold ,
usb_to_agent usbToAgent,
usb_to_owner usbToOwner,
official_withdram officialWithdram
official_withdram officialWithdram,
platform_operation_usb platformOperationUsb
from guild_salary_bill_date_cycle where stat_date = #{dateCycle}
<if test="hallId != null">
AND guild_id = #{hallId}

17
accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildUsdBillRecordMapper.xml
View File

@@ -45,7 +45,10 @@
<if test="salaryOperateType == 5">
and `type` in (5,8)
</if>
<if test="salaryOperateType != 5">
<if test="salaryOperateType == 9">
and `type` in (9,10)
</if>
<if test="salaryOperateType != 5 and salaryOperateType != 9">
and `type` =#{salaryOperateType}
</if>
</if>
@@ -90,14 +93,16 @@
IFNULL(a.usbToGold,0) usbToGold,
IFNULL(a.usbToAgent,0) usbToAgent,
IFNULL(a.usbToOwner,0) usbToOwner,
IFNULL(a.officialWithdram,0) officialWithdram FROM guild_member hm
IFNULL(a.officialWithdram,0) officialWithdram,
IFNULL(a.platformOperationUsb,0) platformOperationUsb FROM guild_member hm
LEFT JOIN
(select uid,guild_id,
sum(IF( FIND_IN_SET( type, 1), operate_usd, 0 )) diamondToUsb,
sum(IF( FIND_IN_SET( type, 2), operate_usd, 0 )) usbToGold,
sum(IF( FIND_IN_SET( type, 3), operate_usd, 0 )) usbToAgent,
sum(IF( FIND_IN_SET( type, 4), operate_usd, 0 )) usbToOwner,
sum(IF( FIND_IN_SET( type, 5) or FIND_IN_SET(type, 7) or FIND_IN_SET( type, 8), operate_usd, 0 )) officialWithdram
sum(IF( FIND_IN_SET( type, 5) or FIND_IN_SET(type, 7) or FIND_IN_SET( type, 8), operate_usd, 0 )) officialWithdram,
sum(IF( FIND_IN_SET( type, 9,10), operate_usd, 0 )) platformOperationUsb
from guild_usd_bill_record r
where r.cycle_date = #{dateCycle}
<if test="hallId != null">
@@ -129,14 +134,16 @@
IFNULL(a.usbToGold,0) usbToGold,
IFNULL(a.usbToAgent,0) usbToAgent,
IFNULL(a.usbToOwner,0) usbToOwner,
IFNULL(a.officialWithdram,0) officialWithdram FROM guild_member hm
IFNULL(a.officialWithdram,0) officialWithdram,
IFNULL(a.platformOperationUsb,0) platformOperationUsb FROM guild_member hm
LEFT JOIN
(select uid,guild_id,cycle_date,
sum(IF( FIND_IN_SET( type, 1), operate_usd, 0 )) diamondToUsb,
sum(IF( FIND_IN_SET( type, 2), operate_usd, 0 )) usbToGold,
sum(IF( FIND_IN_SET( type, 3), operate_usd, 0 )) usbToAgent,
sum(IF( FIND_IN_SET( type, 4), operate_usd, 0 )) usbToOwner,
sum(IF( FIND_IN_SET( type, 5) or FIND_IN_SET(type, 7) or FIND_IN_SET( type, 8), operate_usd, 0 )) officialWithdram
sum(IF( FIND_IN_SET( type, 5) or FIND_IN_SET(type, 7) or FIND_IN_SET( type, 8), operate_usd, 0 )) officialWithdram,
sum(IF( FIND_IN_SET( type, 9,10), operate_usd, 0 )) platformOperationUsb
from guild_usd_bill_record
where cycle_date = #{dateCycle}
group by uid ,guild_id) a ON hm.uid = a.uid AND hm.guild_id = a.guild_id