|
|
|
@@ -519,7 +519,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
|
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
@Override |
|
|
|
public List<WxAllBill> createReceive(WxFinanceReceive record,MallUserInfo user) { |
|
|
|
public Map createReceive(WxFinanceReceive record,MallUserInfo user) { |
|
|
|
//冲抵信息根据页面返回的账单抵扣信息直接保存入库 |
|
|
|
//费用计算自动优先匹配时间最早的那个 |
|
|
|
|
|
|
|
@@ -591,7 +591,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
addreceive.setMerchantId(record.getMerchantId()); |
|
|
|
addreceive.setRemark(record.getRemark()); |
|
|
|
wxFinanceReceiveMapper.insert(addreceive); |
|
|
|
return bills; |
|
|
|
|
|
|
|
Map retMap = new HashMap(); |
|
|
|
retMap.put("addreceive", addreceive); |
|
|
|
retMap.put("billlist", bills); |
|
|
|
return retMap; |
|
|
|
} |
|
|
|
|
|
|
|
public boolean createBillReceive(FinanceReceiveCalcuteDTO calcuteDto,MallUserInfo user,WxFinanceReceive addreceive,WxAllBill be,WxMerchant merchant,WxBillPayWay payWay0) { |
|
|
|
@@ -727,7 +731,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
|
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
@Override |
|
|
|
public List<WxAllBill> createPay(WxFinanceReceive record,MallUserInfo user) { |
|
|
|
public Map createPay(WxFinanceReceive record,MallUserInfo user) { |
|
|
|
//费用计算自动优先匹配时间最早的那个 |
|
|
|
//单保存冲抵的时候,实收金额为0 |
|
|
|
BigDecimal payTotal = new BigDecimal(0); |
|
|
|
@@ -788,7 +792,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
addreceive.setMerchantId(record.getMerchantId()); |
|
|
|
addreceive.setRemark(record.getRemark()); |
|
|
|
wxFinanceReceiveMapper.insert(addreceive); |
|
|
|
return bills; |
|
|
|
|
|
|
|
Map retMap = new HashMap(); |
|
|
|
retMap.put("addreceive", addreceive); |
|
|
|
retMap.put("billlist", bills); |
|
|
|
return retMap; |
|
|
|
} |
|
|
|
|
|
|
|
public boolean createBillPay(FinanceReceiveCalcuteDTO calcuteDto,MallUserInfo user,WxFinanceReceive addreceive,WxAllBill be,WxMerchant merchant,WxBillPayWay payWay0) { |
|
|
|
|