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;