Commit 8ceec659 by xiaoer.li

Merge remote-tracking branch 'remotes/origin/feature/混合支付增加门店名称'

parents 4ba35019 c0ba56ad
...@@ -70,5 +70,6 @@ public class CombPayRequest { ...@@ -70,5 +70,6 @@ public class CombPayRequest {
private Boolean disable_service_goods_tag = false; private Boolean disable_service_goods_tag = false;
private String request_source ="V1"; private String request_source ="V1";
private String ver ="10"; private String ver ="10";
private String storeName;
} }
...@@ -3567,6 +3567,7 @@ public class OrderAdapter { ...@@ -3567,6 +3567,7 @@ public class OrderAdapter {
orderPayDto.setAppId(paymentRequest.getWxAppId()); orderPayDto.setAppId(paymentRequest.getWxAppId());
orderPayDto.setPayCode(paymentRequest.getPayCode()); orderPayDto.setPayCode(paymentRequest.getPayCode());
orderPayDto.setVer("V1"); orderPayDto.setVer("V1");
orderPayDto.setStoreName(orderBean.getShopName());
orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30")); orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30"));
List<ProductVO> productVOS = new ArrayList<ProductVO>(); List<ProductVO> productVOS = new ArrayList<ProductVO>();
if (CollectionUtils.isNotEmpty(orderBean.getProductList())) { if (CollectionUtils.isNotEmpty(orderBean.getProductList())) {
......
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