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

家族-后台-结算接口

Browse Source
This commit is contained in:
khalil
2025-09-26 16:21:25 +08:00
parent 47a7b536c8
commit b30b858061
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java
View File

@@ -13,6 +13,7 @@ import com.accompany.business.mybatismapper.*;
import com.accompany.business.service.*;
import com.accompany.business.service.activity.WeekStarService;
import com.accompany.business.service.apple.IOSRefundV2Service;
import com.accompany.business.service.clan.FamilyDiamondSettlementService;
import com.accompany.business.service.guild.*;
import com.accompany.business.service.level.LevelService;
import com.accompany.business.service.lucky.BravoRecordService;
@@ -135,6 +136,8 @@ public class MyApiService {
private WeekGuildPartitionStatService weekGuildPartitionStatService;
@Autowired
private WeekRechargeAgentPartitionStatService weekRechargeAgentPartitionStatService;
@Autowired
private FamilyDiamondSettlementService familyDiamondSettlementService;
public void refreshRoomMoneyRankList() {
List<Long> roomUidList = myApiAdminMapper.getExceptionRoomUid();
@@ -777,4 +780,8 @@ public class MyApiService {
throw new Exception("createRoom error, code=" + roomRet.getCode() + "&uid=" + room.getUid() + "json=" + JSON.toJSONString(roomRet));
}
}
public void familySettlement(Integer partitionId, String cycleDate, Integer waitSecond) {
familyDiamondSettlementService.settlement(partitionId, cycleDate, waitSecond);
}
}

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyWageStatAdminService.java
View File

@@ -273,7 +273,7 @@ public class FamilyWageStatAdminService {
if (null != diamondRemain){
vo.setDiamondRemain(diamondRemain.toString());
if (null != familyWage && diamondRemain.compareTo(familyWage.getDiamondBonus()) >= 0) {
if (null != familyWage && diamondRemain.compareTo(familyWage.getDiamondNumThreshold()) >= 0) {
vo.setDiamondWage(familyWage.getDiamondBonus());
}
}

9
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java
View File

@@ -359,4 +359,13 @@ public class MyApiController {
return BusiResult.success();
}
@GetMapping("/familySettlement")
public BusiResult<Void> familySettlement(Long roomId, Integer partitionId, String cycleDate, Integer waitSecond) {
if (null == roomId || !roomId.equals(603L) || null == partitionId || StringUtils.isBlank(cycleDate)) {
throw new AdminServiceException(BusiStatus.PARAMERROR);
}
myApiService.familySettlement(partitionId, cycleDate, waitSecond);
return BusiResult.success();
}
}

4
accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FamilyGiftRecordMapper.xml
View File

@@ -130,7 +130,7 @@
gm.create_time createTime,
gm.enable enable,
f.`name` familyName,
sum(ifnull(fms.`serial_value`, 0)) goldIncome
ifnull(fms.`serial_value`, 0) goldIncome
FROM
family_member gm
left join family f on f.id = gm.family_id
@@ -175,7 +175,7 @@
<if test="endTime != null and endTime != ''">
and `date &lt;= #{endTime}
</if>
group by family_member_id) fg ON fg.family_member_id = gm.family_member_id
group by family_member_id) fg ON fg.family_member_id = gm.id
<where>
<if test="uid != null">
gm.uid = #{uid}