Преглед изворни кода

[修改][审批流][完善注释]

release_toaliyun_real
luozukai пре 6 година
родитељ
комит
f40711cd8c
2 измењених фајлова са 4 додато и 3 уклоњено
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java

+ 1
- 0
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") @io.swagger.annotations.ApiModelProperty(value="领取条件",name="condition")
private String conditions; private String conditions;


@io.swagger.annotations.ApiModelProperty(value="最后一次审批操作类型,取值同EnumFlowKey",name="approvalType")
private Integer approvalType; private Integer approvalType;


@TableField(exist = false) @TableField(exist = false)


+ 3
- 3
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.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode());
settleRecord.setTenantId(wxBillSettle.getTenantId()); 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.setUpdatetime(new Date());
wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode());


Loading…
Откажи
Сачувај