|
|
|
@@ -251,9 +251,12 @@ public class WxBillRentServiceImpl implements WxBillRentService { |
|
|
|
result.put("deposit", deposit); |
|
|
|
|
|
|
|
//解单金额 |
|
|
|
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
|
|
|
WxBillRent billRent = wxBillRentMapper.selectByPrimaryKey(id); |
|
|
|
WxMerchantTradeDaily merchantTradeDaily = new WxMerchantTradeDaily(); |
|
|
|
merchantTradeDaily.setMerchantId(billRent.getMerchantId()); |
|
|
|
merchantTradeDaily.setStartTime(sd.format(billRent.getStarttime())); |
|
|
|
merchantTradeDaily.setEndTime(sd.format(billRent.getEndtime())); |
|
|
|
String money = wxMerchantTradeDailyMapper.findSumMoney(merchantTradeDaily); |
|
|
|
result.put("solutionBillMoney", StringUtils.isBlank(money)?0:money); |
|
|
|
return result; |
|
|
|
|