From f40711cd8c80b29baaeea772a1c3ca27a7d45461 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 19 Sep 2019 10:13:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B5=81][=E5=AE=8C=E5=96=84=E6=B3=A8=E9=87=8A]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxCoupon.java | 1 + .../com/iformall/service/impl/WxBillAllServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 35817be93..f9906be73 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -136,6 +136,7 @@ public class WxCoupon extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="领取条件",name="condition") private String conditions; + @io.swagger.annotations.ApiModelProperty(value="最后一次审批操作类型,取值同EnumFlowKey",name="approvalType") private Integer approvalType; @TableField(exist = false) 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 0d1e8bdea..1b29a8854 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -290,9 +290,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { 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")); + 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.setUpdatetime(new Date()); wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode());