Commit 9c80729f by ping.wu

删除无用日志

parent 79dcf745
...@@ -109,6 +109,7 @@ public class OrderController { ...@@ -109,6 +109,7 @@ public class OrderController {
*/ */
@ApiAnnotation(logMessage = "appCreateOrder") @ApiAnnotation(logMessage = "appCreateOrder")
@PostMapping("/app/create") @PostMapping("/app/create")
@Deprecated
public BaseResponse appCreateOrder(@Validated @LogParams @RequestBody AppCreateOrderVo createOrderVo, BindingResult bindingResult) { public BaseResponse appCreateOrder(@Validated @LogParams @RequestBody AppCreateOrderVo createOrderVo, BindingResult bindingResult) {
return orderAdapterService.appCreateOrder(createOrderVo); return orderAdapterService.appCreateOrder(createOrderVo);
} }
......
...@@ -42,7 +42,7 @@ public class OrderReportJobHandler { ...@@ -42,7 +42,7 @@ public class OrderReportJobHandler {
String key = RedisKeyConstant.KGD_NO_ORDER_STORE_DATE + date; String key = RedisKeyConstant.KGD_NO_ORDER_STORE_DATE + date;
BoundHashOperations<String, String, Set<String>> boundHashOperations = redisCache.getRedisTemplate().boundHashOps(key); BoundHashOperations<String, String, Set<String>> boundHashOperations = redisCache.getRedisTemplate().boundHashOps(key);
Map<String, Set<String>> entries = boundHashOperations.entries(); Map<String, Set<String>> entries = boundHashOperations.entries();
AppLogUtil.infoLog("下单门店记录推送 entries", entries, null); // AppLogUtil.infoLog("下单门店记录推送 entries", entries, null);
if (!CollectionUtils.isEmpty(entries)) { if (!CollectionUtils.isEmpty(entries)) {
// 推送门店 服务 // 推送门店 服务
List<ReportStoreIdsRequestVo> requestDto = new ArrayList<>(entries.size()); List<ReportStoreIdsRequestVo> requestDto = new ArrayList<>(entries.size());
...@@ -56,7 +56,7 @@ public class OrderReportJobHandler { ...@@ -56,7 +56,7 @@ public class OrderReportJobHandler {
.partnerList(requestDto) .partnerList(requestDto)
.build(); .build();
BaseResponse baseResponse = storeBackstageClient.pushOrderStore(pushOrderStoreDto); BaseResponse baseResponse = storeBackstageClient.pushOrderStore(pushOrderStoreDto);
AppLogUtil.infoLog("上报门店支付情况", JSON.toJSONString(pushOrderStoreDto), JSON.toJSONString(baseResponse)); // AppLogUtil.infoLog("上报门店支付情况", JSON.toJSONString(pushOrderStoreDto), JSON.toJSONString(baseResponse));
// 数据推送之后的 redis 缓存数据 清理 // 数据推送之后的 redis 缓存数据 清理
redisCache.updateTTL(key, 1, TimeUnit.DAYS); redisCache.updateTTL(key, 1, TimeUnit.DAYS);
} catch (Exception e) { } catch (Exception e) {
......
...@@ -165,7 +165,7 @@ public class SpellGroupOrderDataManager { ...@@ -165,7 +165,7 @@ public class SpellGroupOrderDataManager {
groupWorkJoinRequest.setPartnerCode(orderBean.getCompanyId()); groupWorkJoinRequest.setPartnerCode(orderBean.getCompanyId());
groupWorkJoinRequest.setAppId(wxappid); groupWorkJoinRequest.setAppId(wxappid);
groupWorkJoinRequest.setMobile(StringUtils.isEmpty(userLoginInfoDto.getMobile()) ? orderBean.getPhone() : userLoginInfoDto.getMobile()); groupWorkJoinRequest.setMobile(StringUtils.isEmpty(userLoginInfoDto.getMobile()) ? orderBean.getPhone() : userLoginInfoDto.getMobile());
log.info(JSON.toJSONString(groupWorkJoinRequest)); // log.info(JSON.toJSONString(groupWorkJoinRequest));
GroupWorkJoinResponse groupWorkJoinResponse = promotionDiscountClient.groupWorkJoin(groupWorkJoinRequest); GroupWorkJoinResponse groupWorkJoinResponse = promotionDiscountClient.groupWorkJoin(groupWorkJoinRequest);
return groupWorkJoinResponse; return groupWorkJoinResponse;
} }
......
...@@ -33,6 +33,7 @@ public interface MallOrderService { ...@@ -33,6 +33,7 @@ public interface MallOrderService {
/** /**
* 订单确认完成 * 订单确认完成
*/ */
@Deprecated
BaseResponse orderAffirm(OrderAffirmRequestVO requestVO); BaseResponse orderAffirm(OrderAffirmRequestVO requestVO);
/** /**
......
...@@ -50,6 +50,7 @@ public interface OrderAdapterService { ...@@ -50,6 +50,7 @@ public interface OrderAdapterService {
/** /**
* APP下单,下单带商品信息,不经过购物车服务 * APP下单,下单带商品信息,不经过购物车服务
*/ */
@Deprecated
BaseResponse appCreateOrder(AppCreateOrderVo createOrderVo); BaseResponse appCreateOrder(AppCreateOrderVo createOrderVo);
/** /**
......
...@@ -108,6 +108,7 @@ public interface Orderservice { ...@@ -108,6 +108,7 @@ public interface Orderservice {
/** /**
* 获取退款理由 * 获取退款理由
*/ */
@Deprecated
BaseResponse getRefundReason(GetRefundReasonVo getRefundReasonVo); BaseResponse getRefundReason(GetRefundReasonVo getRefundReasonVo);
BaseResponse getNewRefundReason(GetRefundReasonVo getRefundReasonVo); BaseResponse getNewRefundReason(GetRefundReasonVo getRefundReasonVo);
...@@ -156,6 +157,8 @@ public interface Orderservice { ...@@ -156,6 +157,8 @@ public interface Orderservice {
* @return * @return
*/ */
BaseResponse spellGroupOrderFailRefund(SpellGroupFailRefundVo refundVo); BaseResponse spellGroupOrderFailRefund(SpellGroupFailRefundVo refundVo);
BaseResponse scoreRecord(QueryOrderVo queryOrderVo); BaseResponse scoreRecord(QueryOrderVo queryOrderVo);
/** /**
......
...@@ -84,7 +84,6 @@ public class OrderBusinessServiceImpl implements OrderBusinessService { ...@@ -84,7 +84,6 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
request.setOrderSettlementDetailList(orderSettlementCreateReqs); request.setOrderSettlementDetailList(orderSettlementCreateReqs);
} }
request.setActualPayAmount(confirmOrderRequest.getActualPayAmount()); request.setActualPayAmount(confirmOrderRequest.getActualPayAmount());
// request.setActualPayAmount(request.getActualPayAmount());
request.setOperator(confirmOrderRequest.getOperator()); request.setOperator(confirmOrderRequest.getOperator());
if (StringUtils.isNotBlank(confirmOrderRequest.getPayChannel())) { if (StringUtils.isNotBlank(confirmOrderRequest.getPayChannel())) {
request.setPayChannel(confirmOrderRequest.getPayChannel()); request.setPayChannel(confirmOrderRequest.getPayChannel());
......
...@@ -75,7 +75,7 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService ...@@ -75,7 +75,7 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
@Override @Override
public BaseResponse verificationCoupon(List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> accountList, QueryOrdersResponseDto.DataBean.OrderBean orderBean, CouponReqType couponReqType) { public BaseResponse verificationCoupon(List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> accountList, QueryOrdersResponseDto.DataBean.OrderBean orderBean, CouponReqType couponReqType) {
AppLogUtil.infoLog("fiserhman 券码核销 begin", JSON.toJSONString(accountList), JSON.toJSONString(orderBean)); // AppLogUtil.infoLog("fiserhman 券码核销 begin", JSON.toJSONString(accountList), JSON.toJSONString(orderBean));
if (CollectionUtils.isEmpty(accountList)) { if (CollectionUtils.isEmpty(accountList)) {
return ResponseUtil.success(); return ResponseUtil.success();
} }
...@@ -196,13 +196,13 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService ...@@ -196,13 +196,13 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
//71.券核销 //71.券核销
// todo 这循环有啥用-.- // todo 这循环有啥用-.-
for (int i = 2; i >= 0; i--) { for (int i = 2; i >= 0; i--) {
AppLogUtil.infoLog("核销券码开始==", JSON.toJSONString(couponCodeVerificationDto), null); // AppLogUtil.infoLog("核销券码开始==", JSON.toJSONString(couponCodeVerificationDto), null);
couponCodeResponseDto = couponOfflineClient.verification(couponCodeVerificationDto); couponCodeResponseDto = couponOfflineClient.verification(couponCodeVerificationDto);
AppLogUtil.infoLog("核销券码返回==", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto)); // AppLogUtil.infoLog("核销券码返回==", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(), "/api", couponCodeVerificationDto, couponCodeResponseDto); ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(), "/api", couponCodeVerificationDto, couponCodeResponseDto);
if (Objects.nonNull(couponCodeResponseDto) && Objects.equals(couponCodeResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())) { if (Objects.nonNull(couponCodeResponseDto) && Objects.equals(couponCodeResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())) {
ok = true; ok = true;
AppLogUtil.infoLog("CouponReverseServiceImpl", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto)); // AppLogUtil.infoLog("CouponReverseServiceImpl", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
} }
break; break;
} }
......
...@@ -244,7 +244,7 @@ public class AppOrderServiceImpl implements AppOrderService { ...@@ -244,7 +244,7 @@ public class AppOrderServiceImpl implements AppOrderService {
@Override @Override
public String paySuccessCallback(PaysuccessNoticeMessage message, ConfirmOrderDto confirmOrderDto, Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans) { public String paySuccessCallback(PaysuccessNoticeMessage message, ConfirmOrderDto confirmOrderDto, Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans) {
String paySuccessCallbackResult = orderservice.paySuccessCallback(message, confirmOrderDto, orderBeans); String paySuccessCallbackResult = orderservice.paySuccessCallback(message, confirmOrderDto, orderBeans);
QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode()); // QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
// 删除订单自增缓存 // 删除订单自增缓存
//redisCache.delete(RedisUtil.getPaymentTransIdSequenceKey(orderBean.getOid())); //redisCache.delete(RedisUtil.getPaymentTransIdSequenceKey(orderBean.getOid()));
// 删除支付交易号订单关系缓存 // 删除支付交易号订单关系缓存
......
...@@ -92,7 +92,7 @@ public class CouponActivityServiceImpl implements CouponActivityService { ...@@ -92,7 +92,7 @@ public class CouponActivityServiceImpl implements CouponActivityService {
return ResponseUtil.success(); return ResponseUtil.success();
} catch (Exception ex) { } catch (Exception ex) {
emailAlertService.sendEmailAlert("券码移除卡包异常", String.format("request:%s \r\nexception:%s", "券码号:"+couponCode+"订单号:"+orderCode, Throwables.getStackTraceAsString(ex))); emailAlertService.sendEmailAlert("券码移除卡包异常", String.format("request:%s \r\nexception:%s", "券码号:"+couponCode+"订单号:"+orderCode, Throwables.getStackTraceAsString(ex)));
ErrorLog.printErrorLog("verification_error", "/callbackNotify", orderCode, ex); // ErrorLog.printErrorLog("verification_error", "/callbackNotify", orderCode, ex);
return ResponseUtil.error(ResponseResult.COUPON_CALLBACK_FAIL); return ResponseUtil.error(ResponseResult.COUPON_CALLBACK_FAIL);
} }
} }
......
...@@ -959,7 +959,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -959,7 +959,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
if (saasOrder != null && (!PayStatus.NOT_PAY.getCode().equals(saasOrder.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(saasOrder.getStatus()))) { if (saasOrder != null && (!PayStatus.NOT_PAY.getCode().equals(saasOrder.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(saasOrder.getStatus()))) {
return sendPaySuccessNoticeMessage(); return sendPaySuccessNoticeMessage();
} }
AppLogUtil.errorLog("paySuccessCallback_payAccess_faild", gson.toJson(confirmOrderDto), gson.toJson(payAccessResponse)); // AppLogUtil.errorLog("paySuccessCallback_payAccess_faild", gson.toJson(confirmOrderDto), gson.toJson(payAccessResponse));
//orderRefund(orderBean, "订单异常退款", openid, oid); //orderRefund(orderBean, "订单异常退款", openid, oid);
return gson.toJson(message); return gson.toJson(message);
} }
...@@ -1077,7 +1077,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1077,7 +1077,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
private QueryOrdersResponseDto.DataBean.OrderBean getOrderBean(ConfirmOrderDto confirmOrderDto) { private QueryOrdersResponseDto.DataBean.OrderBean getOrderBean(ConfirmOrderDto confirmOrderDto) {
Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans = orderService.getOrderBeanByOrderId(confirmOrderDto.getOrderId()); Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans = orderService.getOrderBeanByOrderId(confirmOrderDto.getOrderId());
AppLogUtil.debugLotsParams("从缓存重新获取数据,orderId:{},orderBeans:{}", confirmOrderDto.getOrderId(), orderBeans); // AppLogUtil.debugLotsParams("从缓存重新获取数据,orderId:{},orderBeans:{}", confirmOrderDto.getOrderId(), orderBeans);
return orderBeans.get(OrderBeanType.SAASORDER.getCode()); return orderBeans.get(OrderBeanType.SAASORDER.getCode());
} }
...@@ -2101,7 +2101,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2101,7 +2101,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
} }
} }
AppLogUtil.infoLog("生成参数完成:", req, null); // AppLogUtil.infoLog("生成参数完成:", req, null);
orderSdkService.updateCostCouponCodeNew(req, LogTreadLocal.getTrackingNo()); orderSdkService.updateCostCouponCodeNew(req, LogTreadLocal.getTrackingNo());
...@@ -2117,7 +2117,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2117,7 +2117,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
* @param orderBean * @param orderBean
*/ */
public boolean withOrderBuyCoupon3(QueryOrdersResponseDto.DataBean.OrderBean orderBean, String thirdPartyMemberId){ public boolean withOrderBuyCoupon3(QueryOrdersResponseDto.DataBean.OrderBean orderBean, String thirdPartyMemberId){
AppLogUtil.infoLog("发券入参:", thirdPartyMemberId, JSON.toJSONString(orderBean)); // AppLogUtil.infoLog("发券入参:", thirdPartyMemberId, JSON.toJSONString(orderBean));
try{ try{
UpdateCouponCodeReq req = new UpdateCouponCodeReq(); UpdateCouponCodeReq req = new UpdateCouponCodeReq();
...@@ -2145,7 +2145,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2145,7 +2145,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())){
log.error("发券异常 :" + JSON.toJSONString(request) + JSON.toJSONString(responseDto)); // log.error("发券异常 :" + JSON.toJSONString(request) + JSON.toJSONString(responseDto));
continue; continue;
} }
...@@ -2165,7 +2165,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2165,7 +2165,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())) {
log.error("获取优惠券详情失败,发券失败" + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse)); // log.error("获取优惠券详情失败,发券失败" + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse));
return false; return false;
} }
...@@ -2181,7 +2181,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2181,7 +2181,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()) {
log.error("没有有效的优惠券,更新失败 " + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse)); // log.error("没有有效的优惠券,更新失败 " + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse));
continue; continue;
} else { } else {
couponCode = couponOptional.get().getCode(); couponCode = couponOptional.get().getCode();
...@@ -2191,14 +2191,14 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2191,14 +2191,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()) {
log.error("没有有效的优惠券,更新失败 " + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse)); // log.error("没有有效的优惠券,更新失败 " + 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)) {
log.error("没有匹配的优惠券,更新失败 " + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse)); // log.error("没有匹配的优惠券,更新失败 " + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse));
continue; continue;
} }
UpdateCouponCodeReq.CouponUpdateInfo couponUpdateInfo = new UpdateCouponCodeReq.CouponUpdateInfo(); UpdateCouponCodeReq.CouponUpdateInfo couponUpdateInfo = new UpdateCouponCodeReq.CouponUpdateInfo();
......
...@@ -184,6 +184,7 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -184,6 +184,7 @@ public class MallOrderServiceImpl implements MallOrderService {
* 订单确认完成 * 订单确认完成
*/ */
@Override @Override
@Deprecated
public BaseResponse orderAffirm(OrderAffirmRequestVO requestVO) { public BaseResponse orderAffirm(OrderAffirmRequestVO requestVO) {
String trackingNo = LogTreadLocal.getTrackingNo(); String trackingNo = LogTreadLocal.getTrackingNo();
...@@ -518,7 +519,7 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -518,7 +519,7 @@ public class MallOrderServiceImpl implements MallOrderService {
if (saasOrder != null && (!PayStatus.NOT_PAY.getCode().equals(saasOrder.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(saasOrder.getStatus()))) { if (saasOrder != null && (!PayStatus.NOT_PAY.getCode().equals(saasOrder.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(saasOrder.getStatus()))) {
return sendPaySuccessNoticeMessage(); return sendPaySuccessNoticeMessage();
} }
AppLogUtil.errorLog("paySuccessCallback_payAccess_faild", gson.toJson(confirmOrderDto), gson.toJson(payAccessResponse)); // AppLogUtil.errorLog("paySuccessCallback_payAccess_faild", gson.toJson(confirmOrderDto), gson.toJson(payAccessResponse));
return gson.toJson(message); return gson.toJson(message);
} }
...@@ -555,15 +556,14 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -555,15 +556,14 @@ public class MallOrderServiceImpl implements MallOrderService {
//支付回掉成功标记 //支付回掉成功标记
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() != null && message.getSource().equals(PaySuccessSource.OUTSIDE.getSource())) { if (message.getSource() != null && message.getSource().equals(PaySuccessSource.OUTSIDE.getSource())) {
log.info("微商城调用券码核销==" + message.getTrans_id()); // log.info("微商城调用券码核销==" + message.getTrans_id());
verificationCoupon(message.getTrans_id()); verificationCoupon(message.getTrans_id());
log.info("微商城调用券码结束==" + message.getTrans_id()); // log.info("微商城调用券码结束==" + message.getTrans_id());
} }
orderIds.add(orderBean.getOid()); orderIds.add(orderBean.getOid());
orderIds = orderIds.stream().distinct().collect(Collectors.toList()); orderIds = orderIds.stream().distinct().collect(Collectors.toList());
//接单 //接单
if(orderIds.size() > 1 || orderBean.getMarketingType() != OrderMarketType.GROUPB.getIndex()){ if(orderIds.size() > 1 || orderBean.getMarketingType() != OrderMarketType.GROUPB.getIndex()){
POSOrderOperationBaseReq acceptOrderReq = new POSOrderOperationBaseReq(); POSOrderOperationBaseReq acceptOrderReq = new POSOrderOperationBaseReq();
for(String orderId : orderIds){ for(String orderId : orderIds){
...@@ -700,7 +700,7 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -700,7 +700,7 @@ public class MallOrderServiceImpl implements MallOrderService {
if (StringUtils.isEmpty(oid)) { if (StringUtils.isEmpty(oid)) {
return; return;
} }
AppLogUtil.infoLog("backOrdersStatusChange", oid, String.valueOf(status)); // AppLogUtil.infoLog("backOrdersStatusChange", oid, String.valueOf(status));
OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto(); OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
requestDto.setOid(oid); requestDto.setOid(oid);
requestDto.setOrderStatus(status); requestDto.setOrderStatus(status);
......
...@@ -308,12 +308,10 @@ public class OrderAdapterServiceImpl implements OrderAdapterService { ...@@ -308,12 +308,10 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
// 蜜雪+混合支付专用:通过交易号从缓存中拿订单号,如果有数据则实际订单号为其value值 // 蜜雪+混合支付专用:通过交易号从缓存中拿订单号,如果有数据则实际订单号为其value值
String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(message.getTrans_id())); String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(message.getTrans_id()));
if (StringUtils.isNotBlank(orderId)) { if (StringUtils.isNotBlank(orderId)) {
AppLogUtil.debugLotsParams("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.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:{}", LogTreadLocal.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());
......
...@@ -254,9 +254,9 @@ public class OrderCommonService { ...@@ -254,9 +254,9 @@ public class OrderCommonService {
shoppingCartClearDto.setTableNumber(orderBean.getBarCounter()); shoppingCartClearDto.setTableNumber(orderBean.getBarCounter());
shoppingCartClearDto.setOperationType(3); shoppingCartClearDto.setOperationType(3);
ShoppingCartBaseResponse cartBaseResponse = shoppingCartClient.clearShoppingCart(shoppingCartClearDto); ShoppingCartBaseResponse cartBaseResponse = shoppingCartClient.clearShoppingCart(shoppingCartClearDto);
if(cartBaseResponse == null || ObjectUtils.notEqual(cartBaseResponse.getCode(),RESPONSE_SUCCESS_CODE)){ // if(cartBaseResponse == null || ObjectUtils.notEqual(cartBaseResponse.getCode(),RESPONSE_SUCCESS_CODE)){
AppLogUtil.infoLog("支付成功回调通知清除购物车信息失败 request:{},response:{}",shoppingCartClearDto,cartBaseResponse); // AppLogUtil.infoLog("支付成功回调通知清除购物车信息失败 request:{},response:{}",shoppingCartClearDto,cartBaseResponse);
} // }
//调用围餐订单完成接口 //调用围餐订单完成接口
AssortmentGroupOrderAffirmRequest affirmRequest = new AssortmentGroupOrderAffirmRequest(); AssortmentGroupOrderAffirmRequest affirmRequest = new AssortmentGroupOrderAffirmRequest();
affirmRequest.setOrderClient(OrderClientType.WAI_MEAL.getIndex()); affirmRequest.setOrderClient(OrderClientType.WAI_MEAL.getIndex());
...@@ -276,7 +276,7 @@ public class OrderCommonService { ...@@ -276,7 +276,7 @@ public class OrderCommonService {
affirmRequest.setOperator(orderBean.getUserName()); affirmRequest.setOperator(orderBean.getUserName());
AssortmentAffirmGroupOrderResponse groupOrderResponse = orderCenterSdkService.affirmGroupOrder(affirmRequest); AssortmentAffirmGroupOrderResponse groupOrderResponse = orderCenterSdkService.affirmGroupOrder(affirmRequest);
if(ObjectUtils.notEqual(RESPONSE_SUCCESS_CODE,groupOrderResponse.getErrcode())){ if(ObjectUtils.notEqual(RESPONSE_SUCCESS_CODE,groupOrderResponse.getErrcode())){
AppLogUtil.errorLog("paySuccessCallback_payAccess_faild", JSON.toJSONString(message), JSON.toJSONString(groupOrderResponse)); // AppLogUtil.errorLog("paySuccessCallback_payAccess_faild", JSON.toJSONString(message), JSON.toJSONString(groupOrderResponse));
return this.newSendPayFaileMessage(); return this.newSendPayFaileMessage();
} }
......
...@@ -228,8 +228,8 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService { ...@@ -228,8 +228,8 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
ActivityUpdateStockRequest activityUpdateStockRequest = spellGroupOrderAdapter.convert2ActivityUpdateStockRequest(orderBean, createSpellGroupOrderDto); ActivityUpdateStockRequest activityUpdateStockRequest = spellGroupOrderAdapter.convert2ActivityUpdateStockRequest(orderBean, createSpellGroupOrderDto);
if (activityUpdateStockRequest != null && (CollectionUtils.isNotEmpty(activityUpdateStockRequest.getStock()) || CollectionUtils.isNotEmpty(activityUpdateStockRequest.getActivityList()))) { if (activityUpdateStockRequest != null && (CollectionUtils.isNotEmpty(activityUpdateStockRequest.getStock()) || CollectionUtils.isNotEmpty(activityUpdateStockRequest.getActivityList()))) {
com.freemud.application.sdk.api.base.BaseResponse activityResponse = promotionSdkService.subtractStock(activityUpdateStockRequest, ""); com.freemud.application.sdk.api.base.BaseResponse activityResponse = promotionSdkService.subtractStock(activityUpdateStockRequest, "");
ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(), // ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(),
"subtractStock", JSONObject.toJSONString(activityUpdateStockRequest), JSONObject.toJSONString(activityResponse)); // "subtractStock", JSONObject.toJSONString(activityUpdateStockRequest), JSONObject.toJSONString(activityResponse));
if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getCode())) { if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getCode())) {
//TODO 失败取消订单,异步冲正库存 //TODO 失败取消订单,异步冲正库存
CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
...@@ -356,7 +356,7 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService { ...@@ -356,7 +356,7 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
if (StringUtils.isEmpty(oid)) { if (StringUtils.isEmpty(oid)) {
return; return;
} }
AppLogUtil.infoLog("backOrdersStatusChange", oid, String.valueOf(status)); // AppLogUtil.infoLog("backOrdersStatusChange", oid, String.valueOf(status));
OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto(); OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
requestDto.setOid(oid); requestDto.setOid(oid);
requestDto.setOrderStatus(status); requestDto.setOrderStatus(status);
......
...@@ -81,7 +81,7 @@ public class CouponClientServiceImpl implements CouponClientService { ...@@ -81,7 +81,7 @@ public class CouponClientServiceImpl implements CouponClientService {
McdNetBatchQueryResponse mcdNetBatchQueryResponse = batchQuery(mcCafeCouponRequest); McdNetBatchQueryResponse mcdNetBatchQueryResponse = 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.errorLog("获取优惠券详情失败,无法核销", mcCafeCouponRequest, mcdNetBatchQueryResponse);
return null; return null;
} }
...@@ -107,10 +107,10 @@ public class CouponClientServiceImpl implements CouponClientService { ...@@ -107,10 +107,10 @@ public class CouponClientServiceImpl implements CouponClientService {
couponRedeemResponseList.add(couponRedeemResponse); couponRedeemResponseList.add(couponRedeemResponse);
couponRedeemResponseListAll.add(couponRedeemResponse); couponRedeemResponseListAll.add(couponRedeemResponse);
} }
if(CollectionUtils.isNotEmpty(couponRedeemResponseList)) { // if(CollectionUtils.isNotEmpty(couponRedeemResponseList)) {
AppLogUtil.infoLog(LogTreadLocal.getTrackingNo(), "麦咖啡核销券失败", // AppLogUtil.infoLog(LogTreadLocal.getTrackingNo(), "麦咖啡核销券失败",
JSON.toJSONString(list), JSON.toJSONString(couponRedeemResponseListAll)); // JSON.toJSONString(list), JSON.toJSONString(couponRedeemResponseListAll));
} // }
return couponRedeemResponseList; return couponRedeemResponseList;
} }
......
...@@ -34,7 +34,7 @@ import java.util.stream.Collectors; ...@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
*/ */
@Component @Component
//@JobHandler("orderCountJobHandler") //@JobHandler("orderCountJobHandler")
@Log4j2 //@Log4j2
public class OrderCountJobHandler extends IJobHandler { public class OrderCountJobHandler extends IJobHandler {
@Autowired @Autowired
...@@ -54,13 +54,13 @@ public class OrderCountJobHandler extends IJobHandler { ...@@ -54,13 +54,13 @@ public class OrderCountJobHandler extends IJobHandler {
@Override @Override
public ReturnT<String> execute(String param) throws Exception { public ReturnT<String> execute(String param) throws Exception {
String trackingNo = LogThreadLocal.getTrackingNo(); String trackingNo = LogThreadLocal.getTrackingNo();
log.info("begin xxl-job by send report msg -------- trackingNo:{}", trackingNo); // log.info("begin xxl-job by send report msg -------- trackingNo:{}", trackingNo);
OrderGetPartnerRequest build1 = OrderGetPartnerRequest.builder().type(3).build(); OrderGetPartnerRequest build1 = OrderGetPartnerRequest.builder().type(3).build();
// 获取需要 上报的商户号 // 获取需要 上报的商户号
try { try {
BaseResponse<GetFilterPartnerResponse> filterPartner = microOpenplatformClient.getFilterPartner(build1); BaseResponse<GetFilterPartnerResponse> filterPartner = microOpenplatformClient.getFilterPartner(build1);
AppLogUtil.infoLog("上报商户号查询结果", build1, filterPartner == null ? null : JSON.toJSONString(filterPartner)); // AppLogUtil.infoLog("上报商户号查询结果", build1, filterPartner == null ? null : JSON.toJSONString(filterPartner));
if (filterPartner == null if (filterPartner == null
|| filterPartner.getResult() == null || filterPartner.getResult() == null
|| !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(filterPartner.getCode()) || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(filterPartner.getCode())
...@@ -81,7 +81,7 @@ public class OrderCountJobHandler extends IJobHandler { ...@@ -81,7 +81,7 @@ public class OrderCountJobHandler extends IJobHandler {
if (Objects.isNull(result)) { if (Objects.isNull(result)) {
return ReturnT.SUCCESS; return ReturnT.SUCCESS;
} }
AppLogUtil.infoLog("orderCountJobHandlersendreportordercountmsg", orderCountRequestVo, JSON.toJSONString(result)); // AppLogUtil.infoLog("orderCountJobHandlersendreportordercountmsg", orderCountRequestVo, JSON.toJSONString(result));
if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || CollectionUtils.isEmpty(result.getResult())) { if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || CollectionUtils.isEmpty(result.getResult())) {
return ReturnT.SUCCESS; return ReturnT.SUCCESS;
...@@ -90,7 +90,7 @@ public class OrderCountJobHandler extends IJobHandler { ...@@ -90,7 +90,7 @@ public class OrderCountJobHandler extends IJobHandler {
List<OrderCountResp> orderCounts = result.getResult(); List<OrderCountResp> orderCounts = result.getResult();
SendOrderCountsMsg build = SendOrderCountsMsg.builder().partnerRequests(orderCounts).build(); SendOrderCountsMsg build = SendOrderCountsMsg.builder().partnerRequests(orderCounts).build();
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, JSON.toJSONString(e));
} }
......
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