1、调整登录创建用户头像不对

2、留存记录返回参数新增优惠卷类型

fs-service/src/main/java/com/fs/live/service/impl/LiveConsoleOpLogServiceImpl.java

@@ -28,7 +28,9 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -241,15 +243,53 @@ public class LiveConsoleOpLogServiceImpl implements ILiveConsoleOpLogService {
         }
 
         Date now = DateUtils.getNowDate();
+        Map<Long, Long> couponTypeMap = resolveCouponTypeMap(opLogs);
         List<LiveConsoleOpLogRecordVo> result = new ArrayList<>(opLogs.size());
         for (LiveConsoleOpLog opLog : opLogs) {
             boolean claimed = opLog.getId() != null && claimedOpLogIds.contains(opLog.getId());
             int status = resolveOpLogStatus(opLog, claimed, now);
-            result.add(LiveConsoleOpLogRecordVo.from(opLog, status));
+            LiveConsoleOpLogRecordVo recordVo = LiveConsoleOpLogRecordVo.from(opLog, status);
+            fillCouponType(recordVo, opLog, couponTypeMap);
+            result.add(recordVo);
         }
         return result;
     }
 
+    private Map<Long, Long> resolveCouponTypeMap(List<LiveConsoleOpLog> opLogs) {
+        List<Long> couponIds = opLogs.stream()
+                .filter(log -> log.getOpType() != null && log.getBizId() != null
+                        && (log.getOpType() == LiveConsoleOpLog.OP_COMPLETION_COUPON
+                        || log.getOpType() == LiveConsoleOpLog.OP_WATCH_REWARD_COUPON))
+                .map(LiveConsoleOpLog::getBizId)
+                .distinct()
+                .collect(Collectors.toList());
+        Map<Long, Long> couponTypeMap = new HashMap<>();
+        if (couponIds.isEmpty()) {
+            return couponTypeMap;
+        }
+        String ids = couponIds.stream().map(String::valueOf).collect(Collectors.joining(","));
+        List<LiveCoupon> coupons = liveCouponMapper.selectLiveCouponByIds(ids);
+        if (coupons != null) {
+            for (LiveCoupon coupon : coupons) {
+                if (coupon.getCouponId() != null) {
+                    couponTypeMap.put(coupon.getCouponId(), coupon.getType());
+                }
+            }
+        }
+        return couponTypeMap;
+    }
+
+    private void fillCouponType(LiveConsoleOpLogRecordVo recordVo, LiveConsoleOpLog opLog, Map<Long, Long> couponTypeMap) {
+        if (recordVo == null || opLog == null || opLog.getOpType() == null || opLog.getBizId() == null) {
+            return;
+        }
+        if (opLog.getOpType() != LiveConsoleOpLog.OP_COMPLETION_COUPON
+                && opLog.getOpType() != LiveConsoleOpLog.OP_WATCH_REWARD_COUPON) {
+            return;
+        }
+        recordVo.setCouponType(couponTypeMap.get(opLog.getBizId()));
+    }
+
     /**
      * 状态优先级：已领取 > 已结束 > 待领取
      */

fs-service/src/main/java/com/fs/live/vo/LiveConsoleOpLogRecordVo.java

@@ -35,6 +35,9 @@ public class LiveConsoleOpLogRecordVo {
     /** 状态名称 */
     private String statusName;
 
+    /** 优惠券类型（opType=8完课优惠券、10观看奖励优惠券时返回，对应 live_coupon.type：0普通 1套餐 2制单 3无门槛） */
+    private Long couponType;
+
     public static LiveConsoleOpLogRecordVo from(LiveConsoleOpLog log, int status) {
         LiveConsoleOpLogRecordVo vo = new LiveConsoleOpLogRecordVo();
         if (log == null) {

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -104,7 +104,7 @@ public class AppLoginController extends AppBaseController{
             user.setPhone(param.getPhone());
             user.setNickName("app用户" + param.getPhone().substring(param.getPhone().length() - 4));
             user.setStatus(1);
-            user.setAvatar("https://cos.his.cdwjyyh.com/fs/20240926/420728ee06e54575ba82665dedb4756b.png");
+            user.setAvatar("https://obs.cqtyt.com/fs/20260615/4e7c1c2de4b54ec4aaf1047394592a42.png");
             user.setPassword(Md5Utils.hash(param.getPassword()));
             user.setCreateTime(new Date());
 
@@ -197,7 +197,7 @@ public class AppLoginController extends AppBaseController{
         user.setSource(map.get("source"));
         user.setNickName("app用户" + phone.substring(phone.length() - 4));
         user.setStatus(1);
-        user.setAvatar("https://cos.his.cdwjyyh.com/fs/20240926/420728ee06e54575ba82665dedb4756b.png");
+        user.setAvatar("https://obs.cqtyt.com/fs/20260615/4e7c1c2de4b54ec4aaf1047394592a42.png");
         user.setPassword(Md5Utils.hash(password));
         user.setCreateTime(new Date());
         if (userService.insertFsUser(user) > 0) {
@@ -372,7 +372,7 @@ public class AppLoginController extends AppBaseController{
         newUser.setNickName("苹果用户" + param.getPhone().substring(param.getPhone().length() - 4));
         newUser.setCreateTime(new Date());
         newUser.setStatus(1);
-        newUser.setAvatar("https://cos.his.cdwjyyh.com/fs/20240926/420728ee06e54575ba82665dedb4756b.png");
+        newUser.setAvatar("https://obs.cqtyt.com/fs/20260615/4e7c1c2de4b54ec4aaf1047394592a42.png");
         if (StringUtils.isNotEmpty(param.getJpushId())) {
             newUser.setJpushId(param.getJpushId());
         }
@@ -883,7 +883,7 @@ public class AppLoginController extends AppBaseController{
         newUser.setPhone(param.getPhone());
         newUser.setCreateTime(new Date());
         newUser.setStatus(1);
-        newUser.setAvatar("https://cos.his.cdwjyyh.com/fs/20240926/420728ee06e54575ba82665dedb4756b.png");
+        newUser.setAvatar("https://obs.cqtyt.com/fs/20260615/4e7c1c2de4b54ec4aaf1047394592a42.png");
         if (StringUtils.isNotEmpty(param.getJpushId())) {
             newUser.setJpushId(param.getJpushId());
         }