diff --git a/src/main/java/com/gxwebsoft/sdy/controller/SdyDealerOrderController.java b/src/main/java/com/gxwebsoft/sdy/controller/SdyDealerOrderController.java index 23ccdd0..81b2795 100644 --- a/src/main/java/com/gxwebsoft/sdy/controller/SdyDealerOrderController.java +++ b/src/main/java/com/gxwebsoft/sdy/controller/SdyDealerOrderController.java @@ -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); diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java index 1e4a1a9..81f3732 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java @@ -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;