|
|
|
@@ -393,6 +393,17 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
WxMerchant mq = new WxMerchant(); |
|
|
|
mq.updateTenantInfo(record); |
|
|
|
Map<Long, WxMerchant> merchantMap = wxMerchantService.findMerchantMap(mq); |
|
|
|
|
|
|
|
Map<Long,String> shopNumberMap = wxShopService.getMerchantShopNumberMap(record, null, null); |
|
|
|
|
|
|
|
WxBillPayWay pq = new WxBillPayWay(); |
|
|
|
pq.updateTenantInfo(record); |
|
|
|
Map<Long, WxBillPayWay> paywayMap = this.getPayWayMap(pq); |
|
|
|
|
|
|
|
WxEnergyFees fq = new WxEnergyFees(); |
|
|
|
fq.updateTenantInfo(record); |
|
|
|
Map<Long, WxEnergyFees> fmap = wxEnergyService.getFeesMap(fq); |
|
|
|
|
|
|
|
for (int i = 0 ; i < page.getList().size() ; i++) { |
|
|
|
WxFinanceReceive fr = page.getList().get(i); |
|
|
|
if (null != merchantMap && null != fr.getMerchantId()) { |
|
|
|
@@ -401,14 +412,41 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
fr.setMerchantName(merchant.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
// //查询关联的账单记录 |
|
|
|
// WxFinanceReceiveBill rb = new WxFinanceReceiveBill(); |
|
|
|
// rb.updateTenantInfo(record); |
|
|
|
// rb.setReceiveId(fr.getId()); |
|
|
|
// List<WxFinanceReceiveBill> bills = wxFinanceReceiveBillMapper.findList(rb); |
|
|
|
// if (null != bills && bills.size() > 0 ) { |
|
|
|
// |
|
|
|
// } |
|
|
|
//查询关联的账单记录 |
|
|
|
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); |
|
|
|
if (null != paywayMap && null != frb.getPayWay()) { |
|
|
|
WxBillPayWay p = paywayMap.get(frb.getPayWay()); |
|
|
|
if (null != p) { |
|
|
|
frb.setPayWayName(p.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != shopNumberMap && null != frb.getMerchantId()) { |
|
|
|
String shopNumber = shopNumberMap.get(frb.getMerchantId()); |
|
|
|
frb.setShopNumber(shopNumber); |
|
|
|
if (null != merchantMap) { |
|
|
|
WxMerchant merchant = merchantMap.get(frb.getMerchantId()); |
|
|
|
if (null != merchant) { |
|
|
|
frb.setMerchantName(merchant.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (null != fmap && null != frb.getFeesId()) { |
|
|
|
WxEnergyFees ef = fmap.get(frb.getFeesId()); |
|
|
|
if (null != ef) { |
|
|
|
frb.setFeesName(ef.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
fr.setChildBills(bills); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@@ -461,7 +499,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
List<WxBillBaseEntity> bills = record.getBills(); |
|
|
|
sortBills(bills); |
|
|
|
|
|
|
|
//创建一个收款单 |
|
|
|
//创建主收款单 |
|
|
|
WxFinanceReceive addreceive = generateReceive(user, EnumFinanceReceiveType.RECEIVE, receiveTotal.toPlainString(), record.getMerchantId(), null, record.getRemark()); |
|
|
|
if (receiveTotal.compareTo(new BigDecimal(0)) > 0) { |
|
|
|
addreceive.setMoneyDetail(JSON.toJSONString(record.getPayWays())); |
|
|
|
@@ -469,6 +507,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
WxMerchant merchant = new WxMerchant(); |
|
|
|
merchant.updateTenantInfo(record); |
|
|
|
boolean isAllEmpity = true; |
|
|
|
//建立子账单关联单 |
|
|
|
for (int i = 0 ; i < record.getBills().size(); i++) { |
|
|
|
WxBillBaseEntity be = record.getBills().get(i); |
|
|
|
//每个账单要创建一个收款关联单,如果有冲抵,要额外创建 |
|
|
|
@@ -575,6 +614,8 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
frbs.setCreateTime(new Date()); |
|
|
|
frbs.setUpdateTime(new Date()); |
|
|
|
frbs.setMerchantId(bill.getMerchantId()); |
|
|
|
frbs.setStarttime(bill.getStarttime()); |
|
|
|
frbs.setEndtime(bill.getEndtime()); |
|
|
|
wxFinanceReceiveBillMapper.insert(frbs); |
|
|
|
} |
|
|
|
|
|
|
|
|