diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java index 75dbff774..d7f03a3a9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.WxFinancePrintTemplate; import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumBillAllType; import com.iformall.enums.EnumFinancePrintDataType; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxFinancePrintService; import io.swagger.annotations.ApiOperation; @@ -51,16 +52,14 @@ public class WxFinancePrintController extends BaseController { @GetMapping("types") public ResultData types() { List list = new ArrayList(); - Map m = new HashMap(); - m.put("id", EnumFinancePrintDataType.FINANCE_RECEIVE.getCode()); - m.put("name", EnumFinancePrintDataType.FINANCE_RECEIVE.getMessage()); - list.add(m); -// for (EnumFinancePrintDataType t : EnumFinancePrintDataType.values()) { -// Map m = new HashMap(); -// m.put("id", t.getCode()); -// m.put("name", t.getMessage()); -// list.add(m); -// } + for (EnumFinancePrintDataType t : EnumFinancePrintDataType.values()) { + if (t != EnumFinancePrintDataType.BILL) { + Map m = new HashMap(); + m.put("id", t.getCode()); + m.put("name", t.getMessage()); + list.add(m); + } + } return new ResultData(list); } @@ -69,6 +68,7 @@ public class WxFinancePrintController extends BaseController { @TenantIgnore public ResultData printDatas(@ModelAttribute WxFinancePrintData record) { record.setSortColumns("sort asc"); + record.setIsDel(EnumYesOrNo.NO.getCode()); return new ResultData(wxFinancePrintService.printDataList(record)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java index 45dd4a467..6f8f7ae22 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java @@ -28,8 +28,9 @@ public class WxBillSum implements Serializable { public String getNoTaxNeedPay() { if (StringUtils.isNotBlank(taxRate)) { noTaxNeedPay = new BigDecimal(needPay).multiply(new BigDecimal(taxRate)).setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString(); + return noTaxNeedPay; } - return noTaxNeedPay; + return needPay; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java index 7feee3152..55f0f79ea 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java +++ b/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") @@ -67,6 +78,8 @@ public class WxMerchantBillVo implements Serializable { @TableField(exist = false) private List billSumList; + @TableField(exist = false) + private Date currentTime; } diff --git a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java index baa97deb2..503a65eae 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleDataHandler.java +++ b/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(receive.getCurrentTime(),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.getNeedPayChinese(); }else if (name.equals("shopNumber")) { return receive.getShopNumber(); }else if (name.equals("merchantName")) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java index 7e21ebe0b..f7c554ca6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -336,6 +336,7 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { bq.setNeedPay(receiveTotal.toPlainString()); bq.setPaid(payTotal.toPlainString()); bq.setOwe(oweTotal.toPlainString()); + bq.setCurrentTime(new Date()); PrintVo vo = handleComponentData(bq.getMerchantId(),templateId,o,items, printMerchantSettleDataHandler,bq,printMerchantSettleItemDataHandler, sumlist,merchantMap,feesMap,shopNumber); if (null != vo) { voList.add(vo);