fix 修复绘画模型字段更新

xyzc-start/src/main/java/com/xyzc/start/controller/SchemeController.java

@@ -30,17 +30,17 @@ public class SchemeController {
         return Result.ok(scheme);
     }
 
-
     /**
-     * id查询会员卡详细权益
+     * 会员卡订单展示
      */
-    @GetMapping("/currentMember/{memberId}")
-    public Result<MemberCardVo> currentMemberById(@PathVariable("memberId") Long memberId) {
-        MemberCardVo memberCard = schemeService.queryCurrentMemberById(memberId);
+    @GetMapping("/memberOrder")
+    public Result<List<Void>> memberOrder() {
+//        List<SchemeVo> scheme = schemeService.memberOrder();
 
-        return Result.ok(memberCard);
+        return Result.ok();
     }
 
+
     /**
      * 燃料包生效套餐信息
      */
@@ -51,15 +51,6 @@ public class SchemeController {
         return Result.ok(scheme);
     }
 
-//    /**
-//     * id查询燃料包详细权益
-//     */
-//    @GetMapping("/currentFuel/{fuelId}")
-//    public Result<FuelPackageVo> currentFuelById(@PathVariable Long fuelId) {
-//        List<FuelPackageVo> fuelPackage = schemeService.queryCurrentFuelById(fuelId);
-//
-//        return Result.ok(fuelPackage);
-//    }
 
     /**
      * 燃料规则

xyzc-start/src/main/java/com/xyzc/start/domain/UgcUser.java

@@ -24,7 +24,7 @@ public class UgcUser extends BaseEntity {
     /**
      * ugc用户头像地址
      */
-    private String avatar;
+    private Long ugcAvatarId;
 
     /**
      * ugc用户留言

xyzc-start/src/main/java/com/xyzc/start/domain/vo/UgcUserVo.java

@@ -1,6 +1,5 @@
 package com.xyzc.start.domain.vo;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.xyzc.start.domain.UgcUser;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;

xyzc-start/src/main/resources/mapper/WebStart/DrawModelMapper.xml

@@ -11,13 +11,14 @@
                xdm.oss_url,
                xdm.description,
                xuu.id       AS ugc_user_id,
-               xuu.avatar   AS ugc_user_avatar,
+               xua.avatar   AS ugc_user_avatar,
                xuu.ugc_nick AS ugc_user_name,
                xdm.use_count,
                xbuc.is_collect
         from xy_draw_model xdm
                  left join xy_ugc_user xuu on xdm.ugc_id = xuu.id
                  left join xy_base_user_collect xbuc on xdm.id = xbuc.collect_id
+                 left join xy_ugc_avatar xua on xuu.ugc_avatar_id = xua.id
             and xbuc.base_user_id = #{userId}
             and xbuc.type = 1
         where xdm.del_flag = '0'