|
|
|
@@ -425,8 +425,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxFinanceReceiveVo> receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize) { |
|
|
|
private PageInfo<WxFinanceReceiveVo> receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize,boolean hasBills) { |
|
|
|
initQueryParam(record); |
|
|
|
PageInfo<WxFinanceReceive> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFinanceReceiveMapper.findList(record)); |
|
|
|
PageInfo<WxFinanceReceiveVo> pageVo = new PageInfo<WxFinanceReceiveVo>(); |
|
|
|
@@ -458,44 +457,50 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//查询关联的账单记录 |
|
|
|
WxFinanceReceiveBill rb = new WxFinanceReceiveBill(); |
|
|
|
rb.updateTenantInfo(record); |
|
|
|
rb.setReceiveId(fr.getId()); |
|
|
|
List<WxFinanceReceiveBill> bills = wxFinanceReceiveBillMapper.findList(rb); |
|
|
|
if (null != bills && bills.size() > 0 ) { |
|
|
|
for (int j = 0 ; j < bills.size(); j ++) { |
|
|
|
WxFinanceReceiveBill frb = bills.get(j); |
|
|
|
WxFinanceReceiveVo vo = new WxFinanceReceiveVo(); |
|
|
|
vo.initByReceive(fr, frb); |
|
|
|
if (null != paywayMap && null != frb.getPayWay()) { |
|
|
|
WxBillPayWay p = paywayMap.get(vo.getPayWay()); |
|
|
|
if (null != p) { |
|
|
|
vo.setPayWayName(p.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != shopNumberMap && null != frb.getMerchantId()) { |
|
|
|
String shopNumber = shopNumberMap.get(vo.getMerchantId()); |
|
|
|
vo.setShopNumber(shopNumber); |
|
|
|
if (null != merchantMap) { |
|
|
|
WxMerchant merchant = merchantMap.get(vo.getMerchantId()); |
|
|
|
if (null != merchant) { |
|
|
|
vo.setMerchantName(merchant.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != fmap && null != vo.getFeesId()) { |
|
|
|
WxEnergyFees ef = fmap.get(vo.getFeesId()); |
|
|
|
if (null != ef) { |
|
|
|
vo.setFeesName(ef.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
volist.add(vo); |
|
|
|
} |
|
|
|
}else { |
|
|
|
if (!hasBills) { |
|
|
|
WxFinanceReceiveVo vo = new WxFinanceReceiveVo(); |
|
|
|
vo.initByReceive(fr, null); |
|
|
|
volist.add(vo); |
|
|
|
}else { |
|
|
|
//查询关联的账单记录 |
|
|
|
WxFinanceReceiveBill rb = new WxFinanceReceiveBill(); |
|
|
|
rb.updateTenantInfo(record); |
|
|
|
rb.setReceiveId(fr.getId()); |
|
|
|
List<WxFinanceReceiveBill> bills = wxFinanceReceiveBillMapper.findList(rb); |
|
|
|
if (null != bills && bills.size() > 0 ) { |
|
|
|
for (int j = 0 ; j < bills.size(); j ++) { |
|
|
|
WxFinanceReceiveBill frb = bills.get(j); |
|
|
|
WxFinanceReceiveVo vo = new WxFinanceReceiveVo(); |
|
|
|
vo.initByReceive(fr, frb); |
|
|
|
if (null != paywayMap && null != frb.getPayWay()) { |
|
|
|
WxBillPayWay p = paywayMap.get(vo.getPayWay()); |
|
|
|
if (null != p) { |
|
|
|
vo.setPayWayName(p.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != shopNumberMap && null != frb.getMerchantId()) { |
|
|
|
String shopNumber = shopNumberMap.get(vo.getMerchantId()); |
|
|
|
vo.setShopNumber(shopNumber); |
|
|
|
if (null != merchantMap) { |
|
|
|
WxMerchant merchant = merchantMap.get(vo.getMerchantId()); |
|
|
|
if (null != merchant) { |
|
|
|
vo.setMerchantName(merchant.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != fmap && null != vo.getFeesId()) { |
|
|
|
WxEnergyFees ef = fmap.get(vo.getFeesId()); |
|
|
|
if (null != ef) { |
|
|
|
vo.setFeesName(ef.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
volist.add(vo); |
|
|
|
} |
|
|
|
}else { |
|
|
|
WxFinanceReceiveVo vo = new WxFinanceReceiveVo(); |
|
|
|
vo.initByReceive(fr, null); |
|
|
|
volist.add(vo); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
pageVo.setList(volist); |
|
|
|
@@ -504,6 +509,16 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
return pageVo; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxFinanceReceiveVo> receiveVoListWithBillsAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize) { |
|
|
|
return receiveVoListAsPage(record, pageIndex, pageSize, true); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxFinanceReceiveVo> receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize) { |
|
|
|
return receiveVoListAsPage(record, pageIndex, pageSize, false); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<WxFinanceReceive> findReceiveList(WxFinanceReceive record) { |
|
|
|
initQueryParam(record); |
|
|
|
@@ -1039,13 +1054,46 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
@Override |
|
|
|
public void redSetoffReceive(WxFinanceReceive record, MallUserInfo user) { |
|
|
|
invalidReceive(record, user , true); |
|
|
|
copyRedSetOffReceive(record); |
|
|
|
} |
|
|
|
|
|
|
|
private void copyRedSetOffReceive(WxFinanceReceive record) { |
|
|
|
//新增一个红冲,金额是负数 |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
record.setId(idWorker.nextId()); |
|
|
|
record.setReceiveMoney("-"+record.getReceiveMoney()); |
|
|
|
record.setSetOffMoney("-"+record.getSetOffMoney()); |
|
|
|
if (StringUtils.isNotBlank(record.getReceiveMoney())) { |
|
|
|
record.setReceiveMoney("-"+record.getReceiveMoney()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(record.getSetOffMoney())) { |
|
|
|
record.setSetOffMoney("-"+record.getSetOffMoney()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(record.getPayMoney())) { |
|
|
|
record.setPayMoney("-"+record.getPayMoney()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(record.getUseMoney())) { |
|
|
|
record.setUseMoney("-"+record.getUseMoney()); |
|
|
|
} |
|
|
|
record.setStatus(EnumFinanceReceiveStatus.RED_SETOFF.getCode()); |
|
|
|
wxFinanceReceiveMapper.insert(record); |
|
|
|
|
|
|
|
WxFinanceReceiveBill rbq = new WxFinanceReceiveBill(); |
|
|
|
rbq.updateTenantInfo(record); |
|
|
|
rbq.setReceiveId(record.getId()); |
|
|
|
rbq.setUpdateTime(new Date()); |
|
|
|
List<WxFinanceReceiveBill> rbList = wxFinanceReceiveBillMapper.findList(rbq); |
|
|
|
if (null != rbList ) { |
|
|
|
for (int i = 0 ; i < rbList.size() ; i++ ) { |
|
|
|
WxFinanceReceiveBill rb = rbList.get(i); |
|
|
|
rb.setId(idWorker.nextId()); |
|
|
|
if (StringUtils.isNotBlank(rb.getReceive())) { |
|
|
|
rb.setReceive("-"+rb.getReceive()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(rb.getPay())) { |
|
|
|
rb.setPay("-"+rb.getPay()); |
|
|
|
} |
|
|
|
wxFinanceReceiveBillMapper.insert(rb); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|