feat(order): 调整经销商订单导入逻辑与字段映射- 修改订单导入时用户ID的设置逻辑
- 更新订单价格计算方式,移除除以1000的操作 - 默认订单状态设为有效(isInvalid=0) - 注释掉原有的推荐关系查询与绑定逻辑 - 在导入参数类中新增“公司名称”和调整佣金字段命名 - 实体类中增加title字段并标注Excel导出配置 - 调整Excel列名以便更准确反映业务含义
This commit is contained in:
@@ -67,7 +67,7 @@ public class SdyDealerOrderController extends BaseController {
|
|||||||
if (list != null && !list.isEmpty()) {
|
if (list != null && !list.isEmpty()) {
|
||||||
SdyDealerOrderImportParam first = list.get(0);
|
SdyDealerOrderImportParam first = list.get(0);
|
||||||
System.out.println("第一条数据: " + first);
|
System.out.println("第一条数据: " + first);
|
||||||
System.out.println("comments: " + first.getComments());
|
System.out.println("title: " + first.getTitle());
|
||||||
System.out.println("userId: " + first.getUserId());
|
System.out.println("userId: " + first.getUserId());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -80,7 +80,7 @@ public class SdyDealerOrderController extends BaseController {
|
|||||||
for (SdyDealerOrderImportParam d : list) {
|
for (SdyDealerOrderImportParam d : list) {
|
||||||
// 检查是否已存在相同的记录(根据comments字段和未结算状态)
|
// 检查是否已存在相同的记录(根据comments字段和未结算状态)
|
||||||
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<ShopDealerOrder> queryWrapper = new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<>();
|
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<ShopDealerOrder> queryWrapper = new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<>();
|
||||||
queryWrapper.eq(ShopDealerOrder::getComments, d.getComments()); // 使用comments字段
|
queryWrapper.eq(ShopDealerOrder::getTitle, d.getTitle()); // 使用comments字段
|
||||||
queryWrapper.eq(ShopDealerOrder::getIsSettled, 0); // 未结算状态
|
queryWrapper.eq(ShopDealerOrder::getIsSettled, 0); // 未结算状态
|
||||||
|
|
||||||
if (shopDealerOrderService.count(queryWrapper) == 0) {
|
if (shopDealerOrderService.count(queryWrapper) == 0) {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# 开发环境配置
|
# 生产环境配置
|
||||||
|
|
||||||
# 服务器配置
|
# 服务器配置
|
||||||
server:
|
server:
|
||||||
@@ -12,6 +12,8 @@ spring:
|
|||||||
password: P7KsAyDXG8YdLnkA
|
password: P7KsAyDXG8YdLnkA
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
|
druid:
|
||||||
|
remove-abandoned: true
|
||||||
|
|
||||||
# redis
|
# redis
|
||||||
redis:
|
redis:
|
||||||
@@ -22,18 +24,19 @@ spring:
|
|||||||
|
|
||||||
# 日志配置
|
# 日志配置
|
||||||
logging:
|
logging:
|
||||||
|
file:
|
||||||
|
name: websoft-modules.log
|
||||||
level:
|
level:
|
||||||
com.gxwebsoft: DEBUG
|
root: WARN
|
||||||
com.baomidou.mybatisplus: DEBUG
|
com.gxwebsoft: ERROR
|
||||||
com.gxwebsoft.shop.mapper: DEBUG
|
com.baomidou.mybatisplus: ERROR
|
||||||
org.apache.ibatis: DEBUG
|
|
||||||
|
|
||||||
socketio:
|
socketio:
|
||||||
host: 0.0.0.0 #IP地址
|
host: 0.0.0.0 #IP地址
|
||||||
|
|
||||||
# MQTT配置
|
# MQTT配置
|
||||||
mqtt:
|
mqtt:
|
||||||
enabled: false # 添加开关来禁用MQTT服务
|
enabled: true # 启用MQTT服务
|
||||||
host: tcp://1.14.159.185:1883
|
host: tcp://1.14.159.185:1883
|
||||||
username: swdev
|
username: swdev
|
||||||
password: Sw20250523
|
password: Sw20250523
|
||||||
@@ -44,7 +47,6 @@ mqtt:
|
|||||||
keep-alive-interval: 20
|
keep-alive-interval: 20
|
||||||
auto-reconnect: true
|
auto-reconnect: true
|
||||||
|
|
||||||
|
|
||||||
# 框架配置
|
# 框架配置
|
||||||
config:
|
config:
|
||||||
# 文件服务器
|
# 文件服务器
|
||||||
|
|||||||
Reference in New Issue
Block a user