diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java index 96fbc27fd..66b6af281 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleRecord.java @@ -43,7 +43,7 @@ public class WxBillSettleRecord extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="明细",name="detail") private String detail; @io.swagger.annotations.ApiModelProperty(value="描述",name="desc") - private String desc; + private String remark; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; 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 801569480..b6879bbe7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -108,6 +108,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Autowired private String fmUploadDir; + @Autowired + private WxBillSettleMapper wxBillSettleMapper; + @Autowired private WxPayAccountBillMapper wxPayAccountBillMapper; @@ -260,6 +263,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { 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); }else{ logger.info("账单类型不存在"); } diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleRecordMapper.xml index c3c0596d3..706b40dcd 100644 --- a/mallinkService/src/main/resources/mapper/WxBillSettleRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillSettleRecordMapper.xml @@ -12,7 +12,7 @@ - + @@ -20,7 +20,7 @@ `id`,`tenant_id`,`settle_id`,`userid`,`user_name`,`settle_money`, - `settle_time`,`settle_way`,`balance`,detail,`createtime`,`updatetime`,`desc` + `settle_time`,`settle_way`,`balance`,detail,`createtime`,`updatetime`,`remark`