瀏覽代碼

fix 第三方乐团,报名缴费,改成乐团相关费用

周箭河 5 年之前
父節點
當前提交
ee9ebf53e9
共有 1 個文件被更改,包括 14 次插入12 次删除
  1. 14 12
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

+ 14 - 12
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -3,14 +3,7 @@ package com.ym.mec.biz.service.impl;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.ym.mec.biz.dal.dao.*;
@@ -547,14 +540,19 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             }
         }
 
+        String orderSubject = "乐团报名";
+        if(musicGroup.getOwnershipType() != null && musicGroup.getOwnershipType().equals(CooperationOrgan.OwnershipType.COOPERATION)){
+            orderSubject = "乐团相关费用";
+        }
+
         String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
         Map payMap = payService.getPayMap(
                 amount,
                 orderNo,
                 baseApiUrl + "/api-student/studentOrder/notify",
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
-                "乐团报名",
-                "乐团报名",
+                orderSubject,
+                orderSubject,
                 userId,
                 classFee,
                 musicGroup.getOrganId()
@@ -738,14 +736,18 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             }
         }
 
+        String orderSubject = "乐团报名";
+        if(musicGroup.getOwnershipType() != null && musicGroup.getOwnershipType().equals(CooperationOrgan.OwnershipType.COOPERATION)){
+            orderSubject = "乐团相关费用";
+        }
         String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
         Map payMap = payService.getPayMap(
                 amount,
                 orderNo,
                 baseApiUrl + "/api-student/studentOrder/notify",
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
-                "乐团报名",
-                "乐团报名",
+                orderSubject,
+                orderSubject,
                 userId,
                 classFee,
                 musicGroup.getOrganId()