From 6460fc184bf1b421ddf2877565a01d7983e2673c Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 28 Mar 2024 21:28:28 +0800 Subject: [PATCH] fix --- .../market/WxSettleMerchantController.java | 6 +++ .../service/WxSettleMerchantService.java | 3 ++ .../impl/WxSettleMerchantServiceImpl.java | 53 ++++++++++++++----- 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java index 4af5dcf6c..bae90bee6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java @@ -113,6 +113,12 @@ public class WxSettleMerchantController extends BaseController { public ResultData calcutePeriodicity(@RequestBody WxSettleMerchant wxSettleMerchant) { return new ResultData(wxSettleMerchantService.getMapDetail(wxSettleMerchant,true)); } + + @ApiOperation("转换成中文大写") + @PostMapping("/toChineseBig") + public ResultData toChineseBig(@RequestBody BigDecimal money) { + return new ResultData(wxSettleMerchantService.toChineseBig(money)); + } @ApiOperation("导出") @GetMapping("/exportData") diff --git a/mallinkService/src/main/java/com/iformall/service/WxSettleMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxSettleMerchantService.java index 2c8f36f34..6d5e98983 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxSettleMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxSettleMerchantService.java @@ -1,5 +1,6 @@ package com.iformall.service; +import java.math.BigDecimal; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -29,6 +30,8 @@ public interface WxSettleMerchantService { WxSettleMerchant getById(TenantEntity tenantEntity,Long id); Map getMapDetail(WxSettleMerchant record,boolean needCalcute); + String toChineseBig(BigDecimal money); + /** * 保存或更新实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java index d7ea9542d..67806c705 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxSettleMerchantServiceImpl.java @@ -54,12 +54,37 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ valueMap.put("merchantPhone", record.getMerchantPhone()); if (needCalcute) { - record.setCardMoney(calcuteByMoneyAndRate(record.getCardSaleMoney(),record.getCardRate())); - record.setZfbMoney(calcuteByMoneyAndRate(record.getZfbSaleMoney(),record.getZfbRate())); - record.setUnionMoney(calcuteByMoneyAndRate(record.getUnionSaleMoney(),record.getUnionRate())); - record.setWxMoney(calcuteByMoneyAndRate(record.getWxSaleMoney(),record.getWxRate())); - record.setEraseZeroMoney(calcuteByMoneyAndRate(record.getEraseZeroSaleMoney(),record.getEraseZeroRate())); - record.setCashMoney(calcuteByMoneyAndRate(record.getCashSaleMoney(),record.getCashRate())); + if (null == record.getCardRate() && null != record.getCardMoney()) { + //do nothing + }else { + record.setCardMoney(calcuteByMoneyAndRate(record.getCardSaleMoney(),record.getCardRate())); + } + + if (null == record.getZfbRate() && null != record.getZfbMoney()) { + //do nothing + }else { + record.setZfbMoney(calcuteByMoneyAndRate(record.getZfbSaleMoney(),record.getZfbRate())); + } + if (null == record.getUnionRate() && null != record.getUnionMoney()) { + //do nothing + }else { + record.setUnionMoney(calcuteByMoneyAndRate(record.getUnionSaleMoney(),record.getUnionRate())); + } + if (null == record.getWxRate() && null != record.getWxMoney()) { + //do nothing + }else { + record.setWxMoney(calcuteByMoneyAndRate(record.getWxSaleMoney(),record.getWxRate())); + } + if (null == record.getEraseZeroRate() && null != record.getEraseZeroMoney()) { + + }else { + record.setEraseZeroMoney(calcuteByMoneyAndRate(record.getEraseZeroSaleMoney(),record.getEraseZeroRate())); + } + if (null == record.getCashRate() && null != record.getCashMoney()) { + + }else { + record.setCashMoney(calcuteByMoneyAndRate(record.getCashSaleMoney(),record.getCashRate())); + } } @@ -112,9 +137,9 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ valueMap.put("totalMoney", record.getTotalMoney()); valueMap.put("actualMoney", record.getActualMoney()); - valueMap.put("totalMoneyDX", PriceUtilV2.number2CNMontrayUnit(record.getTotalMoney())); + valueMap.put("totalMoneyDX", toChineseBig(record.getTotalMoney())); if (null != record.getActualMoney()) { - valueMap.put("actualMoneyDX", PriceUtilV2.number2CNMontrayUnit(record.getActualMoney())); + valueMap.put("actualMoneyDX", toChineseBig(record.getActualMoney())); } valueMap.put("accountName", record.getAccountName()); @@ -141,12 +166,6 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ return result.setScale(3,BigDecimal.ROUND_HALF_UP); } - public static void main(String[] args) { - BigDecimal result = new BigDecimal(0); - BigDecimal result1 = new BigDecimal(10.000); - System.out.println(result.add(result1)); - - } private Object handleExcelData(Object value) { @@ -155,6 +174,11 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ } return value; } + + @Override + public String toChineseBig(BigDecimal money) { + return PriceUtilV2.number2CNMontrayUnit(money); + } @Override public void saveOrUpdate(WxSettleMerchant record,MallUserInfo operator) { @@ -181,4 +205,5 @@ public class WxSettleMerchantServiceImpl implements WxSettleMerchantService{ } + }