diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 971acea5e..3027b0711 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -255,19 +255,19 @@ public class WxBillAllServiceImpl implements WxBillAllService { } else if (billTypeValue == EnumBillTypeParam.SETTLE.getCode().intValue()) { try { 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(); settleRecord.setSettleId((Long)bill.get("id")); - settleRecord.setSettleMoney((Long) bill.get("owe")); + settleRecord.setSettleMoney(wxBillSettle.getBalance()); settleRecord.setSettleTime(new Date()); settleRecord.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode()); + settleRecord.setTenantId(wxBillSettle.getTenantId()); 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,null,(Long)bill.get("userId")); - WxBillSettle wxBillSettle = new WxBillSettle(); - wxBillSettle.setId(settleRecord.getSettleId()); wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); }catch (Exception e){