From 35d104248b7bfc99f8123b81c81a765298ca421c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sat, 18 Oct 2025 11:04:20 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E8=B0=83=E6=95=B4=E7=BB=8F?= =?UTF-8?q?=E9=94=80=E5=95=86=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=85=A5=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=B8=8E=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84-=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=85=A5=E6=97=B6?= =?UTF-8?q?=E7=94=A8=E6=88=B7ID=E7=9A=84=E8=AE=BE=E7=BD=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=20-=20=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E9=99=A4=E4=BB=A51000=E7=9A=84=E6=93=8D=E4=BD=9C=20-?= =?UTF-8?q?=20=E9=BB=98=E8=AE=A4=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=AE=BE=E4=B8=BA=E6=9C=89=E6=95=88=EF=BC=88isInvalid=3D0?= =?UTF-8?q?=EF=BC=89=20-=20=E6=B3=A8=E9=87=8A=E6=8E=89=E5=8E=9F=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E6=8E=A8=E8=8D=90=E5=85=B3=E7=B3=BB=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=8E=E7=BB=91=E5=AE=9A=E9=80=BB=E8=BE=91=20-=20=E5=9C=A8?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8F=82=E6=95=B0=E7=B1=BB=E4=B8=AD=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E2=80=9C=E5=85=AC=E5=8F=B8=E5=90=8D=E7=A7=B0=E2=80=9D?= =?UTF-8?q?=E5=92=8C=E8=B0=83=E6=95=B4=E4=BD=A3=E9=87=91=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=91=BD=E5=90=8D=20-=20=E5=AE=9E=E4=BD=93=E7=B1=BB=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0title=E5=AD=97=E6=AE=B5=E5=B9=B6=E6=A0=87?= =?UTF-8?q?=E6=B3=A8Excel=E5=AF=BC=E5=87=BA=E9=85=8D=E7=BD=AE=20-=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4Excel=E5=88=97=E5=90=8D=E4=BB=A5=E4=BE=BF?= =?UTF-8?q?=E6=9B=B4=E5=87=86=E7=A1=AE=E5=8F=8D=E6=98=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=90=AB=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../controller/SdyDealerOrderController.java | 18 +++++++----------- .../sdy/param/SdyDealerOrderImportParam.java | 14 +++++++------- .../gxwebsoft/shop/entity/ShopDealerOrder.java | 3 +++ 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 7188635..3cd2de5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ mp-api 1.5.0 - com-gxwebsoft-api + mp-api WebSoftApi project for Spring Boot diff --git a/src/main/java/com/gxwebsoft/sdy/controller/SdyDealerOrderController.java b/src/main/java/com/gxwebsoft/sdy/controller/SdyDealerOrderController.java index 7b13648..23ccdd0 100644 --- a/src/main/java/com/gxwebsoft/sdy/controller/SdyDealerOrderController.java +++ b/src/main/java/com/gxwebsoft/sdy/controller/SdyDealerOrderController.java @@ -80,7 +80,7 @@ public class SdyDealerOrderController extends BaseController { for (SdyDealerOrderImportParam d : list) { // 检查是否已存在相同的记录（根据comments字段和未结算状态） com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper queryWrapper = new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<>(); - queryWrapper.eq(ShopDealerOrder::getTitle, d.getTitle()); // 使用comments字段 + queryWrapper.eq(ShopDealerOrder::getComments, d.getComments()); // 使用comments字段 queryWrapper.eq(ShopDealerOrder::getIsSettled, 0); // 未结算状态 if (shopDealerOrderService.count(queryWrapper) == 0) { @@ -91,25 +91,21 @@ public class SdyDealerOrderController extends BaseController { String orderNo = Long.toString(IdUtil.getSnowflakeNextId()); // 手动映射字段 -// item.setOrderNo(d.getOrderNo()); + item.setUserId(d.getUserId()); item.setOrderNo(orderNo); item.setOrderPrice(d.getOrderPrice()); - item.setTitle(d.getTitle()); item.setDegreePrice(d.getOrderPrice().multiply(new BigDecimal(1000))); - item.setFirstUserId(Integer.valueOf(d.getFirstUserId())); - item.setSecondUserId(Integer.valueOf(d.getSecondUserId())); - item.setThirdUserId(Integer.valueOf(d.getThirdUserId())); + item.setFirstUserId(d.getFirstUserId()); + item.setSecondUserId(d.getSecondUserId()); + item.setThirdUserId(d.getThirdUserId()); item.setFirstMoney(d.getFirstMoney()); item.setSecondMoney(d.getSecondMoney()); item.setThirdMoney(d.getThirdMoney()); item.setTenantId(d.getTenantId()); + item.setTitle(d.getTitle()); item.setComments(d.getComments()); // 假设d.getPrice()返回的BigDecimal未设置精度 - if(d.getPrice() == null){ - item.setPrice(d.getPrice().divide(new BigDecimal(1000), 3, BigDecimal.ROUND_HALF_UP)); - }else { - item.setPrice(d.getPrice()); - } + item.setPrice(d.getPrice()); item.setSettledPrice(d.getSettledPrice()); item.setPayPrice(d.getPayPrice()); item.setRate(d.getRate()); diff --git a/src/main/java/com/gxwebsoft/sdy/param/SdyDealerOrderImportParam.java b/src/main/java/com/gxwebsoft/sdy/param/SdyDealerOrderImportParam.java index 4e4c6fd..4f66cae 100644 --- a/src/main/java/com/gxwebsoft/sdy/param/SdyDealerOrderImportParam.java +++ b/src/main/java/com/gxwebsoft/sdy/param/SdyDealerOrderImportParam.java @@ -20,14 +20,14 @@ public class SdyDealerOrderImportParam implements Serializable { private static final long serialVersionUID = 1L; @Excel(name = "业务员ID") - private String userId; - - @Excel(name = "订单编号") - private String orderNo; + private Integer userId; @Excel(name = "公司名称") private String title; + @Excel(name = "订单编号") + private String orderNo; + @Excel(name = "结算电量") private BigDecimal orderPrice; @@ -50,13 +50,13 @@ public class SdyDealerOrderImportParam implements Serializable { private String month; @Excel(name = "一级分销商ID") - private String firstUserId; + private Integer firstUserId; @Excel(name = "二级分销商ID") - private String secondUserId; + private Integer secondUserId; @Excel(name = "三级分销商ID") - private String thirdUserId; + private Integer thirdUserId; @Excel(name = "一级佣金30%") private BigDecimal firstMoney; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java index 0656d2a..1e4a1a9 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java @@ -33,6 +33,9 @@ public class ShopDealerOrder implements Serializable { @Schema(description = "买家用户ID") private Integer userId; + @Excel(name = "公司名称") + private String title; + @Excel(name = "订单编号") private String orderNo;