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

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

@@ -94,7 +94,7 @@ public class TenantAlbumController {
         //查关联表
         TenantAlbumRef one = tenantAlbumRefService.lambdaQuery().eq(TenantAlbumRef::getTenantAlbumId, id)
                 .last("limit 1").one();
-        vo.setTenantId(one.getTenantId());
+        vo.setTenantId(one.getTenantId().toString());
         //查询曲目表
 
         TenantInfo tenantInfo = tenantInfoService.getById(one.getTenantId());
@@ -164,7 +164,7 @@ public class TenantAlbumController {
                         TenantAlbumWrapper.TenantAlbumSheet tenantAlbumSheet = new TenantAlbumWrapper.TenantAlbumSheet();
                         tenantAlbumSheet.setLevel(m.getLevel());
                         tenantAlbumSheet.setType(m.getType());
-                        tenantAlbumSheet.setId(m.getId());
+                        tenantAlbumSheet.setId(m.getId().toString());
                        return tenantAlbumSheet;
                     }).collect(Collectors.toList()));
                     sheetData.setSubjectType(next.getSubjectType());
@@ -182,9 +182,21 @@ public class TenantAlbumController {
         TenantAlbum tenantAlbum = JSON.parseObject(album.jsonString(), TenantAlbum.class);
         List<TenantAlbumVo.MusicSheetData> musicSheetData = album.getMusicSheetData();
 
-        List<TenantAlbumWrapper.MusicSheetData> musicSheetDataList = musicSheetData.stream().map(next ->
-                        JSON.parseObject(JSON.toJSONString(next), TenantAlbumWrapper.MusicSheetData.class))
-                .collect(Collectors.toList());
+        List<TenantAlbumWrapper.MusicSheetData> musicSheetDataList = musicSheetData.stream().map(next ->{
+            //TenantAlbumWrapper.MusicSheetData sheetData =new TenantAlbumWrapper.MusicSheetData();
+            TenantAlbumWrapper.MusicSheetData sheetData =new TenantAlbumWrapper.MusicSheetData();
+
+            List<TenantAlbumVo.MusicObject> musicSheetList = next.getMusicSheetList();
+            sheetData.getTenantAlbumSheetList().addAll( musicSheetList.stream().map(m->{
+                TenantAlbumWrapper.TenantAlbumSheet tenantAlbumSheet = new TenantAlbumWrapper.TenantAlbumSheet();
+                tenantAlbumSheet.setLevel(m.getLevel());
+                tenantAlbumSheet.setType(m.getType());
+                tenantAlbumSheet.setId(m.getId().toString());
+                return tenantAlbumSheet;
+            }).collect(Collectors.toList()));
+            sheetData.setSubjectType(next.getSubjectType());
+            return sheetData;
+        }).collect(Collectors.toList());
         tenantAlbumService.updateAlbum(album.getTenantId(), tenantAlbum, musicSheetDataList);
         return HttpResponseResult.succeed();
     }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.microsvc.toolkit.middleware.payment.common.api.PaymentServiceContext;
 import com.microsvc.toolkit.middleware.payment.impl.AdapayPaymentServicePlugin;
