|
@@ -19,6 +19,7 @@ import com.ym.mec.biz.event.source.SendSeoMessageSource;
|
|
|
import com.ym.mec.biz.service.*;
|
|
|
import com.ym.mec.common.controller.BaseController;
|
|
|
import com.ym.mec.common.dal.BaseDAO;
|
|
|
+import com.ym.mec.common.dto.OrderCreate;
|
|
|
import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
import com.ym.mec.common.page.PageInfo;
|
|
@@ -1032,6 +1033,25 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
, studentIds, courseIds, classGroupStudents, allLockCourseIds, batchNo, adjust.getMasterTotalPrice());
|
|
|
} else if (calender.getPaymentType() == GOODS_PURCHASE) {
|
|
|
//TODO 推送订单到商城
|
|
|
+ OrderCreate orderCreate = new OrderCreate();
|
|
|
+ String orderNo = idGeneratorService.generatorId("payment") + "";
|
|
|
+ orderCreate.setOrderNo(orderNo);
|
|
|
+ orderCreate.setOrchestraId(musicGroup.getId());
|
|
|
+ orderCreate.setMemberId(musicGroup.getSchoolId().longValue());
|
|
|
+ orderCreate.setTotalAmount(calender.getCurrentTotalAmount());
|
|
|
+ orderCreate.setOrderFormType("MEC");
|
|
|
+ orderCreate.setPlatformType("SCHOOL");
|
|
|
+ MusicGroupPaymentCalenderAddress address = musicGroupPaymentCalenderAddressService.lambdaQuery()
|
|
|
+ .eq(MusicGroupPaymentCalenderAddress::getCalenderId, calender.getId()).one();
|
|
|
+ if (address != null) {
|
|
|
+ orderCreate.setReceiverName(address.getName());
|
|
|
+ orderCreate.setReceiverPostCode(address.getPostCode());
|
|
|
+ orderCreate.setReceiverPhone(address.getPhone());
|
|
|
+ orderCreate.setReceiverProvince(address.getProvince());
|
|
|
+ orderCreate.setReceiverCity(address.getCity());
|
|
|
+ orderCreate.setReceiverRegion(address.getRegion());
|
|
|
+ orderCreate.setReceiverDetailAddress(address.getAddress());
|
|
|
+ }
|
|
|
}
|
|
|
for (MusicGroupPaymentCalender musicGroupPaymentCalender : musicGroupPaymentCalenders) {
|
|
|
//将0元未缴费学员缴费状态更新为已缴费
|