Merge branch 'develop'

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

@@ -642,6 +642,8 @@ public class UserOrderRefundServiceImpl extends ServiceImpl<UserOrderRefundDao,
                                                               InOrOutEnum.OUT);
             }
         }
+        // 处理机构入账
+
         //处理平台入账
         platformCashAccountRecordService.cancelRecord(vo.getOrderNo(), vo.getGoodType().getCode(), vo.getBizId(),
                                                       InOrOutEnum.IN);

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

@@ -801,7 +801,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             }
 
             // 查询用户下单配置
-            String ret = redisCacheService.getUserOrderConfig(reqConfig.getUserId(), userPaymentOrder.getOrderType().getCode());
+            String ret = redisCacheService.getUserOrderConfig(reqConfig.getUserId(), userPaymentOrder.getOrderNo());
             if (StringUtils.isEmpty(ret)) {
                 throw new BizException("支付超时");
             }
@@ -836,7 +836,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             // 缓存用户下单配置
             redisCacheService.saveUserOrderConfig(String.valueOf(reqConfig.getUserId()), reqConfig.getMerOrderNo(), config.jsonString());
             // 缓存用户支付配置信息
-            redisCacheService.saveUserPaymentConfig(reqConfig.getUserId(), userPaymentOrder.getOrderType().getCode(),
+            redisCacheService.saveUserPaymentConfig(reqConfig.getUserId(), userPaymentOrder.getOrderNo(),
                 JSON.toJSONString(paymentReq));
 
             return UserPaymentOrderWrapper.PaymentReq.from(JSON.toJSONString(paymentReq));

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

@@ -220,6 +220,9 @@ public class TenantAlbumMusicWrapper {
             @ApiModelProperty("1:收藏 0:未收藏")
             private boolean favorite;
 
+            @ApiModelProperty("声谱类型，SINGLE:单曲，CONCERT:合奏")
+            private String musicSheetType;
+
             public String jsonString() {
                 return JSON.toJSONString(this);
             }

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

@@ -26,6 +26,7 @@
         m.music_subject_ as musicSubject,
         m.title_img_ as titleImg,
         m.exquisite_flag_ as exquisiteFlag,
+        m.music_sheet_type_ as musicSheetType,
         u.username_ as userName,
         s.name_ as musicSubjectName
 		FROM music_sheet m