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()) {
|
||||
SdyDealerOrderImportParam first = list.get(0);
|
||||
System.out.println("第一条数据: " + first);
|
||||
System.out.println("comments: " + first.getComments());
|
||||
System.out.println("title: " + first.getTitle());
|
||||
System.out.println("userId: " + first.getUserId());
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ public class SdyDealerOrderController extends BaseController {
|
||||
for (SdyDealerOrderImportParam d : list) {
|
||||
// 检查是否已存在相同的记录(根据comments字段和未结算状态)
|
||||
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); // 未结算状态
|
||||
|
||||
if (shopDealerOrderService.count(queryWrapper) == 0) {
|
||||
|
||||
Reference in New Issue
Block a user