Skip to content

O
order-group
Commit 7c412103 by 周晓航
Options

Merge branch 'feature/zxh/【ka】商户号以及部分接口废弃-20220922' into qa

parents 85eeee3d ded20a7f
Showing with 102 additions and 74 deletions
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
...@@ -2738,6 +2738,7 @@ public class OrderSdkAdapter { ...@@ -2738,6 +2738,7 @@ public class OrderSdkAdapter {
queryRelatedOrderByCodeReq.setOrderCode(request.getOrderCode()); queryRelatedOrderByCodeReq.setOrderCode(request.getOrderCode());
queryRelatedOrderByCodeReq.setThirdOrderCode(request.getThirdOrderCode()); queryRelatedOrderByCodeReq.setThirdOrderCode(request.getThirdOrderCode());
queryRelatedOrderByCodeReq.setWithOperationHistory(request.getWithOperationHistory()); queryRelatedOrderByCodeReq.setWithOperationHistory(request.getWithOperationHistory());
queryRelatedOrderByCodeReq.setPartnerId(request.getPartnerId());
return queryRelatedOrderByCodeReq; return queryRelatedOrderByCodeReq;
} }
...@@ -2745,6 +2746,7 @@ public class OrderSdkAdapter { ...@@ -2745,6 +2746,7 @@ public class OrderSdkAdapter {
SdkNewOrderUpdateThirdOrderCodeReq sdkNewOrderUpdateThirdOrderCodeReq = new SdkNewOrderUpdateThirdOrderCodeReq(); SdkNewOrderUpdateThirdOrderCodeReq sdkNewOrderUpdateThirdOrderCodeReq = new SdkNewOrderUpdateThirdOrderCodeReq();
sdkNewOrderUpdateThirdOrderCodeReq.setOrderCode(assortmentSdkUpdateThirdOrderCodeRequest.getOrderCode()); sdkNewOrderUpdateThirdOrderCodeReq.setOrderCode(assortmentSdkUpdateThirdOrderCodeRequest.getOrderCode());
sdkNewOrderUpdateThirdOrderCodeReq.setThirdOrderCode(assortmentSdkUpdateThirdOrderCodeRequest.getThirdOrderCode()); sdkNewOrderUpdateThirdOrderCodeReq.setThirdOrderCode(assortmentSdkUpdateThirdOrderCodeRequest.getThirdOrderCode());
sdkNewOrderUpdateThirdOrderCodeReq.setPartnerId(assortmentSdkUpdateThirdOrderCodeRequest.getPartnerId());
return sdkNewOrderUpdateThirdOrderCodeReq; return sdkNewOrderUpdateThirdOrderCodeReq;
} }
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java
...@@ -339,7 +339,7 @@ public interface OrderCenterSdkService { ...@@ -339,7 +339,7 @@ public interface OrderCenterSdkService {
* @param trackingNo * @param trackingNo
* @return * @return
*/ */
QueryOrderByIdResponse queryOrderByDownstream(String downstreamPosCode, String downstreamThirdOrderCode, String trackingNo); QueryOrderByIdResponse queryOrderByDownstream(String downstreamPosCode, String downstreamThirdOrderCode, String trackingNo, String partnerId);
/** /**
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -615,6 +615,7 @@ public class OrderAdapter { ...@@ -615,6 +615,7 @@ public class OrderAdapter {
confirmOrderDto.setPlatformCoupon(Double.valueOf(message.getPlatform_coupon()).intValue()); confirmOrderDto.setPlatformCoupon(Double.valueOf(message.getPlatform_coupon()).intValue());
confirmOrderDto.setMerchantCoupon(Double.valueOf(message.getMerchant_coupon()).intValue()); confirmOrderDto.setMerchantCoupon(Double.valueOf(message.getMerchant_coupon()).intValue());
confirmOrderDto.setOrderSettlementAmount(message.getTotal_fee()); confirmOrderDto.setOrderSettlementAmount(message.getTotal_fee());
confirmOrderDto.setPartnerId(message.getPartnerId());
return confirmOrderDto; return confirmOrderDto;
} }
......
order-application-service/src/main/java/cn/freemud/entities/dto/ConfirmOrderDto.java
...@@ -35,4 +35,6 @@ public class ConfirmOrderDto { ...@@ -35,4 +35,6 @@ public class ConfirmOrderDto {
*/ */
private Integer orderSettlementAmount; private Integer orderSettlementAmount;
private String partnerId;
} }
order-application-service/src/main/java/cn/freemud/entities/vo/PaysuccessNoticeMessage.java
...@@ -86,4 +86,6 @@ public class PaysuccessNoticeMessage { ...@@ -86,4 +86,6 @@ public class PaysuccessNoticeMessage {
* 储值卡流水明细 * 储值卡流水明细
*/ */
private List<SvcPayItem> svcPayItems; private List<SvcPayItem> svcPayItems;
private String partnerId;
} }
order-application-service/src/main/java/cn/freemud/manager/OrderManager.java
...@@ -24,7 +24,7 @@ public class OrderManager { ...@@ -24,7 +24,7 @@ public class OrderManager {
QueryOrderByIdResponse queryOrderByIdResponse = new QueryOrderByIdResponse(); QueryOrderByIdResponse queryOrderByIdResponse = new QueryOrderByIdResponse();
String trackingNo = LogThreadLocal.getTrackingNo(); String trackingNo = LogThreadLocal.getTrackingNo();
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), request.getOrderId(), QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(request.getOrderClient(), request.getOrderId(),
request.getThirdOrderCode(), request.getWithOperationHistory(), trackingNo); request.getThirdOrderCode(), request.getWithOperationHistory(), trackingNo,request.getPartnerId());
if(orderInfo != null){ if(orderInfo != null){
queryOrderByIdResponse.setErrcode(Integer.parseInt(orderInfo.getCode())); queryOrderByIdResponse.setErrcode(Integer.parseInt(orderInfo.getCode()));
queryOrderByIdResponse.setErrmsg(orderInfo.getMessage()); queryOrderByIdResponse.setErrmsg(orderInfo.getMessage());
......
order-application-service/src/main/java/cn/freemud/service/CallerService.java
...@@ -78,6 +78,7 @@ public class CallerService { ...@@ -78,6 +78,7 @@ public class CallerService {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest(); BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId); baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo()); baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
baseQueryOrderRequest.setPartnerId(vo.getPartnerId());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest); QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
OrderBeanV1 orderBean = queryOrderByIdResponse.getData(); OrderBeanV1 orderBean = queryOrderByIdResponse.getData();
if (Objects.isNull(orderBean)) { if (Objects.isNull(orderBean)) {
......
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
...@@ -7,16 +7,16 @@ import cn.freemud.base.util.DateUtil; ...@@ -7,16 +7,16 @@ import cn.freemud.base.util.DateUtil;
import cn.freemud.entities.dto.delivery.*; import cn.freemud.entities.dto.delivery.*;
import cn.freemud.entities.dto.ecology.*; import cn.freemud.entities.dto.ecology.*;
import cn.freemud.entities.dto.pos.PosBaseRequestDto; import cn.freemud.entities.dto.pos.PosBaseRequestDto;
import cn.freemud.entities.vo.order.EditLogisticsReq;
import cn.freemud.entities.vo.delivery.DeliveryAmountVo; import cn.freemud.entities.vo.delivery.DeliveryAmountVo;
import cn.freemud.entities.vo.order.DirectDeliveryReq; import cn.freemud.entities.vo.order.DirectDeliveryReq;
import cn.freemud.entities.vo.order.EditLogisticsReq;
import cn.freemud.entities.vo.order.LogisticsList; import cn.freemud.entities.vo.order.LogisticsList;
import cn.freemud.entities.vo.order.OrderPack; import cn.freemud.entities.vo.order.OrderPack;
import cn.freemud.enums.*; import cn.freemud.enums.DeliveryStatus;
import cn.freemud.enums.MessageEventTypeEnum;
import cn.freemud.enums.MessageSceneEnum;
import cn.freemud.enums.ResponseResult;
import cn.freemud.interceptor.ServiceException; import cn.freemud.interceptor.ServiceException;
import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
import cn.freemud.management.enums.OperateType;
import cn.freemud.management.service.adapter.OrderManagerAdapter; import cn.freemud.management.service.adapter.OrderManagerAdapter;
import cn.freemud.service.ThirdDeliveryService; import cn.freemud.service.ThirdDeliveryService;
import cn.freemud.service.thirdparty.DeliveryFeiginClient; import cn.freemud.service.thirdparty.DeliveryFeiginClient;
...@@ -39,9 +39,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1; ...@@ -39,9 +39,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus; import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType; import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.OrderType; import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
import com.freemud.application.sdk.api.ordercenter.request.OrderCollectReq;
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.response.OrderBaseResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
...@@ -181,7 +179,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -181,7 +179,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
} }
sendPosMessage(partnerId, storeCode, request.getOrderId(), sendPosDeliveryStatus, request.getRemark()); sendPosMessage(partnerId, storeCode, request.getOrderId(), sendPosDeliveryStatus, request.getRemark());
//推送异常到生态 //推送异常到生态
sendException(request.getOrderId(), request.getExceptionDesc(), request.getUpdateTime(), DeliveryStatus.getDeliveryStatusByCode(deliveryStatus).getDesc()); sendException(request.getOrderId(), request.getExceptionDesc(), request.getUpdateTime(), DeliveryStatus.getDeliveryStatusByCode(deliveryStatus).getDesc(),partnerId);
// 取消外卖中台配送单 订单异常 // 取消外卖中台配送单 订单异常
// 如果 "配送单异常并且顾客更改配送地址" 不取消配送单 // 如果 "配送单异常并且顾客更改配送地址" 不取消配送单
// if (!isDeliveryAbnormalAndCustomerChangedAddress(request)) { // if (!isDeliveryAbnormalAndCustomerChangedAddress(request)) {
...@@ -319,7 +317,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -319,7 +317,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
@Override @Override
public BaseResponse mallCallbackUrl(MallCallbackRequestDto request) { public BaseResponse mallCallbackUrl(MallCallbackRequestDto request) {
QueryByCodeResponse responseDto = orderSdkService.getOrderInfo(null, request.getTid(), null, null, null); QueryByCodeResponse responseDto = orderSdkService.getOrderInfo(null, request.getTid(), null, null, null,null);
if (responseDto == null || !Objects.equals(SUCCESS_RESPONSE_CODE.toString(), responseDto.getCode())|| responseDto.getResult().getOrderCode() == null) { if (responseDto == null || !Objects.equals(SUCCESS_RESPONSE_CODE.toString(), responseDto.getCode())|| responseDto.getResult().getOrderCode() == null) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} }
...@@ -394,7 +392,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -394,7 +392,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
// pos获取回调状态 // pos获取回调状态
sendPosMessage(request.getPartnerId(), request.getStoreId(), request.getOrderId(), 71, request.getErrorDesc()); sendPosMessage(request.getPartnerId(), request.getStoreId(), request.getOrderId(), 71, request.getErrorDesc());
//生态回调 //生态回调
sendException(request.getOrderId(), request.getErrorDesc(), request.getErrorCreateTime(), deliveryEarlyWarningMsg); sendException(request.getOrderId(), request.getErrorDesc(), request.getErrorCreateTime(), deliveryEarlyWarningMsg,request.getPartnerId());
return ResponseUtil.success(); return ResponseUtil.success();
} }
...@@ -489,6 +487,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -489,6 +487,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest(); BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId); baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo()); baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
baseQueryOrderRequest.setPartnerId(partnerId);
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest); QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
if (!ResponseConstant.SUCCESS_RESPONSE_CODE.equals(response.getErrcode())) { if (!ResponseConstant.SUCCESS_RESPONSE_CODE.equals(response.getErrcode())) {
AppLogUtil.infoLog("麦咖啡订阅消息推送失败，查询订单信息失败:{} {}" ,null, JSON.toJSONString(response)); AppLogUtil.infoLog("麦咖啡订阅消息推送失败，查询订单信息失败:{} {}" ,null, JSON.toJSONString(response));
...@@ -544,6 +543,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -544,6 +543,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
try { try {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest(); BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId); baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setPartnerId(partnerId);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo()); baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest); QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
OrderBeanV1 orderBean = response.getData(); OrderBeanV1 orderBean = response.getData();
...@@ -607,10 +607,11 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -607,10 +607,11 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
/** /**
* 通知生态发送调用消息 * 通知生态发送调用消息
*/ */
public void sendException(String orderId, String unusualReason, String unusualTime, String desc) { public void sendException(String orderId, String unusualReason, String unusualTime, String desc, String partnerId) {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest(); BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId); baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo()); baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
baseQueryOrderRequest.setPartnerId(partnerId);
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest); QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
OrderBeanV1 orderBean = response.getData(); OrderBeanV1 orderBean = response.getData();
SubscribeMessageRequest request = new SubscribeMessageRequest(); SubscribeMessageRequest request = new SubscribeMessageRequest();
......
order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
...@@ -112,14 +112,14 @@ public class AppOrderServiceImpl implements AppOrderService { ...@@ -112,14 +112,14 @@ public class AppOrderServiceImpl implements AppOrderService {
//1.5.4版本，商品库存校验与扣库存 //1.5.4版本，商品库存校验与扣库存
//List<String> stockProductIds = checkOrder.getStockProductIdList(createOrderVo, shoppingCartGoodsDto); //List<String> stockProductIds = checkOrder.getStockProductIdList(createOrderVo, shoppingCartGoodsDto);
// 下单前检查优惠券是否可用 // 下单前检查优惠券是否可用
if (StringUtils.isNotBlank(createOrderVo.getCouponCode())){ if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) {
InvalidCouponsRequestDto requestDto = new InvalidCouponsRequestDto(); InvalidCouponsRequestDto requestDto = new InvalidCouponsRequestDto();
List<String> couponList = new ArrayList<>(); List<String> couponList = new ArrayList<>();
couponList.add(createOrderVo.getCouponCode()); couponList.add(createOrderVo.getCouponCode());
requestDto.setCouponCodes(couponList); requestDto.setCouponCodes(couponList);
requestDto.setPartnerId(Integer.valueOf(createOrderVo.getPartnerId())); requestDto.setPartnerId(Integer.valueOf(createOrderVo.getPartnerId()));
InvalidCouponsResponseDto invalidCouponsResponseDto = couponOnlineClient.invalidCoupons(requestDto); InvalidCouponsResponseDto invalidCouponsResponseDto = couponOnlineClient.invalidCoupons(requestDto);
if (invalidCouponsResponseDto.getStatusCode() != 100 || invalidCouponsResponseDto.getData() == null || (invalidCouponsResponseDto.getData() != null && CollectionUtils.isNotEmpty(invalidCouponsResponseDto.getData().getInvalidCoupons()))){ if (invalidCouponsResponseDto.getStatusCode() != 100 || invalidCouponsResponseDto.getData() == null || (invalidCouponsResponseDto.getData() != null && CollectionUtils.isNotEmpty(invalidCouponsResponseDto.getData().getInvalidCoupons()))) {
return ResponseUtil.error(ResponseResult.COUPON_INVALID.getCode(), ResponseResult.COUPON_INVALID.getMessage()); return ResponseUtil.error(ResponseResult.COUPON_INVALID.getCode(), ResponseResult.COUPON_INVALID.getMessage());
} }
} }
...@@ -142,7 +142,7 @@ public class AppOrderServiceImpl implements AppOrderService { ...@@ -142,7 +142,7 @@ public class AppOrderServiceImpl implements AppOrderService {
@Override @Override
public BaseResponse createPrepay(CreatePrepayVo createPrepayVo) { public BaseResponse createPrepay(CreatePrepayVo createPrepayVo) {
CreateOrderOperateDto createOrderOperateDto = this.getCreateOrderOperateDto(createPrepayVo.getOrderCode()); CreateOrderOperateDto createOrderOperateDto = this.getCreateOrderOperateDto(createPrepayVo.getOrderCode(), createPrepayVo.getPartnerId());
OrderBeanV1 productOrderBean = createOrderOperateDto.getProductOrderBean(); OrderBeanV1 productOrderBean = createOrderOperateDto.getProductOrderBean();
this.checkOrderBefore(createPrepayVo, productOrderBean); this.checkOrderBefore(createPrepayVo, productOrderBean);
// 关闭历史预支付订单 // 关闭历史预支付订单
...@@ -239,8 +239,6 @@ public class AppOrderServiceImpl implements AppOrderService { ...@@ -239,8 +239,6 @@ public class AppOrderServiceImpl implements AppOrderService {
// CreateOrderResponseVo responseVo = orderAdapter.convent2CreateFatherSonOrderNoPayResponseVo(orderBean); // CreateOrderResponseVo responseVo = orderAdapter.convent2CreateFatherSonOrderNoPayResponseVo(orderBean);
// return ResponseUtil.success(responseVo); // return ResponseUtil.success(responseVo);
// } // }
@Override @Override
public String paySuccessCallback(PaysuccessNoticeMessage message, ConfirmOrderDto confirmOrderDto, Map<String, OrderBeanV1> orderBeans) { public String paySuccessCallback(PaysuccessNoticeMessage message, ConfirmOrderDto confirmOrderDto, Map<String, OrderBeanV1> orderBeans) {
String paySuccessCallbackResult = orderservice.paySuccessCallback(message, confirmOrderDto, orderBeans); String paySuccessCallbackResult = orderservice.paySuccessCallback(message, confirmOrderDto, orderBeans);
...@@ -280,9 +278,10 @@ public class AppOrderServiceImpl implements AppOrderService { ...@@ -280,9 +278,10 @@ public class AppOrderServiceImpl implements AppOrderService {
return null; return null;
} }
private CreateOrderOperateDto getCreateOrderOperateDto(String orderId) { private CreateOrderOperateDto getCreateOrderOperateDto(String orderId, String partnerId) {
QueryRelatedOrderByCodeRequest baseQueryOrderRequest = new QueryRelatedOrderByCodeRequest(); QueryRelatedOrderByCodeRequest baseQueryOrderRequest = new QueryRelatedOrderByCodeRequest();
baseQueryOrderRequest.setOrderCode(orderId); baseQueryOrderRequest.setOrderCode(orderId);
baseQueryOrderRequest.setPartnerId(partnerId);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo()); baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryRelatedOrderByCodeResp queryOrderByIdResponse = orderCenterSdkService.queryRelatedOrderByCode(baseQueryOrderRequest); QueryRelatedOrderByCodeResp queryOrderByIdResponse = orderCenterSdkService.queryRelatedOrderByCode(baseQueryOrderRequest);
if (queryOrderByIdResponse == null || CollectionUtils.isEmpty(queryOrderByIdResponse.getOrderBeanList())) { if (queryOrderByIdResponse == null || CollectionUtils.isEmpty(queryOrderByIdResponse.getOrderBeanList())) {
......
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
...@@ -397,6 +397,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService { ...@@ -397,6 +397,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
//查询订单信息 //查询订单信息
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest(); BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId); baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setPartnerId(createReserveOrderVo.getPartnerId());
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo()); baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest); QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
if (!RESPONSE_SUCCESS_CODE.equals(queryOrderByIdResponse.getErrcode()) || queryOrderByIdResponse.getData() == null) { if (!RESPONSE_SUCCESS_CODE.equals(queryOrderByIdResponse.getErrcode()) || queryOrderByIdResponse.getData() == null) {
...@@ -508,6 +509,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService { ...@@ -508,6 +509,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
//拉取订单详细信息 //拉取订单详细信息
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest(); BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId); baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setPartnerId(assortmentCustomerInfoVo.getPartnerId());
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo()); baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest); QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
//判断订单中是否存在未称重商品 //判断订单中是否存在未称重商品
...@@ -606,6 +608,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService { ...@@ -606,6 +608,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
message.setOpenid(assortmentCustomerInfoVo.getOpenId()); message.setOpenid(assortmentCustomerInfoVo.getOpenId());
message.setPlatform_coupon(0); message.setPlatform_coupon(0);
message.setMerchant_coupon(0); message.setMerchant_coupon(0);
message.setPartnerId(assortmentCustomerInfoVo.getPartnerId());
orderAdapterService.paySuccessCallback(message); orderAdapterService.paySuccessCallback(message);
} }
}else{ }else{
...@@ -692,6 +695,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService { ...@@ -692,6 +695,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
//查询订单信息 //查询订单信息
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest(); BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId); baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setPartnerId(assortmentCustomerInfoVo.getPartnerId());
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo()); baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest); QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
queryTableStatusReponseVo = orderAdapter.conventTableStatusInfoByOrderInfo(queryOrderByIdResponse); queryTableStatusReponseVo = orderAdapter.conventTableStatusInfoByOrderInfo(queryOrderByIdResponse);
......
order-application-service/src/main/java/cn/freemud/service/impl/EvaluationServiceImpl.java
...@@ -58,7 +58,7 @@ public class EvaluationServiceImpl implements EvaluationService { ...@@ -58,7 +58,7 @@ public class EvaluationServiceImpl implements EvaluationService {
public BaseResponse userOrderEvaluationNew(AddUserOrderEvaluationNewRequestVo request) { public BaseResponse userOrderEvaluationNew(AddUserOrderEvaluationNewRequestVo request) {
OrderEvaluationStatus orderEvaluationStatus = new OrderEvaluationStatus(EvaluationStatus.SUCCESS.getCode()); OrderEvaluationStatus orderEvaluationStatus = new OrderEvaluationStatus(EvaluationStatus.SUCCESS.getCode());
try { try {
QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo("", request.getOrderId(), "", null, LogThreadLocal.getTrackingNo()); QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo("", request.getOrderId(), "", null, LogThreadLocal.getTrackingNo(),request.getPartnerId());
if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "") || orderDetailResponse.getResult() == null) { if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "") || orderDetailResponse.getResult() == null) {
return ResponseUtil.success(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.success(ResponseResult.ORDER_NOT_EXIST);
} }
...@@ -187,7 +187,7 @@ public class EvaluationServiceImpl implements EvaluationService { ...@@ -187,7 +187,7 @@ public class EvaluationServiceImpl implements EvaluationService {
return ResponseUtil.success(new OrderEvaluationStatus(2)); return ResponseUtil.success(new OrderEvaluationStatus(2));
} }
QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo("", request.getOrderId(), "", null, LogThreadLocal.getTrackingNo()); QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo("", request.getOrderId(), "", null, LogThreadLocal.getTrackingNo(),request.getPartnerId());
if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "") if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "")
|| orderDetailResponse.getResult() == null || StringUtils.isEmpty(orderDetailResponse.getResult().getOrderCode())) { || orderDetailResponse.getResult() == null || StringUtils.isEmpty(orderDetailResponse.getResult().getOrderCode())) {
return ResponseUtil.success(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.success(ResponseResult.ORDER_NOT_EXIST);
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
...@@ -8,7 +8,6 @@ import cn.freemud.entities.EdenResponse; ...@@ -8,7 +8,6 @@ import cn.freemud.entities.EdenResponse;
import cn.freemud.entities.bo.CreateOrderBONew; import cn.freemud.entities.bo.CreateOrderBONew;
import cn.freemud.entities.db.OpenPlatformOrderConfig; import cn.freemud.entities.db.OpenPlatformOrderConfig;
import cn.freemud.entities.dto.ConfirmOrderDto; import cn.freemud.entities.dto.ConfirmOrderDto;
import cn.freemud.entities.dto.ecology.ReportActivityBehaviorsRequest;
import cn.freemud.entities.dto.order.CreateCashierOrderDto; import cn.freemud.entities.dto.order.CreateCashierOrderDto;
import cn.freemud.entities.dto.pay.SvcPayItem; import cn.freemud.entities.dto.pay.SvcPayItem;
import cn.freemud.entities.dto.pay.svc.ConsumeHistoryCreateRequest; import cn.freemud.entities.dto.pay.svc.ConsumeHistoryCreateRequest;
...@@ -30,7 +29,6 @@ import cn.freemud.service.universal.factory.CreateOrderServiceFactory; ...@@ -30,7 +29,6 @@ import cn.freemud.service.universal.factory.CreateOrderServiceFactory;
import cn.freemud.utils.RedisUtil; import cn.freemud.utils.RedisUtil;
import cn.freemud.utils.ResponseUtil; import cn.freemud.utils.ResponseUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo; import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.api.assortment.datamanager.enums.IappIdType; import com.freemud.api.assortment.datamanager.enums.IappIdType;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager; import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
...@@ -45,9 +43,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequ ...@@ -45,9 +43,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequ
import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum; import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum; import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus; import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService; import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import com.freemud.application.sdk.api.service.EmailAlertService; import com.freemud.application.sdk.api.service.EmailAlertService;
...@@ -333,7 +329,7 @@ public class OrderAdapterServiceImpl { ...@@ -333,7 +329,7 @@ public class OrderAdapterServiceImpl {
if (StringUtils.isNotBlank(orderId)) { if (StringUtils.isNotBlank(orderId)) {
confirmOrderDto.setOrderId(orderId); confirmOrderDto.setOrderId(orderId);
} }
Map<String, OrderBeanV1> orderBeans = orderServiceImpl.getOrderBeanByOrderId(confirmOrderDto.getOrderId()); Map<String, OrderBeanV1> orderBeans = orderServiceImpl.getOrderBeanByOrderId(confirmOrderDto.getOrderId(),confirmOrderDto.getPartnerId());
if (MapUtils.isEmpty(orderBeans)) { if (MapUtils.isEmpty(orderBeans)) {
return gson.toJson(message); return gson.toJson(message);
} }
...@@ -422,7 +418,7 @@ public class OrderAdapterServiceImpl { ...@@ -422,7 +418,7 @@ public class OrderAdapterServiceImpl {
// 增加全局开关，当紧急方案打开时进行直接处理callBack消息 // 增加全局开关，当紧急方案打开时进行直接处理callBack消息
if (orderBean != null && orderCenterProperties.isUrgentCallbackOpen()) { if (orderBean != null && orderCenterProperties.isUrgentCallbackOpen()) {
// 查询 // 查询
OrderCallBackRequestVo requestVo = saasOrderHandle.convert2CallbackReq(orderBean.getOid(), 2, null, null); OrderCallBackRequestVo requestVo = saasOrderHandle.convert2CallbackReq(orderBean.getOid(), 2, null, null,message.getPartnerId());
ApiLog.infoMessage("紧急方案 支付成功直接调用callback,orderCode:{},requestId:{}", requestVo.getOrderCode(), requestVo.getRequestId()); ApiLog.infoMessage("紧急方案 支付成功直接调用callback,orderCode:{},requestId:{}", requestVo.getOrderCode(), requestVo.getRequestId());
orderCallbackClient.callbackOrder(requestVo); orderCallbackClient.callbackOrder(requestVo);
} }
...@@ -527,7 +523,7 @@ public class OrderAdapterServiceImpl { ...@@ -527,7 +523,7 @@ public class OrderAdapterServiceImpl {
Map<String, Object> respMsg = new LinkedHashMap<>(); Map<String, Object> respMsg = new LinkedHashMap<>();
for (String orderCode : request.getOrderCodes()) { for (String orderCode : request.getOrderCodes()) {
// 校验订单 // 校验订单
QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo(null, orderCode, null, null, LogThreadLocal.getTrackingNo()); QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo(null, orderCode, null, null, LogThreadLocal.getTrackingNo(),assortmentCustomerInfoVo.getPartnerId());
if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "") || orderDetailResponse.getResult() == null) { if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "") || orderDetailResponse.getResult() == null) {
respMsg.put(orderCode, "订单不存在"); respMsg.put(orderCode, "订单不存在");
continue; continue;
......
order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
...@@ -254,6 +254,7 @@ public class PayServiceImpl { ...@@ -254,6 +254,7 @@ public class PayServiceImpl {
message.setMerchant_coupon(0); message.setMerchant_coupon(0);
message.setSource(PaySuccessSource.OUTSIDE.getSource()); message.setSource(PaySuccessSource.OUTSIDE.getSource());
message.setSvcPayItems(orderPayResponse.getSvcPayItems()); message.setSvcPayItems(orderPayResponse.getSvcPayItems());
message.setPartnerId(createPrepayRequestDto.getPartnerId());
orderAdapterService.paySuccessCallback(message); orderAdapterService.paySuccessCallback(message);
return createOrderResponse; return createOrderResponse;
} }
......
order-application-service/src/main/java/cn/freemud/service/impl/PointsMallOrderServiceImpl.java
...@@ -414,7 +414,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService { ...@@ -414,7 +414,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
return ResponseUtil.error(ResponseResult.PARAMETER_MISSING); return ResponseUtil.error(ResponseResult.PARAMETER_MISSING);
} }
String orderCode = queryOrderVo.getOid(); String orderCode = queryOrderVo.getOid();
QueryByCodeResponse queryByCodeResponse = orderSdkService.getOrderInfo("", orderCode, "", null, LogThreadLocal.getTrackingNo()); QueryByCodeResponse queryByCodeResponse = orderSdkService.getOrderInfo("", orderCode, "", null, LogThreadLocal.getTrackingNo(),userLoginInfoDto.getPartnerId());
if (null == queryByCodeResponse || null == queryByCodeResponse.getResult()) { if (null == queryByCodeResponse || null == queryByCodeResponse.getResult()) {
return ResponseUtil.success(); return ResponseUtil.success();
......
order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
...@@ -730,6 +730,7 @@ public abstract class UniversalOrderService { ...@@ -730,6 +730,7 @@ public abstract class UniversalOrderService {
message.setPlatform_coupon(0); message.setPlatform_coupon(0);
message.setMerchant_coupon(0); message.setMerchant_coupon(0);
message.setSource(PaySuccessSource.OUTSIDE.getSource()); message.setSource(PaySuccessSource.OUTSIDE.getSource());
message.setPartnerId(createPrepayRequestDto.getPartnerId());
orderAdapterService.paySuccessCallback(message); orderAdapterService.paySuccessCallback(message);
return ResponseUtil.success(createOrderResponse); return ResponseUtil.success(createOrderResponse);
} }
......
order-application-service/src/main/java/cn/freemud/service/universal/impl/SaasMallOrderService.java
...@@ -294,7 +294,7 @@ public class SaasMallOrderService extends UniversalOrderService { ...@@ -294,7 +294,7 @@ public class SaasMallOrderService extends UniversalOrderService {
private String paySuccessCallback(PaysuccessNoticeMessage message) { private String paySuccessCallback(PaysuccessNoticeMessage message) {
ConfirmOrderDto confirmOrderDto = orderAdapter.convent2ConfirmOrderDto(message); ConfirmOrderDto confirmOrderDto = orderAdapter.convent2ConfirmOrderDto(message);
Map<String, OrderBeanV1> orderBeans = getOrderBeanByOrderId(confirmOrderDto.getOrderId()); Map<String, OrderBeanV1> orderBeans = getOrderBeanByOrderId(confirmOrderDto.getOrderId(),confirmOrderDto.getPartnerId());
return this.paySuccessCallback(message, confirmOrderDto, orderBeans); return this.paySuccessCallback(message, confirmOrderDto, orderBeans);
} }
...@@ -303,10 +303,10 @@ public class SaasMallOrderService extends UniversalOrderService { ...@@ -303,10 +303,10 @@ public class SaasMallOrderService extends UniversalOrderService {
return mallOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans); return mallOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
} }
private Map<String, OrderBeanV1> getOrderBeanByOrderId(String orderId) { private Map<String, OrderBeanV1> getOrderBeanByOrderId(String orderId, String partnerId) {
// 订单查询：若结果集只有一个orderBean，则为普通订单，否则为会员卡订单（父子订单） // 订单查询：若结果集只有一个orderBean，则为普通订单，否则为会员卡订单（父子订单）
Map<String, OrderBeanV1> result = new HashMap<>(); Map<String, OrderBeanV1> result = new HashMap<>();
QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(orderId); QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(orderId,partnerId);
if (CollectionUtils.isEmpty(queryOrderByIdResponseDto.getData())) { if (CollectionUtils.isEmpty(queryOrderByIdResponseDto.getData())) {
return result; return result;
} }
...@@ -323,10 +323,11 @@ public class SaasMallOrderService extends UniversalOrderService { ...@@ -323,10 +323,11 @@ public class SaasMallOrderService extends UniversalOrderService {
return result; return result;
} }
private QueryRelationOrderByIdResponseDto getQueryRelationOrderByIdResponseDto(String oid) { private QueryRelationOrderByIdResponseDto getQueryRelationOrderByIdResponseDto(String oid, String partnerId) {
QueryRelatedOrderByCodeRequest baseQueryOrderRequest = new QueryRelatedOrderByCodeRequest(); QueryRelatedOrderByCodeRequest baseQueryOrderRequest = new QueryRelatedOrderByCodeRequest();
baseQueryOrderRequest.setOrderCode(oid); baseQueryOrderRequest.setOrderCode(oid);
baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo()); baseQueryOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
baseQueryOrderRequest.setPartnerId(partnerId);
QueryRelatedOrderByCodeResp queryOrderByIdResponse; QueryRelatedOrderByCodeResp queryOrderByIdResponse;
queryOrderByIdResponse = orderCenterSdkService.queryRelatedOrderByCode(baseQueryOrderRequest); queryOrderByIdResponse = orderCenterSdkService.queryRelatedOrderByCode(baseQueryOrderRequest);
String string = JSONObject.toJSONString(queryOrderByIdResponse); String string = JSONObject.toJSONString(queryOrderByIdResponse);
......
order-application-service/src/test/java/cn/freemud/service/impl/EncircleOrderServiceImplTest.java
package cn.freemud.service.impl; package cn.freemud.service.impl;
import cn.freemud.adapter.DeliveryAdapter; import cn.freemud.adapter.DeliveryAdapter;
import cn.freemud.entities.dto.QueryOrdersResponseDto;
import cn.freemud.entities.vo.CreateDeliveryVo; import cn.freemud.entities.vo.CreateDeliveryVo;
import cn.freemud.entities.vo.CreateOrderVo; import cn.freemud.entities.vo.CreateOrderVo;
import cn.freemud.entities.vo.encircle.CreateReserveOrderVo; import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
...@@ -16,9 +15,9 @@ import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest; ...@@ -16,9 +15,9 @@ import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse; import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService; import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.junit.Test;
import org.junit.Before;
import org.junit.After; import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
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;
...@@ -84,22 +83,22 @@ public class EncircleOrderServiceImplTest { ...@@ -84,22 +83,22 @@ public class EncircleOrderServiceImplTest {
@Test @Test
public void testd() throws Exception { public void testd() throws Exception {
Map<String, OrderBeanV1> orderBeans = orderService.getOrderBeanByOrderId("18550453673517366500002"); Map<String, OrderBeanV1> orderBeans = orderService.getOrderBeanByOrderId("18550453673517366500002", null);
OrderBeanV1 orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode()); OrderBeanV1 orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
//获取门店信息 //获取门店信息
StoreResponse storeInfo = storeCenterService.getStoreInfo(new StoreInfoRequest(orderBean.getCompanyId(), orderBean.getShopId()), ""); StoreResponse storeInfo = storeCenterService.getStoreInfo(new StoreInfoRequest(orderBean.getCompanyId(), orderBean.getShopId()), "");
if (storeInfo == null || ObjectUtils.notEqual(cn.freemud.management.enums.ResponseResult.SUCCESS.getCode(), storeInfo.getStatusCode().toString()) || storeInfo.getBizVO() == null) { if (storeInfo == null || ObjectUtils.notEqual(cn.freemud.management.enums.ResponseResult.SUCCESS.getCode(), storeInfo.getStatusCode().toString()) || storeInfo.getBizVO() == null) {
//return sendPaySuccessNoticeMessage(); //return sendPaySuccessNoticeMessage();
} }
CreateDeliveryVo createDeliveryVo = deliveryAdapter.buildDeliveryOrderRequestDto(orderBean, storeInfo, deliveryCallBackUrl,""); CreateDeliveryVo createDeliveryVo = deliveryAdapter.buildDeliveryOrderRequestDto(orderBean, storeInfo, deliveryCallBackUrl, "");
//创建配送单 //创建配送单
CreateDeliveryOrderResponseDto deliveryResponse = deliveryFeiginClient.deliveryOrderAdd(createDeliveryVo); CreateDeliveryOrderResponseDto deliveryResponse = deliveryFeiginClient.deliveryOrderAdd(createDeliveryVo);
//创建配送单失败，更新订单为异常单 //创建配送单失败，更新订单为异常单
if (deliveryResponse == null || 100 != deliveryResponse.getCode() || deliveryResponse.getData() == null) { if (deliveryResponse == null || 100 != deliveryResponse.getCode() || deliveryResponse.getData() == null) {
String deliveryId = deliveryResponse != null && deliveryResponse.getData() != null ? deliveryResponse.getData().getDeliveryId() : ""; String deliveryId = deliveryResponse != null && deliveryResponse.getData() != null ? deliveryResponse.getData().getDeliveryId() : "";
String operator = "系统" ; String operator = "系统";
//updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, operator); //updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, operator);
// return sendPaySuccessNoticeMessage(); // return sendPaySuccessNoticeMessage();
} }
} }
...@@ -245,7 +244,7 @@ try { ...@@ -245,7 +244,7 @@ try {
} }
@Test @Test
public void testQueryTableNumberStatus()throws Exception{ public void testQueryTableNumberStatus() throws Exception {
EmptyTableNumberVo emptyTableNumberVo = new EmptyTableNumberVo(); EmptyTableNumberVo emptyTableNumberVo = new EmptyTableNumberVo();
emptyTableNumberVo.setPartnerId("1864"); emptyTableNumberVo.setPartnerId("1864");
......
order-management/src/main/java/cn/freemud/management/controller/DeliveryOrderController.java
...@@ -26,8 +26,8 @@ public class DeliveryOrderController { ...@@ -26,8 +26,8 @@ public class DeliveryOrderController {
@ApiOperation(value = "创建配送单", notes = "创建配送单", produces = "application/json") @ApiOperation(value = "创建配送单", notes = "创建配送单", produces = "application/json")
@GetMapping("/delivery/create") @GetMapping("/delivery/create")
public BaseResponse deliveryCreate(@RequestParam("orderCode") String orderCode public BaseResponse deliveryCreate(@RequestParam("orderCode") String orderCode
, @RequestParam(value = "operator", required = false) String operator) { , @RequestParam(value = "operator", required = false) String operator, @RequestParam(value = "partnerId", required = false) String partnerId) {
return orderDeliveryService.createDelivery(orderCode, operator); return orderDeliveryService.createDelivery(orderCode, operator,partnerId);
} }
......
order-management/src/main/java/cn/freemud/management/entities/dto/request/delivery/DeliveryOrderRequest.java
...@@ -11,4 +11,5 @@ public class DeliveryOrderRequest { ...@@ -11,4 +11,5 @@ public class DeliveryOrderRequest {
private String orderCode; private String orderCode;
private String operator; private String operator;
private String partnerId;
} }
order-management/src/main/java/cn/freemud/management/service/OrderBaseService.java
...@@ -44,7 +44,7 @@ public class OrderBaseService { ...@@ -44,7 +44,7 @@ public class OrderBaseService {
@Autowired @Autowired
private OrderServiceV1 serviceV1; private OrderServiceV1 serviceV1;
public OrderBeanV1 getByOrderCode(String orderCode) { public OrderBeanV1 getByOrderCode(String orderCode, String partnerId) {
// BaseQueryOrderRequest queryRequest = new BaseQueryOrderRequest(); // BaseQueryOrderRequest queryRequest = new BaseQueryOrderRequest();
// queryRequest.setOrderId(orderCode); // queryRequest.setOrderId(orderCode);
// QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(queryRequest); // QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(queryRequest);
...@@ -52,8 +52,8 @@ public class OrderBaseService { ...@@ -52,8 +52,8 @@ public class OrderBaseService {
// return null; // return null;
// } // }
// return response.getData(); // return response.getData();
String trackingNo = LogThreadLocal.getTrackingNo(); String trackingNo = LogThreadLocal.getTrackingNo();
return serviceV1.queryOrderById(null,orderCode,null,null,trackingNo); return serviceV1.queryOrderById(null, orderCode, null, null, trackingNo, partnerId);
} }
public void sendMessage(OrderBeanV1 orderBean, OperateType opType, String reason) { public void sendMessage(OrderBeanV1 orderBean, OperateType opType, String reason) {
...@@ -72,10 +72,10 @@ public class OrderBaseService { ...@@ -72,10 +72,10 @@ public class OrderBaseService {
MessageTemplateRequest<MessagePushOrderTemplateRequest> messageTemplateRequest = null; MessageTemplateRequest<MessagePushOrderTemplateRequest> messageTemplateRequest = null;
try { try {
messageTemplateRequest = messagePushAdapter.convent2MessageTemplateRequest(orderBean, reason, opType); messageTemplateRequest = messagePushAdapter.convent2MessageTemplateRequest(orderBean, reason, opType);
if (messageTemplateRequest!=null && messageTemplateRequest.getMessageEventType() != null) { if (messageTemplateRequest != null && messageTemplateRequest.getMessageEventType() != null) {
BaseResponse baseResponse = messageTemplatePushService.sendTemplateMsg(messageTemplateRequest); BaseResponse baseResponse = messageTemplatePushService.sendTemplateMsg(messageTemplateRequest);
if(baseResponse != null && !ResponseResultEnum.SUCCESS.getCode().equals(baseResponse.getCode())){ if (baseResponse != null && !ResponseResultEnum.SUCCESS.getCode().equals(baseResponse.getCode())) {
ApiLog.printLog("sendTemplateMsg",orderBean.getOid(), JSONObject.toJSONString(baseResponse),null); ApiLog.printLog("sendTemplateMsg", orderBean.getOid(), JSONObject.toJSONString(baseResponse), null);
} }
} }
} catch (Exception e) { } catch (Exception e) {
...@@ -92,9 +92,9 @@ public class OrderBaseService { ...@@ -92,9 +92,9 @@ public class OrderBaseService {
* @param orderCode * @param orderCode
* @param deliveryId * @param deliveryId
*/ */
public void updateDeliveryAbnormal(String partnerId, String orderCode, String deliveryId, String operator,String msg) { public void updateDeliveryAbnormal(String partnerId, String orderCode, String deliveryId, String operator, String msg) {
AssortmentUpdateDeliveryAbnormalRequest request = AssortmentUpdateDeliveryAbnormalRequest.builder() AssortmentUpdateDeliveryAbnormalRequest request = AssortmentUpdateDeliveryAbnormalRequest.builder()
.abnormalDesc("配送异常"+ msg) .abnormalDesc("配送异常" + msg)
.deliveryId(deliveryId) .deliveryId(deliveryId)
.orderCode(orderCode) .orderCode(orderCode)
.partnerId(partnerId) .partnerId(partnerId)
......
order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
...@@ -45,7 +45,7 @@ public class OrderManagerAdapter { ...@@ -45,7 +45,7 @@ public class OrderManagerAdapter {
*/ */
public BaseResponse<OrderManagerResponse> orderConfirmTake(OrderManagerRequest request) { public BaseResponse<OrderManagerResponse> orderConfirmTake(OrderManagerRequest request) {
//查询订单 //查询订单
BaseResponse<OrderBeanV1> orderBeanResp = this.getOrderBean(request.getOrderId()); BaseResponse<OrderBeanV1> orderBeanResp = this.getOrderBean(request.getOrderId(),request.getPartnerId());
if (!Objects.equals(orderBeanResp.getCode(), ResponseResult.SUCCESS.getCode())) { if (!Objects.equals(orderBeanResp.getCode(), ResponseResult.SUCCESS.getCode())) {
return ResponseUtil.error(orderBeanResp.getMessage()); return ResponseUtil.error(orderBeanResp.getMessage());
} }
...@@ -70,7 +70,7 @@ public class OrderManagerAdapter { ...@@ -70,7 +70,7 @@ public class OrderManagerAdapter {
*/ */
public BaseResponse<OrderManagerResponse> orderDone(OrderManagerRequest request) { public BaseResponse<OrderManagerResponse> orderDone(OrderManagerRequest request) {
//查询订单 //查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId()); OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) { if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} }
...@@ -91,7 +91,7 @@ public class OrderManagerAdapter { ...@@ -91,7 +91,7 @@ public class OrderManagerAdapter {
*/ */
public BaseResponse<OrderManagerResponse> orderDelivery(OrderManagerRequest request) { public BaseResponse<OrderManagerResponse> orderDelivery(OrderManagerRequest request) {
//查询订单 //查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId()); OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (Objects.isNull(orderBean)) { if (Objects.isNull(orderBean)) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} }
...@@ -119,7 +119,7 @@ public class OrderManagerAdapter { ...@@ -119,7 +119,7 @@ public class OrderManagerAdapter {
public BaseResponse<OrderManagerResponse> orderAffirm(OrderManagerRequest request, OrderBeanV1 orderBean) { public BaseResponse<OrderManagerResponse> orderAffirm(OrderManagerRequest request, OrderBeanV1 orderBean) {
if (orderBean == null) { if (orderBean == null) {
//查询订单 //查询订单
orderBean = orderBaseService.getByOrderCode(request.getOrderId()); orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) { if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} }
...@@ -141,7 +141,7 @@ public class OrderManagerAdapter { ...@@ -141,7 +141,7 @@ public class OrderManagerAdapter {
*/ */
public BaseResponse orderReject(OrderManagerRequest request) { public BaseResponse orderReject(OrderManagerRequest request) {
//查询订单 //查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId()); OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) { if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} }
...@@ -171,7 +171,7 @@ public class OrderManagerAdapter { ...@@ -171,7 +171,7 @@ public class OrderManagerAdapter {
*/ */
public BaseResponse orderAgreeRefund(OrderManagerRequest request) { public BaseResponse orderAgreeRefund(OrderManagerRequest request) {
//查询订单 //查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId()); OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) { if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} }
...@@ -222,7 +222,7 @@ public class OrderManagerAdapter { ...@@ -222,7 +222,7 @@ public class OrderManagerAdapter {
*/ */
public BaseResponse orderRejectRefund(OrderManagerRequest request) { public BaseResponse orderRejectRefund(OrderManagerRequest request) {
//查询订单 //查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId()); OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) { if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} }
...@@ -250,7 +250,7 @@ public class OrderManagerAdapter { ...@@ -250,7 +250,7 @@ public class OrderManagerAdapter {
*/ */
public BaseResponse orderCancel(OrderManagerRequest request) { public BaseResponse orderCancel(OrderManagerRequest request) {
//查询订单 //查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId()); OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) { if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} }
...@@ -327,7 +327,7 @@ public class OrderManagerAdapter { ...@@ -327,7 +327,7 @@ public class OrderManagerAdapter {
*/ */
public BaseResponse orderCreateDelivery(OrderManagerRequest request) { public BaseResponse orderCreateDelivery(OrderManagerRequest request) {
//查询订单 //查询订单
BaseResponse<OrderBeanV1> orderBeanResp = this.getOrderBean(request.getOrderId()); BaseResponse<OrderBeanV1> orderBeanResp = this.getOrderBean(request.getOrderId(),request.getPartnerId());
if (!Objects.equals(orderBeanResp.getCode(), ResponseResult.SUCCESS.getCode())) { if (!Objects.equals(orderBeanResp.getCode(), ResponseResult.SUCCESS.getCode())) {
return ResponseUtil.error(orderBeanResp.getMessage()); return ResponseUtil.error(orderBeanResp.getMessage());
} }
...@@ -340,9 +340,9 @@ public class OrderManagerAdapter { ...@@ -340,9 +340,9 @@ public class OrderManagerAdapter {
return handleResponse(request, orderBean, orderManagerResponse); return handleResponse(request, orderBean, orderManagerResponse);
} }
private BaseResponse<OrderBeanV1> getOrderBean(String orderId) { private BaseResponse<OrderBeanV1> getOrderBean(String orderId, String partnerId) {
//查询订单 //查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(orderId); OrderBeanV1 orderBean = orderBaseService.getByOrderCode(orderId,partnerId);
// 防止NPE // 防止NPE
if (orderBean == null) { if (orderBean == null) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
...@@ -358,7 +358,7 @@ public class OrderManagerAdapter { ...@@ -358,7 +358,7 @@ public class OrderManagerAdapter {
*/ */
public BaseResponse orderCancelDelivery(OrderManagerRequest request) { public BaseResponse orderCancelDelivery(OrderManagerRequest request) {
//查询订单 //查询订单
BaseResponse<OrderBeanV1> orderBeanResp = this.getOrderBean(request.getOrderId()); BaseResponse<OrderBeanV1> orderBeanResp = this.getOrderBean(request.getOrderId(),request.getPartnerId());
if (!Objects.equals(orderBeanResp.getCode(), ResponseResult.SUCCESS.getCode())) { if (!Objects.equals(orderBeanResp.getCode(), ResponseResult.SUCCESS.getCode())) {
return ResponseUtil.error(orderBeanResp.getMessage()); return ResponseUtil.error(orderBeanResp.getMessage());
} }
...@@ -375,7 +375,7 @@ public class OrderManagerAdapter { ...@@ -375,7 +375,7 @@ public class OrderManagerAdapter {
*/ */
public BaseResponse developRefund(OrderManagerRequest request) { public BaseResponse developRefund(OrderManagerRequest request) {
//查询订单 //查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId()); OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId(),request.getPartnerId());
if (null == orderBean) { if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} }
...@@ -394,7 +394,7 @@ public class OrderManagerAdapter { ...@@ -394,7 +394,7 @@ public class OrderManagerAdapter {
*/ */
public BaseResponse refundSuccessCallback(RefundSuccessCallbackVo request) { public BaseResponse refundSuccessCallback(RefundSuccessCallbackVo request) {
// step 1 查订单 // step 1 查订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderCode()); OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderCode(),request.getPartnerId());
if (null == orderBean) { if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} }
......
order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java
...@@ -399,11 +399,11 @@ public class SaasOrderHandle { ...@@ -399,11 +399,11 @@ public class SaasOrderHandle {
* @param msgType 消息类型 MsgType() 1:订单信息变化通知通知 * @param msgType 消息类型 MsgType() 1:订单信息变化通知通知
* @return * @return
*/ */
public OrderCallBackRequestVo convert2CallbackReq(String orderCode, Integer orderState, Integer operateType, String msgType) { public OrderCallBackRequestVo convert2CallbackReq(String orderCode, Integer orderState, Integer operateType, String msgType, String partnerId) {
OrderCallBackRequestVo notifyDto = new OrderCallBackRequestVo(); OrderCallBackRequestVo notifyDto = new OrderCallBackRequestVo();
//直接查询基础服务获取订单信息 //直接查询基础服务获取订单信息
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(null, orderCode, null, QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(null, orderCode, null,
null, LogThreadLocal.getTrackingNo()); null, LogThreadLocal.getTrackingNo(),partnerId);
if (orderInfo == null) { if (orderInfo == null) {
return null; return null;
} }
......
order-management/src/main/java/cn/freemud/management/service/impl/OrderDeliveryService.java
...@@ -37,8 +37,8 @@ public class OrderDeliveryService { ...@@ -37,8 +37,8 @@ public class OrderDeliveryService {
* @param orderCode * @param orderCode
* @return * @return
*/ */
public BaseResponse createDelivery(String orderCode, String operator) { public BaseResponse createDelivery(String orderCode, String operator, String partnerId) {
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(orderCode); OrderBeanV1 orderBean = orderBaseService.getByOrderCode(orderCode,partnerId);
if (null == orderBean) { if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} }
...@@ -59,7 +59,7 @@ public class OrderDeliveryService { ...@@ -59,7 +59,7 @@ public class OrderDeliveryService {
* @return * @return
*/ */
public BaseResponse cancelDeliveryOrder(DeliveryOrderRequest request) { public BaseResponse cancelDeliveryOrder(DeliveryOrderRequest request) {
OrderBeanV1 data = orderBaseService.getByOrderCode(request.getOrderCode()); OrderBeanV1 data = orderBaseService.getByOrderCode(request.getOrderCode(),request.getPartnerId());
if (null == data) { if (null == data) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} }
......
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
...@@ -143,7 +143,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService { ...@@ -143,7 +143,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
} }
// 增加全局开关，当紧急方案打开时进行直接处理callBack消息 // 增加全局开关，当紧急方案打开时进行直接处理callBack消息
if (orderCenterProperties.isUrgentCallbackOpen()) { if (orderCenterProperties.isUrgentCallbackOpen()) {
OrderCallBackRequestVo requestVo = saasOrderHandle.convert2CallbackReq(orderBean.getOid(), 3, null, null); OrderCallBackRequestVo requestVo = saasOrderHandle.convert2CallbackReq(orderBean.getOid(), 3, null, null, request.getPartnerId());
ApiLog.infoMessage("紧急方案 接单成功直接调用callback,orderCode:{},requestId:{}", requestVo.getOrderCode(), requestVo.getRequestId()); ApiLog.infoMessage("紧急方案 接单成功直接调用callback,orderCode:{},requestId:{}", requestVo.getOrderCode(), requestVo.getRequestId());
orderCallbackClient.callbackOrder(requestVo); orderCallbackClient.callbackOrder(requestVo);
} }
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
...@@ -7,6 +7,7 @@ public class InterfaceAddressConstant { ...@@ -7,6 +7,7 @@ public class InterfaceAddressConstant {
//创建订单 //创建订单
public static final String CREATE_ORDER = "order/v2/create"; public static final String CREATE_ORDER = "order/v2/create";
//创建父子订单 //创建父子订单
@Deprecated
public static final String CREATE_FATHER_ORDER = "order/v2/createRelatedOrders"; public static final String CREATE_FATHER_ORDER = "order/v2/createRelatedOrders";
//根据订单CODE查询订单详细信息 //根据订单CODE查询订单详细信息
public static final String GET_ORDER_INFO = "order/v2/queryByCode"; public static final String GET_ORDER_INFO = "order/v2/queryByCode";
...@@ -19,8 +20,10 @@ public class InterfaceAddressConstant { ...@@ -19,8 +20,10 @@ public class InterfaceAddressConstant {
//支付成功 //支付成功
public static final String MCCAFE_COLLECT_ORDER = "order/v2/mcCafe/syncPos"; public static final String MCCAFE_COLLECT_ORDER = "order/v2/mcCafe/syncPos";
//父子订单支付成功 //父子订单支付成功
@Deprecated
public static final String FATHER_ORDER_PAY_SUCCESS = "/order/v2/relatedOrdersPaySuccess"; public static final String FATHER_ORDER_PAY_SUCCESS = "/order/v2/relatedOrdersPaySuccess";
//删除订单 //删除订单
@Deprecated
public static final String DELETE_ORDER = "order/v2/delete"; public static final String DELETE_ORDER = "order/v2/delete";
//取消整个订单 //取消整个订单
public static final String CANCEL_ORDER = "order/v2/cancel"; public static final String CANCEL_ORDER = "order/v2/cancel";
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/QueryRelatedOrderByCodeReq.java
...@@ -20,4 +20,5 @@ public class QueryRelatedOrderByCodeReq { ...@@ -20,4 +20,5 @@ public class QueryRelatedOrderByCodeReq {
private String orderCode; private String orderCode;
private String thirdOrderCode; private String thirdOrderCode;
private Boolean withOperationHistory; private Boolean withOperationHistory;
private String partnerId;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/SdkNewOrderUpdateThirdOrderCodeReq.java
...@@ -16,6 +16,9 @@ import lombok.Data; ...@@ -16,6 +16,9 @@ import lombok.Data;
*/ */
@Data @Data
public class SdkNewOrderUpdateThirdOrderCodeReq { public class SdkNewOrderUpdateThirdOrderCodeReq {
// 商户号
protected String partnerId;
private String orderCode; private String orderCode;
private String thirdOrderCode; private String thirdOrderCode;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/carpark/ParkingOrderAffirmReq.java
...@@ -80,4 +80,9 @@ public class ParkingOrderAffirmReq { ...@@ -80,4 +80,9 @@ public class ParkingOrderAffirmReq {
/*******商户名称****/ /*******商户名称****/
private String partnerName; private String partnerName;
/**
* 商户号 必传字段
*/
private String partnerId;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/carpark/ParkingOrderCancelReq.java
...@@ -11,4 +11,5 @@ public class ParkingOrderCancelReq { ...@@ -11,4 +11,5 @@ public class ParkingOrderCancelReq {
private String orderCode; private String orderCode;
private String operator; private String operator;
private String cancelReason; private String cancelReason;
private String partnerId;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/BatchQueryByCodesReq.java
...@@ -24,4 +24,6 @@ public class BatchQueryByCodesReq { ...@@ -24,4 +24,6 @@ public class BatchQueryByCodesReq {
*/ */
private List<String> orderCodes; private List<String> orderCodes;
private String partnerId;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderDownLoadSdkService.java
...@@ -286,6 +286,7 @@ public class OrderDownLoadSdkService { ...@@ -286,6 +286,7 @@ public class OrderDownLoadSdkService {
// 查询redis // 查询redis
BatchQueryByCodesReq batchQueryByCodesReq = new BatchQueryByCodesReq(); BatchQueryByCodesReq batchQueryByCodesReq = new BatchQueryByCodesReq();
batchQueryByCodesReq.setOrderCodes(orderCodes); batchQueryByCodesReq.setOrderCodes(orderCodes);
batchQueryByCodesReq.setPartnerId(request.getPartnerId());
OrderBaseResp<List<OrderInfoReqs>> redisResponse = orderSdkService.batchQueryByCodes(batchQueryByCodesReq, LogThreadLocal.getTrackingNo()); OrderBaseResp<List<OrderInfoReqs>> redisResponse = orderSdkService.batchQueryByCodes(batchQueryByCodesReq, LogThreadLocal.getTrackingNo());
logUtil.info("list 热点数据查询redis, ",batchQueryByCodesReq,redisResponse); logUtil.info("list 热点数据查询redis, ",batchQueryByCodesReq,redisResponse);
if (CollectionUtils.isEmpty(redisResponse.getResult())) { if (CollectionUtils.isEmpty(redisResponse.getResult())) {
...@@ -373,6 +374,7 @@ public class OrderDownLoadSdkService { ...@@ -373,6 +374,7 @@ public class OrderDownLoadSdkService {
logUtil.info("进入redis 数据替换 ES 逻辑", LogThreadLocal.getTrackingNo(), null); logUtil.info("进入redis 数据替换 ES 逻辑", LogThreadLocal.getTrackingNo(), null);
BatchQueryByCodesReq batchQueryByCodesReq = new BatchQueryByCodesReq(); BatchQueryByCodesReq batchQueryByCodesReq = new BatchQueryByCodesReq();
batchQueryByCodesReq.setOrderCodes(Collections.singletonList(infoReqs.getOrderCode())); batchQueryByCodesReq.setOrderCodes(Collections.singletonList(infoReqs.getOrderCode()));
batchQueryByCodesReq.setPartnerId(partnerId);
OrderBaseResp<List<OrderInfoReqs>> redisResponse = orderSdkService.batchQueryByCodes(batchQueryByCodesReq, LogThreadLocal.getTrackingNo()); OrderBaseResp<List<OrderInfoReqs>> redisResponse = orderSdkService.batchQueryByCodes(batchQueryByCodesReq, LogThreadLocal.getTrackingNo());
logUtil.info("热点数据查询redis, ",batchQueryByCodesReq,redisResponse); logUtil.info("热点数据查询redis, ",batchQueryByCodesReq,redisResponse);
if (CollectionUtils.isEmpty(redisResponse.getResult())) { if (CollectionUtils.isEmpty(redisResponse.getResult())) {
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderServiceV1.java
...@@ -19,8 +19,8 @@ public class OrderServiceV1 { ...@@ -19,8 +19,8 @@ public class OrderServiceV1 {
* 根据订单编号查询订单信息 * 根据订单编号查询订单信息
* 返回 V1版本订单数据结构 * 返回 V1版本订单数据结构
*/ */
public OrderBeanV1 queryOrderById(String orderClient, String orderCode, String thirdOrderCode, Integer withOperationHistory, String trackingNo){ public OrderBeanV1 queryOrderById(String orderClient, String orderCode, String thirdOrderCode, Integer withOperationHistory, String trackingNo,String partnerId){
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(orderClient, orderCode, thirdOrderCode, withOperationHistory, trackingNo); QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(orderClient, orderCode, thirdOrderCode, withOperationHistory, trackingNo,partnerId);
if(orderInfo == null || orderInfo.getResult() == null || StringUtils.isEmpty(orderInfo.getResult().getOrderCode())){ if(orderInfo == null || orderInfo.getResult() == null || StringUtils.isEmpty(orderInfo.getResult().getOrderCode())){
return null; return null;
} }
......
ordercenter-sdk/src/test/java/com/freemud/application/sdk/api/ordercenter/service/TestApiService.java
...@@ -425,7 +425,7 @@ public class TestApiService { ...@@ -425,7 +425,7 @@ public class TestApiService {
String orderClient = "11"; String orderClient = "11";
String orderCode = null; String orderCode = null;
String thirdOrderCode = "27003913648267755"; String thirdOrderCode = "27003913648267755";
QueryByCodeResponse response = orderSdkService.getOrderInfo(orderClient, orderCode, thirdOrderCode, 0, ""); QueryByCodeResponse response = orderSdkService.getOrderInfo(orderClient, orderCode, thirdOrderCode, 0, "","");
System.out.println(JSON.toJSONString(response)); System.out.println(JSON.toJSONString(response));
} }
......
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