feat(order): 调整经销商订单导入逻辑与字段映射- 修改订单导入时用户ID的设置逻辑

- 更新订单价格计算方式,移除除以1000的操作
- 默认订单状态设为有效(isInvalid=0)
- 注释掉原有的推荐关系查询与绑定逻辑
- 在导入参数类中新增“公司名称”和调整佣金字段命名
- 实体类中增加title字段并标注Excel导出配置
- 调整Excel列名以便更准确反映业务含义
This commit is contained in:
2025-10-18 11:40:43 +08:00
parent 35d104248b
commit 3f3e7a9544
2 changed files with 0 additions and 38 deletions

View File

@@ -113,41 +113,6 @@ public class SdyDealerOrderController extends BaseController {
item.setIsInvalid(0);
item.setIsSettled(0); // 新导入的数据设为未结算
// TODO 导入指定用户ID
// if(d.getUserId() != null){
// item.setUserId(d.getUserId());
// item.setIsInvalid(1);
//
// }else {
// // TODO 通过报备客户信息查询绑定关系
// ShopDealerApply dealerApply = shopDealerApplyService.getByDealerNameRel(d.getComments());
//
// // 已签约客户
// if(dealerApply != null){
// item.setIsInvalid(0);
// item.setUserId(dealerApply.getUserId());
// item.setFirstUserId(dealerApply.getRefereeId());
// }
// }
// 查询推荐关系
// if(ObjectUtil.isNotEmpty(item.getUserId())){
// ShopDealerReferee referee = shopDealerRefereeService.getByUserIdRel(item.getUserId());
// item.setFirstUserId(referee.getDealerId());
// item.setFirstNickname(referee.getDealerName());
// ShopDealerReferee referee2 = shopDealerRefereeService.getByUserIdRel(referee.getDealerId());
// if(ObjectUtil.isNotEmpty(referee2)){
// item.setSecondUserId(referee2.getDealerId());
// item.setSecondNickname(referee2.getDealerName());
// ShopDealerReferee referee3 = shopDealerRefereeService.getByUserIdRel(referee2.getDealerId());
// if(ObjectUtil.isNotEmpty(referee3)){
// item.setThirdUserId(referee3.getDealerId());
// item.setThirdNickname(referee3.getDealerName());
// }
// }
// item.setIsInvalid(0);
// }
System.out.println("准备导入数据: " + item);
if (ObjectUtil.isNotEmpty(item)) {
shopDealerOrderService.save(item);

View File

@@ -39,9 +39,6 @@ public class ShopDealerOrder implements Serializable {
@Excel(name = "订单编号")
private String orderNo;
@Excel(name = "商品名称")
private String title;
@Schema(description = "买家用户昵称")
@TableField(exist = false)
private String nickname;