|
@@ -112,12 +112,12 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
|
112
|
112
|
private TaWxPayConfigMapper taWxPayConfigMapper;
|
113
|
113
|
|
114
|
114
|
@Override
|
115
|
|
- public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, String startDate, String endDate, String miniAppName) {
|
|
115
|
+ public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, String startDate, String endDate, String miniAppName, String auditStatus) {
|
116
|
116
|
IPage<TaOrgOrder> result = pg;
|
117
|
117
|
|
118
|
118
|
if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
|
119
|
119
|
List<String> urlList = new ArrayList<>();
|
120
|
|
- result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
|
|
120
|
+ result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, auditStatus);
|
121
|
121
|
result.getRecords().forEach(e -> {
|
122
|
122
|
e.setCertificateUrlList(getCertificateByOrderId(e.getOrderId()));
|
123
|
123
|
});
|
|
@@ -517,7 +517,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
|
517
|
517
|
|
518
|
518
|
//插入凭证记录
|
519
|
519
|
if (CollectionUtils.isNotEmpty(refundApplication.getCertificateList())) {
|
520
|
|
- List<TaOrgAccountCertificate> taOrgAccountCertificateList = assembleAccountCertificate(refundApplication.getOrgId(), taOrgAccount, taOrgAccountDetailedList.getSerialNo(), taOrgOrder.getOrderId(), userId, CommConstant.ITEM_TYPE_REFUND);
|
|
520
|
+ List<TaOrgAccountCertificate> taOrgAccountCertificateList = assembleAccountCertificate(refundApplication, taOrgAccount, taOrgAccountDetailedList.getSerialNo(), taOrgOrder.getOrderId(), userId, CommConstant.ITEM_TYPE_REFUND);
|
521
|
521
|
taOrgAccountCertificateList.forEach(e -> {
|
522
|
522
|
taOrgAccountCertificateMapper.insert(e);
|
523
|
523
|
});
|
|
@@ -660,13 +660,13 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
|
660
|
660
|
* @param userId
|
661
|
661
|
* @return
|
662
|
662
|
*/
|
663
|
|
- public List<TaOrgAccountCertificate> assembleAccountCertificate(Integer orgId, TaOrgAccount taOrgAccount, Integer accountSerialNo, String orderId, Integer userId, String consumeType) {
|
|
663
|
+ public List<TaOrgAccountCertificate> assembleAccountCertificate(TaOrgRefundApplication taOrgRefundApplication, TaOrgAccount taOrgAccount, Integer accountSerialNo, String orderId, Integer userId, String consumeType) {
|
664
|
664
|
SysUser taUser = selectUserById(userId);
|
665
|
665
|
List<TaOrgAccountCertificate> taOrgAccountCertificateList = new ArrayList<>();
|
666
|
666
|
|
667
|
|
- taOrgAccount.getCertificateList().forEach(e -> {
|
|
667
|
+ taOrgRefundApplication.getCertificateList().forEach(e -> {
|
668
|
668
|
TaOrgAccountCertificate taOrgAccountCertificate = new TaOrgAccountCertificate();
|
669
|
|
- taOrgAccountCertificate.setOrgId(orgId);
|
|
669
|
+ taOrgAccountCertificate.setOrgId(taOrgRefundApplication.getOrgId());
|
670
|
670
|
taOrgAccountCertificate.setAccountId(taOrgAccount.getAccountId());
|
671
|
671
|
taOrgAccountCertificate.setAccountSerialNo(accountSerialNo);
|
672
|
672
|
taOrgAccountCertificate.setOrderId(orderId);
|