|
|
|
@@ -117,6 +117,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
@Autowired |
|
|
|
StringRedisTemplate stringRedisTemplate; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxBillSettleRecordService wxBillSettleRecordService; |
|
|
|
|
|
|
|
@Override |
|
|
|
public Map<String, Object> listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) { |
|
|
|
//更新各账单状态 |
|
|
|
@@ -241,7 +244,18 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
if (wxBillOtherDeposit != null && !wxBillOtherDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { |
|
|
|
updateBillOtherDeposit(bill); |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else if (billTypeValue == EnumBillTypeParam.SETTLE.getCode().intValue()) { |
|
|
|
logger.info("更新结算单"); |
|
|
|
WxBillSettleRecord settleRecord = new WxBillSettleRecord(); |
|
|
|
settleRecord.setSettleId((Long)bill.get("id")); |
|
|
|
settleRecord.setSettleMoney((Long) bill.get("owe")); |
|
|
|
settleRecord.setSettleTime(new Date()); |
|
|
|
settleRecord.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode()); |
|
|
|
|
|
|
|
BigDecimal money = new BigDecimal(settleRecord.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); |
|
|
|
settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage()+"收款"+money.toString()+"元"); |
|
|
|
wxBillSettleRecordService.saveOrUpdate(settleRecord); |
|
|
|
}else{ |
|
|
|
logger.info("账单类型不存在"); |
|
|
|
} |
|
|
|
} |
|
|
|
|