Skip to content

O
order-group
Commit 8b42cf2b by vega
Options

Merge branch 'feature/1.9.36-新增银联礼品卡支付-肖家炜' into develop 

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
parents 129520fc 225ccd21
Showing with 27 additions and 22 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -542,8 +542,8 @@ public class OrderAdapter {
createOrderDto.setOrderType(convent2OrderTypeEnum(orderType));
createOrderDto.setPayType(QueryPayType.ONLINE_PAY);
if (Objects.nonNull(createOrderVo.getUnionPayCard())) {
createOrderDto.setPayChannel(PayChannel.UPC.getCode());
createOrderDto.setPayChannelName(PayChannel.UPC.getDesc());
createOrderDto.setPayChannel(PayChannel.USVCP.getCode());
createOrderDto.setPayChannelName(PayChannel.USVCP.getDesc());
} else if(StringUtils.isNotBlank(createOrderVo.getCardCode())){
createOrderDto.setPayChannel("10102");
createOrderDto.setPayChannelName("储值卡支付");
......@@ -601,8 +601,8 @@ public class OrderAdapter {
productOrderInfo.setOrderType(orderType);
productOrderInfo.setPayType(QueryPayType.ONLINE_PAY);
if (Objects.nonNull(createOrderVo.getUnionPayCard())) {
productOrderInfo.setPayChannel(PayChannel.UPC.getCode());
productOrderInfo.setPayChannelName(PayChannel.UPC.getDesc());
productOrderInfo.setPayChannel(PayChannel.USVCP.getCode());
productOrderInfo.setPayChannelName(PayChannel.USVCP.getDesc());
} else if(StringUtils.isNotBlank(createOrderVo.getCardCode())){
productOrderInfo.setPayChannel("10102");
productOrderInfo.setPayChannelName("储值卡支付");
......@@ -734,8 +734,8 @@ public class OrderAdapter {
memberOrderInfo.setIsParent(false);
memberOrderInfo.setOrderClient(OrderClientType.I_MEMBER.getIndex());
if (Objects.nonNull(createOrderVo.getUnionPayCard())) {
memberOrderInfo.setPayChannel(PayChannel.UPC.getCode());
memberOrderInfo.setPayChannelName(PayChannel.UPC.getDesc());
memberOrderInfo.setPayChannel(PayChannel.USVCP.getCode());
memberOrderInfo.setPayChannelName(PayChannel.USVCP.getDesc());
} else if(StringUtils.isNotBlank(createOrderVo.getCardCode())){
memberOrderInfo.setPayChannel("10102");
memberOrderInfo.setPayChannelName("储值卡支付");
......@@ -777,8 +777,8 @@ public class OrderAdapter {
fatherOrderInfo.setOrderClient(OrderClientType.SAAS.getIndex());
fatherOrderInfo.setOrderType(orderType);
if (Objects.nonNull(createOrderVo.getUnionPayCard())) {
fatherOrderInfo.setPayChannel(PayChannel.UPC.getCode());
fatherOrderInfo.setPayChannelName(PayChannel.UPC.getDesc());
fatherOrderInfo.setPayChannel(PayChannel.USVCP.getCode());
fatherOrderInfo.setPayChannelName(PayChannel.USVCP.getDesc());
} else if(StringUtils.isNotBlank(createOrderVo.getCardCode())){
fatherOrderInfo.setPayChannel("10102");
fatherOrderInfo.setPayChannelName("储值卡支付");
......@@ -1048,7 +1048,7 @@ public class OrderAdapter {
responseVo.setOrderPayType("支付宝支付");
} else if (ordersBean.getPayChannel() != null && PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
responseVo.setOrderPayType("微信支付");
} else if (ordersBean.getPayChannel() != null && Objects.equals(PayChannel.UPC.getCode(), ordersBean.getPayChannel())) {
} else if (ordersBean.getPayChannel() != null && Objects.equals(PayChannel.USVCP.getCode(), ordersBean.getPayChannel())) {
responseVo.setOrderPayType("银联礼品卡支付");
} else {
responseVo.setOrderPayType("微信支付");
......
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
......@@ -223,25 +223,25 @@ public class CreateOrderVo {
private String invoiceTitle;
/**
* 是否使用银联礼品卡,如果不为空则为使用
* 是否使用银联SVC卡,如果不为空则为使用
*/
@Valid
@ApiModelProperty(value = "银联礼品卡")
@ApiModelProperty(value = "银联SVC卡")
private UnionPayCard unionPayCard;
/**
* 银联礼品卡
* 银联SVC卡
*/
@Data
@ApiModel(value = "银联礼品卡类", description = "如果传了礼品卡字段,此类中属性必传")
@ApiModel(value = "银联SVC卡", description = "如果传了银联SVC卡字段,此类中属性必传")
public static class UnionPayCard {
@NotNull(message = "银联礼品卡手机号必传")
@ApiModelProperty(value = "银联礼品卡手机号",required = true)
@NotNull(message = "银联SVC卡手机号必传")
@ApiModelProperty(value = "银联SVC卡卡号(手机号)",required = true)
private String code;
@NotNull(message = "银联礼品卡密码必传")
@ApiModelProperty(value = "银联礼品卡密码",required = true)
@NotNull(message = "银联SVC卡密码必传")
@ApiModelProperty(value = "银联SVC卡密码",required = true)
private String password;
}
......
order-application-service/src/main/java/cn/freemud/enums/PayChannel.java
......@@ -15,7 +15,10 @@ package cn.freemud.enums;
public enum PayChannel {
SVC("10102", "svc卡支付"),
UPC("10031", "银联"),
/**
* union svc pay
*/
USVCP("10556", "银联SVC支付"),
ALIPAY("10300", "支付宝"),
WXPAY("10211", "微信");
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -2156,7 +2156,7 @@ public class OrderServiceImpl implements Orderservice {
throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
} else if (totalAmount > 0 && Objects.nonNull(createPrepayRequestDto.getUnionPayCard())) {
// 银联礼品卡支付
orderPayResponse = upcPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getUnionPayCard());
orderPayResponse = uSvcPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getUnionPayCard());
} else if (totalAmount > 0 && StringUtils.isBlank(cardCode)) {
String partnerPayOvertime = this.getPartnerPayOvertime(createPrepayRequestDto.getPartnerId());
orderPayResponse = getPreOrderPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getCardAmount(), transId, partnerPayOvertime);
......@@ -2209,7 +2209,7 @@ public class OrderServiceImpl implements Orderservice {
* @param unionPayCard
* @return
*/
private OrderPayResponse upcPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String transId, String trackingNo, CreateOrderVo.UnionPayCard unionPayCard) {
private OrderPayResponse uSvcPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String transId, String trackingNo, CreateOrderVo.UnionPayCard unionPayCard) {
OrderPayResponse orderPayResponse = new OrderPayResponse();
if (Objects.isNull(unionPayCard) || StringUtils.isBlank(unionPayCard.getCode()) || StringUtils.isBlank(unionPayCard.getPassword())) {
orderPayResponse.setMsg("银联礼品卡信息缺失");
......@@ -2219,7 +2219,9 @@ public class OrderServiceImpl implements Orderservice {
String partnerId = orderBean.getCompanyId();
request.setBody(orderBean.getShopName());
request.setBusinessDate(DateTimeFormatter.ofPattern(DateUtil.FORMAT_YYYY_MM_DD_HHMMSS).format(LocalDateTime.now()));
// 礼品卡信息
// paymentRequest 的 payCode可能为null,不保险
request.setPayCode(PayChannel.USVCP.getCode());
// 银联svc卡信息
request.setCode(unionPayCard.getCode());
request.setCardPassword(unionPayCard.getPassword());
request.setPartnerId(partnerId);
......@@ -2762,7 +2764,7 @@ public class OrderServiceImpl implements Orderservice {
}
//银联礼品卡支付
if (totalAmount > 0 && Objects.nonNull(createOrderVo.getUnionPayCard())) {
return upcPay(fatherBeanListOne, paymentRequest, fatherBeanListOne.getOid(), LogThreadLocal.getTrackingNo(), createOrderVo.getUnionPayCard());
return uSvcPay(fatherBeanListOne, paymentRequest, fatherBeanListOne.getOid(), LogThreadLocal.getTrackingNo(), createOrderVo.getUnionPayCard());
}
//唤起微信支付
if (totalAmount > 0 && StringUtils.isBlank(createOrderVo.getCardCode()) && StringUtils.isBlank(createOrderVo.getFaceCode())) {
......
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