diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeApplyDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeApplyDto.java index 57d357aeb..fc072b9d1 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeApplyDto.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/recharge/WalletRechargeApplyDto.java @@ -27,4 +27,9 @@ public class WalletRechargeApplyDto extends WalletRechargeApplyEntity { * 审批相关 */ private Boolean isFindCheckUser = false; + + /** + * 发票编号 + */ + private String invoiceCode; } diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyVo.java index 76197174a..4d06416cf 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyVo.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyVo.java @@ -45,4 +45,9 @@ public class WalletRechargeApplyVo extends WalletRechargeApplyEntity implements */ private Integer totalPrice; + /** + * 发票编号 + */ + private String invoiceCode; + } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeApplyMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeApplyMapper.xml index 0ba2c157d..3a71db167 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeApplyMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeApplyMapper.xml @@ -65,14 +65,19 @@ t.unique_code as walletTypeUniqueCode, t.icon as walletTypeIcon, t.is_rule as isRule, + i.code as invoiceCode, (select sum(i.price) from wallet_recharge_import i where i.del_flag = '0' and i.apply_id = a.id) as totalPrice from wallet_recharge_apply a left join wallet_type t on a.wallet_type_id = t.id and t.del_flag = '0' + left join wallet_recharge_invoice i on i.id = a.invoice_id and i.del_flag = '0' + + and i.code = #{dto.invoiceCode} + group by a.id