Merge remote-tracking branch 'origin/dev' into dev

application-webadmin/src/main/java/com/tourism/webadmin/back/service/impl/TourProjectGroupPurchaseServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.Page;
+import com.tourism.common.additional.config.ApplicationConfig;
 import com.tourism.common.core.base.dao.BaseDaoMapper;
 import com.tourism.common.core.base.service.BaseService;
 import com.tourism.common.core.constant.ErrorCodeEnum;
@@ -70,6 +71,8 @@ public class TourProjectGroupPurchaseServiceImpl extends BaseService<TourProject
     private TourUserServiceImpl tourUserService;
     @Autowired
     private RedissonClient redissonClient;
+    @Autowired
+    private ApplicationConfig config;
 
     /**
      * 返回当前Service的主表Mapper对象。
@@ -222,7 +225,7 @@ public class TourProjectGroupPurchaseServiceImpl extends BaseService<TourProject
             if (StringUtils.isNotBlank(usersAvatars)) {
                 String url = TokenData.takeFromRequest().getHeadImageUrl();
                 if(StringUtils.isBlank(url)){
-                    url = "https://t.xiaoyaotravel.com/default_profile/defaultAvatar.png";
+                    url = config.getDefaultAvatar();
                 }
                 groupPurchase.setUsersAvatars(usersAvatars + "," + url);
             } else {