|
|
@@ -253,21 +253,27 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
updateBillOtherDeposit(bill); |
|
|
updateBillOtherDeposit(bill); |
|
|
} |
|
|
} |
|
|
} else if (billTypeValue == EnumBillTypeParam.SETTLE.getCode().intValue()) { |
|
|
} else if (billTypeValue == EnumBillTypeParam.SETTLE.getCode().intValue()) { |
|
|
logger.info("更新结算单id:{}",(Long)bill.get("id")); |
|
|
|
|
|
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,null,(Long)bill.get("userId")); |
|
|
|
|
|
|
|
|
|
|
|
WxBillSettle wxBillSettle = new WxBillSettle(); |
|
|
|
|
|
wxBillSettle.setId(settleRecord.getSettleId()); |
|
|
|
|
|
wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); |
|
|
|
|
|
wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); |
|
|
|
|
|
|
|
|
try { |
|
|
|
|
|
logger.info("更新结算单id:{}",(Long)bill.get("id")); |
|
|
|
|
|
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,null,(Long)bill.get("userId")); |
|
|
|
|
|
|
|
|
|
|
|
WxBillSettle wxBillSettle = new WxBillSettle(); |
|
|
|
|
|
wxBillSettle.setId(settleRecord.getSettleId()); |
|
|
|
|
|
wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); |
|
|
|
|
|
wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); |
|
|
|
|
|
}catch (Exception e){ |
|
|
|
|
|
logger.error("结算单error",e); |
|
|
|
|
|
e.printStackTrace(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
}else{ |
|
|
}else{ |
|
|
logger.info("账单类型不存在"); |
|
|
logger.info("账单类型不存在"); |
|
|
} |
|
|
} |
|
|
|