Skip to content

O
order-group
Commit 9c80729f by ping.wu
Options

删除无用日志

parent 79dcf745
Showing with 104 additions and 137 deletions
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
...@@ -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);
} }
......
order-application-service/src/main/java/cn/freemud/handler/OrderReportJobHandler.java
...@@ -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) {
......
order-application-service/src/main/java/cn/freemud/manager/SpellGroupOrderDataManager.java
...@@ -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;
} }
......
order-application-service/src/main/java/cn/freemud/service/MallOrderService.java
...@@ -33,6 +33,7 @@ public interface MallOrderService { ...@@ -33,6 +33,7 @@ public interface MallOrderService {
/** /**
* 订单确认完成 * 订单确认完成
*/ */
@Deprecated
BaseResponse orderAffirm(OrderAffirmRequestVO requestVO); BaseResponse orderAffirm(OrderAffirmRequestVO requestVO);
/** /**
......
order-application-service/src/main/java/cn/freemud/service/OrderAdapterService.java
...@@ -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);
/** /**
......
order-application-service/src/main/java/cn/freemud/service/Orderservice.java
...@@ -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);
/** /**
......
order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java
...@@ -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());
......
order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java
...@@ -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;
} }
......
order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
...@@ -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()));
// 删除支付交易号订单关系缓存 // 删除支付交易号订单关系缓存
......
order-application-service/src/main/java/cn/freemud/service/impl/CouponActivityServiceImpl.java
...@@ -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);
} }
} }
......
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
...@@ -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();
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
...@@ -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);
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
...@@ -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());
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java
...@@ -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();
} }
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -140,7 +140,6 @@ import org.apache.commons.collections4.CollectionUtils; ...@@ -140,7 +140,6 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils; import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
...@@ -158,7 +157,6 @@ import java.util.stream.Collectors; ...@@ -158,7 +157,6 @@ import java.util.stream.Collectors;
import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND; import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
@Slf4j
@Service @Service
public class OrderServiceImpl implements Orderservice { public class OrderServiceImpl implements Orderservice {
...@@ -544,7 +542,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -544,7 +542,7 @@ public class OrderServiceImpl implements Orderservice {
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);
} }
...@@ -618,9 +616,9 @@ public class OrderServiceImpl implements Orderservice { ...@@ -618,9 +616,9 @@ public class OrderServiceImpl implements Orderservice {
//支付回调成功标记 //支付回调成功标记
redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES); redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES);
if (message.getSource() != null && message.getSource().equals(PaySuccessSource.OUTSIDE.getSource())) { if (message.getSource() != null && message.getSource().equals(PaySuccessSource.OUTSIDE.getSource())) {
AppLogUtil.debugLog("调用券码核销== trans_id:{}" , message.getTrans_id(),null); // AppLogUtil.debugLog("调用券码核销== trans_id:{}" , message.getTrans_id(),null);
verificationCoupon(message.getTrans_id()); verificationCoupon(message.getTrans_id());
AppLogUtil.debugLog("调用券码结束== trans_id:{}" , message.getTrans_id(),null); // AppLogUtil.debugLog("调用券码结束== trans_id:{}" , message.getTrans_id(),null);
} }
//支付成功后 //支付成功后
// buriedPointService.paySuccessBuridPoint(partnerId, storeId, orderBean); // buriedPointService.paySuccessBuridPoint(partnerId, storeId, orderBean);
...@@ -713,7 +711,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -713,7 +711,7 @@ public class OrderServiceImpl implements Orderservice {
private String verificationCoupon(String transId) { private String verificationCoupon(String transId) {
String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(transId)); String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(transId));
if (StringUtils.isNotBlank(orderId)) { if (StringUtils.isNotBlank(orderId)) {
AppLogUtil.debugLotsParams("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(), transId, orderId); // AppLogUtil.debugLotsParams("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(), transId, orderId);
transId = orderId; transId = orderId;
} }
QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(transId); QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(transId);
...@@ -863,7 +861,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -863,7 +861,7 @@ public class OrderServiceImpl implements Orderservice {
String channelType = this.getQueryOrderChannelType(queryOrderVo, userLoginInfoDto); String channelType = this.getQueryOrderChannelType(queryOrderVo, userLoginInfoDto);
QueryOrdersDto queryOrdersDto = orderAdapter.convent2QueryOrdersDto(queryOrderDto, userId, channelType); QueryOrdersDto queryOrdersDto = orderAdapter.convent2QueryOrdersDto(queryOrderDto, userId, channelType);
QueryOrdersResponse queryOrderResponse; QueryOrdersResponse queryOrderResponse;
try { // try {
QueryOrdersRequest queryOrdersRequest2 = new QueryOrdersRequest(); QueryOrdersRequest queryOrdersRequest2 = new QueryOrdersRequest();
BeanUtil.convertBean(queryOrdersDto, queryOrdersRequest2); BeanUtil.convertBean(queryOrdersDto, queryOrdersRequest2);
queryOrdersRequest2.setTrackingNo(LogTreadLocal.getTrackingNo()); queryOrdersRequest2.setTrackingNo(LogTreadLocal.getTrackingNo());
...@@ -886,10 +884,10 @@ public class OrderServiceImpl implements Orderservice { ...@@ -886,10 +884,10 @@ public class OrderServiceImpl implements Orderservice {
queryOrderResponse = orderCenterSdkService.queryOrders(queryOrdersRequest2); queryOrderResponse = orderCenterSdkService.queryOrders(queryOrdersRequest2);
} }
} catch (Exception e) { // } catch (Exception e) {
AppLogUtil.errorLog("queryOrders_error", gson.toJson(queryOrdersDto), e); // AppLogUtil.errorLog("queryOrders_error", gson.toJson(queryOrdersDto), 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())) {
return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode()); return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode());
} }
...@@ -1101,7 +1099,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1101,7 +1099,6 @@ public class OrderServiceImpl implements Orderservice {
} }
} }
responseMap.put("count", queryOrderResponse.getData() == null ? 0 : queryOrderResponse.getData().getCount()); responseMap.put("count", queryOrderResponse.getData() == null ? 0 : queryOrderResponse.getData().getCount());
responseMap.put("list", queryOrderResponseVos); responseMap.put("list", queryOrderResponseVos);
//只有有订单时才显示用户自定义取餐信息 //只有有订单时才显示用户自定义取餐信息
...@@ -1299,7 +1296,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1299,7 +1296,7 @@ public class OrderServiceImpl implements Orderservice {
//fisherman 【ID1032306】 【订单聚合层】总部和区域活动可同时生效 //fisherman 【ID1032306】 【订单聚合层】总部和区域活动可同时生效
BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftBaseResponse; BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftBaseResponse;
payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoinNew(payGitRequestDto); payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoinNew(payGitRequestDto);
AppLogUtil.infoLog("fisherman 总部和区域活动可同时生效 ", payGitRequestDto, payGiftBaseResponse); // AppLogUtil.infoLog("fisherman 总部和区域活动可同时生效 ", payGitRequestDto, payGiftBaseResponse);
if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) { if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) {
PayGiftCheckAndJoinResponseObj result = payGiftBaseResponse.getResult(); PayGiftCheckAndJoinResponseObj result = payGiftBaseResponse.getResult();
PayGiftCheckAndJoinResponseDto oldPayGift = result.getOldPayGift(); PayGiftCheckAndJoinResponseDto oldPayGift = result.getOldPayGift();
...@@ -1371,14 +1368,14 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1371,14 +1368,14 @@ public class OrderServiceImpl implements Orderservice {
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest); QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode())) { if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode())) {
AppLogUtil.infoLog("订单详情实时查询错误，baseQueryOrderRequest，", baseQueryOrderRequest, ""); // AppLogUtil.infoLog("订单详情实时查询错误，baseQueryOrderRequest，", baseQueryOrderRequest, "");
return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR); return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
} }
if (response.getData() == null && queryOrderEs) { if (response.getData() == null && queryOrderEs) {
// 查询es // 查询es
response = orderCenterSdkService.queryOrderByCodeES(partnerId, oid, LogThreadLocal.getTrackingNo()); response = orderCenterSdkService.queryOrderByCodeES(partnerId, oid, LogThreadLocal.getTrackingNo());
AppLogUtil.infoLog("订单详情实时查询没有数据,es查询，partnerId，oid", partnerId, oid); // AppLogUtil.infoLog("订单详情实时查询没有数据,es查询，partnerId，oid", partnerId, oid);
} }
if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode()) || response.getData() == null) { if (!RESPONSE_SUCCESS_CODE.equals(response.getErrcode()) || response.getData() == null) {
...@@ -1651,9 +1648,9 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1651,9 +1648,9 @@ public class OrderServiceImpl implements Orderservice {
} }
//关闭预支付 //关闭预支付
if(queryPayOrder){ if(queryPayOrder){
long currentTimeMillis = System.currentTimeMillis(); // long currentTimeMillis = System.currentTimeMillis();
boolean paySuccess = closePrePay(orderBean); boolean paySuccess = closePrePay(orderBean);
log.info("closePrePay elapsed-time:{}",System.currentTimeMillis() - currentTimeMillis); // log.info("closePrePay elapsed-time:{}",System.currentTimeMillis() - currentTimeMillis);
if(paySuccess){ if(paySuccess){
return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "支付成功"); return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "支付成功");
} }
...@@ -1922,7 +1919,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1922,7 +1919,7 @@ public class OrderServiceImpl implements Orderservice {
isRefundDeliveryFee = true; isRefundDeliveryFee = true;
}else{ }else{
QueryFreightRefundSupportedResponse queryFreightRefundSupportedResponse = deliveryFeiginClient.isFreightRefundSupported(queryFreightRefundSupportedVo); QueryFreightRefundSupportedResponse queryFreightRefundSupportedResponse = deliveryFeiginClient.isFreightRefundSupported(queryFreightRefundSupportedVo);
AppLogUtil.infoLog("queryFreightRefundSupportedResponse of oid:{}, {}, {}", orderBean.getOid(), orderBean.getStatus(), (null != queryFreightRefundSupportedResponse ? ToStringBuilder.reflectionToString(queryFreightRefundSupportedResponse) : null)); // AppLogUtil.infoLog("queryFreightRefundSupportedResponse of oid:{}, {}, {}", orderBean.getOid(), orderBean.getStatus(), (null != queryFreightRefundSupportedResponse ? ToStringBuilder.reflectionToString(queryFreightRefundSupportedResponse) : null));
if(null != queryFreightRefundSupportedResponse && RESPONSE_SUCCESS_CODE == queryFreightRefundSupportedResponse.getCode()){ if(null != queryFreightRefundSupportedResponse && RESPONSE_SUCCESS_CODE == queryFreightRefundSupportedResponse.getCode()){
Boolean freightRefundSupported = queryFreightRefundSupportedResponse.getData(); Boolean freightRefundSupported = queryFreightRefundSupportedResponse.getData();
isRefundDeliveryFee = freightRefundSupported; isRefundDeliveryFee = freightRefundSupported;
...@@ -1931,7 +1928,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1931,7 +1928,7 @@ public class OrderServiceImpl implements Orderservice {
} }
}else { }else {
AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue()); AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue());
AppLogUtil.infoLog("orderRefund of oid:{}, {}, {}", orderBean.getOid(), orderBean.getStatus(), (null != refundDeliveryFeeConfig ? ToStringBuilder.reflectionToString(refundDeliveryFeeConfig) : null)); // AppLogUtil.infoLog("orderRefund of oid:{}, {}, {}", orderBean.getOid(), orderBean.getStatus(), (null != refundDeliveryFeeConfig ? ToStringBuilder.reflectionToString(refundDeliveryFeeConfig) : null));
// 0、null表示 关闭 ; 1 表示开启 // 0、null表示 关闭 ; 1 表示开启
if (null != refundDeliveryFeeConfig if (null != refundDeliveryFeeConfig
&& Arrays.asList(OrderStatus.DISTRIBUTION.getCode(), OrderStatus.COMPLETE.getCode()).contains(orderBean.getStatus()) && Arrays.asList(OrderStatus.DISTRIBUTION.getCode(), OrderStatus.COMPLETE.getCode()).contains(orderBean.getStatus())
...@@ -2102,7 +2099,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2102,7 +2099,7 @@ public class OrderServiceImpl implements Orderservice {
if (StringUtils.isEmpty(oid)) { if (StringUtils.isEmpty(oid)) {
return; return;
} }
AppLogUtil.infoLog("backOrdersStatusChange oid:{} orderStatus:{}", oid, String.valueOf(orderStatus)); // AppLogUtil.infoLog("backOrdersStatusChange oid:{} orderStatus:{}", oid, String.valueOf(orderStatus));
OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto(); OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
requestDto.setOid(oid); requestDto.setOid(oid);
requestDto.setPayStatus(payStatus); requestDto.setPayStatus(payStatus);
...@@ -2123,7 +2120,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2123,7 +2120,7 @@ public class OrderServiceImpl implements Orderservice {
* @param request * @param request
*/ */
public void asynchronousPrint(OrderPrintDto request) { public void asynchronousPrint(OrderPrintDto request) {
AppLogUtil.debugLog("OrderPrintDto", JSONObject.toJSONString(request), null); // 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);
...@@ -2642,8 +2639,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2642,8 +2639,6 @@ public class OrderServiceImpl implements Orderservice {
} else { } else {
createOrderResponse.setPaySuccess(true); createOrderResponse.setPaySuccess(true);
} }
// 推荐优惠插件用户下单数据上报
//wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
if (!createOrderResponse.getPaySuccess()) { if (!createOrderResponse.getPaySuccess()) {
return ResponseUtil.success(createOrderResponse); return ResponseUtil.success(createOrderResponse);
} else { } else {
...@@ -2651,7 +2646,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2651,7 +2646,6 @@ public class OrderServiceImpl implements Orderservice {
/** /**
* - 老的svc卡或是0元订单下单成功直接核销 这里不处理 * - 老的svc卡或是0元订单下单成功直接核销 这里不处理
* - 混合支付纯svc支付 需要直接内部核销 其他支付方式需依靠外部回调 * - 混合支付纯svc支付 需要直接内部核销 其他支付方式需依靠外部回调
* -
*/ */
PaysuccessNoticeMessage message = new PaysuccessNoticeMessage(); PaysuccessNoticeMessage message = new PaysuccessNoticeMessage();
message.setResult_code(100); message.setResult_code(100);
...@@ -2662,11 +2656,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2662,11 +2656,6 @@ public class OrderServiceImpl implements Orderservice {
message.setPlatform_coupon(0); message.setPlatform_coupon(0);
message.setMerchant_coupon(0); message.setMerchant_coupon(0);
message.setSource(PaySuccessSource.OUTSIDE.getSource()); message.setSource(PaySuccessSource.OUTSIDE.getSource());
/*
if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getEbcode().equals(orderPayResponse.getPayMode())) {
message.setSource(PaySuccessSource.OUTSIDE.getSource());
}
*/
orderAdapterService.paySuccessCallback(message); orderAdapterService.paySuccessCallback(message);
return ResponseUtil.success(createOrderResponse); return ResponseUtil.success(createOrderResponse);
} }
...@@ -2685,13 +2674,11 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2685,13 +2674,11 @@ public class OrderServiceImpl implements Orderservice {
boolean check = this.checkSvcComPay(orderBean.getCompanyId(), orderBean.getShopId()); boolean check = this.checkSvcComPay(orderBean.getCompanyId(), orderBean.getShopId());
//混合支付 //混合支付
if (check && StringUtils.isNotBlank(channel)) { if (check && StringUtils.isNotBlank(channel)) {
AppLogUtil.debugLog("混合支付:",null,null); // AppLogUtil.debugLog("混合支付:",null,null);
String partnerPayOvertime = this.getPartnerPayOvertime(orderBean.getCompanyId()); String partnerPayOvertime = this.getPartnerPayOvertime(orderBean.getCompanyId());
orderPayResponse = comPayOrder(cardCode, orderBean, paymentRequest, partnerPayOvertime, totalAmount.intValue(), channel, storeId, LogThreadLocal.getTrackingNo()); orderPayResponse = comPayOrder(cardCode, orderBean, paymentRequest, partnerPayOvertime, totalAmount.intValue(), channel, storeId, LogThreadLocal.getTrackingNo());
} } else {//svc 支付
//svc 支付 // AppLogUtil.debugLog("svc卡支付:",null,null);
else {
AppLogUtil.debugLog("svc卡支付:",null,null);
orderPayResponse = svcPay(cardCode, orderBean, paymentRequest, transId, trackingNo); orderPayResponse = svcPay(cardCode, orderBean, paymentRequest, transId, trackingNo);
} }
return orderPayResponse; return orderPayResponse;
...@@ -2822,7 +2809,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2822,7 +2809,7 @@ public class OrderServiceImpl implements Orderservice {
public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String transId, String partnerPayOvertime, OrderExtInfoDto orderExtInfoDto) { public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String transId, String partnerPayOvertime, OrderExtInfoDto orderExtInfoDto) {
OrderPayResponse orderPayResponse; OrderPayResponse orderPayResponse;
try { // try {
UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId, partnerPayOvertime); UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId, partnerPayOvertime);
// add by miaohui for 拼单群收款判断拼单人数大于1时参与微信平台补贴活动，创建预支付时上送goodsTag，后续抽成促销服务活动时删除此逻辑 start // add by miaohui for 拼单群收款判断拼单人数大于1时参与微信平台补贴活动，创建预支付时上送goodsTag，后续抽成促销服务活动时删除此逻辑 start
if (null != orderBean.getMarketingType() && OrderMarketType.COLLAGE.getIndex() == orderBean.getMarketingType()) { if (null != orderBean.getMarketingType() && OrderMarketType.COLLAGE.getIndex() == orderBean.getMarketingType()) {
...@@ -2860,12 +2847,12 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2860,12 +2847,12 @@ public class OrderServiceImpl implements Orderservice {
} }
} }
} 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));
//TODO 邮件告警 //TODO 邮件告警
orderPayResponse = new OrderPayResponse(); // orderPayResponse = new OrderPayResponse();
orderPayResponse.setMsg("getPreOrderPay_error"); // orderPayResponse.setMsg("getPreOrderPay_error");
} // }
return orderPayResponse; return orderPayResponse;
} }
...@@ -3460,7 +3447,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3460,7 +3447,7 @@ public class OrderServiceImpl implements Orderservice {
} }
String userId = userLoginInfoDto.getMemberId(); String userId = userLoginInfoDto.getMemberId();
List<QueryOrderByConditionsResponseVo> responseVos = null; List<QueryOrderByConditionsResponseVo> responseVos = null;
try { // try {
OrderConditionsReq orderConditionsReq = new OrderConditionsReq(); OrderConditionsReq orderConditionsReq = new OrderConditionsReq();
BeanUtil.convertBean(queryOrderByConditionsRequestVo, orderConditionsReq); BeanUtil.convertBean(queryOrderByConditionsRequestVo, orderConditionsReq);
orderConditionsReq.setUserId(userId); orderConditionsReq.setUserId(userId);
...@@ -3503,10 +3490,10 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3503,10 +3490,10 @@ public class OrderServiceImpl implements Orderservice {
return queryOrderByConditionsResponseVo; return queryOrderByConditionsResponseVo;
} }
).collect(Collectors.toList()); ).collect(Collectors.toList());
} catch (Exception e) { // } catch (Exception e) {
AppLogUtil.errorLog("queryOrders_error", gson.toJson(queryOrderByConditionsRequestVo), e); // AppLogUtil.errorLog("queryOrders_error", gson.toJson(queryOrderByConditionsRequestVo), e);
return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR); // return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
} // }
return ResponseUtil.success(responseVos); return ResponseUtil.success(responseVos);
} }
...@@ -3529,7 +3516,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3529,7 +3516,7 @@ public class OrderServiceImpl implements Orderservice {
public void buildQueryOrderResponseVo(QueryOrderResponseVo queryOrderResponseVo, QueryOrderByIdResponse response, String partnerId) { public void buildQueryOrderResponseVo(QueryOrderResponseVo queryOrderResponseVo, QueryOrderByIdResponse response, String partnerId) {
if (null == response || response.getData() == null || !ObjectUtils.equals(response.getErrcode(), RESPONSE_SUCCESS_CODE)) { if (null == response || response.getData() == null || !ObjectUtils.equals(response.getErrcode(), RESPONSE_SUCCESS_CODE)) {
AppLogUtil.infoLog("订单详情查询，返回值错误，QueryOrderByIdResponse:{}", response,null); // AppLogUtil.infoLog("订单详情查询，返回值错误，QueryOrderByIdResponse:{}", response,null);
return; return;
} }
...@@ -3579,27 +3566,14 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3579,27 +3566,14 @@ public class OrderServiceImpl implements Orderservice {
} }
CombPayRequest combPayRequest = orderAdapter.convent2CombPayOrderRequest(cardNo, orderBean, paymentRequest, partnerPayOvertime, ebCode, channel, totalAmount); CombPayRequest combPayRequest = orderAdapter.convent2CombPayOrderRequest(cardNo, orderBean, paymentRequest, partnerPayOvertime, ebCode, channel, totalAmount);
//todo :xxxooooo xxxoooxox CombPayResponse combPayResponse = comPayClient.combPay(combPayRequest, combPayRequest.getPartner_id());
CombPayResponse combPayResponse = null;
int i = 1;
do {
try {
combPayResponse = comPayClient.combPay(combPayRequest, combPayRequest.getPartner_id());
if (combPayResponse != null) {
break;
}
} catch (Exception exception) {
}
i++;
} while (i < 4);
if (combPayResponse == null || !ResponseCodeConstant.PAYMENT_RESPONSE_SUCCESS.equals(combPayResponse.getCode())) { if (combPayResponse == null || !ResponseCodeConstant.PAYMENT_RESPONSE_SUCCESS.equals(combPayResponse.getCode())) {
AppLogUtil.debugLotsParams("混合支付返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(combPayRequest), JSONObject.toJSONString(combPayResponse)); // AppLogUtil.debugLotsParams("混合支付返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(combPayRequest), JSONObject.toJSONString(combPayResponse));
orderPayResponse.setMsg(combPayResponse != null ? "支付：" + combPayResponse.getMsg() : "混合支付忙不过来啦，请稍后再试"); orderPayResponse.setMsg(combPayResponse != null ? "支付：" + combPayResponse.getMsg() : "混合支付忙不过来啦，请稍后再试");
return orderPayResponse; return orderPayResponse;
} }
Integer svcAmount = 0; // Integer svcAmount = 0;
Integer svcVAmount = 0; // Integer svcVAmount = 0;
List<CombPayResponse.PayPlatform> payPlatforms = combPayResponse.getData().getPayPlatformResponseList(); List<CombPayResponse.PayPlatform> payPlatforms = combPayResponse.getData().getPayPlatformResponseList();
if (payPlatforms.size() == 0) { if (payPlatforms.size() == 0) {
orderPayResponse.setMsg("混合支付:生成预支付失败"); orderPayResponse.setMsg("混合支付:生成预支付失败");
...@@ -3624,9 +3598,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3624,9 +3598,7 @@ public class OrderServiceImpl implements Orderservice {
//加入轮训队列 //加入轮训队列
putDelMq(orderBean.getCompanyId(), storeId, orderPayResponse.getFmId(), orderBean.getOid(), PayChannelType.getByEbcode(cashPay.getEbCode()).getIndex().intValue()); putDelMq(orderBean.getCompanyId(), storeId, orderPayResponse.getFmId(), orderBean.getOid(), PayChannelType.getByEbcode(cashPay.getEbCode()).getIndex().intValue());
return orderPayResponse; return orderPayResponse;
} } else {//单svc
//单svc
else {
CombPayResponse.PayPlatform svcPay = payPlatforms CombPayResponse.PayPlatform svcPay = payPlatforms
.stream() .stream()
.filter(f -> PayChannelType.SVC.getEbcode().equals(f.getEbCode())).findFirst() .filter(f -> PayChannelType.SVC.getEbcode().equals(f.getEbCode())).findFirst()
...@@ -3650,10 +3622,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3650,10 +3622,7 @@ public class OrderServiceImpl implements Orderservice {
orderPayResponse.getPayItem().add(payItem); orderPayResponse.getPayItem().add(payItem);
} }
} }
return orderPayResponse; return orderPayResponse;
} }
/** /**
...@@ -3720,7 +3689,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3720,7 +3689,7 @@ public class OrderServiceImpl implements Orderservice {
query = svcComPayClient.query(requestDto); query = svcComPayClient.query(requestDto);
if (query != null) break; if (query != null) break;
} }
ApiLog.printLog("order checkSvcComPay:{}", JSON.toJSONString(query),null,null); // ApiLog.printLog("order checkSvcComPay:{}", JSON.toJSONString(query),null,null);
if (query == null || !ResponseResult.SUCCESS.getCode().equals(query.getCode())) { if (query == null || !ResponseResult.SUCCESS.getCode().equals(query.getCode())) {
return false; return false;
} }
...@@ -3750,19 +3719,19 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3750,19 +3719,19 @@ public class OrderServiceImpl implements Orderservice {
*/ */
public void timeOutRefund(QueryOrdersResponseDto.DataBean.OrderBean orderBean) { public void timeOutRefund(QueryOrdersResponseDto.DataBean.OrderBean orderBean) {
//调用支付退款 //调用支付退款
AppLogUtil.debugLotsParams("payment timeout callback for refund orderDto={}", JSON.toJSONString(orderBean)); // AppLogUtil.debugLotsParams("payment timeout callback for refund orderDto={}", JSON.toJSONString(orderBean));
Integer abState = 4; Integer abState = 4;
String noPay = "8200404"; String noPay = "8200404";
//4 表示订单已经退款了 //4 表示订单已经退款了
if (abState.equals(orderBean.getAbnormalState())) { if (abState.equals(orderBean.getAbnormalState())) {
AppLogUtil.debugLotsParams("payment timeout callback for refund is exist"); // AppLogUtil.debugLotsParams("payment timeout callback for refund is exist");
return; return;
} }
com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = null; com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = null;
Long refundId = System.currentTimeMillis(); Long refundId = System.currentTimeMillis();
OrderExtInfoDto orderExtInfoDTO = gson.fromJson(orderBean.getExtInfo(), OrderExtInfoDto.class); OrderExtInfoDto orderExtInfoDTO = gson.fromJson(orderBean.getExtInfo(), OrderExtInfoDto.class);
if (orderExtInfoDTO == null || StringUtils.isBlank(orderExtInfoDTO.getFmId())) { if (orderExtInfoDTO == null || StringUtils.isBlank(orderExtInfoDTO.getFmId())) {
AppLogUtil.debugLotsParams("payment timeout callback for refund not create pre order"); // AppLogUtil.debugLotsParams("payment timeout callback for refund not create pre order");
return; return;
} }
Integer state = PayRefundStatus.SUCCESS.getCode(); Integer state = PayRefundStatus.SUCCESS.getCode();
...@@ -3772,7 +3741,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3772,7 +3741,7 @@ public class OrderServiceImpl implements Orderservice {
com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid()); com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid());
response = standardPaymentService.orderRefund(orderPayRefundRequest, LogTreadLocal.getTrackingNo()); response = standardPaymentService.orderRefund(orderPayRefundRequest, LogTreadLocal.getTrackingNo());
AppLogUtil.debugLotsParams("payment timeout callback for refund orderId={},request={},resp={}", orderBean.getOid(), JSON.toJSONString(orderPayRefundRequest), JSON.toJSONString(response)); // AppLogUtil.debugLotsParams("payment timeout callback for refund orderId={},request={},resp={}", orderBean.getOid(), JSON.toJSONString(orderPayRefundRequest), JSON.toJSONString(response));
if (response != null && noPay.equals(response.getCode())) { if (response != null && noPay.equals(response.getCode())) {
return; return;
} }
...@@ -3961,13 +3930,11 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3961,13 +3930,11 @@ public class OrderServiceImpl implements Orderservice {
// todo 此时存在处理中的售后怎么办? // todo 此时存在处理中的售后怎么办?
orderBeanList = filterOrder(orderBeanList); orderBeanList = filterOrder(orderBeanList);
if (orderBeanList.isEmpty()){ if (orderBeanList.isEmpty()){
log.warn("拼团失败取消订单 -> 需要取消的订单未空 团号:{}",refundVo.getSpellGroupCode()); // log.warn("拼团失败取消订单 -> 需要取消的订单未空 团号:{}",refundVo.getSpellGroupCode());
return ResponseUtil.success(); return ResponseUtil.success();
} }
// 批量退款 // 批量退款
log.info("拼团失败取消订单 -> 开始处理， 团号:{}, 订单号:{}", refundVo.getSpellGroupCode(), orderBeanList); // log.info("拼团失败取消订单 -> 开始处理， 团号:{}, 订单号:{}", refundVo.getSpellGroupCode(), orderBeanList);
SpellGroupBatchOrderRefundVo orderRefundVo = new SpellGroupBatchOrderRefundVo(); SpellGroupBatchOrderRefundVo orderRefundVo = new SpellGroupBatchOrderRefundVo();
orderRefundVo.setPartnerId(orderBeanList.get(0).getCompanyId()); orderRefundVo.setPartnerId(orderBeanList.get(0).getCompanyId());
orderRefundVo.setStoreId(orderBeanList.get(0).getShopId()); orderRefundVo.setStoreId(orderBeanList.get(0).getShopId());
...@@ -3996,11 +3963,11 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3996,11 +3963,11 @@ public class OrderServiceImpl implements Orderservice {
for (OrderBean orderBean : orderBeans) { for (OrderBean orderBean : orderBeans) {
if (Objects.equals(PayStatus.NOT_PAY.getCode(), orderBean.getPayStatus()) if (Objects.equals(PayStatus.NOT_PAY.getCode(), orderBean.getPayStatus())
|| Objects.equals(OrderStatus.WAIT_PAY.getCode(), orderBean.getStatus())) { || Objects.equals(OrderStatus.WAIT_PAY.getCode(), orderBean.getStatus())) {
log.info("拼团批量取消订单 -> 订单未支付，无需退款 订单号:{} ", orderBean.getOid()); // log.info("拼团批量取消订单 -> 订单未支付，无需退款 订单号:{} ", orderBean.getOid());
continue; continue;
} }
if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus())) { if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus())) {
log.info("拼团批量取消订单 -> 订单已取消，无需退款 订单号:{} ", orderBean.getOid()); // log.info("拼团批量取消订单 -> 订单已取消，无需退款 订单号:{} ", orderBean.getOid());
continue; continue;
} }
list.add(orderBean); list.add(orderBean);
...@@ -4069,14 +4036,14 @@ public class OrderServiceImpl implements Orderservice { ...@@ -4069,14 +4036,14 @@ public class OrderServiceImpl implements Orderservice {
// 1 进行批量退款 // 1 进行批量退款
if (!payRefundOrderCodes.isEmpty()) { if (!payRefundOrderCodes.isEmpty()) {
PayBatchRefundResponse response = null; PayBatchRefundResponse response = null;
try { // try {
// 1.1 组装批量退款参数 // 1.1 组装批量退款参数
BatchOrderRefundV2Request batchOrderRefundV2Request = orderAdapter.getBatchOrderRefundV2Request(payRefundOrderCodes, partnerId, storeId); BatchOrderRefundV2Request batchOrderRefundV2Request = orderAdapter.getBatchOrderRefundV2Request(payRefundOrderCodes, partnerId, storeId);
// 1.2 调用支付服务退款 // 1.2 调用支付服务退款
response = mulitiPaymentClient.batchRefund(batchOrderRefundV2Request); response = mulitiPaymentClient.batchRefund(batchOrderRefundV2Request);
} catch (Exception e) { // } catch (Exception e) {
log.error("拼团批量退款失败!!", e); // log.error("拼团批量退款失败!!", e);
} // }
PayBatchRefundResponse.BatchRefundBatchIdData batchIdData; PayBatchRefundResponse.BatchRefundBatchIdData batchIdData;
// 注意响应值是200 // 注意响应值是200
if (Objects.isNull(response) || !Objects.equals(ResponseCodeConstant.PAYMENT_RESPONSE_SUCCESS, response.getCode()) if (Objects.isNull(response) || !Objects.equals(ResponseCodeConstant.PAYMENT_RESPONSE_SUCCESS, response.getCode())
...@@ -4113,26 +4080,24 @@ public class OrderServiceImpl implements Orderservice { ...@@ -4113,26 +4080,24 @@ public class OrderServiceImpl implements Orderservice {
cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks()); cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee); cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee);
boolean fail = true; boolean fail = true;
try { // try {
BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest); BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
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())) {
log.error("批量取消订单失败 订单号:{}",orderBean.getOid()); // log.error("批量取消订单失败 订单号:{}",orderBean.getOid());
}else { }else {
fail = false; fail = false;
// 删除订单 通知活动添加商品库存 // 删除订单 通知活动添加商品库存
backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus(), orderBean.getPayStatus()); backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus(), orderBean.getPayStatus());
} }
}catch(Exception e){ // }catch(Exception e){
log.error("批量取消订单异常 订单号:{}",orderBean.getOid(),e); // log.error("批量取消订单异常 订单号:{}",orderBean.getOid(),e);
} // }
// 记录失败 // 记录失败
if (fail){ if (fail){
failOrderBean.add(orderBean); failOrderBean.add(orderBean);
} }
} }
// todo 失败入库 // todo 失败入库
return ResponseUtil.success(); return ResponseUtil.success();
} }
...@@ -4202,7 +4167,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -4202,7 +4167,7 @@ public class OrderServiceImpl implements Orderservice {
BeanUtil.convertBean(orderCountRequestVo, orderCountReqs); BeanUtil.convertBean(orderCountRequestVo, orderCountReqs);
com.freemud.application.sdk.api.ordercenter.response.BaseResponse<List<OrderCountResp>> result = orderSdkService.countOrdersByPartnerIds(orderCountReqs, trackingNo); com.freemud.application.sdk.api.ordercenter.response.BaseResponse<List<OrderCountResp>> result = orderSdkService.countOrdersByPartnerIds(orderCountReqs, trackingNo);
AppLogUtil.infoLog("remote /order/v2/orderCount resp :",orderCountReqs, result); // AppLogUtil.infoLog("remote /order/v2/orderCount resp :",orderCountReqs, result);
if (Objects.isNull(result)) { if (Objects.isNull(result)) {
return new BaseResponse(ResponseResultEnum.SYSTEM_ERROR.getCode(), ResponseResultEnum.SYSTEM_ERROR.getMessage(), "", null); return new BaseResponse(ResponseResultEnum.SYSTEM_ERROR.getCode(), ResponseResultEnum.SYSTEM_ERROR.getMessage(), "", null);
} }
...@@ -4223,7 +4188,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -4223,7 +4188,7 @@ public class OrderServiceImpl implements Orderservice {
// 实时查询，暂时不查询es // 实时查询，暂时不查询es
OrderStateInfoResp response = orderCenterSdkService.queryOrderStateInfo(orderCode, partnerId, orderClient, LogThreadLocal.getTrackingNo()); OrderStateInfoResp response = orderCenterSdkService.queryOrderStateInfo(orderCode, partnerId, orderClient, LogThreadLocal.getTrackingNo());
if (Objects.isNull(response) || !Objects.equals(RESPONSE_SUCCESS_CODE, response.getErrcode()) || response.getData() == null) { if (Objects.isNull(response) || !Objects.equals(RESPONSE_SUCCESS_CODE, response.getErrcode()) || response.getData() == null) {
AppLogUtil.infoLog("订单详情实时查询错误，queryOrderStateInfoResp，", response, ""); // AppLogUtil.infoLog("订单详情实时查询错误，queryOrderStateInfoResp，", response, "");
return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR); return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
} }
OrderStateMonitorInfoVo infoVo = new OrderStateMonitorInfoVo(); OrderStateMonitorInfoVo infoVo = new OrderStateMonitorInfoVo();
...@@ -4233,7 +4198,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -4233,7 +4198,6 @@ public class OrderServiceImpl implements Orderservice {
infoVo.setNeedMonitor(Objects.equals(response.getData().getStateTimeout(), 0L)); infoVo.setNeedMonitor(Objects.equals(response.getData().getStateTimeout(), 0L));
infoVo.setUpdateTimestamp(response.getData().getStateUpdateTimestamp()); infoVo.setUpdateTimestamp(response.getData().getStateUpdateTimestamp());
return ResponseUtil.success(infoVo); return ResponseUtil.success(infoVo);
} }
......
order-application-service/src/main/java/cn/freemud/service/impl/SpellGroupOrderServiceImpl.java
...@@ -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);
......
order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
...@@ -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;
} }
......
order-application-service/src/main/java/cn/freemud/xxljob/OrderCountJobHandler.java
...@@ -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