From 3f3e7a95445aaecc2e871723b161fa076f16bb6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sat, 18 Oct 2025 11:40:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E8=B0=83=E6=95=B4=E7=BB=8F?= =?UTF-8?q?=E9=94=80=E5=95=86=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=85=A5=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=B8=8E=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84-=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=85=A5=E6=97=B6?= =?UTF-8?q?=E7=94=A8=E6=88=B7ID=E7=9A=84=E8=AE=BE=E7=BD=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=20-=20=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E9=99=A4=E4=BB=A51000=E7=9A=84=E6=93=8D=E4=BD=9C=20-?= =?UTF-8?q?=20=E9=BB=98=E8=AE=A4=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=AE=BE=E4=B8=BA=E6=9C=89=E6=95=88=EF=BC=88isInvalid=3D0?= =?UTF-8?q?=EF=BC=89=20-=20=E6=B3=A8=E9=87=8A=E6=8E=89=E5=8E=9F=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E6=8E=A8=E8=8D=90=E5=85=B3=E7=B3=BB=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=8E=E7=BB=91=E5=AE=9A=E9=80=BB=E8=BE=91=20-=20=E5=9C=A8?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8F=82=E6=95=B0=E7=B1=BB=E4=B8=AD=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E2=80=9C=E5=85=AC=E5=8F=B8=E5=90=8D=E7=A7=B0=E2=80=9D?= =?UTF-8?q?=E5=92=8C=E8=B0=83=E6=95=B4=E4=BD=A3=E9=87=91=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=91=BD=E5=90=8D=20-=20=E5=AE=9E=E4=BD=93=E7=B1=BB=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0title=E5=AD=97=E6=AE=B5=E5=B9=B6=E6=A0=87?= =?UTF-8?q?=E6=B3=A8Excel=E5=AF=BC=E5=87=BA=E9=85=8D=E7=BD=AE=20-=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4Excel=E5=88=97=E5=90=8D=E4=BB=A5=E4=BE=BF?= =?UTF-8?q?=E6=9B=B4=E5=87=86=E7=A1=AE=E5=8F=8D=E6=98=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=90=AB=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SdyDealerOrderController.java | 35 ------------------- .../shop/entity/ShopDealerOrder.java | 3 -- 2 files changed, 38 deletions(-) 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;