update

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

@@ -352,8 +352,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Map payMap = payService.getPayMap(
                 orderAmount,
                 orderNo,
-                "http://mstudev.dayaedu.com/api-student/studentOrder/notify",
-                "http://mstudev.dayaedu.com/#/paymentresult?orderNo=" + orderNo,
+                "http://mstutest.dayaedu.com/api-student/studentOrder/notify",
+                "http://mstutest.dayaedu.com/#/paymentresult?orderNo=" + orderNo,
                 "测试订单",
                 "测试订单");
         
@@ -492,8 +492,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Map payMap = payService.getPayMap(
                 orderAmount,
                 orderNo,
-                "http://mstudev.dayaedu.com/api-student/studentOrder/notify",
-                "http://mstudev.dayaedu.com/#/paymentresult?orderNo=" + orderNo,
+                "http://mstutest.dayaedu.com/api-student/studentOrder/notify",
+                "http://mstutest.dayaedu.com/#/paymentresult?orderNo=" + orderNo,
                 "测试订单",
                 "测试订单");
         

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherDefaultVipGroupSalaryServiceImpl.java

@@ -9,7 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Long, TeacherDefaultVipGroupSalary>  implements TeacherDefaultVipGroupSalaryService {
@@ -24,7 +26,12 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 
 	@Override
 	public TeacherDefaultVipGroupSalary findByTeacherAndCategory(Integer userId, Long categoryId) {
-		return teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(userId,categoryId);
+		TeacherDefaultVipGroupSalary byTeacherAndCategory = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(userId, categoryId);
+		if(Objects.isNull(byTeacherAndCategory)){
+			byTeacherAndCategory.setOfflineClassesSalary(new BigDecimal(0));
+			byTeacherAndCategory.setOnlineClassesSalary(new BigDecimal(0));
+		}
+		return byTeacherAndCategory;
 	}
 
 	@Override
@@ -38,4 +45,4 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 			teacherDefaultVipGroupSalaryDao.batchAdd(teacherDefaultVipGroupSalaries);
 		}
 	}
-}
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -995,8 +995,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			Map<String,Object> payMap = payService.getPayMap(
 					amount,
 					orderNo,
-					"http://mstudev.dayaedu.com/api-student/studentOrder/notify",
-					"http://mstudev.dayaedu.com/#/paymentresult?orderNo=" + orderNo,
+					"http://mstutest.dayaedu.com/api-student/studentOrder/notify",
+					"http://mstutest.dayaedu.com/#/paymentresult?orderNo=" + orderNo,
 					"vip课购买",
 					vipGroup.getName());
 			studentPaymentOrder.setPaymentChannel((String) payMap.get("type"));