Skip to content

O
order-group
Commit 6303f9dd by ping.wu
Options

订单聚合层去除支付sdk

parent 1214535f
Showing with 213 additions and 148 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -19,16 +19,12 @@ import cn.freemud.constant.RedisKeyConstant;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.bo.CreateOrderBONew;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
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.*;
import cn.freemud.entities.dto.pay.CombPayResponse;
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.PayProductDto;
import cn.freemud.entities.dto.pay.UnifiedOrderCom;
import cn.freemud.entities.dto.pay.UnifiedOrderRequest;
import cn.freemud.entities.dto.promotion.OrderBeanRequest;
import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
......@@ -49,6 +45,7 @@ import cn.freemud.enums.ResponseResult;
import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request;
import cn.freemud.management.entities.dto.request.pay.OrderRefundRequest;
import cn.freemud.redis.RedisCache;
import cn.freemud.utils.AppLogUtil;
import cn.freemud.utils.BarcodeUtil;
......@@ -71,7 +68,6 @@ import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
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.response.BaseDownLoadResponse;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
......@@ -86,8 +82,6 @@ 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.QueryOrderByIdResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
......@@ -98,8 +92,6 @@ import org.apache.commons.lang.time.FastDateFormat;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import cn.freemud.management.entities.dto.request.pay.OrderRefundRequest;
import java.awt.geom.Point2D;
import java.math.BigDecimal;
......@@ -112,6 +104,9 @@ import java.util.stream.Stream;
import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
//import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
//import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
@Component
public class OrderAdapter {
......@@ -2687,10 +2682,10 @@ public class OrderAdapter {
orderPayDto.setVipAmount(Long.valueOf(cardAmount));
orderPayDto.setAppId(paymentRequest.getWxAppId());
orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30"));
List<UnifiedOrderRequest.ProductBean> productBeans = new ArrayList<UnifiedOrderRequest.ProductBean>();
List<PayProductDto> productBeans = new ArrayList<>();
if (CollectionUtils.isNotEmpty(orderBean.getProductList())) {
orderBean.getProductList().forEach(orderProductBean -> {
UnifiedOrderRequest.ProductBean productBean = new UnifiedOrderRequest.ProductBean();
PayProductDto productBean = new PayProductDto();
productBean.setPid(orderProductBean.getProductId());
productBean.setConsumeNum(orderProductBean.getNumber());
productBean.setSeq(orderProductBean.getSequence());
......@@ -2730,10 +2725,10 @@ public class OrderAdapter {
orderPayDto.setVipAmount(Long.valueOf(cardAmount));
orderPayDto.setAppId(paymentRequest.getWxAppId());
orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30"));
List<UnifiedOrderRequest.ProductBean> productBeans = new ArrayList<UnifiedOrderRequest.ProductBean>();
List<PayProductDto> productBeans = new ArrayList<>();
if (CollectionUtils.isNotEmpty(orderBean.getProductList())) {
orderBean.getProductList().forEach(orderProductBean -> {
UnifiedOrderRequest.ProductBean productBean = new UnifiedOrderRequest.ProductBean();
PayProductDto productBean = new PayProductDto();
productBean.setPid(orderProductBean.getSpecification());
productBean.setConsumeNum(orderProductBean.getNumber());
productBean.setSeq(orderProductBean.getSequence());
......@@ -2841,39 +2836,39 @@ public class OrderAdapter {
return createOrderResponseVo;
}
public OrderPayResponse convent2OrderPayResponse(UnifiedOrderResponse unifiedOrderResponse) {
OrderPayResponse responseDto = new OrderPayResponse();
responseDto.setFmId(unifiedOrderResponse.getFmId());
responseDto.setMsg(unifiedOrderResponse.getMsg());
responseDto.setPayEbcode(unifiedOrderResponse.getPayEbcode());
responseDto.setPayId(unifiedOrderResponse.getPayId());
UnifiedOrderResponse.PayOrderBean payOrderBean = unifiedOrderResponse.getPayOrder();
if (null != payOrderBean) {
OrderPayResponse.PayOrderBean payBean = new OrderPayResponse.PayOrderBean();
payBean.setAppid(payOrderBean.getAppid());
payBean.setNonceStr(payOrderBean.getNonceStr());
payBean.setPackageX(payOrderBean.getPackageX());
payBean.setSign(payOrderBean.getSign());
payBean.setSignType(payOrderBean.getSignType());
payBean.setTimestamp(payOrderBean.getTimestamp());
payBean.setAliPayOrder(payOrderBean.getAliPayOrder());
responseDto.setPayOrder(payBean);
// coco 机场支付
try {
JSONObject jsonObject = JSONObject.parseObject(payOrderBean.getAliPayOrder());
responseDto.setSellerId(jsonObject.getString("sellerId"));
responseDto.setPayNotifyUrl(jsonObject.getString("payNotifyUrl"));
responseDto.setEbCode(jsonObject.getString("ebCode"));
} catch (Exception e) {
}
}
responseDto.setStatusCode(unifiedOrderResponse.getStatusCode());
responseDto.setPayTransId(unifiedOrderResponse.getPayTransId());
responseDto.setThirdOrderToken(unifiedOrderResponse.getOrderToken());
responseDto.setThirdOrderId(unifiedOrderResponse.getOrderId());
return responseDto;
}
// public OrderPayResponse convent2OrderPayResponse(UnifiedOrderResponse unifiedOrderResponse) {
// OrderPayResponse responseDto = new OrderPayResponse();
// responseDto.setFmId(unifiedOrderResponse.getFmId());
// responseDto.setMsg(unifiedOrderResponse.getMsg());
// responseDto.setPayEbcode(unifiedOrderResponse.getPayEbcode());
// responseDto.setPayId(unifiedOrderResponse.getPayId());
// PayOrderDto payOrderBean = unifiedOrderResponse.getPayOrder();
// if (null != payOrderBean) {
// OrderPayResponse.PayOrderBean payBean = new OrderPayResponse.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);
// // coco 机场支付
// try {
// JSONObject jsonObject = JSONObject.parseObject(payOrderBean.getAliPayOrder());
// responseDto.setSellerId(jsonObject.getString("sellerId"));
// responseDto.setPayNotifyUrl(jsonObject.getString("payNotifyUrl"));
// responseDto.setEbCode(jsonObject.getString("ebCode"));
// } catch (Exception e) {
//
// }
// }
// responseDto.setStatusCode(unifiedOrderResponse.getStatusCode());
// responseDto.setPayTransId(unifiedOrderResponse.getPayTransId());
// responseDto.setThirdOrderToken(unifiedOrderResponse.getOrderToken());
// responseDto.setThirdOrderId(unifiedOrderResponse.getOrderId());
// return responseDto;
// }
/**
* 订单信息转换
......
order-application-service/src/main/java/cn/freemud/entities/dto/MerchantAccountDto.java
package cn.freemud.entities.dto;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerMerchantAccount;
import com.freemud.sdk.api.assortment.payment.enums.PlatformType;
import lombok.Data;
import java.util.List;
@Data
public class MerchantAccountDto {
/**
* 支付渠道
*/
private PlatformType platformType;
/**
* 建联账户
*/
List<AssortmentOpenPlatformPartnerMerchantAccount> merchantAccounts;
}
//package cn.freemud.entities.dto;
//
//import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerMerchantAccount;
//import lombok.Data;
//
//import java.util.List;
//
//@Data
//public class MerchantAccountDto {
//
// /**
// * 支付渠道
// */
//// private PlatformType platformType;
// /**
// * 建联账户
// */
// List<AssortmentOpenPlatformPartnerMerchantAccount> merchantAccounts;
//
//}
order-application-service/src/main/java/cn/freemud/entities/dto/order/FacePayRequestDto.java
package cn.freemud.entities.dto.order;
import com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest;
import cn.freemud.entities.dto.pay.PayProductDto;
import lombok.Data;
import java.util.List;
......@@ -42,6 +42,6 @@ public class FacePayRequestDto {
//下单所用小程序类型：1微信，2支付宝，3抖音 礼品卡支付新增，记录渠道
private Integer applicationType;
private List<CodePayRequest.PayProduct> products;
private List<PayProductDto> products;
}
order-application-service/src/main/java/cn/freemud/entities/dto/pay/CloseUnifiedOrderResult.java 0 → 100644
package cn.freemud.entities.dto.pay;
import lombok.Data;
@Data
public class CloseUnifiedOrderResult {
private Integer resultCode;
private String resultMsg;
}
order-application-service/src/main/java/cn/freemud/entities/dto/pay/PayProductDto.java
......@@ -10,4 +10,11 @@ public class PayProductDto {
private Long price;
private String name;
private Integer consumeNum;
private String pid;
private Integer seq;
private String salesType = "NORMAL";
// private Long price;
// private String name;
}
order-application-service/src/main/java/cn/freemud/entities/dto/pay/PaymentCloseUnifiedOrderRequest.java 0 → 100644
package cn.freemud.entities.dto.pay;
import lombok.Data;
@Data
public class PaymentCloseUnifiedOrderRequest {
private String transactionCode;
private String ver;
private String partnerId;
private String storeId;
private String frontTransId;
private String stationId;
private String operatorId;
private String transId;
private String businessDate;
private Integer clientCode;
private String fmId;
}
order-application-service/src/main/java/cn/freemud/entities/dto/pay/PaymentCloseUnifiedOrderResponse.java 0 → 100644
package cn.freemud.entities.dto.pay;
public class PaymentCloseUnifiedOrderResponse {
private Integer code;
private String message;
private CloseUnifiedOrderResult data;
}
order-application-service/src/main/java/cn/freemud/entities/dto/pay/UnifiedOrderRequest.java
package cn.freemud.entities.dto.pay;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
public class UnifiedOrderRequest {
private String appId;
private String partnerId;
private String operatorId = "1";
private String stationId = "1";
private String storeId;
private String payCode;
private String payTimeOutTime;
private Map<String, String> extendParams;
private Integer invoiceFlag;
private String transId;
private String openId;
private String businessDate;
private String notifyUrl;
private String body;
private String goodsTag;
private Long amount;
private Long undisAmount;
private Long vipAmount;
private String foodOrderType;
private Long merchantDiscount;
private List<PayProductDto> products;
}
order-application-service/src/main/java/cn/freemud/entities/dto/pay/UnifiedOrderResponse.java 0 → 100644
package cn.freemud.entities.dto.pay;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@Data
public class UnifiedOrderResponse {
private String orderId;
private String orderToken;
@JsonProperty("pay_transId")
private String payTransId;
@JsonProperty("pay_id")
private String payId;
@JsonProperty("pay_ebcode")
private String payEbcode;
private String msg;
private String fmId;
@JsonProperty("pay_order")
private PayOrderDto payOrder;
private Integer statusCode;
}
order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
......@@ -10,6 +10,8 @@ import cn.freemud.entities.dto.coupon.InvalidCouponsRequestDto;
import cn.freemud.entities.dto.coupon.InvalidCouponsResponseDto;
import cn.freemud.entities.dto.order.CreateOrderOperateDto;
import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
import cn.freemud.entities.dto.pay.PaymentCloseUnifiedOrderRequest;
import cn.freemud.entities.dto.pay.PaymentCloseUnifiedOrderResponse;
import cn.freemud.entities.dto.pay.PaymentQueryRequestDto;
import cn.freemud.entities.dto.pay.PaymentQueryResponseDto;
import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
......@@ -42,8 +44,6 @@ import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderReq
import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentCloseUnifiedOrderRequest;
import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentCloseUnifiedOrderResponse;
import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
import com.freemud.application.sdk.api.productcenter.domain.ProductInfosDTO;
import com.freemud.application.sdk.api.productcenter.request.product.GetProductRequest;
......
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
......@@ -7,6 +7,8 @@ import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.UpdateReserveOrderResponseVo;
import cn.freemud.entities.bo.CreateOrderBONew;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.pay.PaymentCloseUnifiedOrderRequest;
import cn.freemud.entities.dto.pay.PaymentCloseUnifiedOrderResponse;
import cn.freemud.entities.dto.pay.PaymentQueryRequestDto;
import cn.freemud.entities.dto.pay.PaymentQueryResponseDto;
import cn.freemud.entities.dto.pay.svc.SVCCardAmountRequestDto;
......@@ -45,8 +47,6 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.ProductTypeEnum;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentCloseUnifiedOrderRequest;
import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentCloseUnifiedOrderResponse;
import com.freemud.application.sdk.api.storecenter.request.GetStoreTableRequest;
import com.freemud.application.sdk.api.storecenter.response.GetStoreTableResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
......
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
......@@ -53,7 +53,9 @@ import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.management.entities.dto.request.order.MCCafeCouponRequest;
import cn.freemud.management.entities.dto.request.order.MCCafeCouponVo;
import cn.freemud.management.entities.dto.request.pay.OrderRefundRequest;
import cn.freemud.management.entities.dto.response.coupon.McdNetBatchQueryResponse;
import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse;
import cn.freemud.management.enums.OrderSource;
import cn.freemud.management.service.OrderBaseService;
import cn.freemud.manager.PushMccafeOrderManager;
......@@ -114,12 +116,6 @@ import com.freemud.sdk.api.assortment.order.response.order.*;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.util.LockUtils;
import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
import com.freemud.sdk.api.assortment.payment.request.OrderRefundQueryRequest;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
import com.freemud.sdk.api.assortment.payment.response.OrderRefundQueryResponse;
import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
import com.freemud.sdk.api.assortment.payment.service.process.NewPaymentCenterServiceImpl;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
......@@ -269,8 +265,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
private McCafePushOrderClient mcCafePushOrderClient;
@Autowired
private PushMccafeOrderManager pushMccafeOrderManager;
@Autowired
private NewPaymentCenterServiceImpl paymentCenterService;
// @Autowired
// private NewPaymentCenterServiceImpl paymentCenterService;
@Autowired
private AssortmentCustomerInfoManager assortmentCustomerInfoManager;
......@@ -1347,7 +1343,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
} else if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType()) && CancelDeliveryResponseDto.hasCollectMsg.equals(deliveryBaseResponse.getErrmsg())) {
OrderRefundRequest orderRefundRequest = new OrderRefundRequest();
com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest orderRefundRequest = new com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest();
orderRefundRequest.setPartnerId(orderBean.getCompanyId());
orderRefundRequest.setStoreId(orderBean.getShopId());
orderRefundRequest.setOrderId(orderBean.getOid());
......@@ -1393,7 +1389,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
if (orderBean.getAmount() != 0) {
//调用支付退款
com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
Map<String, String> extendParams = new HashMap<>();
if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
extendParams.put("mealType", "delivery");
......@@ -1461,9 +1457,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
}
}
// PlatformBaseRequest platformBaseRequest = getRequest(orderBean);
OrderRefundRequest orderRefundRequest = new OrderRefundRequest();
com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest orderRefundRequest = new com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest();
orderRefundRequest.setPartnerId(orderBean.getCompanyId());
orderRefundRequest.setStoreId(orderBean.getShopId());
orderRefundRequest.setOrderId(orderBean.getOid());
......@@ -3029,21 +3024,21 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
orderPayment.setRefundReason(afterSalesOrderRespOptional.get().getAfterSalesReason());
}
orderPayment.setRefundStatus("REFUNDED");
OrderRefundQueryRequest orderRefundQueryRequest = new OrderRefundQueryRequest();
orderRefundQueryRequest.setPartnerId(mcCafePartnerId);
orderRefundQueryRequest.setStoreId(orderInfoReqs.getStoreId());
orderRefundQueryRequest.setOrgTransId(orderInfoReqs.getOrderCode());
orderRefundQueryRequest.setOrgPayFmId(orderExtInfoDto.getFmId());
com.freemud.application.sdk.api.base.BaseResponse<OrderRefundQueryResponse> refundQueryResponseBaseResponse =
paymentCenterService.orderRefundQuery(orderRefundQueryRequest, LogThreadLocal.getTrackingNo());
if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(refundQueryResponseBaseResponse.getCode())
&& null != refundQueryResponseBaseResponse.getData()
&& ResponseConstant.SUCCESS_RESPONSE_CODE.equals(refundQueryResponseBaseResponse.getData().getStatusCode())) {
orderPayment.setChannelRefundTransactionId(refundQueryResponseBaseResponse.getData().getRefundDetail().get(0).getEndTransId());
} else {
AppLogUtil.errorLog("获取退款三方流水号失败 request: "+ JSON.toJSONString(orderRefundQueryRequest) + " response: "+JSON.toJSONString(refundQueryResponseBaseResponse), null, null, null);
throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR, "获取退款三方流水号失败");
}
// OrderRefundQueryRequest orderRefundQueryRequest = new OrderRefundQueryRequest();
// orderRefundQueryRequest.setPartnerId(mcCafePartnerId);
// orderRefundQueryRequest.setStoreId(orderInfoReqs.getStoreId());
// orderRefundQueryRequest.setOrgTransId(orderInfoReqs.getOrderCode());
// orderRefundQueryRequest.setOrgPayFmId(orderExtInfoDto.getFmId());
// com.freemud.application.sdk.api.base.BaseResponse refundQueryResponseBaseResponse =
// paymentCenterService.orderRefundQuery(orderRefundQueryRequest, LogThreadLocal.getTrackingNo());
// if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(refundQueryResponseBaseResponse.getCode())
// && null != refundQueryResponseBaseResponse.getData()
// && ResponseConstant.SUCCESS_RESPONSE_CODE.equals(refundQueryResponseBaseResponse.getData().getStatusCode())) {
// orderPayment.setChannelRefundTransactionId(refundQueryResponseBaseResponse.getData().getRefundDetail().get(0).getEndTransId());
// } else {
// AppLogUtil.errorLog("获取退款三方流水号失败 request: "+ JSON.toJSONString(orderRefundQueryRequest) + " response: "+JSON.toJSONString(refundQueryResponseBaseResponse), null, null, null);
// throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR, "获取退款三方流水号失败");
// }
}
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
......@@ -74,9 +74,6 @@ 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.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
......@@ -87,6 +84,9 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import cn.freemud.management.entities.dto.request.pay.OrderRefundRequest;
import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse;
import java.util.*;
import java.util.concurrent.TimeUnit;
......@@ -725,7 +725,7 @@ public class MallOrderServiceImpl implements MallOrderService {
int state = PayRefundStatus.SUCCESS.getCode();
if (orderBean.getAmount() != 0) {
//调用支付退款
com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
response = payServiceImpl.orderRefund(orderPayRefundRequest);
if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java
......@@ -4,37 +4,26 @@ import cn.freemud.adapter.MessageNoticeAdapter;
import cn.freemud.adapter.OrderAdapter;
import cn.freemud.base.util.DateUtil;
import cn.freemud.constant.RedisKeyConstant;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.dto.ConfirmOrderDto;
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;
import cn.freemud.enums.OrderBeanType;
import cn.freemud.enums.PayStatus;
import cn.freemud.enums.RedisCacheEnum;
import cn.freemud.enums.ResponseResult;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.redis.RedisCache;
import cn.freemud.service.CouponActivityService;
import cn.freemud.service.thirdparty.ShoppingCartClient;
import cn.freemud.utils.AppLogUtil;
import cn.freemud.utils.DateTimeUtil;
import cn.freemud.utils.RedisUtil;
import cn.freemud.utils.ValidationCode;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.ProductTypeEnum;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.storecenter.request.ChangeTableOrderStateRequest;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
......@@ -42,29 +31,17 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
import com.freemud.sdk.api.assortment.order.request.order.AssortmentGroupOrderAffirmRequest;
import com.freemud.sdk.api.assortment.order.request.order.ClearTableRequest;
import com.freemud.sdk.api.assortment.order.request.order.OrderEditRequest;
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.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;
import com.google.common.collect.Maps;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Map;
import java.util.concurrent.TimeUnit;
//import com.freemud.application.sdk.api.log.LogThreadLocal;
/**
* All rights Reserved, Designed By www.freemud.cn
*
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -2827,7 +2827,7 @@ public class OrderServiceImpl implements Orderservice {
SdkUpdateAbnormalState sdkUpdateAbnormalState = new SdkUpdateAbnormalState();
String desc = "支付未及时回调";
com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid());
OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid());
response = payServiceImpl.orderRefund(orderPayRefundRequest);
if (response != null && noPay.equals(response.getCode())) {
return;
......
order-application-service/src/main/java/cn/freemud/service/impl/ParkingOrderServiceImpl.java
......@@ -21,10 +21,6 @@ import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoR
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentQueryOrderRequest;
import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentQueryOrderResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......
order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
......@@ -26,6 +26,7 @@ import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
import cn.freemud.management.entities.dto.request.pay.PaymentQueryOrderRequestDto;
import cn.freemud.management.entities.dto.response.pay.*;
import cn.freemud.management.entities.dto.response.pay.PaymentQueryOrderResponseDto;
import cn.freemud.management.enums.PaymentRefundStatus;
import cn.freemud.management.thirdparty.MulitiPaymentClient;
import cn.freemud.management.thirdparty.OMSPaymentClient;
import cn.freemud.redis.RedisCache;
......@@ -56,8 +57,6 @@ import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.UpdateOrderReq;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentCloseUnifiedOrderRequest;
import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentCloseUnifiedOrderResponse;
import com.freemud.application.sdk.api.util.ResponseUtils;
import com.freemud.sdk.api.assortment.order.constant.OrderRedisKeyConstant;
import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
......@@ -146,6 +145,8 @@ public class PayServiceImpl {
private static final Integer MULITI_RESPONSE = 200;
private static final String SUCCESS = "SUCCESS";
public static final Integer SUCCESS_RESPONSE_CODE_INT = 100;
public static final Integer REFUND_RESPONSE_CODE = 8200305;
/**
* 创建预支付订单
......@@ -1314,7 +1315,7 @@ public class PayServiceImpl {
request.setRefundDesc(refundRequest.getRefundDesc());
request.setNotifyUrl(refundRequest.getNotifyUrl());
request.setPartnerId(refundRequest.getPartnerId());
request.setVer(Integer.valueOf(ConstantPaymentReqType.version));
request.setVer(2);
request.setExtendParams(refundRequest.getExtendParams());
com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> checkParam = this.checkParam(refundRequest.getPartnerId(), refundRequest.getStoreId(), refundRequest.getRefundAmount(), wxAppStore);
if (!Objects.equals(checkParam.getCode(), "100")) {
......@@ -1355,11 +1356,19 @@ public class PayServiceImpl {
}
// public Integer getRefundStatus(Integer resultCode) {
// if (Objects.equals(resultCode, ResponseConstant.SUCCESS_RESPONSE_CODE_INT)) {
// return PaymentRefundStatus.PAYMENT_REFUND_STATUS_1.getCode();
// } else {
// return Objects.equals(resultCode, ResponseConstant.REFUND_RESPONSE_CODE) ? PaymentRefundStatus.PAYMENT_REFUND_STATUS_4.getCode() : PaymentRefundStatus.PAYMENT_REFUND_STATUS_2.getCode();
// }
// }
public Integer getRefundStatus(Integer resultCode) {
if (Objects.equals(resultCode, ResponseConstant.SUCCESS_RESPONSE_CODE_INT)) {
if (Objects.equals(resultCode, SUCCESS_RESPONSE_CODE_INT)) {
return PaymentRefundStatus.PAYMENT_REFUND_STATUS_1.getCode();
} else {
return Objects.equals(resultCode, ResponseConstant.REFUND_RESPONSE_CODE) ? PaymentRefundStatus.PAYMENT_REFUND_STATUS_4.getCode() : PaymentRefundStatus.PAYMENT_REFUND_STATUS_2.getCode();
return Objects.equals(resultCode, REFUND_RESPONSE_CODE) ? PaymentRefundStatus.PAYMENT_REFUND_STATUS_4.getCode() : PaymentRefundStatus.PAYMENT_REFUND_STATUS_2.getCode();
}
}
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java
......@@ -7,8 +7,6 @@ import cn.freemud.entities.dto.order.UnifiedPayResponseDto;
import cn.freemud.entities.dto.order.InvoiceCreateResponse;
import cn.freemud.entities.dto.pay.*;
import cn.freemud.entities.dto.order.RefundQueryResponseDto;
import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentCloseUnifiedOrderRequest;
import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentCloseUnifiedOrderResponse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
......
order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
......@@ -85,8 +85,6 @@ import com.freemud.sdk.api.assortment.order.request.order.*;
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.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
......@@ -101,8 +99,6 @@ import java.util.stream.Collectors;
import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS;
import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR;
//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
/**
* 订单服务
*
......
order-application-service/src/main/java/cn/freemud/service/universal/impl/SaasMallOrderService.java
......@@ -50,11 +50,8 @@ import com.freemud.sdk.api.assortment.order.request.order.*;
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.QueryRelatedOrderByCodeResp;
//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;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
......@@ -67,6 +64,8 @@ import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
/**
* @author : xh.Z
......
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