|
|
@@ -42,7 +42,6 @@ import org.springblade.yeePay.entity.saas.PayLinkOrderDto;
|
|
|
import org.springblade.yeePay.service.YeePayService;
|
|
|
import org.springblade.yeePay.service.YeepaySaasService;
|
|
|
import org.springframework.context.ApplicationEventPublisher;
|
|
|
-import org.springframework.core.env.Environment;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
@@ -192,11 +191,11 @@ public class YeePayPlugin implements Payment {
|
|
|
private void setDtoInfo(PayParam payParam, InitOrderDto initOrderDto) {
|
|
|
if (payParam.getOrderType().equalsIgnoreCase(OrderType.AGENT_CHARGE.getName())) {
|
|
|
AgentLeagueRecord agentLeagueRecord = agentLeagueRecordService.getOne(Condition.getQueryWrapper(new AgentLeagueRecord()).lambda()
|
|
|
- .eq(AgentLeagueRecord::getTradeNo,payParam.getOrderId()));
|
|
|
+ .eq(AgentLeagueRecord::getTradeNo, payParam.getOrderId()));
|
|
|
|
|
|
Assert.notNull(agentLeagueRecord, "订单查询失败，无此订单信息！");
|
|
|
initOrderDto.setGoodsName("代理加盟缴费");
|
|
|
- initOrderDto.setOrderId(String.valueOf(agentLeagueRecord.getId()));
|
|
|
+ initOrderDto.setOrderId(payParam.getOrderId());
|
|
|
initOrderDto.setOrderAmount(agentLeagueRecord.getLeague().doubleValue());
|
|
|
initOrderDto.setAppId(agentLeagueRecord.getAppid());
|
|
|
initOrderDto.setUserId(agentLeagueRecord.getOpenid());
|
