From f03d958d970240e7a740da188baac48ab7c8a4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Tue, 9 Jul 2024 18:45:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E7=A5=A8=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserInvoiceController.java | 31 ++++++++++++------- .../gxwebsoft/booking/entity/NuoNuoGoods.java | 4 +++ .../gxwebsoft/booking/entity/NuoNuoOrder.java | 12 +++++++ .../shop/controller/OrderController.java | 2 +- 4 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/gxwebsoft/booking/controller/UserInvoiceController.java b/src/main/java/com/gxwebsoft/booking/controller/UserInvoiceController.java index 8c62b58..ada8d54 100644 --- a/src/main/java/com/gxwebsoft/booking/controller/UserInvoiceController.java +++ b/src/main/java/com/gxwebsoft/booking/controller/UserInvoiceController.java @@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.HashMap; import java.util.List; import java.util.UUID; @@ -144,33 +145,39 @@ public class UserInvoiceController extends BaseController { final NuoNuo nuoNuo = new NuoNuo(); final NuoNuoOrder order = new NuoNuoOrder(); order.setBuyerName(invoice.getName()); + order.setBuyerTaxNum(invoice.getInvoiceCode()); + order.setBuyerPhone(invoice.getPhone()); // order.setSalerTaxNum(invoice.getInvoiceCode()); // order.setSalerTel(invoice.getPhone()); - order.setSalerTaxNum("339901999999142"); + order.setSalerTaxNum("339901999999142"); // 91450100737617400R order.setSalerTel("339901999999142"); order.setOrderNo(orderInfo.getOrderNo()); order.setInvoiceDate(DateUtil.now()); - order.setClerk("张三"); + order.setClerk("赵裕璐"); + order.setPayee("班嘉良"); + order.setChecker("蓝蕙孚"); order.setBuyerPhone(userInvoice.getPhone()); order.setInvoiceType("1"); + order.setRemark("不动产地址:广西壮族自治区南宁市良庆区五象大道西段669号广西体育中心综合馆;(市)标志:否;"); final NuoNuoGoods goods = new NuoNuoGoods(); - goods.setGoodsName(orderInfo.getComments()); + goods.setGoodsName("场地费"); + goods.setGoodsCode("3040502029902000000"); goods.setWithTaxFlag("0"); goods.setDField1(orderInfo.getComments()); goods.setDField2("无"); goods.setDField3("无"); goods.setDField4("无"); goods.setDField5("无"); - final String tax = orderInfo.getTotalPrice().multiply(new BigDecimal("0.06")).toString(); - goods.setTax(tax); - goods.setTaxRate(new BigDecimal("0.06").toString()); - System.out.println("不含税金额 = " + orderInfo.getTotalPrice()); - System.out.println("税额 = " + tax); - System.out.println("含税金额 = " + orderInfo.getTotalPrice().add(new BigDecimal(tax))); - goods.setTaxExcludedAmount(orderInfo.getTotalPrice().toString()); - goods.setTaxIncludedAmount(orderInfo.getTotalPrice().add(new BigDecimal(tax)).toString()); + goods.setTaxRate(new BigDecimal("0.05").toString()); + final BigDecimal taxExcludedAmount = orderInfo.getTotalPrice().divide(new BigDecimal("1.05"), 4, RoundingMode.HALF_UP); + final BigDecimal tax = taxExcludedAmount.multiply(new BigDecimal("0.05")).setScale(4,RoundingMode.HALF_EVEN); + goods.setTax(tax.toString()); + goods.setTaxExcludedAmount(taxExcludedAmount.toString()); + goods.setTaxIncludedAmount(orderInfo.getTotalPrice().toString()); order.setInvoiceDetail(goods); - System.out.println("order = " + order); + System.out.println("税额 = " + tax); + System.out.println("不含税金额 = " + taxExcludedAmount); + System.out.println("含税金额 = " + orderInfo.getTotalPrice()); nuoNuo.setOrder(order); String content = JSONUtil.toJSONString(nuoNuo);//API私有请求参数 diff --git a/src/main/java/com/gxwebsoft/booking/entity/NuoNuoGoods.java b/src/main/java/com/gxwebsoft/booking/entity/NuoNuoGoods.java index f1c4542..ecd501a 100644 --- a/src/main/java/com/gxwebsoft/booking/entity/NuoNuoGoods.java +++ b/src/main/java/com/gxwebsoft/booking/entity/NuoNuoGoods.java @@ -24,6 +24,10 @@ public class NuoNuoGoods implements Serializable { @TableField(exist = false) private String goodsName; + @ApiModelProperty(value = "服务分类") + @TableField(exist = false) + private String goodsCode; + @ApiModelProperty(value = "单价含税标志：0:不含税,1:含税") @TableField(exist = false) private String withTaxFlag; diff --git a/src/main/java/com/gxwebsoft/booking/entity/NuoNuoOrder.java b/src/main/java/com/gxwebsoft/booking/entity/NuoNuoOrder.java index 83002d0..af77ecb 100644 --- a/src/main/java/com/gxwebsoft/booking/entity/NuoNuoOrder.java +++ b/src/main/java/com/gxwebsoft/booking/entity/NuoNuoOrder.java @@ -56,6 +56,18 @@ public class NuoNuoOrder implements Serializable { @TableField(exist = false) private String clerk; + @ApiModelProperty(value = "收款人") + @TableField(exist = false) + private String payee; + + @ApiModelProperty(value = "复核人") + @TableField(exist = false) + private String checker; + + @ApiModelProperty(value = "备注信息") + @TableField(exist = false) + private String remark; + @ApiModelProperty(value = "购方手机号") @TableField(exist = false) private String buyerPhone; diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java index 5d8c4d1..82e4738 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java @@ -191,7 +191,7 @@ public class OrderController extends BaseController { order.setUserId(loginUser.getUserId()); order.setLoginUser(loginUser); order.setAccessToken(access_token); - order.setExpirationTime(DateUtil.offset(DateUtil.date(), DateField.MINUTE, 10)); + order.setExpirationTime(DateUtil.offset(DateUtil.date(), DateField.MINUTE, 1)); if (order.getOrderInfo() != null) { order.setTotalNum(order.getOrderInfo().size()); }