|
|
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.ym.mec.biz.dal.dao.CloudTeacherOrderDao;
|
|
|
import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
|
|
|
+import com.ym.mec.biz.dal.dao.SysConfigDao;
|
|
|
import com.ym.mec.biz.dal.dto.CloudTeacherOrderDto;
|
|
|
import com.ym.mec.biz.dal.dto.Mapper;
|
|
|
import com.ym.mec.biz.dal.entity.*;
|
|
|
@@ -55,6 +56,8 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
|
|
|
private TenantOrderRecordService tenantOrderRecordService;
|
|
|
@Autowired
|
|
|
private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
|
|
|
+ @Autowired
|
|
|
+ private SysConfigDao sysConfigDao;
|
|
|
|
|
|
@Override
|
|
|
public BaseDAO<Long, CloudTeacherOrder> getDAO() {
|
|
|
@@ -180,7 +183,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
|
|
|
//生成订单编号
|
|
|
String orderNo = idGenerator.generatorId("payment") + "";
|
|
|
TenantOrderRecordEnum tenantEnum = TenantOrderRecordEnum.CLOUD_TEACHER;
|
|
|
-
|
|
|
+ String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
|
|
|
Map<String, Object> payMap = new HashMap<>();
|
|
|
int orderState = 0;
|
|
|
//消费大于0元则拉起支付
|
|
|
@@ -190,8 +193,8 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
|
|
|
payAmount,
|
|
|
BigDecimal.ZERO,
|
|
|
orderNo,
|
|
|
- null,
|
|
|
- null,
|
|
|
+ baseApiUrl + "/api-student/studentOrder/callback",
|
|
|
+ baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
|
|
|
tenantEnum.getMsg(),
|
|
|
tenantEnum.getMsg()
|
|
|
);
|
zouxuan