From 9cc612248fc4ad546002323dce2d66d1044b1de9 Mon Sep 17 00:00:00 2001 From: hly <2783385703@qq.com> Date: Tue, 26 Aug 2025 11:56:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-pc/.env.production | 4 ++-- .../org/jeecg/api/service/impl/AppletLoginServiceImpl.java | 6 +++--- .../org/jeecg/api/service/impl/AppletOrderServiceImpl.java | 12 +++++++----- .../jeecg/api/service/impl/AppletOrderTeamServiceImpl.java | 13 +++++++------ .../org/jeecg/modules/commonOrder/entity/CommonOrder.java | 5 +++++ 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/admin-pc/.env.production b/admin-pc/.env.production index b720202..79488da 100644 --- a/admin-pc/.env.production +++ b/admin-pc/.env.production @@ -1,5 +1,5 @@ NODE_ENV=production -# VUE_APP_API_BASE_URL=http://localhost:8081/recycle-admin/ -VUE_APP_API_BASE_URL=https://www.ddmhs.top/recycle-admin/ +# VUE_APP_API_BASE_URL=http://localhost:8081/recycle-admin-v2/ +VUE_APP_API_BASE_URL=https://www.ddmhs.top/recycle-admin-v2/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java index 1067109..1a72f3a 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java @@ -109,9 +109,9 @@ public class AppletLoginServiceImpl implements AppletLoginService { member.setIntegerPrice(new BigDecimal(0)); // 设置默认用户名 - String randomStr = UUID.randomUUID().toString().substring(0, 6); - member.setNickName("用户" + randomStr); - member.setHeadImage("https://oss.ddmhs.top/2025-07-06/55163a0d-6e3b-41ec-83a8-8f787b5160bb.jpg"); +// String randomStr = UUID.randomUUID().toString().substring(0, 6); +// member.setNickName("用户" + randomStr); +// member.setHeadImage("https://oss.ddmhs.top/2025-07-06/55163a0d-6e3b-41ec-83a8-8f787b5160bb.jpg"); // 设置推广官 List list = commonDistributionRatioService diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java index 3dafbc7..541d8cf 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java @@ -192,11 +192,13 @@ public class AppletOrderServiceImpl implements AppletOrderService { //得到第三级集合数据 for (CommonOrder order1 : children) { - CommonVip vip = commonVipService.getById(order1.getPinId()); - if (vip != null){ - order1.setPinName(vip.getName()); - }else { - order1.setPinName("品牌已被下架"); + if(StringUtils.isNotBlank(order1.getPinId())) { + CommonVip vip = commonVipService.getById(order1.getPinId()); + if (vip != null) { + order1.setPinName(vip.getName()); + } else { + order1.setPinName("品牌已被下架"); + } } // 设置款式名称 diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java index d89f204..b6232a2 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java @@ -199,12 +199,13 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService { //得到第三级集合数据 for (CommonOrder order1 : children) { - - CommonVip vip = commonVipService.getById(order1.getPinId()); - if (vip != null){ - order1.setPinName(vip.getName()); - }else { - order1.setPinName("品牌已被下架"); + if(StringUtils.isNotBlank(order1.getPinId())){ + CommonVip vip = commonVipService.getById(order1.getPinId()); + if (vip != null){ + order1.setPinName(vip.getName()); + }else { + order1.setPinName("品牌已被下架"); + } } // 设置款式名称 diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java index 5c8190d..c72acf3 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java @@ -234,6 +234,11 @@ public class CommonOrder implements Serializable { @ApiModelProperty(value = "款式ID") private String styleId; + @Excel(name = "级别", width = 15) + @ApiModelProperty(value = "级别") + private String qualityLevel; + + @TableField (exist=false) private List commonOrderList;//子订单用户