Browse Source

[修改][结算单][修改跳点率计算]

release_toaliyun_real
luozukai 6 years ago
parent
commit
7cac4f4809
3 changed files with 6 additions and 4 deletions
  1. +0
    -2
      mallinkAdmin/src/test/java/com/iformall/service/test/Test.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java
  3. +2
    -2
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 0
- 2
mallinkAdmin/src/test/java/com/iformall/service/test/Test.java View File

@@ -148,8 +148,6 @@ public class Test {
WxBillAll wxBillAll = new WxBillAll(); WxBillAll wxBillAll = new WxBillAll();
wxBillAll.setTenantId("456"); wxBillAll.setTenantId("456");
wxBillAll.setMerchantId(324754110547066880l); wxBillAll.setMerchantId(324754110547066880l);
wxBillAll.setPageIndex(1);
wxBillAll.setPageSize(6);
System.out.println("--------"+JsonUtil.obj2Json(wxBillAllService.listBill(wxBillAll))); System.out.println("--------"+JsonUtil.obj2Json(wxBillAllService.listBill(wxBillAll)));
} }
} }

+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java View File

@@ -3,6 +3,7 @@ package com.iformall.domain.vo;
import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data; import lombok.Data;


import javax.persistence.Transient;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;


@@ -74,6 +75,9 @@ public class WxBillAllVo {
@io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime") @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime")
private Date updatetime; private Date updatetime;


@Transient
private Integer freeze;

public String getReceivePayStr() { public String getReceivePayStr() {
if(getReceivePay()!=null) { if(getReceivePay()!=null) {
receivePayStr = new BigDecimal(getReceivePay()).divide(new BigDecimal(100)).toString(); receivePayStr = new BigDecimal(getReceivePay()).divide(new BigDecimal(100)).toString();


+ 2
- 2
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml View File

@@ -38,8 +38,8 @@
<result column="price_detail" property="priceDetail"/> <result column="price_detail" property="priceDetail"/>
<result column="updatetime" jdbcType="TIMESTAMP" property="updatetime"/> <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime"/>
<result column="freeze" property="freeze"/>
</resultMap> </resultMap>






Loading…
Cancel
Save