Browse Source

修复bug

master
前端-胡立永 2 weeks ago
parent
commit
9cc612248f
5 changed files with 24 additions and 16 deletions
  1. +2
    -2
      admin-pc/.env.production
  2. +3
    -3
      module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java
  3. +7
    -5
      module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java
  4. +7
    -6
      module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java
  5. +5
    -0
      module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java

+ 2
- 2
admin-pc/.env.production View File

@ -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

+ 3
- 3
module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java View File

@ -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<CommonDistributionRatio> list = commonDistributionRatioService


+ 7
- 5
module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java View File

@ -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("品牌已被下架");
}
}
// 设置款式名称


+ 7
- 6
module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java View File

@ -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("品牌已被下架");
}
}
// 设置款式名称


+ 5
- 0
module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java View File

@ -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<CommonOrder> commonOrderList;//子订单用户


Loading…
Cancel
Save