소스 검색

fix

release_toaliyun_real
winter 1 년 전
부모
커밋
9967941878
2개의 변경된 파일16개의 추가작업 그리고 0개의 파일을 삭제
  1. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java
  2. +5
    -0
      mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java

+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java 파일 보기

@@ -4,6 +4,8 @@ import cn.afterturn.easypoi.excel.annotation.Excel;

import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.annotation.TableField;
import com.iformall.utils.PriceUtilV2;

import lombok.Data;

import java.io.Serializable;
@@ -33,6 +35,15 @@ public class WxMerchantBillVo implements Serializable {
public String getNeedPayNumber() {
return StringUtils.isBlank(needPay) ? "0" : new BigDecimal(needPay).toPlainString();
}
@TableField(exist = false)
private String needPayChinese;
public String getNeedPayChinese() {
if (StringUtils.isBlank(needPay)) {
needPay = "0";
needPayChinese = PriceUtilV2.number2CNMontrayUnit(new BigDecimal(needPay));
}
return needPayChinese;
}
private String paid;
@Excel(name = "已付账单金额(元)", width = 20, orderNum = "5")


+ 5
- 0
mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java 파일 보기

@@ -1,5 +1,6 @@
package com.iformall.print.data.impl;

import java.util.Date;
import java.util.Map;

import org.springframework.stereotype.Service;
@@ -28,12 +29,16 @@ public class PrintMerchantSettleDataHandler implements PrintDataParser{
return DateUtils.date2String(receive.getMinDate(),DateUtils.DATE_PATTERN);
}else if (name.equals("returnPay")) {
return receive.getReturnPay();
}else if (name.equals("currentTime")) {
return DateUtils.date2String(new Date(),DateUtils.DATE_PATTERN);
}else if (name.equals("owe")) {
return receive.getOwe();
}else if (name.equals("paid")) {
return receive.getPaid();
}else if (name.equals("needPay")) {
return receive.getNeedPay();
}else if (name.equals("needPayChinese")) {
return receive.getNeedPay();
}else if (name.equals("shopNumber")) {
return receive.getShopNumber();
}else if (name.equals("merchantName")) {


불러오는 중...
취소
저장