diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java index fdc39a8..6f46211 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDTO.java @@ -75,7 +75,7 @@ public class CashRecordDTO{ /** * 所属地区 */ - private String market; + private Integer market; /** * 金币订单号 diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index 6bfef96..5d9b9f4 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -71,7 +71,7 @@ public class CashRefundServiceImpl implements RefundService { list.forEach(item -> { if (item.getRelatedId() != null) relatedIds.add(item.getRelatedId()); - if (item.getMarket() != null) marketIds.add(Integer.valueOf(item.getMarket())); + if (item.getMarket() != null) marketIds.add(item.getMarket()); if (item.getSubmitterId() != null) submitterIds.add(item.getSubmitterId()); if (item.getAuditId() != null) auditIds.add(item.getAuditId()); }); @@ -330,7 +330,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); list.forEach(item -> { if (item.getRelatedId() != null) relatedIds.add(item.getRelatedId()); - if (item.getMarket() != null) marketIds.add(Integer.valueOf(item.getMarket())); + if (item.getMarket() != null) marketIds.add(item.getMarket()); if (item.getSubmitterId() != null) submitterIds.add(item.getSubmitterId()); if (item.getAuditId() != null) auditIds.add(item.getAuditId()); }); @@ -390,7 +390,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); list.forEach(item -> { if (item.getRelatedId() != null) relatedIds.add(item.getRelatedId()); - if (item.getMarket() != null) marketIds.add(Integer.valueOf(item.getMarket())); + if (item.getMarket() != null) marketIds.add(item.getMarket()); if (item.getSubmitterId() != null) submitterIds.add(item.getSubmitterId()); if (item.getAuditId() != null) auditIds.add(item.getAuditId()); });