+import com.microsvc.toolkit.middleware.payment.impl.YeepayPaymentServicePlugin;
 import com.microsvc.toolkit.middleware.payment.properties.PayConfigProperties;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,26 +39,54 @@ public class PaymentMerchantConfigServiceImpl extends ServiceImpl<PaymentMerchan
             return;
         }
         for (PaymentMerchantConfig config : list) {
-            PayConfigProperties.AdapayPayConfig adapayPayConfig = new PayConfigProperties.AdapayPayConfig();
-            adapayPayConfig.setEnable(true);
-            adapayPayConfig.setAppId(config.getAppId());
-            adapayPayConfig.setPayType(config.getPaymentVendor());
-            adapayPayConfig.setMerchantId(config.getMerKey());
-            adapayPayConfig.setMerchantId(config.getApiKey());
-            adapayPayConfig.setPayNotifyUrl(properties.getPayNotifyUrl());
-            adapayPayConfig.setRefundNotifyUrl(properties.getRefundNotifyUrl());
-            adapayPayConfig.setKeyPublic(config.getRsaPublicKey());
-            adapayPayConfig.setKeyPrivate(config.getRsaPrivateKey());
-            adapayPayConfig.setWxAppId(config.getWxAppId());
-            adapayPayConfig.setWxAppSecret(config.getWxAppSecret());
-            adapayPayConfig.setSupportCreditCards(properties.getSupportCreditCards());
-            AdapayPaymentServicePlugin plugin = null;
-            try {
-                plugin = new AdapayPaymentServicePlugin(config.getPaymentVendor(), adapayPayConfig, false);
-                PaymentServiceContext.addPlugin(plugin);
-            } catch (Exception e) {
-                log.error("初始化支付插件失败", e);
+            if (config.getPaymentVendor().equals("adapay")) {
+
+                PayConfigProperties.AdapayPayConfig adapayPayConfig = new PayConfigProperties.AdapayPayConfig();
+                adapayPayConfig.setEnable(true);
+                adapayPayConfig.setAppId(config.getAppId());
+                adapayPayConfig.setPayType(config.getPaymentVendor());
+                adapayPayConfig.setMerchantId(config.getMerKey());
+                adapayPayConfig.setMerchantId(config.getApiKey());
+                adapayPayConfig.setPayNotifyUrl(properties.getPayNotifyUrl());
+                adapayPayConfig.setRefundNotifyUrl(properties.getRefundNotifyUrl());
+                adapayPayConfig.setKeyPublic(config.getRsaPublicKey());
+                adapayPayConfig.setKeyPrivate(config.getRsaPrivateKey());
+                adapayPayConfig.setWxAppId(config.getWxAppId());
+                adapayPayConfig.setWxAppSecret(config.getWxAppSecret());
+                adapayPayConfig.setSupportCreditCards(properties.getSupportCreditCards());
+                AdapayPaymentServicePlugin plugin = null;
+                try {
+                    plugin = new AdapayPaymentServicePlugin(config.getPaymentVendor(), adapayPayConfig, false);
+                    PaymentServiceContext.addPlugin(plugin);
+                } catch (Exception e) {
+                    log.error("初始化支付插件失败", e);
+                }
+            } else if (config.getPaymentVendor().equals("yeepay")){
+                PayConfigProperties.YeepayPayConfig yeepayPayConfig = new PayConfigProperties.YeepayPayConfig();
+                yeepayPayConfig.setEnable(true);
+                yeepayPayConfig.setAppId(config.getAppId());
+                yeepayPayConfig.setPayType(config.getPaymentVendor());
+                yeepayPayConfig.setMerchantId(config.getMerKey());
+                yeepayPayConfig.setMerchantId(config.getApiKey());
+                yeepayPayConfig.setPayNotifyUrl(properties.getPayNotifyUrl());
+                yeepayPayConfig.setRefundNotifyUrl(properties.getRefundNotifyUrl());
+                yeepayPayConfig.setKeyPublic(config.getRsaPublicKey());
+                yeepayPayConfig.setKeyPrivate(config.getRsaPrivateKey());
+                yeepayPayConfig.setWxAppId(config.getWxAppId());
+                yeepayPayConfig.setWxAppSecret(config.getWxAppSecret());
+                yeepayPayConfig.setSupportCreditCards(properties.getSupportCreditCards());
+                yeepayPayConfig.setAlipayAppId(config.getAlipayAppId());
+                yeepayPayConfig.setAlipayPrivateKey(config.getAlipayPrivateKey());
+                yeepayPayConfig.setAlipayPrivateKey(config.getAlipayPublicKey());
+                YeepayPaymentServicePlugin plugin = null;
+                try {
+                    plugin = new YeepayPaymentServicePlugin(config.getPaymentVendor(), yeepayPayConfig, false);
+                    PaymentServiceContext.addPlugin(plugin);
+                } catch (Exception e) {
+                    log.error("初始化支付插件失败", e);
+                }
             }
+
         }
 
     }

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

@@ -341,7 +341,7 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
                 tenantAlbumMusic1.setTenantId(tenantId);
                 tenantAlbumMusic1.setSubjectType(next.getSubjectType());
                 tenantAlbumMusic1.setTenantAlbumId(tenantAlbum.getId());
-                tenantAlbumMusic1.setMusicSheetId(tenantAlbumMusic.getId());
+                tenantAlbumMusic1.setMusicSheetId(Long.valueOf(tenantAlbumMusic.getId()));
                 tenantAlbumMusic1.setSortNumber(sort.getAndIncrement());
                 tenantAlbumMusic1.setDelFlag(false);
                 tenantAlbumMusic1.setLevel(tenantAlbumMusic.getLevel());

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

@@ -623,6 +623,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             .price(orderReq.getPaymentCashAmount().setScale(2, RoundingMode.HALF_UP))
             .expirationTime(DateTime.now().plusMinutes(120).toDate())
             .wxAppId(paymentServiceContext.getPaymentService(orderReq.getPaymentVendor()).getPaymentConfig().getWxAppId())
+            .alipayAppId(paymentServiceContext.getPaymentService(orderReq.getPaymentVendor()).getPaymentConfig().getAlipayAppId())
             .userId(String.valueOf(orderReq.getUserId()))
             .build();
 

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

@@ -83,7 +83,7 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
                 //查关联表
                 TenantAlbumRef one = tenantAlbumRefService.lambdaQuery().eq(TenantAlbumRef::getTenantAlbumId, i.getId())
                         .last("limit 1").one();
-                vo.setTenantId(one.getTenantId());
+                vo.setTenantId(one.getTenantId().toString());
 
                 //查询曲目表
                 TenantInfo tenantInfo = tenantInfoService.getById(one.getTenantId());

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

@@ -71,10 +71,10 @@ public class TenantAlbumWrapper {
     public static class TenantAlbum {
 
         @ApiModelProperty("主键ID")
-        private Long id;
+        private String id;
 
         @ApiModelProperty("机构ID")
-        private Long tenantId;
+        private String tenantId;
 
         @ApiModelProperty("专辑名称")
         private String name;
@@ -263,10 +263,10 @@ public class TenantAlbumWrapper {
     public static class TenantAlbumSheet {
 
         @ApiModelProperty("主键ID")
-        private Long id;
+        private String id;
 
         @ApiModelProperty("机构ID")
-        private Long tenantId;
+        private String tenantId;
 
         @ApiModelProperty("声部分类(ENSEMBLE, MUSIC, SUBJECT)")
         private SubjectTypeEnum subjectType;

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

@@ -569,6 +569,9 @@ public class UserPaymentOrderWrapper {
         @ApiModelProperty("微信支付公众号")
         private String wxAppId;
 
+        @ApiModelProperty("支付宝应用ID")
+        private String alipayAppId;
+
         @ApiModelProperty("支付用户Id")
         private String userId;