Skip to content

O
order-group
Commit 8c7a2977 by ping.wu
Options

打印日志修改

parent 41e8d6cb
Showing with 92 additions and 89 deletions
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
...@@ -131,9 +131,8 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -131,9 +131,8 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
requestDto.setRemark(request.getRemark()); requestDto.setRemark(request.getRemark());
requestDto.setExceptionDesc(request.getExceptionDesc()); requestDto.setExceptionDesc(request.getExceptionDesc());
requestDto.setExceptionId(request.getExceptionId()); requestDto.setExceptionId(request.getExceptionId());
if (StringUtils.isNotBlank(request.getRemark())) if (StringUtils.isNotBlank(request.getRemark())) {
{ requestDto.setRemark("配送:" + request.getRemark());
requestDto.setRemark("配送:"+request.getRemark());
} }
OrderBaseResponse orderBaseResponseDto = orderCenterSdkService.updateDeliveryInfoById(requestDto); OrderBaseResponse orderBaseResponseDto = orderCenterSdkService.updateDeliveryInfoById(requestDto);
//订单服务修改配送单信息失败 //订单服务修改配送单信息失败
...@@ -151,25 +150,25 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -151,25 +150,25 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
posBaseRequestDto.setRider_phone(request.getRiderPhone()); posBaseRequestDto.setRider_phone(request.getRiderPhone());
posBaseRequestDto.setDelivery_status(DeliveryStatus.ALLOTRIDER.getCode()); posBaseRequestDto.setDelivery_status(DeliveryStatus.ALLOTRIDER.getCode());
posBaseRequestDto.setPartner_id(partnerId); posBaseRequestDto.setPartner_id(partnerId);
sendPosService(deliveryStatus,posBaseRequestDto); sendPosService(deliveryStatus, posBaseRequestDto);
} else if (deliveryStatus == DeliveryStatus.RIDERGETMEAL.getCode() || deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode()) { } else if (deliveryStatus == DeliveryStatus.RIDERGETMEAL.getCode() || deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode()) {
// 订单配送 // 订单配送
posBaseRequestDto.setHorseman(true); posBaseRequestDto.setHorseman(true);
sendPosService(deliveryStatus,posBaseRequestDto); sendPosService(deliveryStatus, posBaseRequestDto);
} else if (deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode()) { } else if (deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode()) {
// 订单已完成 // 订单已完成
posBaseRequestDto.setHorseman(true); posBaseRequestDto.setHorseman(true);
sendPosService(deliveryStatus,posBaseRequestDto); sendPosService(deliveryStatus, posBaseRequestDto);
} else if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode() || deliveryStatus == DeliveryStatus.DELIVERYCANCEL.getCode()) { } else if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode() || deliveryStatus == DeliveryStatus.DELIVERYCANCEL.getCode()) {
Integer sendPosDeliveryStatus; Integer sendPosDeliveryStatus;
if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode()){ if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode()) {
sendPosDeliveryStatus = 71; sendPosDeliveryStatus = 71;
} else { } else {
sendPosDeliveryStatus = 81; sendPosDeliveryStatus = 81;
} }
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());
// 取消外卖中台配送单 订单异常 // 取消外卖中台配送单 订单异常
// 如果 "配送单异常并且顾客更改配送地址" 不取消配送单 // 如果 "配送单异常并且顾客更改配送地址" 不取消配送单
// if (!isDeliveryAbnormalAndCustomerChangedAddress(request)) { // if (!isDeliveryAbnormalAndCustomerChangedAddress(request)) {
...@@ -178,7 +177,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -178,7 +177,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
// 运单异常，取消订单 // 运单异常，取消订单
posBaseRequestDto.setReason("没有骑手接单"); posBaseRequestDto.setReason("没有骑手接单");
posBaseRequestDto.setDeliveryId(request.getDeliveryId()); posBaseRequestDto.setDeliveryId(request.getDeliveryId());
sendPosService(deliveryStatus,posBaseRequestDto); sendPosService(deliveryStatus, posBaseRequestDto);
} }
// 订单配送状态变化时发送到MQ // 订单配送状态变化时发送到MQ
...@@ -187,7 +186,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -187,7 +186,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
produceMQService.sendRocketMqOfDeliveryInfo(request); produceMQService.sendRocketMqOfDeliveryInfo(request);
} }
//配送订阅消息 //配送订阅消息
sendMicroMessage(partnerId,request.getOrderId(),deliveryStatus); sendMicroMessage(partnerId, request.getOrderId(), deliveryStatus);
// else { // else {
// return ResponseUtil.error(ResponseResult.SYSTEM_ERROR.getCode(), "订单回调状态有误"); // return ResponseUtil.error(ResponseResult.SYSTEM_ERROR.getCode(), "订单回调状态有误");
...@@ -202,11 +201,11 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -202,11 +201,11 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
*/ */
@Override @Override
public BaseResponse macCafeCallbackUrl(MacCafeCallbackUrlRequestDto request) { public BaseResponse macCafeCallbackUrl(MacCafeCallbackUrlRequestDto request) {
OrderManagerRequest orderManagerRequest=new OrderManagerRequest(); OrderManagerRequest orderManagerRequest = new OrderManagerRequest();
orderManagerRequest.setPartnerId(request.getPartnerId()); orderManagerRequest.setPartnerId(request.getPartnerId());
orderManagerRequest.setOrderId(request.getOrderId()); orderManagerRequest.setOrderId(request.getOrderId());
if("1".equals(request.getCancelApplicant())) { if ("1".equals(request.getCancelApplicant())) {
orderManagerRequest.setReason(StringUtils.isNotBlank(request.getCancelReason())?request.getCancelReason():"餐道主动取消"); orderManagerRequest.setReason(StringUtils.isNotBlank(request.getCancelReason()) ? request.getCancelReason() : "餐道主动取消");
} else { } else {
orderManagerRequest.setReason(null); orderManagerRequest.setReason(null);
} }
...@@ -215,49 +214,49 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -215,49 +214,49 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
Integer reviewStatus = request.getReviewStatus(); Integer reviewStatus = request.getReviewStatus();
int deliveryStatus = request.getDeliveryStatus(); int deliveryStatus = request.getDeliveryStatus();
if (reviewStatus!=null && reviewStatus.equals(DeliveryReviewStatus.AGREE.getCode())){ if (reviewStatus != null && reviewStatus.equals(DeliveryReviewStatus.AGREE.getCode())) {
orderManagerRequest.setOperateType(OperateType.ORDER_AGREE_REFUND.getOpType()); orderManagerRequest.setOperateType(OperateType.ORDER_AGREE_REFUND.getOpType());
orderManagerRequest.setReason("配送回调-同意退款"); orderManagerRequest.setReason("配送回调-同意退款");
return orderManagerAdapter.orderPayRefund(orderManagerRequest); return orderManagerAdapter.orderPayRefund(orderManagerRequest);
} }
if (reviewStatus!=null && reviewStatus.equals(DeliveryReviewStatus.REJECT.getCode())){ if (reviewStatus != null && reviewStatus.equals(DeliveryReviewStatus.REJECT.getCode())) {
orderManagerRequest.setOperateType(OperateType.ORDER_REJECT_REFUND.getOpType()); orderManagerRequest.setOperateType(OperateType.ORDER_REJECT_REFUND.getOpType());
orderManagerRequest.setReason("配送回调-拒绝退款"); orderManagerRequest.setReason("配送回调-拒绝退款");
return orderManagerAdapter.mcCafeOrderRejectRefund(orderManagerRequest); return orderManagerAdapter.mcCafeOrderRejectRefund(orderManagerRequest);
} }
if (deliveryStatus == DeliveryStatus.RIDERGETMEAL.getCode() || deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode()){ if (deliveryStatus == DeliveryStatus.RIDERGETMEAL.getCode() || deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode()) {
orderManagerRequest.setOperateType(OperateType.ORDER_SEND.getOpType()); orderManagerRequest.setOperateType(OperateType.ORDER_SEND.getOpType());
BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderDelivery(orderManagerRequest); BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderDelivery(orderManagerRequest);
if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) { if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
updateDeliveryStatus(request); updateDeliveryStatus(request);
} }
sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus()); sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus());
return baseResponse; return baseResponse;
} else if (deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode() ){ } else if (deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode()) {
orderManagerRequest.setOperateType(OperateType.ORDER_AFFIRM.getOpType()); orderManagerRequest.setOperateType(OperateType.ORDER_AFFIRM.getOpType());
BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderAffirm(orderManagerRequest, null); BaseResponse<OrderManagerResponse> baseResponse = orderManagerAdapter.orderAffirm(orderManagerRequest, null);
if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) { if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
updateDeliveryStatus(request); updateDeliveryStatus(request);
} }
sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus()); sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus());
return baseResponse; return baseResponse;
} else if(deliveryStatus == DeliveryStatus.WATINGORDER.getCode() || deliveryStatus == DeliveryStatus.SYSTEMGETORDER.getCode() } else if (deliveryStatus == DeliveryStatus.WATINGORDER.getCode() || deliveryStatus == DeliveryStatus.SYSTEMGETORDER.getCode()
|| deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode()|| deliveryStatus == DeliveryStatus.RIDERARRIVESTORE.getCode()) { || deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode() || deliveryStatus == DeliveryStatus.RIDERARRIVESTORE.getCode()) {
updateDeliveryStatus(request); updateDeliveryStatus(request);
return ResponseUtil.success(); return ResponseUtil.success();
} else if(deliveryStatus == DeliveryStatus.COLLECTING.getCode()) { } else if (deliveryStatus == DeliveryStatus.COLLECTING.getCode()) {
//推送订单到拉单队列 //推送订单到拉单队列
OrderCollectReq orderCollectReq = new OrderCollectReq(); OrderCollectReq orderCollectReq = new OrderCollectReq();
orderCollectReq.setOrderCode(request.getOrderId()); orderCollectReq.setOrderCode(request.getOrderId());
orderCollectReq.setPartnerId(request.getPartnerId()); orderCollectReq.setPartnerId(request.getPartnerId());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = orderSdkService.collectOrder(orderCollectReq, LogTreadLocal.getTrackingNo()); com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = orderSdkService.collectOrder(orderCollectReq, LogTreadLocal.getTrackingNo());
if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) { if (ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
ResponseUtil.error(ResponseResult.ORDER_COLLECT_FAILED); ResponseUtil.error(ResponseResult.ORDER_COLLECT_FAILED);
} }
//回调成功，记录汇集状态 //回调成功，记录汇集状态
updateDeliveryStatus(request); updateDeliveryStatus(request);
return ResponseUtil.success(); return ResponseUtil.success();
} else if(deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode()) { } else if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode()) {
AssortmentUpdateDeliveryAbnormalRequest assortmentUpdateDeliveryAbnormalRequest = AssortmentUpdateDeliveryAbnormalRequest.builder() AssortmentUpdateDeliveryAbnormalRequest assortmentUpdateDeliveryAbnormalRequest = AssortmentUpdateDeliveryAbnormalRequest.builder()
.abnormalDesc(request.getRemark()) .abnormalDesc(request.getRemark())
.deliveryId(request.getDeliveryId()) .deliveryId(request.getDeliveryId())
...@@ -276,10 +275,10 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -276,10 +275,10 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
updateDeliveryInfoByIdRequest.setOrderId(request.getOrderId()); updateDeliveryInfoByIdRequest.setOrderId(request.getOrderId());
updateDeliveryInfoByIdRequest.setOrderSubState(request.getDeliveryStatus()); updateDeliveryInfoByIdRequest.setOrderSubState(request.getDeliveryStatus());
updateDeliveryInfoByIdRequest.setOperator("sys"); updateDeliveryInfoByIdRequest.setOperator("sys");
if(StringUtils.isNotBlank(request.getRiderPhone())) { if (StringUtils.isNotBlank(request.getRiderPhone())) {
updateDeliveryInfoByIdRequest.setCourierPhone(request.getRiderPhone()); updateDeliveryInfoByIdRequest.setCourierPhone(request.getRiderPhone());
} }
if(StringUtils.isNotBlank(request.getRiderName())) { if (StringUtils.isNotBlank(request.getRiderName())) {
updateDeliveryInfoByIdRequest.setCourierName(request.getRiderName()); updateDeliveryInfoByIdRequest.setCourierName(request.getRiderName());
} }
return orderCenterSdkService.updateDeliveryInfoById(updateDeliveryInfoByIdRequest); return orderCenterSdkService.updateDeliveryInfoById(updateDeliveryInfoByIdRequest);
...@@ -316,7 +315,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -316,7 +315,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
requestDto.setPartnerId(request.getPartnerId()); requestDto.setPartnerId(request.getPartnerId());
requestDto.setProvince(request.getProvinceName()); requestDto.setProvince(request.getProvinceName());
QueryDeliveryAmountResponseDto responseDto = deliveryFeiginClient.queryDeliveryAmount(requestDto); QueryDeliveryAmountResponseDto responseDto = deliveryFeiginClient.queryDeliveryAmount(requestDto);
if(responseDto == null || SUCCESS_RESPONSE_CODE != responseDto.getCode() || CollectionUtils.isEmpty(responseDto.getData())) { if (responseDto == null || SUCCESS_RESPONSE_CODE != responseDto.getCode() || CollectionUtils.isEmpty(responseDto.getData())) {
return ResponseUtil.error(ResponseResult.DELIVERY_INFO_NOT_DELIVERY); return ResponseUtil.error(ResponseResult.DELIVERY_INFO_NOT_DELIVERY);
} }
...@@ -338,7 +337,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -338,7 +337,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
deliveryOrderRequestDto.setOrderCancelCode(4); deliveryOrderRequestDto.setOrderCancelCode(4);
deliveryOrderRequestDto.setOrderCancelDescription("运单异常，商户取消订单"); deliveryOrderRequestDto.setOrderCancelDescription("运单异常，商户取消订单");
String trackingNo = ""; String trackingNo = "";
DeliveryResponseDto responseDto = deliveryService.deliveryOrderCancel(deliveryOrderRequestDto,trackingNo); DeliveryResponseDto responseDto = deliveryService.deliveryOrderCancel(deliveryOrderRequestDto, trackingNo);
if (SUCCESS_RESPONSE_CODE != responseDto.getCode()) { if (SUCCESS_RESPONSE_CODE != responseDto.getCode()) {
throw new ServiceException(ResponseResult.DELIVERY_CANCEL_ORDER_ERROR); throw new ServiceException(ResponseResult.DELIVERY_CANCEL_ORDER_ERROR);
} }
...@@ -348,7 +347,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -348,7 +347,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
/** /**
* 配送订单回调同步POS服务 * 配送订单回调同步POS服务
*/ */
public BaseResponse sendPosService(Integer deliveryStatus,PosBaseRequestDto posBaseRequestDto) { public BaseResponse sendPosService(Integer deliveryStatus, PosBaseRequestDto posBaseRequestDto) {
BaseResponse response = null; BaseResponse response = null;
if (deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode()) { if (deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode()) {
response = posClient.deliveryRiderStatus(posBaseRequestDto); response = posClient.deliveryRiderStatus(posBaseRequestDto);
...@@ -360,13 +359,14 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -360,13 +359,14 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
response = posClient.posAffirm(posBaseRequestDto); response = posClient.posAffirm(posBaseRequestDto);
} else if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode() || deliveryStatus == DeliveryStatus.DELIVERYCANCEL.getCode()) { } else if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode() || deliveryStatus == DeliveryStatus.DELIVERYCANCEL.getCode()) {
// 更新订单状态为异常单 // 更新订单状态为异常单
updateDeliveryAbnormal(posBaseRequestDto.getPartner_id(),posBaseRequestDto.getOrder_id(),posBaseRequestDto.getDeliveryId()); updateDeliveryAbnormal(posBaseRequestDto.getPartner_id(), posBaseRequestDto.getOrder_id(), posBaseRequestDto.getDeliveryId());
} }
return response; return response;
} }
/** /**
* 更新订单为异常单 * 更新订单为异常单
*
* @param partnerCode * @param partnerCode
* @param orderCode * @param orderCode
* @param deliveryId * @param deliveryId
...@@ -407,8 +407,8 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -407,8 +407,8 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
/** /**
* 麦咖啡配送消息推送 * 麦咖啡配送消息推送
*/ */
public void sendMcCafeMicroMessage(String partnerId,String orderId,int deliveryStatus) { public void sendMcCafeMicroMessage(String partnerId, String orderId, int deliveryStatus) {
if((deliveryStatus != DeliveryStatus.RIDERSTARTDELIVERY.getCode() && deliveryStatus != DeliveryStatus.DELIVERYARRIVED.getCode()) if ((deliveryStatus != DeliveryStatus.RIDERSTARTDELIVERY.getCode() && deliveryStatus != DeliveryStatus.DELIVERYARRIVED.getCode())
|| !mcCafePartnerId.equals(partnerId)) { || !mcCafePartnerId.equals(partnerId)) {
ApiLog.info("不发消息", orderId); ApiLog.info("不发消息", orderId);
return; return;
...@@ -421,32 +421,33 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -421,32 +421,33 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
baseQueryOrderRequest.setOrderId(orderId); baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo()); baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
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())) {
log.error("麦咖啡订阅消息推送失败，查询订单信息失败:"+JSON.toJSONString(response)); ApiLog.info("麦咖啡订阅消息推送失败，查询订单信息失败:" + JSON.toJSONString(response));
} }
QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData(); QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData();
if(OrderClientType.SAAS.getIndex().toString().equals(orderBean.getOrderClient())) { if (OrderClientType.SAAS.getIndex().toString().equals(orderBean.getOrderClient())) {
request.setChannel(1); request.setChannel(1);
} else { } else {
return; return;
} }
OrderExtInfoDto extInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), new TypeReference<OrderExtInfoDto>() {}); OrderExtInfoDto extInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), new TypeReference<OrderExtInfoDto>() {
});
request.setMiniAppId(extInfoDto.getAppid()); request.setMiniAppId(extInfoDto.getAppid());
List<String> userList = new ArrayList<>(); List<String> userList = new ArrayList<>();
userList.add(extInfoDto.getOpenid()); userList.add(extInfoDto.getOpenid());
request.setOpenIdList(userList); request.setOpenIdList(userList);
if(deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode()) { if (deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode()) {
request.setMessageEventType(MessageEventTypeEnum.MCCAFE_DELIVERY_ORDER.getType()); request.setMessageEventType(MessageEventTypeEnum.MCCAFE_DELIVERY_ORDER.getType());
request.setScene(MessageSceneEnum.MCCAFE_DELIVERY_ORDER.getDesc()); request.setScene(MessageSceneEnum.MCCAFE_DELIVERY_ORDER.getDesc());
request.setMccafeDeliveryOrder(MccafeDeliveryOrder request.setMccafeDeliveryOrder(MccafeDeliveryOrder
.builder() .builder()
.orderId(orderBean.getOid()) .orderId(orderBean.getOid())
.displayOrderId(orderBean.getDownstreamThirdOrderCode()) .displayOrderId(orderBean.getDownstreamThirdOrderCode())
.address(orderBean.getAddress().length()>20?orderBean.getAddress().substring(0,17)+"...":orderBean.getAddress()) .address(orderBean.getAddress().length() > 20 ? orderBean.getAddress().substring(0, 17) + "..." : orderBean.getAddress())
.build()); .build());
} else if(deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode()) { } else if (deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode()) {
request.setMessageEventType(MessageEventTypeEnum.MCCAFE_COMPLETE_ORDER.getType()); request.setMessageEventType(MessageEventTypeEnum.MCCAFE_COMPLETE_ORDER.getType());
request.setScene(MessageSceneEnum.MCCAFE_COMPLETE_ORDER.getDesc()); request.setScene(MessageSceneEnum.MCCAFE_COMPLETE_ORDER.getDesc());
request.setMccafeCompleteOrder(MccafeCompleteOrder request.setMccafeCompleteOrder(MccafeCompleteOrder
...@@ -460,19 +461,17 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -460,19 +461,17 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
return; return;
} }
ecologyAdminApplicationClient.subscribeMessage(request); ecologyAdminApplicationClient.subscribeMessage(request);
} catch (Exception e) {
LogUtil.error("麦咖啡订阅消息推送失败:", orderId, "", e);
}catch (Exception e){
log.error("麦咖啡订阅消息推送失败:"+orderId, e);
} }
} }
/** /**
* 配送消息推送 * 配送消息推送
*/ */
public void sendMicroMessage(String partnerId,String orderId,int deliveryStatus){ public void sendMicroMessage(String partnerId, String orderId, int deliveryStatus) {
//如果商户配置了配送订阅消息推送 //如果商户配置了配送订阅消息推送
if(deliveryMicroMessagePartner.contains(partnerId)){ if (deliveryMicroMessagePartner.contains(partnerId)) {
try { try {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest(); BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId); baseQueryOrderRequest.setOrderId(orderId);
...@@ -480,7 +479,8 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -480,7 +479,8 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest); QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData(); QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData();
SubscribeMessageRequest request = new SubscribeMessageRequest(); SubscribeMessageRequest request = new SubscribeMessageRequest();
OrderExtInfoDto extInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), new TypeReference<OrderExtInfoDto>() {}); OrderExtInfoDto extInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), new TypeReference<OrderExtInfoDto>() {
});
request.setMiniAppId(extInfoDto.getAppid()); request.setMiniAppId(extInfoDto.getAppid());
List<String> userList = new ArrayList<>(); List<String> userList = new ArrayList<>();
userList.add(extInfoDto.getOpenid()); userList.add(extInfoDto.getOpenid());
...@@ -489,26 +489,26 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -489,26 +489,26 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
//默认微信 //默认微信
request.setChannel(1); request.setChannel(1);
//支付宝 //支付宝
if("3".equals(orderBean.getOrderClient())){ if ("3".equals(orderBean.getOrderClient())) {
request.setChannel(2); request.setChannel(2);
} }
//配送订阅模板消息 //配送订阅模板消息
if(deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode()){ if (deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode()) {
request.setMessageEventType("ORDER_DELIVERY"); request.setMessageEventType("ORDER_DELIVERY");
OrderDeliveryScene orderDeliveryScene = new OrderDeliveryScene(); OrderDeliveryScene orderDeliveryScene = new OrderDeliveryScene();
orderDeliveryScene.setAddress(orderBean.getAddress()); orderDeliveryScene.setAddress(orderBean.getAddress());
Long createTime = orderBean.getGmtCreate(); Long createTime = orderBean.getGmtCreate();
// 获取门店信息 // 获取门店信息
StoreInfoRequest storeInfoRequest = new StoreInfoRequest(partnerId, orderBean.getShopId(),null); StoreInfoRequest storeInfoRequest = new StoreInfoRequest(partnerId, orderBean.getShopId(), null);
StoreResponse storeResponse = storeCenterService.getStoreInfo(storeInfoRequest, LogThreadLocal.getTrackingNo()); StoreResponse storeResponse = storeCenterService.getStoreInfo(storeInfoRequest, LogThreadLocal.getTrackingNo());
//立即单外卖 //立即单外卖
if (OrderType.GENERAL_EXPRESS.getIndex()==orderBean.getNewOrderType()) { if (OrderType.GENERAL_EXPRESS.getIndex() == orderBean.getNewOrderType()) {
if(storeResponse != null && storeResponse.getBizVO() != null && storeResponse.getBizVO().getServiceTime() != null){ if (storeResponse != null && storeResponse.getBizVO() != null && storeResponse.getBizVO().getServiceTime() != null) {
createTime = createTime + storeResponse.getBizVO().getServiceTime()*1000*60; createTime = createTime + storeResponse.getBizVO().getServiceTime() * 1000 * 60;
orderDeliveryScene.setEstimateArrivalTime(DateTimeUtil.timeStampToTime(createTime)); orderDeliveryScene.setEstimateArrivalTime(DateTimeUtil.timeStampToTime(createTime));
} }
}//预约单外卖 }//预约单外卖
if(OrderType.RESERVED_EXPRESS.getIndex()==orderBean.getNewOrderType()&&orderBean.getGmtExpect()!=null){ if (OrderType.RESERVED_EXPRESS.getIndex() == orderBean.getNewOrderType() && orderBean.getGmtExpect() != null) {
orderDeliveryScene.setEstimateArrivalTime(DateTimeUtil.timeStampToTime(orderBean.getGmtExpect())); orderDeliveryScene.setEstimateArrivalTime(DateTimeUtil.timeStampToTime(orderBean.getGmtExpect()));
} }
orderDeliveryScene.setMerchantPhone(storeResponse.getBizVO().getPhone()); orderDeliveryScene.setMerchantPhone(storeResponse.getBizVO().getPhone());
...@@ -517,7 +517,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -517,7 +517,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
ecologyAdminApplicationClient.subscribeMessage(request); ecologyAdminApplicationClient.subscribeMessage(request);
} }
//配送异常模板消息 //配送异常模板消息
if(deliveryStatus == DeliveryStatus.DELIVERYCANCEL.getCode() || deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode()){ if (deliveryStatus == DeliveryStatus.DELIVERYCANCEL.getCode() || deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode()) {
request.setMessageEventType("DELIVERY_ERROR_REMINDER"); request.setMessageEventType("DELIVERY_ERROR_REMINDER");
DeliveryErrorReminder deliveryErrorReminder = new DeliveryErrorReminder(); DeliveryErrorReminder deliveryErrorReminder = new DeliveryErrorReminder();
deliveryErrorReminder.setCreateTime(DateTimeUtil.timeStampToTime(orderBean.getGmtCreate())); deliveryErrorReminder.setCreateTime(DateTimeUtil.timeStampToTime(orderBean.getGmtCreate()));
...@@ -529,23 +529,25 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -529,23 +529,25 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
ecologyAdminApplicationClient.subscribeMessage(request); ecologyAdminApplicationClient.subscribeMessage(request);
} }
}catch (Exception e){ } catch (Exception e) {
log.error("配送订阅消息推送失败:{},失败原因:{}",orderId,e.getMessage()); LogUtil.error("配送订阅消息推送失败:{},失败原因:{}", orderId, "", e);
} }
} }
} }
/** /**
* 通知生态发送调用消息 * 通知生态发送调用消息
*/ */
public void sendException(String orderId,String unusualReason,String unusualTime,String desc) { public void sendException(String orderId, String unusualReason, String unusualTime, String desc) {
try{ try {
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest(); BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId(orderId); baseQueryOrderRequest.setOrderId(orderId);
baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo()); baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest); QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData(); QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData();
SubscribeMessageRequest request = new SubscribeMessageRequest(); SubscribeMessageRequest request = new SubscribeMessageRequest();
OrderExtInfoDto extInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), new TypeReference<OrderExtInfoDto>() {}); OrderExtInfoDto extInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), new TypeReference<OrderExtInfoDto>() {
});
request.setMiniAppId(extInfoDto.getAppid()); request.setMiniAppId(extInfoDto.getAppid());
SendMessageRequest sendMessageRequest = new SendMessageRequest(); SendMessageRequest sendMessageRequest = new SendMessageRequest();
sendMessageRequest.setMessageType("UNUSUAL_ORDER"); sendMessageRequest.setMessageType("UNUSUAL_ORDER");
...@@ -557,9 +559,9 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -557,9 +559,9 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
sendMessageRequest.setOrderStatus(desc); sendMessageRequest.setOrderStatus(desc);
sendMessageRequest.setUtcTime(unusualTime); sendMessageRequest.setUtcTime(unusualTime);
SendMessageResponse sendMessageResponse = ecologyAdminApplicationClient.sendTemplateMessage(sendMessageRequest); SendMessageResponse sendMessageResponse = ecologyAdminApplicationClient.sendTemplateMessage(sendMessageRequest);
log.debug("调用生态返回参数，订单编号:{},返回信息：{}",orderId,JSONObject.toJSONString(sendMessageResponse)); ApiLog.debug("调用生态返回参数，订单编号:{},返回信息：{}", orderId, JSONObject.toJSONString(sendMessageResponse));
}catch (Exception e){ } catch (Exception e) {
log.error("调用生态返回参数失败，订单编号:{}，失败原因：{}",orderId,e.getMessage()); LogUtil.error("调用生态返回参数失败，订单编号:{}，失败原因：{}", orderId, "", e);
} }
} }
} }
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
...@@ -148,7 +148,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService { ...@@ -148,7 +148,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
if(ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),storeTable.getCode()) || storeTable.getData() == null) return ResponseUtil.error(ResponseResult.STORE_NOT_TABLE_INFO); if(ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),storeTable.getCode()) || storeTable.getData() == null) return ResponseUtil.error(ResponseResult.STORE_NOT_TABLE_INFO);
if(storeTable.getData().getActiveFlag() == 0) return ResponseUtil.error(ResponseResult.QUERY_TABLESTATUS_ACTIVEFLAG_ERROR); if(storeTable.getData().getActiveFlag() == 0) return ResponseUtil.error(ResponseResult.QUERY_TABLESTATUS_ACTIVEFLAG_ERROR);
if(storeTable.getData().getOrderState() == 1) { if(storeTable.getData().getOrderState() == 1) {
log.debug("门店返回1,已开台"); ApiLog.debug("门店返回1,已开台");
return ResponseUtil.success(); return ResponseUtil.success();
} }
/** /**
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -421,7 +421,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -421,7 +421,7 @@ public class OrderServiceImpl implements Orderservice {
dto.setTrackingNo(LogThreadLocal.getTrackingNo()); dto.setTrackingNo(LogThreadLocal.getTrackingNo());
paymentQueueService.paymentCallback(dto); paymentQueueService.paymentCallback(dto);
} catch (Exception e) { } catch (Exception e) {
LogUtil.error("paymentQueueService.paymentCallback" ,"", orderId , e); LogUtil.error("paymentQueueService.paymentCallback", "", orderId, e);
} }
} }
...@@ -444,7 +444,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -444,7 +444,7 @@ public class OrderServiceImpl implements Orderservice {
dto.setTrackingNo(LogThreadLocal.getTrackingNo()); dto.setTrackingNo(LogThreadLocal.getTrackingNo());
paymentQueueService.paymentCallback(dto); paymentQueueService.paymentCallback(dto);
} catch (Exception e) { } catch (Exception e) {
log.error("paymentQueueService.paymentCallback" + dto + " error" + e); LogUtil.error("paymentQueueService.paymentCallback", "", orderId, e);
} }
} }
...@@ -590,9 +590,9 @@ public class OrderServiceImpl implements Orderservice { ...@@ -590,9 +590,9 @@ public class OrderServiceImpl implements Orderservice {
//支付回掉成功标记 //支付回掉成功标记
redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES); redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES);
if (message.getSource().equals(PaySuccessSource.OUTSIDE.getSource())) { if (message.getSource().equals(PaySuccessSource.OUTSIDE.getSource())) {
log.debug("调用券码核销==" + message.getTrans_id()); ApiLog.debug("调用券码核销==" + message.getTrans_id());
verificationCoupon(message.getTrans_id()); verificationCoupon(message.getTrans_id());
log.debug("调用券码结束==" + message.getTrans_id()); ApiLog.debug("调用券码结束==" + message.getTrans_id());
} }
//支付成功后 //支付成功后
buriedPointService.paySuccessBuridPoint(partnerId, storeId, orderBean); buriedPointService.paySuccessBuridPoint(partnerId, storeId, orderBean);
...@@ -685,7 +685,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -685,7 +685,7 @@ public class OrderServiceImpl implements Orderservice {
private String verificationCoupon(String transId) { private String verificationCoupon(String transId) {
String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(transId)); String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(transId));
if (StringUtils.isNotBlank(orderId)) { if (StringUtils.isNotBlank(orderId)) {
log.debug("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(), transId, orderId); ApiLog.debug("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(), transId, orderId);
transId = orderId; transId = orderId;
} }
QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(transId); QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(transId);
...@@ -982,7 +982,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -982,7 +982,7 @@ public class OrderServiceImpl implements Orderservice {
} }
} }
} catch (Exception e) { } catch (Exception e) {
log.error("get returnWords error :{}，storeResponseDto:{}", e.getMessage(), JSONObject.toJSON(storeResponseDto)); LogUtil.error("get returnWords", "",JSONObject.toJSONString(storeResponseDto),e);
} }
orderBean.setProgress(String.valueOf(progress)); orderBean.setProgress(String.valueOf(progress));
orderBean.setReturnWords(returnWords); orderBean.setReturnWords(returnWords);
...@@ -1423,14 +1423,14 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1423,14 +1423,14 @@ public class OrderServiceImpl implements Orderservice {
ApiLog.debug("支付有礼hlsPartnerId套餐参与促销日志", hlsPartnerId, queryOrderResponseVo.getOid()); ApiLog.debug("支付有礼hlsPartnerId套餐参与促销日志", hlsPartnerId, queryOrderResponseVo.getOid());
if (hlsPartnerId != null && hlsPartnerId.contains(partnerId)) { if (hlsPartnerId != null && hlsPartnerId.contains(partnerId)) {
// 华莱士获取支付有理促销数据时须将套餐商品内固定搭配、可选搭配商品的skuId一同传入 // 华莱士获取支付有理促销数据时须将套餐商品内固定搭配、可选搭配商品的skuId一同传入
queryOrderResponseVo.getProducts().forEach(productVo -> { queryOrderResponseVo.getProducts().forEach(productVo -> {
if (CollectionUtils.isNotEmpty(productVo.getSetMealProducts())) { if (CollectionUtils.isNotEmpty(productVo.getSetMealProducts())) {
ApiLog.info("支付有礼productVo.getSetMealProducts()套餐参与促销日志", productVo.getSetMealProducts(), queryOrderResponseVo.getOid()); ApiLog.info("支付有礼productVo.getSetMealProducts()套餐参与促销日志", productVo.getSetMealProducts(), queryOrderResponseVo.getOid());
productVo.getSetMealProducts().forEach(setMealProduct -> { productVo.getSetMealProducts().forEach(setMealProduct -> {
skuIds.add(setMealProduct.getPid()); skuIds.add(setMealProduct.getPid());
}); });
} }
}); });
} }
payGitRequestDto.setSkuIds(skuIds); payGitRequestDto.setSkuIds(skuIds);
...@@ -2884,13 +2884,13 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2884,13 +2884,13 @@ public class OrderServiceImpl implements Orderservice {
boolean check = this.checkSvcComPay(orderBean.getCompanyId(), orderBean.getShopId()); boolean check = this.checkSvcComPay(orderBean.getCompanyId(), orderBean.getShopId());
//混合支付 //混合支付
if (check && StringUtils.isNotBlank(channel)) { if (check && StringUtils.isNotBlank(channel)) {
log.debug("混合支付:"); ApiLog.debug("混合支付:");
String partnerPayOvertime = this.getPartnerPayOvertime(orderBean.getCompanyId()); String partnerPayOvertime = this.getPartnerPayOvertime(orderBean.getCompanyId());
orderPayResponse = comPayOrder(cardCode, orderBean, paymentRequest, partnerPayOvertime, totalAmount.intValue(), channel, storeId, LogThreadLocal.getTrackingNo()); orderPayResponse = comPayOrder(cardCode, orderBean, paymentRequest, partnerPayOvertime, totalAmount.intValue(), channel, storeId, LogThreadLocal.getTrackingNo());
} }
//svc 支付 //svc 支付
else { else {
log.debug("svc卡支付"); ApiLog.debug("svc卡支付");
orderPayResponse = svcPay(cardCode, orderBean, paymentRequest, transId, trackingNo); orderPayResponse = svcPay(cardCode, orderBean, paymentRequest, transId, trackingNo);
} }
return orderPayResponse; return orderPayResponse;
...@@ -2968,7 +2968,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2968,7 +2968,7 @@ public class OrderServiceImpl implements Orderservice {
mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue); mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue);
createOrderRequest.setMqMessageRequest(mqMessageRequest); createOrderRequest.setMqMessageRequest(mqMessageRequest);
createOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo()); createOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
log.debug("createOrder sessionId:{},createOrderVo:{}", createOrderVo.getSessionId(), JSON.toJSONString(createOrderRequest)); ApiLog.debug("createOrder sessionId:{},createOrderVo:{}", createOrderVo.getSessionId(), JSON.toJSONString(createOrderRequest));
return orderCenterSdkService.createOrderFlow(createOrderRequest); return orderCenterSdkService.createOrderFlow(createOrderRequest);
} }
...@@ -3032,7 +3032,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3032,7 +3032,7 @@ public class OrderServiceImpl implements Orderservice {
} }
com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo); com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo);
if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())) { if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())) {
log.error("支付SDK返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase)); ApiLog.info("支付SDK返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
// 1.9.34 预支付失败需要把原因进行记录 // 1.9.34 预支付失败需要把原因进行记录
orderPayResponse = new OrderPayResponse(); orderPayResponse = new OrderPayResponse();
orderPayResponse.setMsg(responseBase.getMessage()); orderPayResponse.setMsg(responseBase.getMessage());
...@@ -3250,7 +3250,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3250,7 +3250,7 @@ public class OrderServiceImpl implements Orderservice {
orderEditRequest.setPayChannelType(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getIndex()); orderEditRequest.setPayChannelType(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getIndex());
} }
//混合支付项 //混合支付项
if (CollectionUtils.isNotEmpty(orderPayResponse.getPayItem()) && orderPayResponse.getPayItem().size()==2) { if (CollectionUtils.isNotEmpty(orderPayResponse.getPayItem()) && orderPayResponse.getPayItem().size() == 2) {
orderEditRequest.setOrderPayItem(orderPayResponse.getPayItem()); orderEditRequest.setOrderPayItem(orderPayResponse.getPayItem());
orderEditRequest.setPayChannel(PayChannelType.COMB.getEbcode()); orderEditRequest.setPayChannel(PayChannelType.COMB.getEbcode());
orderEditRequest.setPayChannelName(PayChannelType.COMB.getName()); orderEditRequest.setPayChannelName(PayChannelType.COMB.getName());
...@@ -3819,7 +3819,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3819,7 +3819,7 @@ public class OrderServiceImpl implements Orderservice {
} while (i < 4); } while (i < 4);
if (combPayResponse == null || !ResponseCodeConstant.PAYMENT_RESPONSE_SUCCESS.equals(combPayResponse.getCode())) { if (combPayResponse == null || !ResponseCodeConstant.PAYMENT_RESPONSE_SUCCESS.equals(combPayResponse.getCode())) {
log.debug("混合支付返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(combPayRequest), JSONObject.toJSONString(combPayResponse)); ApiLog.debug("混合支付返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(combPayRequest), JSONObject.toJSONString(combPayResponse));
orderPayResponse.setMsg(combPayResponse != null ? "支付：" + combPayResponse.getMsg() : "混合支付忙不过来啦，请稍后再试"); orderPayResponse.setMsg(combPayResponse != null ? "支付：" + combPayResponse.getMsg() : "混合支付忙不过来啦，请稍后再试");
return orderPayResponse; return orderPayResponse;
} }
...@@ -3945,7 +3945,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3945,7 +3945,7 @@ public class OrderServiceImpl implements Orderservice {
query = svcComPayClient.query(requestDto); query = svcComPayClient.query(requestDto);
if (query != null) break; if (query != null) break;
} }
log.debug("order checkSvcComPay:{}", JSON.toJSONString(query)); ApiLog.debug("order checkSvcComPay:{}", JSON.toJSONString(query));
if (query == null || !ResponseResult.SUCCESS.getCode().equals(query.getCode())) { if (query == null || !ResponseResult.SUCCESS.getCode().equals(query.getCode())) {
return false; return false;
} }
...@@ -3963,7 +3963,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3963,7 +3963,7 @@ public class OrderServiceImpl implements Orderservice {
map.put(pg.split(":")[0], pg.split(":")[1]); map.put(pg.split(":")[0], pg.split(":")[1]);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("goodsTag解析失败：" + collageGoodsTagList); LogUtil.error("goodsTag解析失败：" ,"","",e);
} }
return map; return map;
} }
...@@ -3975,18 +3975,18 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3975,18 +3975,18 @@ public class OrderServiceImpl implements Orderservice {
*/ */
public void timeOutRefund(QueryOrdersResponseDto.DataBean.OrderBean orderBean) { public void timeOutRefund(QueryOrdersResponseDto.DataBean.OrderBean orderBean) {
//调用支付退款 //调用支付退款
log.debug("payment timeout callback for refund orderDto={}", JSON.toJSONString(orderBean)); ApiLog.debug("payment timeout callback for refund orderDto={}", JSON.toJSONString(orderBean));
Integer abState = 4; Integer abState = 4;
String noPay = "8200404"; String noPay = "8200404";
if (abState.equals(orderBean.getAbnormalState())) { if (abState.equals(orderBean.getAbnormalState())) {
log.debug("payment timeout callback for refund is exist"); ApiLog.debug("payment timeout callback for refund is exist");
return; return;
} }
com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = null; com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = null;
Long refundId = System.currentTimeMillis(); Long refundId = System.currentTimeMillis();
OrderExtInfoDto orderExtInfoDTO = gson.fromJson(orderBean.getExtInfo(), OrderExtInfoDto.class); OrderExtInfoDto orderExtInfoDTO = gson.fromJson(orderBean.getExtInfo(), OrderExtInfoDto.class);
if (orderExtInfoDTO == null || StringUtils.isBlank(orderExtInfoDTO.getFmId())) { if (orderExtInfoDTO == null || StringUtils.isBlank(orderExtInfoDTO.getFmId())) {
log.debug("payment timeout callback for refund not create pre order"); ApiLog.debug("payment timeout callback for refund not create pre order");
return; return;
} }
Integer state = PayRefundStatus.SUCCESS.getCode(); Integer state = PayRefundStatus.SUCCESS.getCode();
...@@ -3996,7 +3996,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3996,7 +3996,7 @@ public class OrderServiceImpl implements Orderservice {
com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid()); com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid());
response = standardPaymentService.orderRefund(orderPayRefundRequest, LogTreadLocal.getTrackingNo()); response = standardPaymentService.orderRefund(orderPayRefundRequest, LogTreadLocal.getTrackingNo());
log.debug("payment timeout callback for refund orderId={},request={},resp={}", orderBean.getOid(), JSON.toJSONString(orderPayRefundRequest), JSON.toJSONString(response)); ApiLog.debug("payment timeout callback for refund orderId={},request={},resp={}", orderBean.getOid(), JSON.toJSONString(orderPayRefundRequest), JSON.toJSONString(response));
if (response != null && noPay.equals(response.getCode())) { if (response != null && noPay.equals(response.getCode())) {
return; return;
} }
......
order-application-service/src/test/java/cn.freemud/client/StoreItemClientTest.java
...@@ -28,6 +28,7 @@ import java.util.List; ...@@ -28,6 +28,7 @@ import java.util.List;
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved. * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目 * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/ */
@Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@EnableDiscoveryClient @EnableDiscoveryClient
......
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