Skip to content

O
order-group
Commit c9113971 by ping.wu
Options

Merge branches 'feature/20210830_礼品卡支付_wuping' and 'qa' of… 

Merge branches 'feature/20210830_礼品卡支付_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
parents 894c02de 522099b9
Showing with 335 additions and 198 deletions
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
......@@ -29,7 +29,7 @@ import com.freemud.sdk.api.assortment.order.enums.*;
import com.freemud.sdk.api.assortment.order.request.order.OrderDownloadRequest;
import com.freemud.sdk.api.assortment.order.request.order.*;
import com.freemud.sdk.api.assortment.order.response.order.*;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.util.AssortOrderLogUtil;
import com.freemud.sdk.api.assortment.order.util.ClassUtils;
import com.freemud.sdk.api.assortment.order.util.WeightUtils;
......@@ -1768,29 +1768,29 @@ public class OrderSdkAdapter {
return orderStatus;
}
/**
* 获取自定义信息
*/
public OrderExtInfoDto getOrderExtInfo(OrderPayResponse orderPayResponse, OrderEditInfo orderEditInfo) {
OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
orderExtInfoDto.setOpenid(orderPayResponse.getOpenId());
String prepayId = "";
//TODO StringUtils 依赖修改
if (orderPayResponse.getPayOrder() != null && !StringUtils.isEmpty(orderPayResponse.getPayOrder().getPackageX())) {
String[] prepayIds = orderPayResponse.getPayOrder().getPackageX().split("=");
prepayId = prepayIds.length > 1 ? prepayIds[1] : "";
}
orderExtInfoDto.setPrepayId(prepayId);
orderExtInfoDto.setAppid(orderPayResponse.getWxAppid());
orderExtInfoDto.setExpireDate(orderEditInfo.getExpireDate());
orderExtInfoDto.setServiceTime(orderEditInfo.getServiceTime());
orderExtInfoDto.setPushOrderTime(orderEditInfo.getPushOrderTime());
orderExtInfoDto.setAccessToken(orderEditInfo.getAccessToken());
orderExtInfoDto.setSessionId(orderEditInfo.getSessionId());
orderExtInfoDto.setVersion(orderEditInfo.getVersion());
orderExtInfoDto.setTrackingNo(orderEditInfo.getTrackingNo());
return orderExtInfoDto;
}
// /**
// * 获取自定义信息
// */
// public OrderExtInfoDto getOrderExtInfo(OrderPayResponse orderPayResponse, OrderEditInfo orderEditInfo) {
// OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
// orderExtInfoDto.setOpenid(orderPayResponse.getOpenId());
// String prepayId = "";
// //TODO StringUtils 依赖修改
// if (orderPayResponse.getPayOrder() != null && !StringUtils.isEmpty(orderPayResponse.getPayOrder().getPackageX())) {
// String[] prepayIds = orderPayResponse.getPayOrder().getPackageX().split("=");
// prepayId = prepayIds.length > 1 ? prepayIds[1] : "";
// }
// orderExtInfoDto.setPrepayId(prepayId);
// orderExtInfoDto.setAppid(orderPayResponse.getWxAppid());
// orderExtInfoDto.setExpireDate(orderEditInfo.getExpireDate());
// orderExtInfoDto.setServiceTime(orderEditInfo.getServiceTime());
// orderExtInfoDto.setPushOrderTime(orderEditInfo.getPushOrderTime());
// orderExtInfoDto.setAccessToken(orderEditInfo.getAccessToken());
// orderExtInfoDto.setSessionId(orderEditInfo.getSessionId());
// orderExtInfoDto.setVersion(orderEditInfo.getVersion());
// orderExtInfoDto.setTrackingNo(orderEditInfo.getTrackingNo());
// return orderExtInfoDto;
// }
/**
* 拉单返回参数转换
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: OrderPayResponseDto
* @Package cn.freemud.entities.dto
* @Description:
* @author: liming.guo
* @date: 2018/5/25 17:10
* @version V1.0
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
package com.freemud.sdk.api.assortment.order.response.payment;
import com.freemud.application.sdk.api.ordercenter.entities.PayItem;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
import java.util.ArrayList;
import java.util.List;
@NoArgsConstructor
@Data
@ToString
public class OrderPayResponse {
/**
* pay_transId : 84617583993553153103
* pay_id : 微信小程序支付
* pay_ebcode : 10007
* fmId : ZHL1407O1555247503
* pay_order : {"appid":"wx3ab08e23966343fe","package":"prepay_id=wx25143630149413bcd9fbad100070370076","nonce_str":"-610630281","sign":"D320B2B74D858EBE16841F43AE70E757","timestamp":"1527230190","signType":"MD5"}
* statusCode : 100
*/
/**
* 支付交易序号
*/
private String payTransId;
/**
* 支付方式描述
*/
private String payId;
private String payEbcode;
private String msg;
/**
* 非码交易ID
*/
private String fmId;
private PayOrderBean payOrder;
private Integer statusCode;
private String openId;
private String partnerId;
private String wxAppid;
private String orderId;
private String payMode;
private List<PayItem> payItem = new ArrayList<>();
// 回调地址
private String payNotifyUrl;
//商户id
private String sellerId;
// 支付类型：机场支付=20099
private String ebCode;
/**
* 抖音支付的返回的为orderId 映射为我们thirdOrderId
*/
private String thirdOrderId;
/**
* 抖音支付的orderToken 映射为我们thirdOrderToken
*/
private String thirdOrderToken;
@NoArgsConstructor
@Data
public static class PayOrderBean {
/**
* appid : wx3ab08e23966343fe
* package : prepay_id=wx25143630149413bcd9fbad100070370076
* nonce_str : -610630281
* sign : D320B2B74D858EBE16841F43AE70E757
* timestamp : 1527230190
* signType : MD5
*/
private String appid;
private String packageX;
private String nonceStr;
/**
* 签名
*/
private String sign;
private String timestamp;
/**
* 签名方式
*/
private String signType;
private String aliPayOrder;
}
}
///**
// * All rights Reserved, Designed By www.freemud.cn
// *
// * @Title: OrderPayResponseDto
// * @Package cn.freemud.entities.dto
// * @Description:
// * @author: liming.guo
// * @date: 2018/5/25 17:10
// * @version V1.0
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
// */
//package com.freemud.sdk.api.assortment.order.response.payment;
//
//import com.freemud.application.sdk.api.ordercenter.entities.PayItem;
//import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
//import lombok.Data;
//import lombok.NoArgsConstructor;
//import lombok.ToString;
//
//import java.util.ArrayList;
//import java.util.List;
//
//@NoArgsConstructor
//@Data
//@ToString
//public class OrderPayResponse {
// /**
// * pay_transId : 84617583993553153103
// * pay_id : 微信小程序支付
// * pay_ebcode : 10007
// * fmId : ZHL1407O1555247503
// * pay_order : {"appid":"wx3ab08e23966343fe","package":"prepay_id=wx25143630149413bcd9fbad100070370076","nonce_str":"-610630281","sign":"D320B2B74D858EBE16841F43AE70E757","timestamp":"1527230190","signType":"MD5"}
// * statusCode : 100
// */
//
// /**
// * 支付交易序号
// */
// private String payTransId;
//
// /**
// * 支付方式描述
// */
// private String payId;
//
// private String payEbcode;
//
// private String msg;
//
// /**
// * 非码交易ID
// */
// private String fmId;
//
// private PayOrderBean payOrder;
//
// private Integer statusCode;
//
// private String openId;
//
// private String partnerId;
//
// private String wxAppid;
//
// private String orderId;
//// private String payMode;
//
// private PayChannelType payChannelType;
//
// private List<PayItem> payItem = new ArrayList<>();
//
// // 回调地址
// private String payNotifyUrl;
// //商户id
// private String sellerId;
// // 支付类型：机场支付=20099
// private String ebCode;
//
// /**
// * 抖音支付的返回的为orderId 映射为我们thirdOrderId
// */
// private String thirdOrderId;
//
// /**
// * 抖音支付的orderToken 映射为我们thirdOrderToken
// */
// private String thirdOrderToken;
//
// @NoArgsConstructor
// @Data
// public static class PayOrderBean {
// /**
// * appid : wx3ab08e23966343fe
// * package : prepay_id=wx25143630149413bcd9fbad100070370076
// * nonce_str : -610630281
// * sign : D320B2B74D858EBE16841F43AE70E757
// * timestamp : 1527230190
// * signType : MD5
// */
//
// private String appid;
//
// private String packageX;
//
// private String nonceStr;
//
// /**
// * 签名
// */
// private String sign;
//
// private String timestamp;
//
// /**
// * 签名方式
// */
// private String signType;
//
// private String aliPayOrder;
//
//
// }
//
//}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
......@@ -67,7 +67,7 @@ import com.freemud.sdk.api.assortment.order.request.order.OrderDownloadRequest;
import com.freemud.sdk.api.assortment.order.request.order.*;
import com.freemud.sdk.api.assortment.order.response.order.*;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse.DataBean.OrderBean;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.util.AssortOrderLogUtil;
import com.freemud.sdk.api.assortment.order.vo.AssortmentOrderProductVo;
......@@ -1403,15 +1403,15 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
/**
* 编辑订单，保持预支付信息
*/
public BaseOrderResponse updateOrderInfo(OrderPayResponse orderPayResponse, OrderEditInfo orderEditInfo) {
//TODO 创建自定义信息
OrderExtInfoDto orderExtInfo = orderSdkAdapter.getOrderExtInfo(orderPayResponse, orderEditInfo);
OrderEditRequest orderEditRequest = new OrderEditRequest(orderPayResponse.getPayTransId(),
JSONObject.toJSONString(orderExtInfo));
orderEditRequest.setOrderId(orderPayResponse.getOrderId());
orderEditRequest.setTrackingNo(orderEditInfo.getTrackingNo());
return orderEdit(orderEditRequest);
}
// public BaseOrderResponse updateOrderInfo(OrderPayResponse orderPayResponse, OrderEditInfo orderEditInfo) {
// //TODO 创建自定义信息
// OrderExtInfoDto orderExtInfo = orderSdkAdapter.getOrderExtInfo(orderPayResponse, orderEditInfo);
// OrderEditRequest orderEditRequest = new OrderEditRequest(orderPayResponse.getPayTransId(),
// JSONObject.toJSONString(orderExtInfo));
// orderEditRequest.setOrderId(orderPayResponse.getOrderId());
// orderEditRequest.setTrackingNo(orderEditInfo.getTrackingNo());
// return orderEdit(orderEditRequest);
// }
public BaseOrderResponse getBaseOrderResponse(String code, String message, String data) {
BaseOrderResponse baseOrderResponse = new BaseOrderResponse();
......
order-application-service/src/main/java/cn/freemud/adapter/CreateOrderAdapter.java
......@@ -6,6 +6,7 @@ import cn.freemud.entities.bo.CreateOrderBo;
import cn.freemud.entities.dto.UserDeliveryInfoDto;
import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
import cn.freemud.entities.dto.pay.CombPayResponse;
import cn.freemud.entities.dto.pay.OrderPayResponse;
import cn.freemud.entities.dto.product.AttributeValue;
import cn.freemud.entities.dto.product.GroupDetail;
import cn.freemud.entities.dto.product.ProductAttributeGroup;
......@@ -44,7 +45,7 @@ import com.freemud.sdk.api.assortment.order.request.payment.CombPayRequest;
import com.freemud.sdk.api.assortment.order.request.payment.PayPlatformVO;
import com.freemud.sdk.api.assortment.order.request.payment.ProductVO;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.util.ClassUtils;
import com.freemud.sdk.api.assortment.order.util.WeightUtils;
import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
......@@ -210,7 +211,7 @@ public class CreateOrderAdapter {
orderPayResponse.setPartnerId(partnerId);
orderPayResponse.setOrderId(orderId);
orderPayResponse.setFmId(fmId);
orderPayResponse.setPayMode(PayChannelType.ZERO.getEbcode());
orderPayResponse.setPayChannelType(PayChannelType.ZERO);
return orderPayResponse;
}
......@@ -419,15 +420,15 @@ public class CreateOrderAdapter {
payItem.setPartnerId(partnerId);
if (PayChannelType.SVC.getEbcode().equals(pt.getEbCode())) {
payItem.setPayAmount(new BigDecimal(pt.getPayAmount()));
responseDto.setPayMode(PayChannelType.SVC.getEbcode());
responseDto.setPayChannelType(PayChannelType.SVC);
} else if (PayChannelType.WECHAT.getEbcode().equals(pt.getEbCode()) || PayChannelType.ALIPAY.getEbcode().equals(pt.getEbCode())) {
payItem.setPayAmount(new BigDecimal(pt.getPayAmount()));
responseDto.setPayMode(PayChannelType.getByEbcode(pt.getEbCode()).getEbcode());
responseDto.setPayChannelType(PayChannelType.getByEbcode(pt.getEbCode()));
}
responseDto.getPayItem().add(payItem);
}
if (responseDto.getPayItem().size() == 2) {
responseDto.setPayMode(PayChannelType.COMB.getEbcode());
responseDto.setPayChannelType(PayChannelType.COMB);
}
return responseDto;
}
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -24,6 +24,7 @@ import cn.freemud.entities.dto.order.CreateOrderAccountDto;
import cn.freemud.entities.dto.order.CreateOrderProductDto;
import cn.freemud.entities.dto.order.*;
import cn.freemud.entities.dto.pay.CombPayResponse;
import cn.freemud.entities.dto.pay.OrderPayResponse;
import cn.freemud.entities.dto.promotion.OrderBeanRequest;
import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
......@@ -81,7 +82,7 @@ import com.freemud.sdk.api.assortment.order.response.order.CreateOrderFlowRespon
import com.freemud.sdk.api.assortment.order.response.order.OrderExtended;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
import com.google.common.collect.Lists;
......@@ -1298,8 +1299,8 @@ public class OrderAdapter {
}
responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
responseVo.setPayChannel(ordersBean.getPayChannel());
if (StringUtils.isNotBlank(ordersBean.getPayChannel())) {
PayChannelType ebcode = PayChannelType.getByEbcode(ordersBean.getPayChannel());
if (StringUtils.isNotBlank(ordersBean.getPayChannelType())) {
PayChannelType ebcode = PayChannelType.getByIndex(Byte.parseByte(ordersBean.getPayChannelType()));
if (ebcode != null) {
responseVo.setOrderPayType(ebcode.getName());
responseVo.setOrderPayTypeDescEn(ebcode.getNameEn());
......@@ -3323,7 +3324,7 @@ public class OrderAdapter {
orderPayResponse.setPartnerId(partnerId);
orderPayResponse.setOrderId(orderId);
orderPayResponse.setFmId(fmId);
orderPayResponse.setPayMode(PayChannelType.ZERO.getEbcode());
orderPayResponse.setPayChannelType(PayChannelType.ZERO);
return orderPayResponse;
}
......@@ -4132,12 +4133,6 @@ public class OrderAdapter {
payPlatformVO.setAmount(0L);
platforms.add(payPlatformVO);
payPlatformVO = new PayPlatformVO();
payPlatformVO.setClientCode(PayChannelType.GIFTCARD.getEbcode());
payPlatformVO.setEbcode(PayChannelType.GIFTCARD.getEbcode());
payPlatformVO.setAmount(0L);
platforms.add(payPlatformVO);
String ebcode = PayChannelType.getByIndex(Byte.parseByte(channel)).getEbcode();
payPlatformVO = new PayPlatformVO();
payPlatformVO.setAmount(0L);
......@@ -4195,15 +4190,15 @@ public class OrderAdapter {
payItem.setPartnerId(partnerId);
if (PayChannelType.SVC.getEbcode().equals(pt.getEbCode())) {
payItem.setPayAmount(new BigDecimal(pt.getPayAmount()));
responseDto.setPayMode(PayChannelType.SVC.getEbcode());
responseDto.setPayChannelType(PayChannelType.SVC);
} else if (PayChannelType.WECHAT.getEbcode().equals(pt.getEbCode()) || PayChannelType.ALIPAY.getEbcode().equals(pt.getEbCode())) {
payItem.setPayAmount(new BigDecimal(pt.getPayAmount()));
responseDto.setPayMode(PayChannelType.getByEbcode(pt.getEbCode()).getEbcode());
responseDto.setPayChannelType(PayChannelType.getByEbcode(pt.getEbCode()));
}
responseDto.getPayItem().add(payItem);
}
if (responseDto.getPayItem().size() == 2) {
responseDto.setPayMode(PayChannelType.COMB.getEbcode());
responseDto.setPayChannelType(PayChannelType.COMB);
}
return responseDto;
}
......
order-application-service/src/main/java/cn/freemud/entities/dto/pay/CombPayResponse.java
......@@ -60,6 +60,10 @@ public class CombPayResponse {
@ApiModelProperty(value = "间联单号")
private String transId;
//储值卡类型：0一次性卡（礼品卡），3重复使用卡（储值卡）")
private Integer cardType;
@ApiModelProperty(value = "")
private PayOrderBean payOrder;
@Data
......
order-application-service/src/main/java/cn/freemud/entities/dto/pay/OrderPayResponse.java 0 → 100644
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: OrderPayResponseDto
* @Package cn.freemud.entities.dto
* @Description:
* @author: liming.guo
* @date: 2018/5/25 17:10
* @version V1.0
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
package cn.freemud.entities.dto.pay;
import com.freemud.application.sdk.api.ordercenter.entities.PayItem;
import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
import java.util.ArrayList;
import java.util.List;
//sdk 类迁移
@NoArgsConstructor
@Data
@ToString
public class OrderPayResponse {
/**
* pay_transId : 84617583993553153103
* pay_id : 微信小程序支付
* pay_ebcode : 10007
* fmId : ZHL1407O1555247503
* pay_order : {"appid":"wx3ab08e23966343fe","package":"prepay_id=wx25143630149413bcd9fbad100070370076","nonce_str":"-610630281","sign":"D320B2B74D858EBE16841F43AE70E757","timestamp":"1527230190","signType":"MD5"}
* statusCode : 100
*/
/**
* 支付交易序号
*/
private String payTransId;
/**
* 支付方式描述
*/
private String payId;
private String payEbcode;
private String msg;
/**
* 非码交易ID
*/
private String fmId;
private PayOrderBean payOrder;
private Integer statusCode;
private String openId;
private String partnerId;
private String wxAppid;
private String orderId;
// private String payMode;
private PayChannelType payChannelType;
private List<PayItem> payItem = new ArrayList<>();
// 回调地址
private String payNotifyUrl;
//商户id
private String sellerId;
// 支付类型：机场支付=20099
private String ebCode;
/**
* 抖音支付的返回的为orderId 映射为我们thirdOrderId
*/
private String thirdOrderId;
/**
* 抖音支付的orderToken 映射为我们thirdOrderToken
*/
private String thirdOrderToken;
@NoArgsConstructor
@Data
public static class PayOrderBean {
/**
* appid : wx3ab08e23966343fe
* package : prepay_id=wx25143630149413bcd9fbad100070370076
* nonce_str : -610630281
* sign : D320B2B74D858EBE16841F43AE70E757
* timestamp : 1527230190
* signType : MD5
*/
private String appid;
private String packageX;
private String nonceStr;
/**
* 签名
*/
private String sign;
private String timestamp;
/**
* 签名方式
*/
private String signType;
private String aliPayOrder;
}
}
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
......@@ -29,6 +29,7 @@ import cn.freemud.entities.dto.QueryOrdersResponseDto.DataBean.OrderBean;
import cn.freemud.entities.dto.delivery.*;
import cn.freemud.entities.dto.order.CreateOrderOperateDto;
import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
import cn.freemud.entities.dto.pay.OrderPayResponse;
import cn.freemud.entities.dto.pay.PaymentMqMessageDto;
import cn.freemud.entities.dto.product.AttributeValue;
import cn.freemud.entities.dto.product.GroupDetail;
......@@ -98,7 +99,7 @@ import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
import com.freemud.sdk.api.assortment.order.enums.OldOrderType;
import com.freemud.sdk.api.assortment.order.request.order.*;
import com.freemud.sdk.api.assortment.order.response.order.*;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import cn.freemud.service.mccafe.CouponClientService;
import cn.freemud.service.mccafe.MCCafeOrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
......@@ -15,6 +15,7 @@ import cn.freemud.entities.dto.PayAccessResponse;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.ecology.VirtualBindStoreResponse;
import cn.freemud.entities.dto.ecology.VirtualStoreRequest;
import cn.freemud.entities.dto.pay.OrderPayResponse;
import cn.freemud.entities.dto.pay.PaymentMqMessageDto;
import cn.freemud.entities.dto.product.AttributeValue;
import cn.freemud.entities.dto.product.GroupDetail;
......@@ -68,7 +69,6 @@ import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
import com.freemud.sdk.api.assortment.order.request.order.*;
import com.freemud.sdk.api.assortment.order.response.order.*;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
......@@ -385,9 +385,9 @@ public class MallOrderServiceImpl implements MallOrderService {
orderPayResponse.setOpenId(paymentRequest.getOpenId());
orderPayResponse.setPartnerId(orderBean.getCompanyId());
orderPayResponse.setOrderId(orderBean.getOid());
orderPayResponse.setPayMode(PayChannelType.WECHAT.getEbcode());
orderPayResponse.setPayChannelType(PayChannelType.WECHAT);
if (orderPayResponse.getPayOrder() != null && StringUtils.isNotBlank(orderPayResponse.getPayOrder().getAliPayOrder())) {
orderPayResponse.setPayMode(PayChannelType.ALIPAY.getEbcode());
orderPayResponse.setPayChannelType(PayChannelType.ALIPAY);
}
putDelMq(request.getPartnerId(), request.getStoreId(), responseBase.getData().getFmId(), orderBean.getOid());
return orderPayResponse;
......@@ -417,10 +417,10 @@ public class MallOrderServiceImpl implements MallOrderService {
JSONObject.toJSONString(orderExtInfo));
orderEditRequest.setOrderId(orderBean.getOid());
orderEditRequest.setTrackingNo(trackingNo);
if (orderPayResponse.getPayMode() != null) {
orderEditRequest.setPayChannel(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getEbcode());
orderEditRequest.setPayChannelName(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getName());
orderEditRequest.setPayChannelType(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getIndex());
if (orderPayResponse.getPayChannelType() != null) {
orderEditRequest.setPayChannel(orderPayResponse.getPayChannelType().getEbcode());
orderEditRequest.setPayChannelName(orderPayResponse.getPayChannelType().getName());
orderEditRequest.setPayChannelType(orderPayResponse.getPayChannelType().getIndex());
}
BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderEdit(orderEditRequest);
if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS, baseOrderResponse.getErrcode())) {
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java
......@@ -8,6 +8,7 @@ import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.dto.ConfirmOrderDto;
import cn.freemud.entities.dto.QueryOrdersResponseDto;
import cn.freemud.entities.dto.ShoppingCartBaseResponse;
import cn.freemud.entities.dto.pay.OrderPayResponse;
import cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto;
import cn.freemud.entities.vo.CreateOrderResponseVo;
import cn.freemud.entities.vo.PaysuccessNoticeMessage;
......@@ -45,7 +46,7 @@ import com.freemud.sdk.api.assortment.order.request.order.PaymentRequest;
import com.freemud.sdk.api.assortment.order.response.order.AssortmentAffirmGroupOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
......
order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
......@@ -15,6 +15,7 @@ import cn.freemud.entities.dto.SvcComPayResponseDto;
import cn.freemud.entities.dto.order.CreateOrderOperateDto;
import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
import cn.freemud.entities.dto.pay.CombPayResponse;
import cn.freemud.entities.dto.pay.OrderPayResponse;
import cn.freemud.entities.dto.pay.PaymentMqMessageDto;
import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
......@@ -82,7 +83,7 @@ import com.freemud.sdk.api.assortment.order.request.payment.CombPayRequest;
import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
......@@ -733,9 +734,9 @@ public abstract class UniversalOrderService {
}
if (totalAmount > 0 && StringUtils.isBlank(cardCode) && Objects.isNull(createPrepayRequestDto.getUnionPayCard())) {
createOrderResponse.setPaySuccess(false);
} else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.COMB.getEbcode().equals(orderPayResponse.getPayMode())) {
} else if (orderPayResponse.getPayChannelType() != null && PayChannelType.COMB.getEbcode().equals(orderPayResponse.getPayChannelType().getEbcode())) {
createOrderResponse.setPaySuccess(false);
} else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getEbcode().equals(orderPayResponse.getPayMode())) {
} else if (orderPayResponse.getPayChannelType() != null && PayChannelType.SVC.getEbcode().equals(orderPayResponse.getPayChannelType().getEbcode())) {
createOrderResponse.setPaySuccess(true);
} else {
createOrderResponse.setPaySuccess(true);
......@@ -790,10 +791,10 @@ public abstract class UniversalOrderService {
JSONObject.toJSONString(orderExtInfo));
orderEditRequest.setOrderId(orderBean.getOid());
orderEditRequest.setTrackingNo(trackingNo);
if (orderPayResponse.getPayMode() != null) {
orderEditRequest.setPayChannel(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getEbcode());
orderEditRequest.setPayChannelName(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getName());
orderEditRequest.setPayChannelType(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getIndex());
if (orderPayResponse.getPayChannelType() != null) {
orderEditRequest.setPayChannel(orderPayResponse.getPayChannelType().getEbcode());
orderEditRequest.setPayChannelName(orderPayResponse.getPayChannelType().getName());
orderEditRequest.setPayChannelType(orderPayResponse.getPayChannelType().getIndex());
}
//混合支付项
if (CollectionUtils.isNotEmpty(orderPayResponse.getPayItem())) {
......@@ -923,7 +924,7 @@ public abstract class UniversalOrderService {
orderPayResponse.setOpenId(paymentRequest.getOpenId());
orderPayResponse.setPartnerId(orderBean.getCompanyId());
orderPayResponse.setOrderId(orderBean.getOid());
orderPayResponse.setPayMode(PayChannelType.SVC.getEbcode());
orderPayResponse.setPayChannelType(PayChannelType.SVC);
}
return orderPayResponse;
}
......@@ -996,7 +997,7 @@ public abstract class UniversalOrderService {
orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
orderPayResponse.setPartnerId(orderBean.getCompanyId());
orderPayResponse.setOrderId(orderBean.getOid());
orderPayResponse.setPayMode(orderPayResponse.getPayMode());
orderPayResponse.setPayChannelType(orderPayResponse.getPayChannelType());
//隐射关系
redisCache.save(RedisUtil.getPaymentTransIdOrderKey(cashPay.getTransId()), orderBean.getOid(), 1L, TimeUnit.DAYS);
//加入轮训队列
......@@ -1015,7 +1016,7 @@ public abstract class UniversalOrderService {
orderPayResponse.setOpenId(paymentRequest.getOpenId());
orderPayResponse.setPartnerId(orderBean.getCompanyId());
orderPayResponse.setOrderId(orderBean.getOid());
orderPayResponse.setPayMode(PayChannelType.SVC.getEbcode());
orderPayResponse.setPayChannelType(PayChannelType.SVC);
for (CombPayResponse.PayPlatform pt : payPlatforms) {
PayItem payItem = new PayItem();
payItem.setFmTradeNo(pt.getFmTradeNo());
......@@ -1110,13 +1111,13 @@ public abstract class UniversalOrderService {
orderPayResponse.setOpenId(paymentRequest.getOpenId());
orderPayResponse.setPartnerId(orderBean.getCompanyId());
orderPayResponse.setOrderId(orderBean.getOid());
orderPayResponse.setPayMode(PayChannelType.WECHAT.getEbcode());
orderPayResponse.setPayChannelType(PayChannelType.WECHAT);
if (orderPayResponse.getPayOrder() != null && StringUtils.isNotBlank(orderPayResponse.getPayOrder().getAliPayOrder())) {
orderPayResponse.setPayMode(PayChannelType.ALIPAY.getEbcode());
orderPayResponse.setPayChannelType(PayChannelType.ALIPAY);
}
//抖音支付
if (PayChannelType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(orderBean.getPayChannelType())) {
orderPayResponse.setPayMode(PayChannelType.TIKTOKPAY.getEbcode());
orderPayResponse.setPayChannelType(PayChannelType.TIKTOKPAY);
}
}
......@@ -1233,7 +1234,7 @@ public abstract class UniversalOrderService {
orderPayResponse.setOpenId(paymentRequest.getOpenId());
orderPayResponse.setPartnerId(orderBean.getCompanyId());
orderPayResponse.setOrderId(orderBean.getOid());
orderPayResponse.setPayMode(PayChannelType.USVCP.getEbcode());
orderPayResponse.setPayChannelType(PayChannelType.USVCP);
}
return orderPayResponse;
}
......
order-application-service/src/main/java/cn/freemud/service/universal/impl/SaasMallOrderService.java
......@@ -9,6 +9,7 @@ import cn.freemud.entities.dto.ConfirmOrderDto;
import cn.freemud.entities.dto.QueryOrdersResponseDto;
import cn.freemud.entities.dto.QueryRelationOrderByIdResponseDto;
import cn.freemud.entities.dto.UserDeliveryInfoDto;
import cn.freemud.entities.dto.pay.OrderPayResponse;
import cn.freemud.entities.dto.product.AttributeValue;
import cn.freemud.entities.dto.product.GroupDetail;
import cn.freemud.entities.dto.product.ProductAttributeGroup;
......@@ -50,7 +51,7 @@ import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryRelatedOrderByCodeResp;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.util.ClassUtils;
import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayChannelType.java
......@@ -14,7 +14,7 @@ public enum PayChannelType {
USVCP((byte)5,"10556", "电子风味卡支付","usvcp"),
ZERO((byte)6,"100000", "0元支付","zero"),
TIKTOKPAY((byte)7,"10066", "抖音支付","tiktokpay"),
GIFTCARD((byte)8,"10199","礼品卡","giftCard"),
GIFTCARD((byte)8,"10102","礼品卡","giftCard"),
;
private Byte index;
......@@ -32,6 +32,8 @@ public enum PayChannelType {
}
return null;
}
public static PayChannelType getByEbcode(String ebcode) {
for (PayChannelType payType : values()) {
if (payType.getEbcode().equals(ebcode)) {
......
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