fix 店铺用户默认头像

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -439,5 +439,10 @@ public interface Constant {
 	/**
 	 * 镜像店铺默认LOGO
 	 */
-	String USER_MIRROR_SHOP_DEFAULT_LOGO = "https://cdn2.yicanggongyi.com/picture/08944798d95e42f62f3bb63d8109dcf1-1732169951288.png";
+	String USER_MIRROR_SHOP_DEFAULT_LOGO = "https://cdn2.yicanggongyi.com/picture/f6e48d2c854bd38a2ed2cc7d319b524f-1731038450046.webp";
+
+	/**
+	 * 镜像店铺用户头像
+	 */
+	String USER_MIRROR_SHOP_USER_DEFAULT_IMG = "https://cdn2.yicanggongyi.com/picture/08944798d95e42f62f3bb63d8109dcf1-1732169951288.png";
 }

netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/ChatGptAccountServiceImpl.java

@@ -549,6 +549,7 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
                     .eq(OrderDon::getRelationId, relationId)
                     .eq(OrderDon::getUserId, groupsRelation.getUserId())
+                    .eq(OrderDon::getOrderType, 1)
                     .notIn(OrderDon::getStatus, Constant.noOrderAllStatus)
                     .orderByDesc(OrderDon::getId)
                     .last("limit 1"));

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -271,6 +271,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 			OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
 					.eq(OrderDon::getRelationId, ticket.getRelationId())
 					.eq(OrderDon::getUserId, ticket.getUserId())
+					.eq(OrderDon::getOrderType, 1)
 					.notIn(OrderDon::getStatus, Constant.noOrderAllStatus)
 					.orderByDesc(OrderDon::getId)
 					.last("limit 1"));

netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -493,8 +493,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 				user.setIsGoogle(true);
 			}
 			user.setNickname(String.format("%s%s", name.toString(), RandomUtil.randomString(6)));
-			//默认头像
-			user.setHeadimgurl(Constant.DEFAULT_HEAD_IMG);
+			if (loginReq.getCmt() == 2) {
+				user.setHeadimgurl(Constant.USER_MIRROR_SHOP_USER_DEFAULT_IMG);
+			} else {
+				//默认头像
+				user.setHeadimgurl(Constant.DEFAULT_HEAD_IMG);
+			}
 			String registerEnv = loginReq.getRegisterEnv();
 			user.setRegisterEnv(StrUtil.isEmpty(registerEnv) ? User.RegisterEnv.pc.name() : registerEnv);
 			this.save(user);