Skip to content

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

打印日志修改

parent 41e8d6cb
Showing with 20 additions and 19 deletions
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
......@@ -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(storeTable.getData().getActiveFlag() == 0) return ResponseUtil.error(ResponseResult.QUERY_TABLESTATUS_ACTIVEFLAG_ERROR);
if(storeTable.getData().getOrderState() == 1) {
log.debug("门店返回1,已开台");
ApiLog.debug("门店返回1,已开台");
return ResponseUtil.success();
}
/**
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -421,7 +421,7 @@ public class OrderServiceImpl implements Orderservice {
dto.setTrackingNo(LogThreadLocal.getTrackingNo());
paymentQueueService.paymentCallback(dto);
} catch (Exception e) {
LogUtil.error("paymentQueueService.paymentCallback" ,"", orderId , e);
LogUtil.error("paymentQueueService.paymentCallback", "", orderId, e);
}
}
......@@ -444,7 +444,7 @@ public class OrderServiceImpl implements Orderservice {
dto.setTrackingNo(LogThreadLocal.getTrackingNo());
paymentQueueService.paymentCallback(dto);
} 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 {
//支付回掉成功标记
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())) {
log.debug("调用券码核销==" + message.getTrans_id());
ApiLog.debug("调用券码核销==" + message.getTrans_id());
verificationCoupon(message.getTrans_id());
log.debug("调用券码结束==" + message.getTrans_id());
ApiLog.debug("调用券码结束==" + message.getTrans_id());
}
//支付成功后
buriedPointService.paySuccessBuridPoint(partnerId, storeId, orderBean);
......@@ -685,7 +685,7 @@ public class OrderServiceImpl implements Orderservice {
private String verificationCoupon(String transId) {
String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(transId));
if (StringUtils.isNotBlank(orderId)) {
log.debug("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(), transId, orderId);
ApiLog.debug("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(), transId, orderId);
transId = orderId;
}
QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(transId);
......@@ -982,7 +982,7 @@ public class OrderServiceImpl implements Orderservice {
}
}
} 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.setReturnWords(returnWords);
......@@ -2884,13 +2884,13 @@ public class OrderServiceImpl implements Orderservice {
boolean check = this.checkSvcComPay(orderBean.getCompanyId(), orderBean.getShopId());
//混合支付
if (check && StringUtils.isNotBlank(channel)) {
log.debug("混合支付:");
ApiLog.debug("混合支付:");
String partnerPayOvertime = this.getPartnerPayOvertime(orderBean.getCompanyId());
orderPayResponse = comPayOrder(cardCode, orderBean, paymentRequest, partnerPayOvertime, totalAmount.intValue(), channel, storeId, LogThreadLocal.getTrackingNo());
}
//svc 支付
else {
log.debug("svc卡支付");
ApiLog.debug("svc卡支付");
orderPayResponse = svcPay(cardCode, orderBean, paymentRequest, transId, trackingNo);
}
return orderPayResponse;
......@@ -2968,7 +2968,7 @@ public class OrderServiceImpl implements Orderservice {
mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue);
createOrderRequest.setMqMessageRequest(mqMessageRequest);
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);
}
......@@ -3032,7 +3032,7 @@ public class OrderServiceImpl implements Orderservice {
}
com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo);
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 预支付失败需要把原因进行记录
orderPayResponse = new OrderPayResponse();
orderPayResponse.setMsg(responseBase.getMessage());
......@@ -3250,7 +3250,7 @@ public class OrderServiceImpl implements Orderservice {
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.setPayChannel(PayChannelType.COMB.getEbcode());
orderEditRequest.setPayChannelName(PayChannelType.COMB.getName());
......@@ -3819,7 +3819,7 @@ public class OrderServiceImpl implements Orderservice {
} while (i < 4);
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() : "混合支付忙不过来啦，请稍后再试");
return orderPayResponse;
}
......@@ -3945,7 +3945,7 @@ public class OrderServiceImpl implements Orderservice {
query = svcComPayClient.query(requestDto);
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())) {
return false;
}
......@@ -3963,7 +3963,7 @@ public class OrderServiceImpl implements Orderservice {
map.put(pg.split(":")[0], pg.split(":")[1]);
}
} catch (Exception e) {
log.error("goodsTag解析失败：" + collageGoodsTagList);
LogUtil.error("goodsTag解析失败：" ,"","",e);
}
return map;
}
......@@ -3975,18 +3975,18 @@ public class OrderServiceImpl implements Orderservice {
*/
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;
String noPay = "8200404";
if (abState.equals(orderBean.getAbnormalState())) {
log.debug("payment timeout callback for refund is exist");
ApiLog.debug("payment timeout callback for refund is exist");
return;
}
com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = null;
Long refundId = System.currentTimeMillis();
OrderExtInfoDto orderExtInfoDTO = gson.fromJson(orderBean.getExtInfo(), OrderExtInfoDto.class);
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;
}
Integer state = PayRefundStatus.SUCCESS.getCode();
......@@ -3996,7 +3996,7 @@ public class OrderServiceImpl implements Orderservice {
com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid());
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())) {
return;
}
......
order-application-service/src/test/java/cn.freemud/client/StoreItemClientTest.java
......@@ -28,6 +28,7 @@ import java.util.List;
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
@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