Skip to content

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

混合支付Beta

parent dd700c49
Showing with 152 additions and 148 deletions
assortment-ordercenter-sdk/pom.xml
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>2.0.24-SNAPSHOT</version> <version>2.1.2-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<dependency> <dependency>
<artifactId>assortment-data-manager</artifactId> <artifactId>assortment-data-manager</artifactId>
<groupId>com.freemud.sdk.api.assortment</groupId> <groupId>com.freemud.sdk.api.assortment</groupId>
<version>3.5.RELEASE</version> <version>5.2.7.RELEASE</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<version>1.5.2-SNAPSHOT</version> <version>1.6.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
...@@ -228,6 +228,4 @@ public class BaseCreateOrderRequest extends BaseConfig { ...@@ -228,6 +228,4 @@ public class BaseCreateOrderRequest extends BaseConfig {
private Integer validityDateDays; private Integer validityDateDays;
} }
private List<OrderPayItemCreateReq> orderPayItemCreateReqList;
} }
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
...@@ -418,11 +418,6 @@ public class QueryOrdersResponse { ...@@ -418,11 +418,6 @@ public class QueryOrdersResponse {
/** /**
* 发票明细
*/
private OrderInvoice orderInvoice;
/**
* 混合支付list * 混合支付list
*/ */
private List<OrderPayItem> orderPayItem; private List<OrderPayItem> orderPayItem;
...@@ -565,8 +560,21 @@ public class QueryOrdersResponse { ...@@ -565,8 +560,21 @@ public class QueryOrdersResponse {
* 订单商品明细ID，由订单服务生成 * 订单商品明细ID，由订单服务生成
*/ */
private Long id; private Long id;
/**
* 加购人ID
*/
private String userId;
/**
* 加购人昵称
*/
private String nickName;
/** /**
* 加购人头像
*/
private String photoUrl;
/**
* 套餐子商品 * 套餐子商品
*/ */
public List<ProductBean> comboProduct; public List<ProductBean> comboProduct;
......
order-application-service/pom.xml
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<dependency> <dependency>
<groupId>com.freemud.sdk.api.assortment</groupId> <groupId>com.freemud.sdk.api.assortment</groupId>
<artifactId>assortment-orderdistributor-sdk</artifactId> <artifactId>assortment-orderdistributor-sdk</artifactId>
<version>2.2.2-SNAPSHOT</version> <version>2.4.3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>2.0.24-SNAPSHOT</version> <version>2.1.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<dependency> <dependency>
<artifactId>promotioncenter-sdk</artifactId> <artifactId>promotioncenter-sdk</artifactId>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
<version>2.3.RELEASE</version> <version>2.6.5.SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.sdk.api.assortment</groupId> <groupId>com.freemud.sdk.api.assortment</groupId>
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<dependency> <dependency>
<artifactId>assortment-data-manager</artifactId> <artifactId>assortment-data-manager</artifactId>
<groupId>com.freemud.sdk.api.assortment</groupId> <groupId>com.freemud.sdk.api.assortment</groupId>
<version>5.1.1-SNAPSHOT</version> <version>5.2.7.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.freemud.commons</groupId> <groupId>cn.freemud.commons</groupId>
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -53,6 +53,7 @@ import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPar ...@@ -53,6 +53,7 @@ import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPar
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.entities.PayItem; import com.freemud.application.sdk.api.ordercenter.entities.PayItem;
import com.freemud.application.sdk.api.ordercenter.enums.*; import com.freemud.application.sdk.api.ordercenter.enums.*;
import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto; import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq; import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
import com.freemud.application.sdk.api.ordercenter.request.create.OrderPayItemCreateReq; import com.freemud.application.sdk.api.ordercenter.request.create.OrderPayItemCreateReq;
...@@ -82,6 +83,7 @@ import org.apache.commons.lang.StringUtils; ...@@ -82,6 +83,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.FastDateFormat; import org.apache.commons.lang.time.FastDateFormat;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.awt.geom.Point2D; import java.awt.geom.Point2D;
...@@ -3554,53 +3556,53 @@ public class OrderAdapter { ...@@ -3554,53 +3556,53 @@ public class OrderAdapter {
return StringUtils.isNotBlank(payChannel) && OrderAdapter.PAY_CODE_10102.equalsIgnoreCase(payChannel); 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) { //public UnifiedOrderApplicationRequest convent2CombPayOrderRequest(List<OrderPayItemCreateReq> orderPayItemCreateReqList, QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, Long amount, Integer cardAmount, String partnerPayOvertime) {
UnifiedOrderApplicationRequest orderPayDto = new UnifiedOrderApplicationRequest(); // UnifiedOrderApplicationRequest orderPayDto = new UnifiedOrderApplicationRequest();
orderPayDto.setEbCode(paymentRequest.getPayCode()); // orderPayDto.setEbCode(paymentRequest.getPayCode());
orderPayDto.setPartnerId(orderBean.getCompanyId()); // orderPayDto.setPartnerId(orderBean.getCompanyId());
orderPayDto.setBody(paymentRequest.getPrincipalName()); // orderPayDto.setBody(paymentRequest.getPrincipalName());
orderPayDto.setNotifyUrl(paymentRequest.getReverseNotifyiDcUrl()); // orderPayDto.setNotifyUrl(paymentRequest.getReverseNotifyiDcUrl());
orderPayDto.setStoreId(orderBean.getShopId()); // orderPayDto.setStoreId(orderBean.getShopId());
orderPayDto.setOpenId(paymentRequest.getOpenId()); // orderPayDto.setOpenId(paymentRequest.getOpenId());
String businessDate = com.freemud.application.sdk.api.util.DateUtil.convert2String(new Date(), "yyyyMMdd"); // String businessDate = com.freemud.application.sdk.api.util.DateUtil.convert2String(new Date(), "yyyyMMdd");
orderPayDto.setBusinessDate(businessDate); // orderPayDto.setBusinessDate(businessDate);
orderPayDto.setAmount(amount); // orderPayDto.setAmount(amount);
orderPayDto.setUndisAmount(1L); // orderPayDto.setUndisAmount(1L);
orderPayDto.setVipAmount(Long.valueOf(cardAmount)); // orderPayDto.setVipAmount(Long.valueOf(cardAmount));
orderPayDto.setAppId(paymentRequest.getWxAppId()); // orderPayDto.setAppId(paymentRequest.getWxAppId());
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())) {
orderBean.getProductList().forEach(orderProductBean -> { // orderBean.getProductList().forEach(orderProductBean -> {
ProductVO productBean = new ProductVO(); // ProductVO productBean = new ProductVO();
productBean.setId(orderProductBean.getProductId()); // productBean.setId(orderProductBean.getProductId());
productBean.setQuantity(BigDecimal.valueOf(orderProductBean.getNumber())); // productBean.setQuantity(BigDecimal.valueOf(orderProductBean.getNumber()));
productBean.setSeq(orderProductBean.getSequence()); // productBean.setSeq(orderProductBean.getSequence());
productBean.setSalesType("NORMAL"); // productBean.setSalesType("NORMAL");
productBean.setPrice(orderProductBean.getPrice()); // productBean.setPrice(orderProductBean.getPrice());
productBean.setName(orderProductBean.getProductName()); // productBean.setName(orderProductBean.getProductName());
productVOS.add(productBean); // productVOS.add(productBean);
}); // });
} // }
orderPayDto.setProducts(productVOS); // orderPayDto.setProducts(productVOS);
orderPayDto.setPayCode(paymentRequest.getPayCode()); // orderPayDto.setPayCode(paymentRequest.getPayCode());
orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType())); // orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
List<PayPlatformVO> platforms = new ArrayList<>(); // List<PayPlatformVO> platforms = new ArrayList<>();
if (null != orderPayItemCreateReqList && orderPayItemCreateReqList.size() > 0) { // if (null != orderPayItemCreateReqList && orderPayItemCreateReqList.size() > 0) {
orderPayItemCreateReqList.forEach(OrderPayItem -> { // orderPayItemCreateReqList.forEach(OrderPayItem -> {
PayPlatformVO payPlatformVO = new PayPlatformVO(); // PayPlatformVO payPlatformVO = new PayPlatformVO();
payPlatformVO.setAmount(OrderPayItem.getPayAmount().longValue()); // payPlatformVO.setAmount(OrderPayItem.getPayAmount().longValue());
payPlatformVO.setEbcode(getEbCode4PayOrderCenter(OrderPayItem.getPayChannelType())); // payPlatformVO.setEbcode(getEbCode4PayOrderCenter(OrderPayItem.getPayChannelType()));
platforms.add(payPlatformVO); // platforms.add(payPlatformVO);
}); // });
} // }
orderPayDto.setPlatforms(platforms); // orderPayDto.setPlatforms(platforms);
orderPayDto.setOutOrderNo(orderBean.getOid()); // orderPayDto.setOutOrderNo(orderBean.getOid());
return orderPayDto; // return orderPayDto;
} //}
public OrderPayResponse convent2OrderCombPayResponse(UnifiedOrderApiResponse unifiedOrderResponse) { public OrderPayResponse convent2OrderCombPayResponse(UnifiedOrderApiResponse unifiedOrderResponse) {
OrderPayResponse responseDto = new OrderPayResponse(); OrderPayResponse responseDto = new OrderPayResponse();
......
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
...@@ -34,8 +34,6 @@ import java.util.List; ...@@ -34,8 +34,6 @@ import java.util.List;
@Data @Data
public class CreateOrderVo { public class CreateOrderVo {
private List<OrderPayItemCreateReq> orderPayItemCreateReqList;
@NotEmpty(message = "sessionId 不能为空") @NotEmpty(message = "sessionId 不能为空")
private String sessionId; private String sessionId;
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -322,8 +322,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -322,8 +322,6 @@ public class OrderServiceImpl implements Orderservice {
ShoppingCartGoodsDto shoppingCartGoodsDto = checkOrder.getShoppingCartGoodsDto(createOrderVo); ShoppingCartGoodsDto shoppingCartGoodsDto = checkOrder.getShoppingCartGoodsDto(createOrderVo);
// 查询小程序自提外卖配置信息 校验当前订单类型的下单参数 校验外卖是否满足起送条件 // 查询小程序自提外卖配置信息 校验当前订单类型的下单参数 校验外卖是否满足起送条件
Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto, shoppingCartGoodsDto, trackingNo); Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto, shoppingCartGoodsDto, trackingNo);
OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo, shoppingCartGoodsDto);
boolean svcPay = checkOrder.checkSvcPay(createOrderVo, shoppingCartGoodsDto, trackingNo); boolean svcPay = checkOrder.checkSvcPay(createOrderVo, shoppingCartGoodsDto, trackingNo);
OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo); OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo);
//1.9.2套餐需求同步优化创建订单代码 //1.9.2套餐需求同步优化创建订单代码
...@@ -385,14 +383,14 @@ public class OrderServiceImpl implements Orderservice { ...@@ -385,14 +383,14 @@ public class OrderServiceImpl implements Orderservice {
log.info("paymentQueueService.paymentCallback" + dto + " error" + e); log.info("paymentQueueService.paymentCallback" + dto + " error" + e);
} }
} }
/** ///**
* 获取预支付成功，将信息放入死心队列，当支付成功没有回掉的时候处理 // * 获取预支付成功，将信息放入死心队列，当支付成功没有回掉的时候处理
* // *
* @param partnerId // * @param partnerId
* @param storeId // * @param storeId
* @param fmId // * @param fmId
* @param orderId // * @param orderId
*/ // */
//public void putDelMq(String partnerId, String storeId, String fmId, String orderId,Integer payChanelType) { //public void putDelMq(String partnerId, String storeId, String fmId, String orderId,Integer payChanelType) {
// PaymentMqMessageDto dto = new PaymentMqMessageDto(); // PaymentMqMessageDto dto = new PaymentMqMessageDto();
// try { // try {
...@@ -3125,80 +3123,80 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3125,80 +3123,80 @@ public class OrderServiceImpl implements Orderservice {
return ResponseUtil.success(responses.getData()); return ResponseUtil.success(responses.getData());
} }
/** ///**
* 创建预支付订单 // * 创建预支付订单
*/ // */
public BaseResponse createCombpayOrder(CreatePrepayRequestDto createPrepayRequestDto) { //public BaseResponse createCombpayOrder(CreatePrepayRequestDto createPrepayRequestDto) {
CreateOrderResponseVo createOrderResponse; // CreateOrderResponseVo createOrderResponse;
OrderPayResponse orderPayResponse = null; // OrderPayResponse orderPayResponse = null;
PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(createPrepayRequestDto.getOpenId(), createPrepayRequestDto.getPartnerId(), createPrepayRequestDto.getWxAppId(), createPrepayRequestDto.getPayCode()); // PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(createPrepayRequestDto.getOpenId(), createPrepayRequestDto.getPartnerId(), createPrepayRequestDto.getWxAppId(), createPrepayRequestDto.getPayCode());
long totalAmount = createPrepayRequestDto.getTotalAmount(); // long totalAmount = createPrepayRequestDto.getTotalAmount();
String cardCode = createPrepayRequestDto.getCardCode(); // String cardCode = createPrepayRequestDto.getCardCode();
if (totalAmount < 0) { // if (totalAmount < 0) {
throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR); // throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
}else{ // }else{
String partnerPayOvertime = this.getPartnerPayOvertime(createPrepayRequestDto.getPartnerId()); // String partnerPayOvertime = this.getPartnerPayOvertime(createPrepayRequestDto.getPartnerId());
orderPayResponse = comPayOrder(createPrepayRequestDto.getOrderPayItemCreateReqList(),createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(),createPrepayRequestDto.getCardAmount(),partnerPayOvertime); // orderPayResponse = comPayOrder(createPrepayRequestDto.getOrderPayItemCreateReqList(),createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(),createPrepayRequestDto.getCardAmount(),partnerPayOvertime);
} // }
if (orderPayResponse == null || Objects.isNull(orderPayResponse.getFmId())) { // if (orderPayResponse == null || Objects.isNull(orderPayResponse.getFmId())) {
return failPreOrderPay(LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getProductOrderBean(), cardCode, createPrepayRequestDto.getOrderClient(), // return failPreOrderPay(LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getProductOrderBean(), cardCode, createPrepayRequestDto.getOrderClient(),
Objects.isNull(orderPayResponse) ? null : orderPayResponse.getMsg()); // Objects.isNull(orderPayResponse) ? null : orderPayResponse.getMsg());
} // }
createOrderResponse = orderAdapter.convent2CreateFatherSonOrderResponseVo(orderPayResponse, createPrepayRequestDto.getProductOrderBean()); // createOrderResponse = orderAdapter.convent2CreateFatherSonOrderResponseVo(orderPayResponse, createPrepayRequestDto.getProductOrderBean());
BaseResponse baseEditResponse = this.updateOrderInfo(orderPayResponse, createPrepayRequestDto.getOrderExtInfoDTO(), createPrepayRequestDto.getProductOrderBean(), LogThreadLocal.getTrackingNo()); // BaseResponse baseEditResponse = this.updateOrderInfo(orderPayResponse, createPrepayRequestDto.getOrderExtInfoDTO(), createPrepayRequestDto.getProductOrderBean(), LogThreadLocal.getTrackingNo());
if (baseEditResponse != null) { // if (baseEditResponse != null) {
return baseEditResponse; // return baseEditResponse;
} // }
if (totalAmount > 0 && StringUtils.isBlank(cardCode)) { // if (totalAmount > 0 && StringUtils.isBlank(cardCode)) {
createOrderResponse.setPaySuccess(false); // createOrderResponse.setPaySuccess(false);
} else { // } else {
createOrderResponse.setPaySuccess(true); // createOrderResponse.setPaySuccess(true);
} // }
// 推荐优惠插件用户下单数据上报 // // 推荐优惠插件用户下单数据上报
if (!createOrderResponse.getPaySuccess()) { // if (!createOrderResponse.getPaySuccess()) {
return ResponseUtil.success(createOrderResponse); // return ResponseUtil.success(createOrderResponse);
} else { // } else {
//如果是商品券支付0元，调用回调接口 // //如果是商品券支付0元，调用回调接口
PaysuccessNoticeMessage message = new PaysuccessNoticeMessage(); // PaysuccessNoticeMessage message = new PaysuccessNoticeMessage();
message.setResult_code(100); // message.setResult_code(100);
message.setOut_trade_no(createOrderResponse.getFmId()); // message.setOut_trade_no(createOrderResponse.getFmId());
message.setTrans_id(createOrderResponse.getOid()); // message.setTrans_id(createOrderResponse.getOid());
message.setTotal_fee(0); // message.setTotal_fee(0);
message.setOpenid(createPrepayRequestDto.getOpenId()); // message.setOpenid(createPrepayRequestDto.getOpenId());
message.setPlatform_coupon(0); // message.setPlatform_coupon(0);
message.setMerchant_coupon(0); // message.setMerchant_coupon(0);
orderAdapterService.paySuccessCallback(message); // orderAdapterService.paySuccessCallback(message);
return ResponseUtil.success(createOrderResponse); // return ResponseUtil.success(createOrderResponse);
} // }
} //}
//
public OrderPayResponse comPayOrder(List<OrderPayItemCreateReq> orderPayItemCreateReqList, QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String partnerPayOvertime) { //public OrderPayResponse comPayOrder(List<OrderPayItemCreateReq> orderPayItemCreateReqList, QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String partnerPayOvertime) {
//
OrderPayResponse orderPayResponse; // OrderPayResponse orderPayResponse;
try { // try {
//微信或者支付宝支付 // //微信或者支付宝支付
UnifiedOrderApplicationRequest request = orderAdapter.convent2CombPayOrderRequest(orderPayItemCreateReqList,orderBean, paymentRequest, orderBean.getAmount(), cardAmount, partnerPayOvertime); // UnifiedOrderApplicationRequest request = orderAdapter.convent2CombPayOrderRequest(orderPayItemCreateReqList,orderBean, paymentRequest, orderBean.getAmount(), cardAmount, partnerPayOvertime);
UnifiedOrderApiResponse responseBase = paymentApplicationClient.unifiedOrder(request,orderBean.getCompanyId()); // UnifiedOrderApiResponse responseBase = paymentApplicationClient.unifiedOrder(request,orderBean.getCompanyId());
if (!ResponseCodeConstant.RESPONSE_SUCCESS.equals(responseBase.getCode())) { // if (!ResponseCodeConstant.RESPONSE_SUCCESS.equals(responseBase.getCode())) {
log.error("混合支付返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase)); // log.error("混合支付返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
orderPayResponse = new OrderPayResponse(); // orderPayResponse = new OrderPayResponse();
orderPayResponse.setMsg(responseBase.getMessage()); // orderPayResponse.setMsg(responseBase.getMessage());
} else { // } else {
putDelMq(request.getPartnerId(), request.getStoreId(), responseBase.getFmTradeNo(), orderBean.getOid()); // putDelMq(request.getPartnerId(), request.getStoreId(), responseBase.getFmTradeNo(), orderBean.getOid());
orderPayResponse = orderAdapter.convent2OrderCombPayResponse(responseBase); // orderPayResponse = orderAdapter.convent2OrderCombPayResponse(responseBase);
orderPayResponse.setWxAppid(paymentRequest.getWxAppId()); // orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
orderPayResponse.setOpenId(paymentRequest.getOpenId()); // orderPayResponse.setOpenId(paymentRequest.getOpenId());
orderPayResponse.setPartnerId(orderBean.getCompanyId()); // orderPayResponse.setPartnerId(orderBean.getCompanyId());
orderPayResponse.setOrderId(orderBean.getOid()); // orderPayResponse.setOrderId(orderBean.getOid());
} // }
} catch (Exception e) { // } catch (Exception e) {
LogUtil.error("comPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest)); // LogUtil.error("comPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest));
//TODO 邮件告警 // //TODO 邮件告警
orderPayResponse = new OrderPayResponse(); // orderPayResponse = new OrderPayResponse();
orderPayResponse.setMsg("comPay_error"); // orderPayResponse.setMsg("comPay_error");
} // }
return orderPayResponse; // return orderPayResponse;
} //}
public String getMealCodeRule(String appId){ public String getMealCodeRule(String appId){
String mealCodeRule = ""; String mealCodeRule = "";
......
ordercenter-sdk/pom.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.5.2-SNAPSHOT</version> <version>1.6.2-SNAPSHOT</version>
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<dependencies> <dependencies>
......
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