| @@ -255,19 +255,19 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| } else if (billTypeValue == EnumBillTypeParam.SETTLE.getCode().intValue()) { | } else if (billTypeValue == EnumBillTypeParam.SETTLE.getCode().intValue()) { | ||||
| try { | try { | ||||
| logger.info("更新结算单id:{}",(Long)bill.get("id")); | logger.info("更新结算单id:{}",(Long)bill.get("id")); | ||||
| logger.info("更新结算单id.money:{}",(Long) bill.get("owe")); | |||||
| WxBillSettle wxBillSettle = wxBillSettleService.getById((Long)bill.get("id")); | |||||
| WxBillSettleRecord settleRecord = new WxBillSettleRecord(); | WxBillSettleRecord settleRecord = new WxBillSettleRecord(); | ||||
| settleRecord.setSettleId((Long)bill.get("id")); | settleRecord.setSettleId((Long)bill.get("id")); | ||||
| settleRecord.setSettleMoney((Long) bill.get("owe")); | |||||
| settleRecord.setSettleMoney(wxBillSettle.getBalance()); | |||||
| settleRecord.setSettleTime(new Date()); | settleRecord.setSettleTime(new Date()); | ||||
| settleRecord.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode()); | settleRecord.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode()); | ||||
| settleRecord.setTenantId(wxBillSettle.getTenantId()); | |||||
| BigDecimal money = new BigDecimal(settleRecord.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); | BigDecimal money = new BigDecimal(settleRecord.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); | ||||
| settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage()+"收款"+money.toString()+"元"); | settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage()+"收款"+money.toString()+"元"); | ||||
| wxBillSettleRecordService.saveOrUpdate(settleRecord,null,(Long)bill.get("userId")); | wxBillSettleRecordService.saveOrUpdate(settleRecord,null,(Long)bill.get("userId")); | ||||
| WxBillSettle wxBillSettle = new WxBillSettle(); | |||||
| wxBillSettle.setId(settleRecord.getSettleId()); | |||||
| wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); | wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); | ||||
| wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); | wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); | ||||
| }catch (Exception e){ | }catch (Exception e){ | ||||