Skip to content

O
order-group
Commit 42961dda by xiaoer.li@freemud.com
Options

merge

parent 10eb9ecc
Showing with 84 additions and 191 deletions
assortment-ordercenter-sdk/pom.xml
......@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>assortment-ordercenter-sdk</artifactId>
<version>2.1.9-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -38,7 +38,7 @@
<dependency>
<groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
......
assortment-ordercenter-sdk/readme.md
......@@ -94,4 +94,5 @@
| 2.1.6-SNAPSHOT| 升级ordercenter-sdk | lixixoaer | 2020-11-10 |
| 2.1.7-SNAPSHOT| 混合支付退款 | lixixoaer | 2020-11-11 |
| 2.1.8-SNAPSHOT| 退款增加自动退款配置的null判断 | 刘鹏飞 | 2020-11-12 |
| 2.1.9-SNAPSHOT| 麦咖啡买三赠一 | 徐康 | 2020-11-16 |
\ No newline at end of file
| 2.1.9-SNAPSHOT| 麦咖啡买三赠一 | 徐康 | 2020-11-16 |
| 2.2.0-SNAPSHOT| 混合支付 | 徐康 | 2020-11-16 |
\ No newline at end of file
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
......@@ -263,12 +263,10 @@ public class OrderSdkAdapter {
//订单重量
Double orderWeight = sumOrderWeight(requestVO.getProducts());
request.setWeight(orderWeight);
request.setOrderPayItemCreateReqList(requestVO.getOrderPayItemCreateReqList());
// 扩展字段（第三方商品分类编号）
if (null != requestVO && null != requestVO.getOtherInfo()) {
request.setExtInfo(JSONObject.toJSONString(requestVO.getOtherInfo()));
}
request.setOrderPayItemCreateReqList(requestVO.getOrderPayItemCreateReqList());
return request;
}
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -62,9 +62,6 @@ import com.freemud.application.sdk.api.promotioncenter.request.promotion.Activit
import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.sdk.api.assortment.order.enums.*;
import com.freemud.sdk.api.assortment.order.request.order.*;
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.request.payment.UnifiedOrderApplicationRequest;
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;
......@@ -3504,9 +3501,7 @@ public class OrderAdapter {
, null
, createOrderVo.getUnionPayCard()
, createOrderVo.getShopId()
, createOrderVo.getOrderPayItemCreateReqList()
, createOrderVo.getCashAmount()
, createOrderVo.getSvcAmount());
, createOrderVo.getChannel());
}
public CreatePrepayRequestDto convertToCreatePrepayRequestDto(String partnerId
, String wxAppId, String openId
......@@ -3522,9 +3517,8 @@ public class OrderAdapter {
, OrderClientType orderClient
, CreateOrderVo.UnionPayCard unionPayCard
, String storeId
, List<OrderPayItemCreateReq> payItem
, BigDecimal cashAmount
, BigDecimal svcAmount){
, String channel
){
CreatePrepayRequestDto requestDto = new CreatePrepayRequestDto();
requestDto.setPartnerId(partnerId);
requestDto.setWxAppId(wxAppId);
......@@ -3541,9 +3535,7 @@ public class OrderAdapter {
requestDto.setOrderClient(orderClient);
requestDto.setUnionPayCard(unionPayCard);
requestDto.setStoreId(storeId);
requestDto.setOrderPayItemCreateReqList(payItem);
requestDto.setCashAmount(cashAmount);
requestDto.setSvcAmount(svcAmount);
requestDto.setChannel(channel);
return requestDto;
}
......@@ -3623,73 +3615,46 @@ public class OrderAdapter {
return StringUtils.isNotBlank(payChannel) && OrderAdapter.PAY_CODE_10102.equalsIgnoreCase(payChannel);
}
///**
// * 支付信息转换
// */
//public UnifiedOrderApplicationRequest convent2CombPayOrderRequest(List<OrderPayItemCreateReq> orderPayItemCreateReqList, QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, Long amount, Integer cardAmount, String partnerPayOvertime) {
// UnifiedOrderApplicationRequest orderPayDto = new UnifiedOrderApplicationRequest();
// orderPayDto.setEbCode(paymentRequest.getPayCode());
// orderPayDto.setPartnerId(orderBean.getCompanyId());
// orderPayDto.setBody(paymentRequest.getPrincipalName());
// orderPayDto.setNotifyUrl(paymentRequest.getReverseNotifyiDcUrl());
// orderPayDto.setStoreId(orderBean.getShopId());
// orderPayDto.setOpenId(paymentRequest.getOpenId());
// String businessDate = com.freemud.application.sdk.api.util.DateUtil.convert2String(new Date(), "yyyyMMdd");
// orderPayDto.setBusinessDate(businessDate);
// orderPayDto.setAmount(amount);
// orderPayDto.setUndisAmount(1L);
// orderPayDto.setVipAmount(Long.valueOf(cardAmount));
// orderPayDto.setAppId(paymentRequest.getWxAppId());
// orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30"));
// List<ProductVO> productVOS = new ArrayList<ProductVO>();
// if (CollectionUtils.isNotEmpty(orderBean.getProductList())) {
// orderBean.getProductList().forEach(orderProductBean -> {
// ProductVO productBean = new ProductVO();
// productBean.setId(orderProductBean.getProductId());
// productBean.setQuantity(BigDecimal.valueOf(orderProductBean.getNumber()));
// productBean.setSeq(orderProductBean.getSequence());
// productBean.setSalesType("NORMAL");
// productBean.setPrice(orderProductBean.getPrice());
// productBean.setName(orderProductBean.getProductName());
// productVOS.add(productBean);
// });
// }
// orderPayDto.setProducts(productVOS);
// orderPayDto.setPayCode(paymentRequest.getPayCode());
// orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
// List<PayPlatformVO> platforms = new ArrayList<>();
// if (null != orderPayItemCreateReqList && orderPayItemCreateReqList.size() > 0) {
// orderPayItemCreateReqList.forEach(OrderPayItem -> {
// PayPlatformVO payPlatformVO = new PayPlatformVO();
// payPlatformVO.setAmount(OrderPayItem.getPayAmount().longValue());
// payPlatformVO.setEbcode(getEbCode4PayOrderCenter(OrderPayItem.getPayChannelType()));
// platforms.add(payPlatformVO);
// });
// }
// orderPayDto.setPlatforms(platforms);
// orderPayDto.setOutOrderNo(orderBean.getOid());
// return orderPayDto;
//}
public OrderPayResponse convent2OrderCombPayResponse(UnifiedOrderApiResponse unifiedOrderResponse) {
/**
* 混合支付返回的支付参数
* @param payPlatforms
* @return
*/
public OrderPayResponse convent2OrderCombPayResponse(List<CombPayResponse.PayPlatform> payPlatforms,String partnerId) {
CombPayResponse.PayPlatform payPlatform = payPlatforms
.stream()
.filter(f -> !PayChannelType.SVC.getEbcode().equals(f.getEbCode())).findFirst()
.orElse(null);
OrderPayResponse responseDto = new OrderPayResponse();
responseDto.setFmId(unifiedOrderResponse.getFmTradeNo());
responseDto.setMsg(unifiedOrderResponse.getMessage());
responseDto.setPayEbcode(unifiedOrderResponse.getEbCode());
responseDto.setPayId(unifiedOrderResponse.getPrepayId());
responseDto.setMsg("succ");
responseDto.setPayEbcode(payPlatform.getEbCode());
responseDto.setPayId("");
OrderPayResponse.PayOrderBean payBean = new OrderPayResponse.PayOrderBean();
payBean.setAppid(unifiedOrderResponse.getAppId());
payBean.setNonceStr(unifiedOrderResponse.getNonceStr());
payBean.setPackageX(unifiedOrderResponse.get_package());
payBean.setSign(unifiedOrderResponse.getPaySign());
payBean.setSignType(unifiedOrderResponse.getPaySignType());
payBean.setTimestamp(unifiedOrderResponse.getTimestamp());
payBean.setAliPayOrder(unifiedOrderResponse.getPayAccount());
responseDto.setPayOrder(payBean);
responseDto.setStatusCode(unifiedOrderResponse.getCode());
responseDto.setPayTransId(payPlatform.getTransId());
responseDto.setFmId(payPlatform.getFmTradeNo());
CombPayResponse.PayPlatform.PayOrderBean payOrderBean = payPlatform.getPayOrder();
if (null != payOrderBean) {
payBean.setAppid(payOrderBean.getAppId());
payBean.setNonceStr(payOrderBean.getNonceStr());
payBean.setPackageX(payOrderBean.getPackageX());
payBean.setSign(payOrderBean.getPaySign());
payBean.setSignType(payOrderBean.getSignType());
payBean.setTimestamp(payOrderBean.getTimeStamp());
payBean.setAliPayOrder(payOrderBean.getAliPayOrder());
responseDto.setPayOrder(payBean);
}
//供修改订单
for (CombPayResponse.PayPlatform pt : payPlatforms) {
PayItem payItem = new PayItem();
payItem.setFmTradeNo(pt.getFmTradeNo());
payItem.setPayChannelType(PayChannelType.getByEbcode(pt.getEbCode()).getIndex().intValue());
payItem.setTransId(pt.getTransId());
payItem.setPartnerId(partnerId);
responseDto.getPayItem().add(payItem);
}
return responseDto;
}
/**
* @param payChannelType
* @return
......@@ -3787,15 +3752,15 @@ public class OrderAdapter {
return deleteOrderDto;
}
public CombPayRequest convent2CombPayOrderRequest(String cardNo
, QueryOrdersResponse.DataBean.OrderBean orderBean
, PaymentRequest paymentRequest
, String partnerPayOvertime
, String orderClient
, String channel
, Integer totalAmount
, Integer svcAmount
, Integer svcVAmount) {
//public CombPayRequest convent2CombPayOrderRequest(String cardNo
// , QueryOrdersResponse.DataBean.OrderBean orderBean
// , PaymentRequest paymentRequest
// , String partnerPayOvertime
// , String orderClient
// , String channel
// , Integer totalAmount
// , Integer svcAmount
// , Integer svcVAmount) {
/**
* 初始化扣减活动库存请求对象
* add by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
......@@ -3814,44 +3779,15 @@ public class OrderAdapter {
return activityUpdateStockRequest;
}
/**
* svc卡支付+现金支付
* @param cashAmount
* @param svcAmount
* @param payChannelType
* @return
*/
public List<OrderPayItemCreateReq> setOrderPayItem(BigDecimal cashAmount,BigDecimal svcAmount, Byte payChannelType){
List<OrderPayItemCreateReq> orderPayItemCreateReqs = new ArrayList<>(0);
OrderPayItemCreateReq orderPayItemCreateReqSvc = new OrderPayItemCreateReq();
//svc卡
orderPayItemCreateReqSvc.setPayAmount(svcAmount);
orderPayItemCreateReqSvc.setPayChannelType(PayChannelType.SVC.getIndex().intValue());
orderPayItemCreateReqSvc.setPayChannelName(PayChannelType.SVC.getName());
orderPayItemCreateReqSvc.setPayEbCode(PayChannelType.SVC.getEbcode());
orderPayItemCreateReqs.add(orderPayItemCreateReqSvc);
//现金支付
OrderPayItemCreateReq orderPayItemCreateReqOther = new OrderPayItemCreateReq();
orderPayItemCreateReqOther.setPayAmount(cashAmount);
orderPayItemCreateReqOther.setPayChannelType(PayChannelType.getByIndex(payChannelType).getIndex().intValue());
orderPayItemCreateReqOther.setPayChannelName(PayChannelType.getByIndex(payChannelType).getName());
orderPayItemCreateReqOther.setPayEbCode(PayChannelType.getByIndex(payChannelType).getEbcode());
orderPayItemCreateReqs.add(orderPayItemCreateReqOther);
return orderPayItemCreateReqs;
}
/**
* 混合支付预支付信息转换
* @param paymentRequest
* @param createPrepayRequestDto
* @param partnerPayOvertime
* @return
*/
public CombPayRequest convent2CombPayOrderRequest(PaymentRequest paymentRequest
, CreatePrepayRequestDto createPrepayRequestDto
, String partnerPayOvertime,String orderClient) {
public CombPayRequest convent2CombPayOrderRequest(String cardNo
, QueryOrdersResponse.DataBean.OrderBean orderBean
, PaymentRequest paymentRequest
, String partnerPayOvertime
, String orderClient
, String channel
, Integer totalAmount
, Integer svcAmount
, Integer svcVAmount) {
CombPayRequest orderPayDto = new CombPayRequest();
orderPayDto.setEbCode(paymentRequest.getPayCode());
orderPayDto.setPartner_id(orderBean.getCompanyId());
......@@ -3861,15 +3797,15 @@ public class OrderAdapter {
orderPayDto.setOpen_id(paymentRequest.getOpenId());
String businessDate = com.freemud.application.sdk.api.util.DateUtil.convert2String(new Date(), "yyyyMMdd");
orderPayDto.setBusiness_date(businessDate);
orderPayDto.setAmount(createPrepayRequestDto.getTotalAmount());
orderPayDto.setAmount(totalAmount.longValue());
orderPayDto.setVip_amount(0L);
orderPayDto.setAppId(paymentRequest.getWxAppId());
orderPayDto.setPayCode(paymentRequest.getPayCode());
orderPayDto.setVer("V1");
orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30"));
List<ProductVO> productVOS = new ArrayList<ProductVO>();
if (CollectionUtils.isNotEmpty(createPrepayRequestDto.getFatherOrderBean().getProductList())) {
for (QueryOrdersResponse.DataBean.OrderBean.ProductBean product : createPrepayRequestDto.getFatherOrderBean().getProductList()) {
if (CollectionUtils.isNotEmpty(orderBean.getProductList())) {
for (QueryOrdersResponse.DataBean.OrderBean.ProductBean product : orderBean.getProductList()) {
ProductVO productBean = new ProductVO();
productBean.setId(product.getProductId());
productBean.setQuantity(product.getNumber());
......@@ -3882,67 +3818,24 @@ public class OrderAdapter {
}
orderPayDto.setProducts(productVOS);
List<PayPlatformVO> platforms = new ArrayList<>();
if(null != createPrepayRequestDto.getOrderPayItemCreateReqList() && createPrepayRequestDto.getOrderPayItemCreateReqList().size()>0){
for (OrderPayItemCreateReq orderPayItemCreateReq : createPrepayRequestDto.getOrderPayItemCreateReqList()) {
PayPlatformVO payPlatformVO = new PayPlatformVO();
payPlatformVO.setAmount(orderPayItemCreateReq.getPayAmount().longValue());
payPlatformVO.setEbcode(orderPayItemCreateReq.getPayEbCode());
if (orderPayItemCreateReq.getPayEbCode().equals(PayChannelType.SVC.getEbcode())) {
payPlatformVO.setClientCode(orderPayItemCreateReq.getPayEbCode());
}
else if (orderPayItemCreateReq.getPayEbCode().equals(PayChannelType.WECHAT.getEbcode())) {
payPlatformVO.setClientCode(orderClient);
}
else if (orderPayItemCreateReq.getPayEbCode().equals(PayChannelType.ALIPAY.getEbcode())) {
payPlatformVO.setClientCode(orderClient);
}
platforms.add(payPlatformVO);
}
}
Long svc = svcAmount.longValue()+svcVAmount.longValue();
PayPlatformVO payPlatformVO = new PayPlatformVO();
payPlatformVO.setClientCode(PayChannelType.SVC.getEbcode());
payPlatformVO.setEbcode(PayChannelType.SVC.getEbcode());
payPlatformVO.setAmount(svc);
platforms.add(payPlatformVO);
String ebcode = PayChannelType.getByIndex(Byte.parseByte(channel)).getEbcode();
payPlatformVO = new PayPlatformVO();
payPlatformVO.setAmount(totalAmount.longValue() - svc);
payPlatformVO.setClientCode(orderClient);
payPlatformVO.setEbcode(ebcode);
platforms.add(payPlatformVO);
orderPayDto.setPlatforms(platforms);
orderPayDto.setOut_order_no(createPrepayRequestDto.getFatherOrderBean().getOid());
orderPayDto.setCardCode(createPrepayRequestDto.getCardCode());
orderPayDto.setOut_order_no(orderBean.getOid());
orderPayDto.setCardCode(cardNo);
return orderPayDto;
}
/**
* 混合支付返回的支付参数
* @param payPlatforms
* @return
*/
public OrderPayResponse convent2OrderCombPayResponse(List<CombPayResponse.PayPlatform> payPlatforms,String partnerId) {
CombPayResponse.PayPlatform payPlatform = payPlatforms
.stream()
.filter(f -> !PayChannelType.SVC.getEbcode().equals(f.getEbCode())).findFirst()
.orElse(null);
OrderPayResponse responseDto = new OrderPayResponse();
responseDto.setMsg("succ");
responseDto.setPayEbcode(payPlatform.getEbCode());
responseDto.setPayId("");
OrderPayResponse.PayOrderBean payBean = new OrderPayResponse.PayOrderBean();
responseDto.setPayTransId(payPlatform.getTransId());
responseDto.setFmId(payPlatform.getFmTradeNo());
CombPayResponse.PayPlatform.PayOrderBean payOrderBean = payPlatform.getPayOrder();
if (null != payOrderBean) {
payBean.setAppid(payOrderBean.getAppId());
payBean.setNonceStr(payOrderBean.getNonceStr());
payBean.setPackageX(payOrderBean.getPackageX());
payBean.setSign(payOrderBean.getPaySign());
payBean.setSignType(payOrderBean.getSignType());
payBean.setTimestamp(payOrderBean.getTimeStamp());
payBean.setAliPayOrder(payOrderBean.getAliPayOrder());
responseDto.setPayOrder(payBean);
}
//供修改订单
for (CombPayResponse.PayPlatform pt : payPlatforms) {
PayItem payItem = new PayItem();
payItem.setFmTradeNo(pt.getFmTradeNo());
payItem.setPayChannelType(PayChannelType.getByEbcode(pt.getEbCode()).getIndex().intValue());
payItem.setTransId(pt.getTransId());
payItem.setPartnerId(partnerId);
responseDto.getPayItem().add(payItem);
}
return responseDto;
}
}
ordercenter-sdk/pom.xml
......@@ -8,7 +8,7 @@
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.6.4-SNAPSHOT</version>
<version>1.6.5-SNAPSHOT</version>
<artifactId>ordercenter-sdk</artifactId>
<dependencies>
......
ordercenter-sdk/readme.md
......@@ -33,5 +33,6 @@
| 1.3.18.RELEASE | 麦咖啡加料 | 徐康 | 2020-10-30 |
| 1.6.3-SNAPSHOT | Add#PayChannelType | lixiaoer | 2020-11-09 |
| 1.6.4-SNAPSHOT | 麦咖啡买三赠一 | 徐康 | 2020-11-16 |
| 1.6.5-SNAPSHOT | 混合支付 | 徐康 | 2020-11-16 |
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