|
@@ -148,8 +148,6 @@ public class PaySaleServiceImpl implements PaySaleService {
|
|
|
return new ExecuteResult<CreateOrderResult>().setExecuteResult(false).setResult(Result.DIGGER_NO_PAY_DEPOSIT);
|
|
|
}
|
|
|
|
|
|
- ExecuteResult<DiggerOfferBo> executeResult = offerService.queryDiggerPayOffer(agentId, openId, productId);
|
|
|
-
|
|
|
//获取保证金
|
|
|
Integer deposit = offerMapper.selectDisplaceDeposit(productId);
|
|
|
|
|
@@ -218,7 +216,7 @@ public class PaySaleServiceImpl implements PaySaleService {
|
|
|
weiXinPay.setOrderNo(outTradeNo);
|
|
|
weiXinPay.setWxOpenId(openId);
|
|
|
weiXinPay.setAgentId(agentId);
|
|
|
- weiXinPay.setDiggerAgentId(sale.getAgentId());
|
|
|
+ weiXinPay.setDiggerAgentId(sale.getSaleId());
|
|
|
weiXinPay.setDeposit(deposit);
|
|
|
weiXinPay.setCreateTime(new Date());
|
|
|
weiXinPay.setOrderStatus(WeiXinPay.ORDER_STATUS_WAIT);
|
|
@@ -237,7 +235,7 @@ public class PaySaleServiceImpl implements PaySaleService {
|
|
|
newDeposit.setId(UuidUtils.generate());
|
|
|
newDeposit.setProductName("保证金");
|
|
|
// newDeposit.setWxPayNo(prepayId);
|
|
|
- newDeposit.setDaId(sale.getAgentId());
|
|
|
+ newDeposit.setDaId(sale.getSaleId());
|
|
|
newDeposit.setAgentId(agentId);
|
|
|
newDeposit.setAgentName(agent.getAgentName());
|
|
|
newDeposit.setAgentPayNo(outTradeNo);
|