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

薪资操作BUGfixed

Browse Source
This commit is contained in:
hokli
2025-07-25 16:02:34 +08:00
parent 8d7100ece6
commit c68176819d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java
View File

@@ -731,6 +731,8 @@ public class OfficialGoldRecordService extends BaseService {
vo.setOperationNum(BigDecimal.valueOf(record.getGoldNum()));
} else if (Constant.WalletCurrencyType.usd.equals(officalSendTypeEnum.getCurrencyType())) {
vo.setOperationNum(BigDecimal.valueOf(record.getDiamondNum()));
} else {
vo.setOperationNum(BigDecimal.valueOf(record.getGoldNum()));
}
vo.setActualAmount(record.getActualAmount());
vo.setRemark(record.getRemark());

4
accompany-admin/accompany-admin-service/src/main/resources/mapper/OfficialGoldRecordMapperExpand.xml
View File

@@ -18,6 +18,7 @@
<result column="remark" property="remark" jdbcType="VARCHAR"/>
<result column="partitionId" property="partitionId" jdbcType="INTEGER"/>
<result column="actualAmount" property="actualAmount" jdbcType="DECIMAL"/>
<result column="diamond_num" property="diamondNum" jdbcType="DOUBLE"/>
</resultMap>
<insert id="insertBatch" useGeneratedKeys="true" >
@@ -30,7 +31,7 @@
<select id="getOfficialGoldRecord" resultMap="BaseResultMap">
select u.avatar,u.erban_no,u.nick,up.golds as
money,up.crystals as radish,r.record_id,r.uid,r.type,r.currency_type,r.remark,r.gold_num,r.operator_id,
money,up.crystals as radish,r.record_id,r.uid,r.type,r.currency_type,r.remark,r.gold_num,r.diamond_num,r.operator_id,
a.username as operator_name,r.create_time,r.bus_type
from official_gold_record r
left join users u on r.uid = u.uid
@@ -57,6 +58,7 @@
r.currency_type,
r.remark,
r.gold_num,
r.diamond_num,
r.operator_id,
a.username as operator_name,
r.create_time,