Browse Source

查询订单详情接口问题修改

weifanli 2 years ago
parent
commit
d3d080f620

+ 2 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -52,6 +52,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         }
         studentHomeVo.setHeardUrl(user.getAvatar());
         studentHomeVo.setUsername(user.getUsername());
+        studentHomeVo.setBirthdate(user.getBirthdate());
         int num = DateUtil.daysBetween(new Date(), detail.getMembershipEndTime());
         studentHomeVo.setMembershipDays(num < 0 ? 0 : num);
         StudentTotal total = (StudentTotal) redissonClient.getBucket(CacheNameEnum.STUDENT_TOTAL.getRedisKey(user.getId()))
@@ -70,6 +71,6 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
 
     @Override
     public Integer setSubject(Long id, String subjectIds) {
-        return baseMapper.setSubject(id,subjectIds);
+        return baseMapper.setSubject(id, subjectIds);
     }
 }

+ 12 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentHomeVo.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.models.auth.In;
 
+import java.util.Date;
+
 /**
  * @Author: liweifan
  * @Data: 2022/3/21 18:37
@@ -16,6 +18,8 @@ public class StudentHomeVo extends Student {
     private String heardUrl;
     @ApiModelProperty("学员昵称")
     private String username;
+    @ApiModelProperty(value = "生日")
+    private Date birthdate;
     @ApiModelProperty("会员剩余有效期天数")
     private Integer membershipDays;
     @ApiModelProperty("累计练习天数")
@@ -49,6 +53,14 @@ public class StudentHomeVo extends Student {
         this.username = username;
     }
 
+    public Date getBirthdate() {
+        return birthdate;
+    }
+
+    public void setBirthdate(Date birthdate) {
+        this.birthdate = birthdate;
+    }
+
     public Integer getExerciseDays() {
         return exerciseDays;
     }

+ 2 - 2
cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -56,8 +56,8 @@
     <select id="detailApp" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo">
         SELECT
             <include refid="baseColumns"/>,
-            , p.trans_no_ as transNo
-            , p.pay_channel_ as payChannel
+            p.trans_no_ as transNo,
+            p.pay_channel_ as payChannel
         FROM user_order t
         left join user_order_payment p on t.order_no_ = p.order_no_
         <where>