Commit 4ce278e3 by xiaoer.li@freemud.com

fix:标识符

parent a1180f48
...@@ -2274,10 +2274,10 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2274,10 +2274,10 @@ public class OrderServiceImpl implements Orderservice {
if (totalAmount > 0 && StringUtils.isBlank(cardCode) && Objects.isNull(createPrepayRequestDto.getUnionPayCard())) { if (totalAmount > 0 && StringUtils.isBlank(cardCode) && Objects.isNull(createPrepayRequestDto.getUnionPayCard())) {
createOrderResponse.setPaySuccess(false); createOrderResponse.setPaySuccess(false);
} }
else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.COMB.getIndex().equals(orderPayResponse.getPayMode())){ else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.COMB.getEbcode().equals(orderPayResponse.getPayMode())){
createOrderResponse.setPaySuccess(false); createOrderResponse.setPaySuccess(false);
} }
else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getIndex().equals(orderPayResponse.getPayMode())){ else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getEbcode().equals(orderPayResponse.getPayMode())){
createOrderResponse.setPaySuccess(true); createOrderResponse.setPaySuccess(true);
} }
else { else {
...@@ -2530,7 +2530,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2530,7 +2530,7 @@ public class OrderServiceImpl implements Orderservice {
orderPayResponse.setOpenId(paymentRequest.getOpenId()); orderPayResponse.setOpenId(paymentRequest.getOpenId());
orderPayResponse.setPartnerId(orderBean.getCompanyId()); orderPayResponse.setPartnerId(orderBean.getCompanyId());
orderPayResponse.setOrderId(orderBean.getOid()); orderPayResponse.setOrderId(orderBean.getOid());
orderPayResponse.setPayMode(PayChannelType.SVC.getIndex()+""); orderPayResponse.setPayMode(PayChannelType.SVC.getEbcode());
} }
return orderPayResponse; return orderPayResponse;
} }
...@@ -3227,7 +3227,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3227,7 +3227,7 @@ public class OrderServiceImpl implements Orderservice {
orderPayResponse.setWxAppid(paymentRequest.getWxAppId()); orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
orderPayResponse.setPartnerId(orderBean.getCompanyId()); orderPayResponse.setPartnerId(orderBean.getCompanyId());
orderPayResponse.setOrderId(orderBean.getOid()); orderPayResponse.setOrderId(orderBean.getOid());
orderPayResponse.setPayMode(PayChannelType.COMB.getIndex()+""); orderPayResponse.setPayMode(PayChannelType.COMB.getEbcode());
//隐射关系 //隐射关系
redisCache.save(RedisUtil.getPaymentTransIdOrderKey(payPlatform.getTransId()),orderBean.getOid(),1L,TimeUnit.DAYS); redisCache.save(RedisUtil.getPaymentTransIdOrderKey(payPlatform.getTransId()),orderBean.getOid(),1L,TimeUnit.DAYS);
//加入轮训队列 //加入轮训队列
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment