Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/UserPaymentClient.java

@@ -138,7 +138,7 @@ public class UserPaymentClient {
         log.info("refund vendor={}, refundResp={}", vendor, JSON.toJSONString(refundResp));
 
         // 退款订单确认
-        UserOrderRefundBill refundBill = userOrderRefundBillService.getByTransNoOrOrderNo(refundResp.getTransNo(), refundResp.getMerOrderNo());
+        UserOrderRefundBill refundBill = userOrderRefundBillService.getByTransNoOrOrderNo(null, refundResp.getMerOrderNo());
         if (Objects.isNull(refundBill)) {
             log.warn("refund REFUND_FAILED, vendor={}, refundResp={}", vendor, JSON.toJSONString(refundResp));
             return refundResp.getMsg();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantAlbumMusicServiceImpl.java

@@ -3,11 +3,10 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.entity.MusicTag;
-import com.yonge.cooleshow.biz.dal.entity.Subject;
+import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.SubjectTypeEnum;
+import com.yonge.cooleshow.biz.dal.mapper.SysUserMapper;
 import com.yonge.cooleshow.biz.dal.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -15,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.BeanUtils;
 import lombok.extern.slf4j.Slf4j;
-import com.yonge.cooleshow.biz.dal.entity.TenantAlbumMusic;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumMusicWrapper;
 import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumMusicMapper;
 
@@ -47,6 +45,9 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
     @Autowired
     private TenantAlbumMusicMapper tenantAlbumMusicMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     /**
      * 查询详情
      * @param id 详情ID
@@ -79,6 +80,23 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         musicSheetQuery.setMusicTagId(query.getMusicTagId());
         musicSheetQuery.setSubjectId(query.getSubjectId());
         List<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> musicSheets = tenantAlbumMusicMapper.selectPage(page, musicSheetQuery);
+        musicSheets.stream().forEach(m->{
+            Long userId = m.getUserId();
+            String musicSubject = m.getMusicSubject();
+
+            //获取用户名
+            if (userId != null){
+                SysUser sysUser = sysUserMapper.selectById(userId);
+                m.setUserName(sysUser.getUsername());
+            }
+
+            //获取声部名
+            if (!musicSubject.isEmpty()){
+                List<Subject> subject = subjectService.findBySubjectByIdList(musicSubject);
+                Subject subject1 = subject.get(0);
+                m.setMusicSubjectName(subject1.getName());
+            }
+        });
 
 
         return page.setRecords(musicSheets);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

@@ -1041,7 +1041,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
         // 并发执行锁
         DistributedLock.of(redissonClient).runIfLockCanGet(lockName, () -> {
             // 退款订单确认
-            UserOrderRefundBill refundOrder = userOrderRefundBillService.getByTransNoOrOrderNo(refundResp.getTransNo(), refundResp.getMerOrderNo());
+            UserOrderRefundBill refundOrder = userOrderRefundBillService.getByTransNoOrOrderNo(null, refundResp.getMerOrderNo());
             if (Objects.isNull(refundOrder)) {
                 throw new com.yonge.toolset.base.exception.BizException("退款订单不存在");
             }
@@ -1183,7 +1183,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             userRefundOrder.setUserId(paymentOrder.getId());
             userRefundOrder.setOrderId(paymentOrder.getId());
             userRefundOrder.setOrderNo(paymentOrder.getOrderNo());
-            userRefundOrder.setOredrDetilIds(paymentOrder.getTransNo());
+//            userRefundOrder.setOredrDetilIds(paymentOrder.getTransNo());
             userRefundOrder.setStatus(AuthStatusEnum.PASS);
             userRefundOrder.setApplyAmount(paymentOrder.getPaymentCashAmount());
             userRefundOrder.setActualAmount(paymentOrder.getPaymentCashAmount());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAlbumMusicWrapper.java

@@ -173,6 +173,8 @@ public class TenantAlbumMusicWrapper {
         @AllArgsConstructor
         @ApiModel(" TenantAlbumMusic-学生端专辑曲目返回")
         public static class StudentTenantAlbumMusic implements QueryInfo {
+            @ApiModelProperty(value = "精品标志")
+            private String exquisiteFlag;
 
             @ApiModelProperty(value = "曲谱名称")
             private String musicSheetName;

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMusicMapper.xml

@@ -24,6 +24,7 @@
         m.user_id_ as userId,
         m.music_subject_ as musicSubject,
         m.title_img_ as titleImg,
+        m.exquisite_flag_ as exquisiteFlag,
         u.username_ as userName,
         s.name_ as musicSubjectName
 		FROM music_sheet m