Skip to content

O
order-group
Commit c1022703 by ping.wu
Options

Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'qa' of… 

Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	call-back-service/src/main/java/cn/freemud/utils/LogUtil.java
parents 9dfc9910 f2af037c
Showing with 209 additions and 143 deletions
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/util/ShoppingSdkLogUtil.java
...@@ -60,13 +60,13 @@ public class ShoppingSdkLogUtil implements BeanFactoryAware { ...@@ -60,13 +60,13 @@ public class ShoppingSdkLogUtil implements BeanFactoryAware {
try { try {
ApiLog.printLog(MessageFormatter.arrayFormat(message, params).getMessage(), param1, param2, param3); ApiLog.printLog(MessageFormatter.arrayFormat(message, params).getMessage(), param1, param2, param3);
} catch (Exception e) { } catch (Exception e) {
com.freemud.application.sdk.api.log.ErrorLog.errorDev("LogUtil.printLog ".concat(message), e, params); com.freemud.application.sdk.api.log.ErrorLog.errorDev("","LogUtil.printLog ".concat(message), e, params);
} }
} }
} }
public void error(String message, Exception e, Object... params) { public void error(String message, Exception e, Object... params) {
com.freemud.application.sdk.api.log.ErrorLog.errorDev(message, e, params); com.freemud.application.sdk.api.log.ErrorLog.errorDev("",message, e, params);
} }
public void errorSe(String message, Exception e, Object... params) { public void errorSe(String message, Exception e, Object... params) {
......
call-back-service/src/main/java/cn/freemud/utils/LogUtil.java 0 → 100644
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: LogUtil
* @Package cn.freemud.utils
* @Description:
* @author: liming.guo
* @date: 2018/7/3 12:01
* @version V1.0
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
package cn.freemud.utils;
import cn.freemud.base.ApplicationContextWare;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.helpers.MessageFormatter;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@Component
public class LogUtil {
@Value("${print-debug-log:false}")
private boolean printDebug;
private static Logger logger = LoggerFactory.getLogger(LogUtil.class);
private static volatile String appName = "NO_APP_NAME";
public void debug(String message, Object... params) {
if (logger.isDebugEnabled()) {
this.info(message, params);
}
}
public void info(String message, Object... params) {
if (printDebug) {
Object[] clone = params != null ? params.clone() : new String[]{};
String param1 = "", param2 = "", param3 = "";
if (params.length > 0) {
param1 = clone[0] instanceof String ? (String) clone[0] : JSON.toJSONString(clone[0]);
}
if (params.length > 1) {
param2 = clone[1] instanceof String ? (String) clone[1] : JSON.toJSONString(clone[1]);
}
if (params.length > 2) {
param3 = clone[2] instanceof String ? (String) clone[2] : JSON.toJSONString(clone[2]);
}
try {
ApiLog.printLog(MessageFormatter.arrayFormat(message, params).getMessage(), param1, param2, param3);
} catch (Exception e) {
ErrorLog.errorDev("","LogUtil.printLog ".concat(message), e, params);
}
}
}
public void error(String message, Exception e, String... params) {
ErrorLog.errorDev("",message, e, params);
}
private static String getAppName() {
if (appName == null) {
appName = ApplicationContextWare.getAppName();
if (appName == null) {
appName = "NO_APP_NAME";
}
}
return appName;
}
public void errorSe(String message, Exception e, String... params) {
ErrorLog.errorSe(message, e, params);
}
}
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -4383,7 +4383,7 @@ public class OrderAdapter { ...@@ -4383,7 +4383,7 @@ public class OrderAdapter {
payTurnoffRefund = assortmentOpenPlatformPartnerConfig.getPartnerValue(); payTurnoffRefund = assortmentOpenPlatformPartnerConfig.getPartnerValue();
} }
} catch (Exception e) { } catch (Exception e) {
AppLogUtil.debugLotsParams("getPayTurnoffRefund error:{}", e.getMessage()); AppLogUtil.errorLog("getPayTurnoffRefund",null,null, e);
} }
return payTurnoffRefund; return payTurnoffRefund;
} }
......
order-application-service/src/main/java/cn/freemud/annotations/LogIgnore.java
package cn.freemud.annotations; //package cn.freemud.annotations;
//
import java.lang.annotation.Retention; //import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; //import java.lang.annotation.RetentionPolicy;
//
/** ///**
* @author wanghanghang // * @author wanghanghang
*/ // */
//
@Retention(RetentionPolicy.RUNTIME) //@Retention(RetentionPolicy.RUNTIME)
public @interface LogIgnore { //public @interface LogIgnore {
/** // /**
* 是否打印日志，true打印，false不打印，注意设置成false状态码和状态码信息都不会打印 // * 是否打印日志，true打印，false不打印，注意设置成false状态码和状态码信息都不会打印
* // *
* @return // * @return
*/ // */
boolean printLog() default true; // boolean printLog() default true;
//
/** // /**
* printLog 设置成true的时候，可以排除哪些状态码的响应不用打印响应报文，只会打印状态码 // * printLog 设置成true的时候，可以排除哪些状态码的响应不用打印响应报文，只会打印状态码
* 默认成功100 // * 默认成功100
* @return // * @return
*/ // */
String[] excludeSuccessCodes() default "100"; // String[] excludeSuccessCodes() default "100";
//
/** // /**
* statusCodeFieldName 默认返回状态码字段为code // * statusCodeFieldName 默认返回状态码字段为code
* // *
* @return // * @return
*/ // */
String codeFieldName() default "code"; // String codeFieldName() default "code";
//
/** // /**
* statusCodeFieldName 默认返回状态码字段为message // * statusCodeFieldName 默认返回状态码字段为message
* // *
* @return // * @return
*/ // */
String messageFieldName() default "message"; // String messageFieldName() default "message";
//
/** // /**
* logMessage 日志打印 // * logMessage 日志打印
* @return // * @return
*/ // */
String logMessage() default ""; // String logMessage() default "";
} //}
order-application-service/src/main/java/cn/freemud/aop/LogIgnoreFeignAspect.java
package cn.freemud.aop; package cn.freemud.aop;
import cn.freemud.annotations.LogIgnore;
import cn.freemud.annotations.LogIgnoreFeign; import cn.freemud.annotations.LogIgnoreFeign;
import cn.freemud.entities.vo.ThirdPartLogVo; import cn.freemud.entities.vo.ThirdPartLogVo;
import cn.freemud.utils.AppLogUtil; import cn.freemud.utils.AppLogUtil;
......
order-application-service/src/main/java/cn/freemud/handler/OrderReportJobHandler.java
...@@ -60,7 +60,7 @@ public class OrderReportJobHandler { ...@@ -60,7 +60,7 @@ public class OrderReportJobHandler {
// 数据推送之后的 redis 缓存数据 清理 // 数据推送之后的 redis 缓存数据 清理
redisCache.updateTTL(key, 1, TimeUnit.DAYS); redisCache.updateTTL(key, 1, TimeUnit.DAYS);
} catch (Exception e) { } catch (Exception e) {
AppLogUtil.errorLog("上报门店支付情况 error", null, JSON.toJSONString(e)); AppLogUtil.errorLog("上报门店支付情况 error", null, null,e);
} }
} }
} }
......
order-application-service/src/main/java/cn/freemud/service/CheckOrderUniversal.java
...@@ -788,7 +788,7 @@ public abstract class CheckOrderUniversal { ...@@ -788,7 +788,7 @@ public abstract class CheckOrderUniversal {
deliveryStartDate = hhmmss.parse(startDateTimeStr); deliveryStartDate = hhmmss.parse(startDateTimeStr);
deliveryEndDate = hhmmss.parse(endDateTimeStr); deliveryEndDate = hhmmss.parse(endDateTimeStr);
} catch (ParseException e) { } catch (ParseException e) {
AppLogUtil.errorLog("getStoreDeliveryInfo_error", endDateTimeStr, e.getMessage()); AppLogUtil.errorLog("getStoreDeliveryInfo_error", endDateTimeStr, null,e);
} }
} }
if (deliveryStartDate == null || deliveryEndDate == null) { if (deliveryStartDate == null || deliveryEndDate == null) {
......
order-application-service/src/main/java/cn/freemud/service/adapter/OrderCheckAdapter.java
...@@ -36,7 +36,6 @@ public class OrderCheckAdapter { ...@@ -36,7 +36,6 @@ public class OrderCheckAdapter {
AppLogUtil.infoLog("商户:{} shopId:{},没有配置预约单",vo.getPartnerId(),vo.getShopId()); AppLogUtil.infoLog("商户:{} shopId:{},没有配置预约单",vo.getPartnerId(),vo.getShopId());
return; return;
} }
AppLogUtil.debugLotsParams("门店：{}，外卖预约单状态：{}，自提预约单状态:{}", vo.getShopId(), configuration.getDeliveryAppoint(), configuration.getSelfMentionSwitch());
for (OrderCheck orderCheck : orderCheckList) { for (OrderCheck orderCheck : orderCheckList) {
if (orderCheck.support(vo.getOrderType())) { if (orderCheck.support(vo.getOrderType())) {
orderCheck.check(vo, storeResponse); orderCheck.check(vo, storeResponse);
......
order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java
...@@ -259,7 +259,7 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService ...@@ -259,7 +259,7 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
MQMessage<OrderResourcePushLogMsgDto> message = new MQMessage<>(header, dto); MQMessage<OrderResourcePushLogMsgDto> message = new MQMessage<>(header, dto);
mqService.convertAndSend(ORDER_RESOURCE_PUSH_LOG_EXCHANGE, ORDER_RESOURCE_PUSH_LOG_ROUTING_KEY, message); mqService.convertAndSend(ORDER_RESOURCE_PUSH_LOG_EXCHANGE, ORDER_RESOURCE_PUSH_LOG_ROUTING_KEY, message);
} catch (Exception e) { } catch (Exception e) {
AppLogUtil.errorLog(trackingNo, "sendMessage COUPON_VERIFICATION error!!! routingKey = order-resource-push-log-routing-key", JSONObject.toJSONString(dto), null, e); AppLogUtil.errorLog( "sendMessage COUPON_VERIFICATION error!!! routingKey = order-resource-push-log-routing-key", JSONObject.toJSONString(dto), null, e);
} }
} }
} }
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
...@@ -574,7 +574,6 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -574,7 +574,6 @@ 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);
AppLogUtil.debugLotsParams("调用生态返回参数，订单编号:{},返回信息：{}", orderId, JSONObject.toJSONString(sendMessageResponse));
} }
......
order-application-service/src/main/java/cn/freemud/service/impl/BuriedPointServiceImpl.java
...@@ -185,7 +185,7 @@ public class BuriedPointServiceImpl implements BuriedPointService { ...@@ -185,7 +185,7 @@ public class BuriedPointServiceImpl implements BuriedPointService {
} }
paySuccessBuridPointDto.setSkus(skus); paySuccessBuridPointDto.setSkus(skus);
AppLogUtil.debugLotsParams("paySuccessBuridPoint {}" + paySuccessBuridPointDto); // AppLogUtil.debugLotsParams("paySuccessBuridPoint {}" + paySuccessBuridPointDto);
// Integer str = buriedPointClient.returnSubmit(paySuccessBuridPointDto); // Integer str = buriedPointClient.returnSubmit(paySuccessBuridPointDto);
} catch (Exception e) { } catch (Exception e) {
AppLogUtil.errorLog("paySuccessBuridPoint error" ,null,null, e); AppLogUtil.errorLog("paySuccessBuridPoint error" ,null,null, e);
......
order-application-service/src/main/java/cn/freemud/service/impl/CheckMCCafeOrder.java
...@@ -507,16 +507,16 @@ public class CheckMCCafeOrder { ...@@ -507,16 +507,16 @@ public class CheckMCCafeOrder {
McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest); McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest);
if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode()) if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())
|| CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) { || CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) {
AppLogUtil.errorLog("部分优惠券当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse); AppLogUtil.infoLog("部分优惠券当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券当前不可用"); throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券当前不可用");
} else if(!ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getCouponlist().get(0).getStatusCode())) { } else if(!ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getCouponlist().get(0).getStatusCode())) {
mcdNetBatchQueryResponse.getCouponlist().forEach(o -> { mcdNetBatchQueryResponse.getCouponlist().forEach(o -> {
if(!ResponseCodeConstant.RESPONSE_SUCCESS.equals(o.getStatusCode())) { if(!ResponseCodeConstant.RESPONSE_SUCCESS.equals(o.getStatusCode())) {
if(o.getCodeInfo() != null) { if(o.getCodeInfo() != null) {
AppLogUtil.errorLog(o.getCodeInfo().getAct_name()+"当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse); AppLogUtil.infoLog(o.getCodeInfo().getAct_name()+"当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, o.getCodeInfo().getAct_name()+"当前不可用"); throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, o.getCodeInfo().getAct_name()+"当前不可用");
} else { } else {
AppLogUtil.errorLog("部分优惠券暂时不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse); AppLogUtil.infoLog("部分优惠券暂时不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券暂时不可用"); throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券暂时不可用");
} }
} }
...@@ -604,16 +604,16 @@ public class CheckMCCafeOrder { ...@@ -604,16 +604,16 @@ public class CheckMCCafeOrder {
McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest); McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest);
if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode()) if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())
|| CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) { || CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) {
AppLogUtil.errorLog("部分优惠券当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse); AppLogUtil.infoLog("部分优惠券当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券当前不可用"); throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券当前不可用");
} else { } else {
mcdNetBatchQueryResponse.getCouponlist().forEach(o -> { mcdNetBatchQueryResponse.getCouponlist().forEach(o -> {
if(!ResponseCodeConstant.RESPONSE_SUCCESS.equals(o.getStatusCode())) { if(!ResponseCodeConstant.RESPONSE_SUCCESS.equals(o.getStatusCode())) {
if(o.getCodeInfo() != null) { if(o.getCodeInfo() != null) {
AppLogUtil.errorLog(o.getCodeInfo().getAct_name()+"当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse); AppLogUtil.infoLog(o.getCodeInfo().getAct_name()+"当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, o.getCodeInfo().getAct_name()+"当前不可用"); throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, o.getCodeInfo().getAct_name()+"当前不可用");
} else { } else {
AppLogUtil.errorLog("部分优惠券暂时不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse); AppLogUtil.infoLog("部分优惠券暂时不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券暂时不可用"); throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券暂时不可用");
} }
} }
......
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
...@@ -472,7 +472,7 @@ public class CheckOrder { ...@@ -472,7 +472,7 @@ public class CheckOrder {
deliveryStartDate = hhmmss.parse(startDateTimeStr); deliveryStartDate = hhmmss.parse(startDateTimeStr);
deliveryEndDate = hhmmss.parse(endDateTimeStr); deliveryEndDate = hhmmss.parse(endDateTimeStr);
} catch (ParseException e) { } catch (ParseException e) {
AppLogUtil.errorLog("getStoreDeliveryInfo_error", endDateTimeStr, e.getMessage()); AppLogUtil.errorLog("getStoreDeliveryInfo_error", endDateTimeStr, null,e);
} }
} }
if (deliveryStartDate == null || deliveryEndDate == null) { if (deliveryStartDate == null || deliveryEndDate == null) {
......
order-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java
...@@ -218,10 +218,8 @@ public class CollageOrderServiceImpl implements CollageOrderService { ...@@ -218,10 +218,8 @@ public class CollageOrderServiceImpl implements CollageOrderService {
getAuthorizerRequestDto.setAuthorizerAppid(userInfo.getWxAppId()); getAuthorizerRequestDto.setAuthorizerAppid(userInfo.getWxAppId());
// 通过partnerId以及appid获取access_token // 通过partnerId以及appid获取access_token
logUtil.debug("collage access_token request partnerId:{} appId:{}", requestVo.getPartnerId(), userInfo.getWxAppId());
GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto); GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto);
String accessToken = getTokenResponseDto.getResult().getAccessToken(); String accessToken = getTokenResponseDto.getResult().getAccessToken();
logUtil.debug("collage access_token response access_token:{}", accessToken);
// 构造群收款订单创建请求对象 // 构造群收款订单创建请求对象
GroupBuyRequest groupBuyRequest = new GroupBuyRequest(); GroupBuyRequest groupBuyRequest = new GroupBuyRequest();
...@@ -289,9 +287,7 @@ public class CollageOrderServiceImpl implements CollageOrderService { ...@@ -289,9 +287,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
desc.setText_desc(order.getShopName() + DateUtil.getCurrentDate(DateUtil.FORMAT_yyyyMMdd)); desc.setText_desc(order.getShopName() + DateUtil.getCurrentDate(DateUtil.FORMAT_yyyyMMdd));
groupBuyRequest.setDesc(desc); groupBuyRequest.setDesc(desc);
logUtil.debug("collage groupBuy request param:{}", groupBuyRequest);
GroupBuyResponse groupBuyResponse = weChatClient.groupBuyCreateOrder(accessToken, groupBuyRequest); GroupBuyResponse groupBuyResponse = weChatClient.groupBuyCreateOrder(accessToken, groupBuyRequest);
logUtil.debug("collage groupBuy response return:{}", groupBuyResponse);
if (null != groupBuyResponse && groupBuyResponse.getErrcode() == 0) { if (null != groupBuyResponse && groupBuyResponse.getErrcode() == 0) {
GroupBuyResp groupBuyResp = new GroupBuyResp(); GroupBuyResp groupBuyResp = new GroupBuyResp();
......
order-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
...@@ -121,7 +121,7 @@ public class CouponServiceImpl implements CouponService { ...@@ -121,7 +121,7 @@ public class CouponServiceImpl implements CouponService {
getMemberCouponListRequestDto.setPageNum(1); getMemberCouponListRequestDto.setPageNum(1);
getMemberCouponListRequestDto.setPageSize(Integer.MAX_VALUE); getMemberCouponListRequestDto.setPageSize(Integer.MAX_VALUE);
GetMemberCouponListResponseDto.Result result = getMemberCouponList(getMemberCouponListRequestDto); GetMemberCouponListResponseDto.Result result = getMemberCouponList(getMemberCouponListRequestDto);
AppLogUtil.debugLog("CouponServiceImpl_getMemberCouponList", JSON.toJSONString(getMemberCouponListRequestDto), JSON.toJSONString(result)); AppLogUtil.infoLog("CouponServiceImpl_getMemberCouponList", JSON.toJSONString(getMemberCouponListRequestDto), JSON.toJSONString(result));
List<GetMemberCouponListResponseDto.Result.MemberCoupon> memberCoupons = Lists.newArrayList(); List<GetMemberCouponListResponseDto.Result.MemberCoupon> memberCoupons = Lists.newArrayList();
// 过滤优惠券得点餐方式 // 过滤优惠券得点餐方式
if (!Objects.isNull(result) && CollectionUtils.isNotEmpty(result.getMemberCoupons())) { if (!Objects.isNull(result) && CollectionUtils.isNotEmpty(result.getMemberCoupons())) {
......
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
...@@ -327,7 +327,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -327,7 +327,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
if (StringUtils.isEmpty(oid)) { if (StringUtils.isEmpty(oid)) {
return; return;
} }
AppLogUtil.debugLotsParams("backOrdersStatusChange oid:{} orderStatus:{}", oid, String.valueOf(orderStatus)); // AppLogUtil.debugLotsParams("backOrdersStatusChange oid:{} orderStatus:{}", oid, String.valueOf(orderStatus));
OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto(); OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
requestDto.setOid(oid); requestDto.setOid(oid);
requestDto.setOrderStatus(orderStatus); requestDto.setOrderStatus(orderStatus);
...@@ -697,7 +697,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -697,7 +697,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
orderPayResponse.setOrderId(orderBean.getOid()); orderPayResponse.setOrderId(orderBean.getOid());
return orderPayResponse; return orderPayResponse;
} catch (Exception e) { } catch (Exception e) {
AppLogUtil.errorLog("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest)); AppLogUtil.errorLog("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest),e);
//TODO 邮件告警 //TODO 邮件告警
return null; return null;
} }
...@@ -1363,12 +1363,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1363,12 +1363,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderRefund(orderRefundRequest); BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderRefund(orderRefundRequest);
if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) { if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
AppLogUtil.errorLog("mcCafeRefundNotifyCallback", orderRefundRequest, baseOrderResponse); AppLogUtil.infoLog("mcCafeRefundNotifyCallback", orderRefundRequest, baseOrderResponse);
return refundFailedMessage("create after sale order failed"); return refundFailedMessage("create after sale order failed");
} }
return newSendPaySuccessNoticeMessage(); return newSendPaySuccessNoticeMessage();
} }
...@@ -1552,7 +1549,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1552,7 +1549,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
queryOrdersRequest2.setTrackingNo(LogThreadLocal.getTrackingNo()); queryOrdersRequest2.setTrackingNo(LogThreadLocal.getTrackingNo());
queryOrderResponse = orderCenterSdkService.queryMCCafeOrders(queryOrdersRequest2); queryOrderResponse = orderCenterSdkService.queryMCCafeOrders(queryOrdersRequest2);
} catch (Exception e) { } catch (Exception e) {
AppLogUtil.errorLog("queryOrders_error", gson.toJson(queryOrdersDto), e); AppLogUtil.errorLog("queryOrders_error", gson.toJson(queryOrdersDto), null,e);
return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR); return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
} }
if (queryOrderResponse == null || !RESPONSE_SUCCESS_CODE.equals(queryOrderResponse.getErrcode())) { if (queryOrderResponse == null || !RESPONSE_SUCCESS_CODE.equals(queryOrderResponse.getErrcode())) {
...@@ -1825,7 +1822,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1825,7 +1822,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
baseResponseDto.setErrmsg(deliveryBaseResponse.getMsg()); baseResponseDto.setErrmsg(deliveryBaseResponse.getMsg());
if (deliveryBaseResponse == null || !ResponseConstant.SUCCESS_RESPONSE_CODE.equals(deliveryBaseResponse.getCode())) { if (deliveryBaseResponse == null || !ResponseConstant.SUCCESS_RESPONSE_CODE.equals(deliveryBaseResponse.getCode())) {
AppLogUtil.errorLog("申请取消配送单失败", cancelDeliveryRequest, deliveryBaseResponse); AppLogUtil.infoLog("申请取消配送单失败", cancelDeliveryRequest, deliveryBaseResponse);
return baseResponseDto; return baseResponseDto;
} }
} }
...@@ -1847,7 +1844,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1847,7 +1844,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
* @param orderBean * @param orderBean
*/ */
public void sendApplyRefundSubscriptionNotice(OrderBean orderBean,OrderRefundVo request) { public void sendApplyRefundSubscriptionNotice(OrderBean orderBean,OrderRefundVo request) {
AppLogUtil.debugLog("sendApplyRefundSubscriptionNotice", JSONObject.toJSONString(request), null);
String partnerId = orderBean.getCompanyId(); String partnerId = orderBean.getCompanyId();
String shopId = orderBean.getShopId(); String shopId = orderBean.getShopId();
if(orderBean.getExtInfo() == null){ if(orderBean.getExtInfo() == null){
...@@ -1988,7 +1984,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1988,7 +1984,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
* @param request * @param request
*/ */
public void asynchronousPrint(OrderPrintDto request) { public void asynchronousPrint(OrderPrintDto request) {
AppLogUtil.debugLog("OrderPrintDto", JSONObject.toJSONString(request), null);
Header header = new Header(MQAction.INSERT.getAction(), "asynchronous-print-api", request.getOid() + "", cloudPrintQueue); Header header = new Header(MQAction.INSERT.getAction(), "asynchronous-print-api", request.getOid() + "", cloudPrintQueue);
MQMessage<OrderPrintDto> message = new MQMessage<>(header, request); MQMessage<OrderPrintDto> message = new MQMessage<>(header, request);
mqService.convertAndSend(cloud_print_exchange, cloudPrintQueue, message); mqService.convertAndSend(cloud_print_exchange, cloudPrintQueue, message);
...@@ -2023,7 +2018,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2023,7 +2018,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
request.setThirdPartyMemberId(thirdPartyMemberId); request.setThirdPartyMemberId(thirdPartyMemberId);
SendCouponForqujiaDtoResponseDto responseDto = customerExtendClient.sendCouponForqujia(request); SendCouponForqujiaDtoResponseDto responseDto = customerExtendClient.sendCouponForqujia(request);
if(!Objects.equals(responseDto.getCode(), ResponseResult.SUCCESS.getCode())){ if(!Objects.equals(responseDto.getCode(), ResponseResult.SUCCESS.getCode())){
AppLogUtil.errorLog("sendCouponForqujia", JSON.toJSONString(request), JSON.toJSONString(responseDto)); AppLogUtil.infoLog("sendCouponForqujia", JSON.toJSONString(request), JSON.toJSONString(responseDto));
return false; return false;
} }
...@@ -2047,7 +2042,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2047,7 +2042,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest); McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest);
if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode()) if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())
|| CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) { || CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) {
AppLogUtil.errorLog("获取优惠券详情失败，发券失败", mcCafeCouponRequest, mcdNetBatchQueryResponse); AppLogUtil.infoLog("获取优惠券详情失败，发券失败", mcCafeCouponRequest, mcdNetBatchQueryResponse);
return false; return false;
} }
Map<String, Integer> cardStatusMap = mcdNetBatchQueryResponse.getCouponlist().stream() Map<String, Integer> cardStatusMap = mcdNetBatchQueryResponse.getCouponlist().stream()
...@@ -2138,7 +2133,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2138,7 +2133,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
SendCouponForqujiaDtoResponseDto responseDto = customerExtendClient.sendCouponForqujia(request); SendCouponForqujiaDtoResponseDto responseDto = customerExtendClient.sendCouponForqujia(request);
if(!Objects.equals(responseDto.getCode(), ResponseResult.SUCCESS.getCode()) if(!Objects.equals(responseDto.getCode(), ResponseResult.SUCCESS.getCode())
|| responseDto.getData() == null || CollectionUtils.isEmpty(responseDto.getData().getCard_list())){ || responseDto.getData() == null || CollectionUtils.isEmpty(responseDto.getData().getCard_list())){
AppLogUtil.errorLog("发券异常",JSON.toJSONString(request) ,JSON.toJSONString(responseDto)); AppLogUtil.infoLog("发券异常",JSON.toJSONString(request) ,JSON.toJSONString(responseDto));
continue; continue;
} }
...@@ -2158,7 +2153,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2158,7 +2153,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest); McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest);
if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode()) if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())
|| CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) { || CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) {
AppLogUtil.errorLog("获取优惠券详情失败，发券失败" , JSON.toJSONString(mcCafeCouponRequest) , JSON.toJSONString(mcdNetBatchQueryResponse)); AppLogUtil.infoLog("获取优惠券详情失败，发券失败" , JSON.toJSONString(mcCafeCouponRequest) , JSON.toJSONString(mcdNetBatchQueryResponse));
return false; return false;
} }
...@@ -2174,7 +2169,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2174,7 +2169,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
Optional<McdNetBatchQueryResponse.Coupon> couponOptional = mcdNetBatchQueryResponse.getCouponlist().stream() Optional<McdNetBatchQueryResponse.Coupon> couponOptional = mcdNetBatchQueryResponse.getCouponlist().stream()
.filter(o -> ResponseCodeConstant.RESPONSE_SUCCESS.equals(o.getStatusCode())).findFirst(); .filter(o -> ResponseCodeConstant.RESPONSE_SUCCESS.equals(o.getStatusCode())).findFirst();
if(!couponOptional.isPresent()) { if(!couponOptional.isPresent()) {
AppLogUtil.errorLog("没有有效的优惠券，更新失败" , JSON.toJSONString(mcCafeCouponRequest) , JSON.toJSONString(mcdNetBatchQueryResponse)); AppLogUtil.infoLog("没有有效的优惠券，更新失败" , JSON.toJSONString(mcCafeCouponRequest) , JSON.toJSONString(mcdNetBatchQueryResponse));
continue; continue;
} else { } else {
couponCode = couponOptional.get().getCode(); couponCode = couponOptional.get().getCode();
...@@ -2184,14 +2179,14 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2184,14 +2179,14 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
Optional<McdNetBatchQueryResponse.Coupon> couponOptional = mcdNetBatchQueryResponse.getCouponlist().stream() Optional<McdNetBatchQueryResponse.Coupon> couponOptional = mcdNetBatchQueryResponse.getCouponlist().stream()
.filter(o -> ResponseCodeConstant.RESPONSE_SUCCESS.equals(o.getStatusCode())).findFirst(); .filter(o -> ResponseCodeConstant.RESPONSE_SUCCESS.equals(o.getStatusCode())).findFirst();
if(!couponOptional.isPresent()) { if(!couponOptional.isPresent()) {
AppLogUtil.errorLog("没有有效的优惠券，更新失败" , JSON.toJSONString(mcCafeCouponRequest) , JSON.toJSONString(mcdNetBatchQueryResponse)); AppLogUtil.infoLog("没有有效的优惠券，更新失败" , JSON.toJSONString(mcCafeCouponRequest) , JSON.toJSONString(mcdNetBatchQueryResponse));
continue; continue;
} else { } else {
couponCode = couponOptional.get().getCode(); couponCode = couponOptional.get().getCode();
} }
} }
if(StringUtils.isBlank(couponCode)) { if(StringUtils.isBlank(couponCode)) {
AppLogUtil.errorLog("没有匹配的优惠券，更新失败" , JSON.toJSONString(mcCafeCouponRequest) , JSON.toJSONString(mcdNetBatchQueryResponse)); AppLogUtil.infoLog("没有匹配的优惠券，更新失败" , JSON.toJSONString(mcCafeCouponRequest) , JSON.toJSONString(mcdNetBatchQueryResponse));
continue; continue;
} }
UpdateCouponCodeReq.CouponUpdateInfo couponUpdateInfo = new UpdateCouponCodeReq.CouponUpdateInfo(); UpdateCouponCodeReq.CouponUpdateInfo couponUpdateInfo = new UpdateCouponCodeReq.CouponUpdateInfo();
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
...@@ -392,7 +392,7 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -392,7 +392,7 @@ public class MallOrderServiceImpl implements MallOrderService {
putDelMq(request.getPartnerId(), request.getStoreId(), responseBase.getData().getFmId(), orderBean.getOid()); putDelMq(request.getPartnerId(), request.getStoreId(), responseBase.getData().getFmId(), orderBean.getOid());
return orderPayResponse; return orderPayResponse;
} catch (Exception e) { } catch (Exception e) {
AppLogUtil.errorLog("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest)); AppLogUtil.errorLog("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest),e);
//TODO 邮件告警 //TODO 邮件告警
return null; return null;
} }
...@@ -564,10 +564,10 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -564,10 +564,10 @@ public class MallOrderServiceImpl implements MallOrderService {
try { try {
com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = orderSdkService.acceptOrder(acceptOrderReq, LogThreadLocal.getTrackingNo()); com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = orderSdkService.acceptOrder(acceptOrderReq, LogThreadLocal.getTrackingNo());
if(baseResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(baseResponse.getCode())) { if(baseResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(baseResponse.getCode())) {
AppLogUtil.errorLog("paySuccessCallback_acceptOrder_faild", gson.toJson(confirmOrderDto), gson.toJson(payAccessResponse)); AppLogUtil.infoLog("paySuccessCallback_acceptOrder_faild", gson.toJson(confirmOrderDto), gson.toJson(payAccessResponse));
} }
}catch (Exception e){ }catch (Exception e){
AppLogUtil.errorLog("paySuccessCallback_acceptOrder_error",orderId,e); AppLogUtil.errorLog("paySuccessCallback_acceptOrder_error",orderId,null,e);
} }
} }
} }
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
...@@ -380,12 +380,10 @@ public class OrderAdapterServiceImpl implements OrderAdapterService { ...@@ -380,12 +380,10 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
// 通过交易号从缓存中拿订单号，如果有数据则实际订单号为其value值 // 通过交易号从缓存中拿订单号，如果有数据则实际订单号为其value值
String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(confirmOrderDto.getOrderId())); String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(confirmOrderDto.getOrderId()));
if (StringUtils.isNotBlank(orderId)) { if (StringUtils.isNotBlank(orderId)) {
AppLogUtil.debugLotsParams("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogThreadLocal.getTrackingNo(), confirmOrderDto.getOrderId(), orderId);
confirmOrderDto.setOrderId(orderId); confirmOrderDto.setOrderId(orderId);
} }
Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans = orderService.getOrderBeanByOrderId(confirmOrderDto.getOrderId()); Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans = orderService.getOrderBeanByOrderId(confirmOrderDto.getOrderId());
if (MapUtils.isEmpty(orderBeans)) { if (MapUtils.isEmpty(orderBeans)) {
AppLogUtil.debugLotsParams("paySuccessCallback_queryOrderById_faild, trackingNo:{},PaysuccessNoticeMessage:{}", LogThreadLocal.getTrackingNo(), gson.toJson(message));
return gson.toJson(message); return gson.toJson(message);
} }
QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode()); QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java
...@@ -148,7 +148,7 @@ public class OrderCommonService { ...@@ -148,7 +148,7 @@ public class OrderCommonService {
orderExtInfoDto.setPrePayTransId(request.getTransId()); orderExtInfoDto.setPrePayTransId(request.getTransId());
} catch (Exception e) { } catch (Exception e) {
AppLogUtil.errorLog("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest)); AppLogUtil.errorLog("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest),e);
//给出支付失败提示 //给出支付失败提示
return null; return null;
} }
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -672,7 +672,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -672,7 +672,7 @@ public class OrderServiceImpl implements Orderservice {
} }
// 尝试开通会员卡失败三次 // 尝试开通会员卡失败三次
if (i >= count) { if (i >= count) {
AppLogUtil.errorLog("尝试开通会员卡失败" + count + "次", JSON.toJSONString(purchasePaidRequestDto), JSON.toJSONString(baseResponse)); AppLogUtil.infoLog("尝试开通会员卡失败" + count + "次", JSON.toJSONString(purchasePaidRequestDto), JSON.toJSONString(baseResponse));
} }
} }
} }
...@@ -2399,7 +2399,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2399,7 +2399,7 @@ public class OrderServiceImpl implements Orderservice {
} else { } else {
productDto.setCustomerCode(""); productDto.setCustomerCode("");
productDto.setProductCode(""); productDto.setProductCode("");
AppLogUtil.errorLog("getProducts_exception", JSONObject.toJSONString(pids), JSONObject.toJSONString(products)); AppLogUtil.infoLog("getProducts_exception", JSONObject.toJSONString(pids), JSONObject.toJSONString(products));
} }
//套餐子商品 //套餐子商品
if (CollectionUtils.isNotEmpty(productDto.getComboProduct())) { if (CollectionUtils.isNotEmpty(productDto.getComboProduct())) {
...@@ -3089,7 +3089,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3089,7 +3089,6 @@ public class OrderServiceImpl implements Orderservice {
* @param orderBean * @param orderBean
*/ */
public void sendApplyRefundSubscriptionNotice(OrderBean orderBean, OrderRefundVo request) { public void sendApplyRefundSubscriptionNotice(OrderBean orderBean, OrderRefundVo request) {
AppLogUtil.debugLog("sendApplyRefundSubscriptionNotice", JSONObject.toJSONString(request), null);
// String partnerId = orderBean.getCompanyId(); // String partnerId = orderBean.getCompanyId();
// String shopId = orderBean.getShopId(); // String shopId = orderBean.getShopId();
// if (orderBean.getExtInfo() == null) { // if (orderBean.getExtInfo() == null) {
...@@ -3901,7 +3900,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3901,7 +3900,7 @@ public class OrderServiceImpl implements Orderservice {
totalOrders = null == orderInfoReqs.getTotalNum() ? 0 : orderInfoReqs.getTotalNum(); totalOrders = null == orderInfoReqs.getTotalNum() ? 0 : orderInfoReqs.getTotalNum();
result.put("totalOrders", totalOrders); result.put("totalOrders", totalOrders);
} catch (Exception e) { } catch (Exception e) {
AppLogUtil.errorLog("queryTodayOrders", gson.toJson(queryOrderByConditionsRequestVo), e); AppLogUtil.errorLog("queryTodayOrders", gson.toJson(queryOrderByConditionsRequestVo),null, e);
return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR); return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
} }
return ResponseUtil.success(result); return ResponseUtil.success(result);
......
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
...@@ -805,7 +805,7 @@ public class SellCouponOrderServiceImpl { ...@@ -805,7 +805,7 @@ public class SellCouponOrderServiceImpl {
// 订单支付成功 // 订单支付成功
PayAccessResponse payAccessResponse = orderBusinessService.payAccess(var1); PayAccessResponse payAccessResponse = orderBusinessService.payAccess(var1);
}catch (Exception e){ }catch (Exception e){
AppLogUtil.errorLog(LogThreadLocal.getTrackingNo(),"sdkPayAccessError",JSONObject.toJSONString(var1),null,e); AppLogUtil.errorLog("sdkPayAccessError",JSONObject.toJSONString(var1),null,e);
} }
//支付成功直接完成 //支付成功直接完成
OrderChangeStateReq request = new OrderChangeStateReq(); OrderChangeStateReq request = new OrderChangeStateReq();
......
order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
...@@ -1121,7 +1121,7 @@ public abstract class UniversalOrderService { ...@@ -1121,7 +1121,7 @@ public abstract class UniversalOrderService {
} }
} catch (Exception e) { } catch (Exception e) {
AppLogUtil.errorLog("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest)); AppLogUtil.errorLog("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest),e);
//TODO 邮件告警 //TODO 邮件告警
orderPayResponse = new OrderPayResponse(); orderPayResponse = new OrderPayResponse();
orderPayResponse.setMsg("getPreOrderPay_error"); orderPayResponse.setMsg("getPreOrderPay_error");
......
order-application-service/src/main/java/cn/freemud/service/universal/impl/SaasMallOrderService.java
...@@ -385,7 +385,7 @@ public class SaasMallOrderService extends UniversalOrderService { ...@@ -385,7 +385,7 @@ public class SaasMallOrderService extends UniversalOrderService {
orderPayResponse.setOrderId(orderBean.getOid()); orderPayResponse.setOrderId(orderBean.getOid());
return orderPayResponse; return orderPayResponse;
} catch (Exception e) { } catch (Exception e) {
AppLogUtil.errorLog("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest)); AppLogUtil.errorLog("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest),e);
//TODO 邮件告警 //TODO 邮件告警
return null; return null;
} }
......
order-application-service/src/main/java/cn/freemud/utils/AppLogUtil.java
...@@ -61,20 +61,22 @@ public class AppLogUtil implements BeanFactoryAware { ...@@ -61,20 +61,22 @@ public class AppLogUtil implements BeanFactoryAware {
private static volatile String appName = "NO_APP_NAME"; private static volatile String appName = "NO_APP_NAME";
public void debug(String message, Object... params) { // public void debug(String message, Object... params) {
if (logger.isDebugEnabled()) { // if (logger.isDebugEnabled()) {
logUtil.info(message, params); // logUtil.info(message, params);
} // }
} // }
public void info(String message, Object... params) { public void info(String message, Object... params) {
logUtil.info(message,params); logUtil.info(message,params);
} }
public void error(String message, Exception e, String... params) {
logUtil.error(message, e, params); // public void error(String message, Exception e, String... params) {
} // logUtil.errorDev("",message, e, params);
public void error(String message, Object... params) { // }
ErrorLog.errorDev(message, params); // public void error(String message, Object... params) {
} // ErrorLog.errorDev(message, params);
// }
public void errorSe(String message, Exception e, String... params) { public void errorSe(String message, Exception e, String... params) {
...@@ -85,21 +87,21 @@ public class AppLogUtil implements BeanFactoryAware { ...@@ -85,21 +87,21 @@ public class AppLogUtil implements BeanFactoryAware {
return beanFactory.getBean("logUtil", LogUtil.class); return beanFactory.getBean("logUtil", LogUtil.class);
} }
public static void debugLog(String message, Object requestParams, Object responseParams) { // public static void debugLog(String message, Object requestParams, Object responseParams) {
if (requestParams != null) { // if (requestParams != null) {
message = message.concat(" requestParams:{}"); // message = message.concat(" requestParams:{}");
} // }
if (responseParams == null) { // if (responseParams == null) {
message = message.concat(" responseParams:{}"); // message = message.concat(" responseParams:{}");
} // }
getLogUtil().debug(message, requestParams, responseParams); // getLogUtil().debug(message, requestParams, responseParams);
} // }
//
public static void debugLotsParams(String message, Object... params) { // public static void debugLotsParams(String message, Object... params) {
if (logger.isDebugEnabled()) { // if (logger.isDebugEnabled()) {
getLogUtil().debug(message, params); // getLogUtil().debug(message, params);
} // }
} // }
public static void infoLog(String message, Object requestParams, Object responseParams) { public static void infoLog(String message, Object requestParams, Object responseParams) {
getLogUtil().info(message.concat(" requestParams:{} responseParams:{}"),requestParams,responseParams); getLogUtil().info(message.concat(" requestParams:{} responseParams:{}"),requestParams,responseParams);
...@@ -112,17 +114,17 @@ public class AppLogUtil implements BeanFactoryAware { ...@@ -112,17 +114,17 @@ public class AppLogUtil implements BeanFactoryAware {
getLogUtil().info(message.concat(" requestParams:{} responseParams:{}"),requestParams,responseParams); getLogUtil().info(message.concat(" requestParams:{} responseParams:{}"),requestParams,responseParams);
} }
public static void errorLog(String message, Object requestParams, Object responseParams) { // public static void errorLog(String message, Object requestParams, Object responseParams) {
getLogUtil().error(message.concat(" requestParams:{} responseParams:{}"),null,requestParams,responseParams); // getLogUtil().error(message.concat(" requestParams:{} responseParams:{}"),null,requestParams,responseParams);
} // }
public static void errorLog(String message, String requestParams, String responseParams, Exception e) { public static void errorLog(String message, String requestParams, String responseParams, Exception e) {
getLogUtil().error(message.concat(" requestParams:{} responseParams:{}"),e,requestParams,responseParams); getLogUtil().error("",message.concat(" requestParams:{} responseParams:{}"),e,requestParams,responseParams);
} }
public static void errorLog(String trackingId, String message, String requestParams, String responseParams, Exception e) { // public static void errorLog(String trackingId, String message, String requestParams, String responseParams, Exception e) {
getLogUtil().error(message.concat(" requestParams:{} responseParams:{}"),e,requestParams,responseParams); // getLogUtil().error(message.concat(" requestParams:{} responseParams:{}"),e,requestParams,responseParams);
} // }
public static void printLog(String message, Object requestParams, Object responseParams) { public static void printLog(String message, Object requestParams, Object responseParams) {
getLogUtil().info(message.concat(" requestParams:{} responseParams:{}"),requestParams,responseParams); getLogUtil().info(message.concat(" requestParams:{} responseParams:{}"),requestParams,responseParams);
...@@ -152,12 +154,12 @@ public class AppLogUtil implements BeanFactoryAware { ...@@ -152,12 +154,12 @@ public class AppLogUtil implements BeanFactoryAware {
url = thirdPartLogVo.getUri(); url = thirdPartLogVo.getUri();
methodName = thirdPartLogVo.getMethodName(); methodName = thirdPartLogVo.getMethodName();
} }
getLogUtil().error("createAt:{} appName:{} trackingNo:{} thirdPartyName:{} timeConsumed:{} url:{} methodName:{} request:{} stackTrack:{}",null, DateUtil.convert2String(Calendar.getInstance().getTime() getLogUtil().error("","createAt:{} appName:{} trackingNo:{} thirdPartyName:{} timeConsumed:{} url:{} methodName:{} request:{} stackTrack:{}",null, DateUtil.convert2String(Calendar.getInstance().getTime()
, "yyyy-MM-dd HH:mm:ss"), appName, tracking, thirdPartyName, endTime - startTime, url, methodName , "yyyy-MM-dd HH:mm:ss"), appName, tracking, thirdPartyName, endTime - startTime, url, methodName
, requestDataConvert, JSONObject.toJSONString(errorObject)); , requestDataConvert, JSONObject.toJSONString(errorObject));
} catch (Exception e) { } catch (Exception e) {
getLogUtil().error("LogUtilError stackTrack",e,null); getLogUtil().error("","LogUtilError stackTrack",e,null);
} }
} }
...@@ -207,7 +209,7 @@ public class AppLogUtil implements BeanFactoryAware { ...@@ -207,7 +209,7 @@ public class AppLogUtil implements BeanFactoryAware {
method = targetClass.getMethod(joinPoint.getSignature().getName(), argTypes); method = targetClass.getMethod(joinPoint.getSignature().getName(), argTypes);
} }
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
AppLogUtil.errorLog("", serviceName, JSON.toJSONString(joinPoint.getArgs()), e); AppLogUtil.errorLog("createThirdPartLogVo", serviceName, JSON.toJSONString(joinPoint.getArgs()), e);
} }
if(method != null) { if(method != null) {
methodName = method.getName(); methodName = method.getName();
...@@ -231,7 +233,7 @@ public class AppLogUtil implements BeanFactoryAware { ...@@ -231,7 +233,7 @@ public class AppLogUtil implements BeanFactoryAware {
thirdPartLogVo.setRequestBody(requestBody); thirdPartLogVo.setRequestBody(requestBody);
return thirdPartLogVo; return thirdPartLogVo;
} catch (Exception e) { } catch (Exception e) {
getLogUtil().error("LogUtilError stackTrack:{}", e); getLogUtil().error("","LogUtilError stackTrack:{}", e);
return null; return null;
} }
} }
......
order-application-service/src/main/java/cn/freemud/xxljob/OrderCountJobHandler.java
...@@ -91,7 +91,7 @@ public class OrderCountJobHandler extends IJobHandler { ...@@ -91,7 +91,7 @@ public class OrderCountJobHandler extends IJobHandler {
BaseResponse baseResponse = microOpenplatformClient.addOrderSum(build); BaseResponse baseResponse = microOpenplatformClient.addOrderSum(build);
// AppLogUtil.infoLog("orderCountJobHandlersendreportorderend", JSON.toJSONString(build), JSON.toJSONString(baseResponse)); // AppLogUtil.infoLog("orderCountJobHandlersendreportorderend", JSON.toJSONString(build), JSON.toJSONString(baseResponse));
} catch (Exception e) { } catch (Exception e) {
AppLogUtil.errorLog("orderCountJobHandlersendreportorderend", null, JSON.toJSONString(e)); AppLogUtil.errorLog("orderCountJobHandlersendreportorderend", null, null,e);
} }
return ReturnT.SUCCESS; return ReturnT.SUCCESS;
} }
......
order-application-service/src/test/java/cn.freemud/client/CouoponOnlineTest.java
...@@ -59,7 +59,7 @@ public class CouoponOnlineTest { ...@@ -59,7 +59,7 @@ public class CouoponOnlineTest {
String sign = SignUtil.createMD5Sign(requestDto, appSecret); String sign = SignUtil.createMD5Sign(requestDto, appSecret);
requestDto.setSign(sign); requestDto.setSign(sign);
BatchQueryActivityInfoResponseDto batchQueryActivityInfoResponseDto = cardBinClient.batchQueryActivityInfo(requestDto); BatchQueryActivityInfoResponseDto batchQueryActivityInfoResponseDto = cardBinClient.batchQueryActivityInfo(requestDto);
AppLogUtil.debugLog("batchQueryActivityInfoTest", JSON.toJSONString(requestDto), JSON.toJSONString(batchQueryActivityInfoResponseDto)); // AppLogUtil.debugLog("batchQueryActivityInfoTest", JSON.toJSONString(requestDto), JSON.toJSONString(batchQueryActivityInfoResponseDto));
} }
......
order-application-service/src/test/java/cn.freemud/service/CouponActivityServiceTest.java
...@@ -221,16 +221,16 @@ public class CouponActivityServiceTest { ...@@ -221,16 +221,16 @@ public class CouponActivityServiceTest {
System.out.println(JSON.toJSONString(mcdNetBatchQueryResponse)); System.out.println(JSON.toJSONString(mcdNetBatchQueryResponse));
if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode()) if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())
|| CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) { || CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) {
AppLogUtil.errorLog("部分优惠券当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse); AppLogUtil.infoLog("部分优惠券当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券当前不可用"); throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券当前不可用");
} else { } else {
mcdNetBatchQueryResponse.getCouponlist().forEach(o -> { mcdNetBatchQueryResponse.getCouponlist().forEach(o -> {
if(!ResponseCodeConstant.RESPONSE_SUCCESS.equals(o.getStatusCode())) { if(!ResponseCodeConstant.RESPONSE_SUCCESS.equals(o.getStatusCode())) {
if(o.getCodeInfo() != null) { if(o.getCodeInfo() != null) {
AppLogUtil.errorLog(o.getCodeInfo().getAct_name()+"当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse); AppLogUtil.infoLog(o.getCodeInfo().getAct_name()+"当前不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, o.getCodeInfo().getAct_name()+"当前不可用"); throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, o.getCodeInfo().getAct_name()+"当前不可用");
} else { } else {
AppLogUtil.errorLog("部分优惠券暂时不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse); AppLogUtil.infoLog("部分优惠券暂时不可用", mcCafeCouponRequest, mcdNetBatchQueryResponse);
throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券暂时不可用"); throw new ServiceException(ResponseResult.COUPON_SHOP_NOTSUPPORT, "部分优惠券暂时不可用");
} }
} }
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderDownLoadSdkService.java
...@@ -390,7 +390,7 @@ public class OrderDownLoadSdkService { ...@@ -390,7 +390,7 @@ public class OrderDownLoadSdkService {
return queryResponse; return queryResponse;
}catch (Exception e){ }catch (Exception e){
// 不要影响主流程 // 不要影响主流程
logUtil.error("Redis替换ES异常 queryResponse:{} error", e,queryResponse); logUtil.error("","Redis替换ES异常 queryResponse:{} error", e,queryResponse);
return queryResponse; return queryResponse;
} }
} }
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/util/LogUtil.java
...@@ -54,12 +54,13 @@ public class LogUtil { ...@@ -54,12 +54,13 @@ public class LogUtil {
try { try {
ApiLog.printLog(MessageFormatter.arrayFormat(message, params).getMessage(), param1, param2, param3); ApiLog.printLog(MessageFormatter.arrayFormat(message, params).getMessage(), param1, param2, param3);
} catch (Exception e) { } catch (Exception e) {
ErrorLog.errorDev("LogUtil.printLog ".concat(message), e, params); ErrorLog.errorDev("","LogUtil.printLog".concat(message), e, params);
} }
} }
} }
public void error(String message, Exception e, Object... params) {
ErrorLog.errorDev(message, e, params); public void error(String statusCode, String message, Exception e, Object... params) {
ErrorLog.errorDev(statusCode,message, e, params);
} }
public void errorSe(String message, Exception e, Object... params) { public void errorSe(String message, Exception e, Object... params) {
......
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