| @@ -43,7 +43,7 @@ public class WxBillSettleRecord extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="明细",name="detail") | @io.swagger.annotations.ApiModelProperty(value="明细",name="detail") | ||||
| private String detail; | private String detail; | ||||
| @io.swagger.annotations.ApiModelProperty(value="描述",name="desc") | @io.swagger.annotations.ApiModelProperty(value="描述",name="desc") | ||||
| private String desc; | |||||
| private String remark; | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | ||||
| private Date createtime; | private Date createtime; | ||||
| @@ -108,6 +108,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| @Autowired | @Autowired | ||||
| private String fmUploadDir; | private String fmUploadDir; | ||||
| @Autowired | |||||
| private WxBillSettleMapper wxBillSettleMapper; | |||||
| @Autowired | @Autowired | ||||
| private WxPayAccountBillMapper wxPayAccountBillMapper; | 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); | 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()); | |||||
| wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); | |||||
| }else{ | }else{ | ||||
| logger.info("账单类型不存在"); | logger.info("账单类型不存在"); | ||||
| } | } | ||||
| @@ -12,7 +12,7 @@ | |||||
| <result column="settle_way" property="settleWay"/> | <result column="settle_way" property="settleWay"/> | ||||
| <result column="balance" property="balance"/> | <result column="balance" property="balance"/> | ||||
| <result column="detail" property="detail"/> | <result column="detail" property="detail"/> | ||||
| <result column="desc" property="desc"/> | |||||
| <result column="remark" property="remark"/> | |||||
| <result column="createtime" property="createtime"/> | <result column="createtime" property="createtime"/> | ||||
| <result column="updatetime" property="updatetime"/> | <result column="updatetime" property="updatetime"/> | ||||
| @@ -20,7 +20,7 @@ | |||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`settle_id`,`userid`,`user_name`,`settle_money`, | `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` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||