Skip to content

O
order-group
Commit 82f78c45 by zhiheng.zhang
Options

Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into… 

Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into feature/20210720-购物车日志修改-张志恒
parents 0a4426bc a8577563
Showing with 236 additions and 87 deletions
order-application-service/pom.xml
......@@ -23,17 +23,17 @@
<artifactId>xxl-job-core</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.freemud.sdk.api.assortment</groupId>
<artifactId>assortment-orderdistributor-sdk</artifactId>
<version>3.5.6.RELEASE</version>
<exclusions>
<exclusion>
<groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.freemud.sdk.api.assortment</groupId>-->
<!-- <artifactId>assortment-orderdistributor-sdk</artifactId>-->
<!-- <version>3.5.6.RELEASE</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>cn.freemud</groupId>-->
<!-- <artifactId>ordercenter-sdk</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -188,7 +188,8 @@ public class OrderAdapter {
boolean isUseFreightCoupon = false;
List<ActivityDiscountsDto> activityDiscountsDtos = shoppingCartGoodsDto.getActivityDiscountsDtos();
if (CollectionUtils.isNotEmpty(activityDiscountsDtos)) {
ActivityDiscountsDto activityDiscountsDto = activityDiscountsDtos.stream().filter(a -> a.getActivityType() != null && a.getActivityType().equals(ActivityTypeEnum.TYPE_34.getCode())).findFirst().orElse(null);
ActivityDiscountsDto activityDiscountsDto = activityDiscountsDtos.stream().filter(a -> a.getActivityType() != null
&& a.getActivityType().equals(ActivityTypeEnum.TYPE_34.getCode())).findFirst().orElse(null);
if (activityDiscountsDto != null) {
isUseFreightCoupon = true;
}
......
order-application-service/src/main/java/cn/freemud/amp/config/DlPaymentMqConfig.java 0 → 100644
package cn.freemud.amp.config;
import com.freemud.application.sdk.api.config.TopicExchangeConfig;
import org.springframework.amqp.core.*;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.Map;
@Component
public class DlPaymentMqConfig {
public static final String OPEN_STORE_PAYMENT_QUERY_DL_QUEUE = "open_store_payment_query_dl_queue";
public static final String OPEN_STORE_PAYMENT_QUERY_DL_KEY = "open_store_payment_query_dl_key";
public static final String OPEN_STORE_PAYMENT_QUERY_QUEUE = "open_store_payment_query_queue";
public static final String OPEN_STORE_PAYMENT_QUERY_KEY = "open_store_payment_query_key";
@Bean("dlPaymentMqTopicExchange")
public Exchange dlPaymentMqTopicExchange() {
return ExchangeBuilder.topicExchange(TopicExchangeConfig.EXCHANGE_NAME).durable(true).build();
}
/**
* 写入RabbitMQ使用的默认队列
*
* @return
*/
@Bean("paymentQueueName")
public Queue paymentChangeQueue() {
return QueueBuilder.durable(OPEN_STORE_PAYMENT_QUERY_QUEUE).build();
}
/**
* 绑定消息队列
*
* @param queue 消息队列
* @param topicExchange RabbitMQ Fanout Exchange
* @return 消息队列绑定
*/
@Bean("bindingPaymentQueueChange")
Binding bindingPaymentChange(@Qualifier("paymentQueueName") Queue queue, @Qualifier("dlPaymentMqTopicExchange") Exchange topicExchange) {
return BindingBuilder.bind(queue).to(topicExchange).with(OPEN_STORE_PAYMENT_QUERY_KEY).noargs();
}
@Bean("paymentChangeDlQueue")
public Queue paymentChangeDlQueue() {
Map<String, Object> delayQueueParams = new HashMap<>(2);
// DLX，dead letter发送到的exchange
delayQueueParams.put("x-dead-letter-exchange", TopicExchangeConfig.EXCHANGE_NAME);
// dead letter携带的routing key
delayQueueParams.put("x-dead-letter-routing-key", OPEN_STORE_PAYMENT_QUERY_KEY);
//时间
//delayQueueParams.put("x-message-ttl", 20*1000);
return QueueBuilder.durable(OPEN_STORE_PAYMENT_QUERY_DL_QUEUE).withArguments(delayQueueParams).build();
}
@Bean("bindingPaymentDlChange")
Binding bindingPaymentDlChange(@Qualifier("paymentChangeDlQueue") Queue queue, @Qualifier("dlPaymentMqTopicExchange") Exchange topicExchange) {
Map<String, Object> args = new HashMap<>(2);
args.put("x-dead-letter-exchange", TopicExchangeConfig.EXCHANGE_NAME);
args.put("x-dead-letter-routing-key", OPEN_STORE_PAYMENT_QUERY_KEY);
return BindingBuilder.bind(queue).to(topicExchange).with(OPEN_STORE_PAYMENT_QUERY_DL_KEY).and(args);
}
}
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
......@@ -109,6 +109,7 @@ public class OrderController {
*/
@ApiAnnotation(logMessage = "appCreateOrder")
@PostMapping("/app/create")
@Deprecated
public BaseResponse appCreateOrder(@Validated @LogParams @RequestBody AppCreateOrderVo createOrderVo, BindingResult bindingResult) {
return orderAdapterService.appCreateOrder(createOrderVo);
}
......
order-application-service/src/main/java/cn/freemud/entities/dto/pay/PaymentMqMessageDto.java 0 → 100644
package cn.freemud.entities.dto.pay;
import lombok.Data;
@Data
public class PaymentMqMessageDto {
/**
* （ 非码交易流水号 fmID）
*/
private String fmId;
/**
* 订单号
*/
private String orderId;
/**
* 商户号
*/
private String partnerId;
/**
* 门店号
*/
private String storeId;
private String trackingNo;
/**
* 支付渠道
*/
private Integer payChannelType;
}
order-application-service/src/main/java/cn/freemud/handler/OrderReportJobHandler.java
......@@ -42,7 +42,7 @@ public class OrderReportJobHandler {
String key = RedisKeyConstant.KGD_NO_ORDER_STORE_DATE + date;
BoundHashOperations<String, String, Set<String>> boundHashOperations = redisCache.getRedisTemplate().boundHashOps(key);
Map<String, Set<String>> entries = boundHashOperations.entries();
AppLogUtil.infoLog("下单门店记录推送 entries", entries, null);
// AppLogUtil.infoLog("下单门店记录推送 entries", entries, null);
if (!CollectionUtils.isEmpty(entries)) {
// 推送门店 服务
List<ReportStoreIdsRequestVo> requestDto = new ArrayList<>(entries.size());
......@@ -56,7 +56,7 @@ public class OrderReportJobHandler {
.partnerList(requestDto)
.build();
BaseResponse baseResponse = storeBackstageClient.pushOrderStore(pushOrderStoreDto);
AppLogUtil.infoLog("上报门店支付情况", JSON.toJSONString(pushOrderStoreDto), JSON.toJSONString(baseResponse));
// AppLogUtil.infoLog("上报门店支付情况", JSON.toJSONString(pushOrderStoreDto), JSON.toJSONString(baseResponse));
// 数据推送之后的 redis 缓存数据 清理
redisCache.updateTTL(key, 1, TimeUnit.DAYS);
} catch (Exception e) {
......
order-application-service/src/main/java/cn/freemud/manager/SpellGroupOrderDataManager.java
......@@ -165,7 +165,7 @@ public class SpellGroupOrderDataManager {
groupWorkJoinRequest.setPartnerCode(orderBean.getCompanyId());
groupWorkJoinRequest.setAppId(wxappid);
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);
return groupWorkJoinResponse;
}
......
order-application-service/src/main/java/cn/freemud/service/MallOrderService.java
......@@ -33,6 +33,7 @@ public interface MallOrderService {
/**
* 订单确认完成
*/
@Deprecated
BaseResponse orderAffirm(OrderAffirmRequestVO requestVO);
/**
......
order-application-service/src/main/java/cn/freemud/service/OrderAdapterService.java
......@@ -50,6 +50,7 @@ public interface OrderAdapterService {
/**
* APP下单，下单带商品信息，不经过购物车服务
*/
@Deprecated
BaseResponse appCreateOrder(AppCreateOrderVo createOrderVo);
/**
......
order-application-service/src/main/java/cn/freemud/service/OrderDistributeMQService.java
package cn.freemud.service;
import com.freemud.sdk.api.assortment.orderdistributor.request.DisRequest;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: ${FILE_NAME}
* @Package com.freemud.mail.core
* @Description: $MQ分发器服务接口
* @author: aiqi.gong
* @date: 2019/3/21 18:37
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
public interface OrderDistributeMQService {
/**
* 消息分发
* @param disRequest 消息体
*/
void messageDistribute(DisRequest disRequest);
}
//package cn.freemud.service;
//
//
//import com.freemud.sdk.api.assortment.orderdistributor.request.DisRequest;
//
///**
// * All rights Reserved, Designed By www.freemud.cn
// *
// * @version V1.0
// * @Title: ${FILE_NAME}
// * @Package com.freemud.mail.core
// * @Description: $MQ分发器服务接口
// * @author: aiqi.gong
// * @date: 2019/3/21 18:37
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
// */
//public interface OrderDistributeMQService {
//
// /**
// * 消息分发
// * @param disRequest 消息体
// */
// void messageDistribute(DisRequest disRequest);
//
//}
order-application-service/src/main/java/cn/freemud/service/Orderservice.java
......@@ -108,6 +108,7 @@ public interface Orderservice {
/**
* 获取退款理由
*/
@Deprecated
BaseResponse getRefundReason(GetRefundReasonVo getRefundReasonVo);
BaseResponse getNewRefundReason(GetRefundReasonVo getRefundReasonVo);
......@@ -156,6 +157,8 @@ public interface Orderservice {
* @return
*/
BaseResponse spellGroupOrderFailRefund(SpellGroupFailRefundVo refundVo);
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 {
request.setOrderSettlementDetailList(orderSettlementCreateReqs);
}
request.setActualPayAmount(confirmOrderRequest.getActualPayAmount());
// request.setActualPayAmount(request.getActualPayAmount());
request.setOperator(confirmOrderRequest.getOperator());
if (StringUtils.isNotBlank(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
@Override
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)) {
return ResponseUtil.success();
}
......@@ -196,13 +196,13 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
//71.券核销
// todo 这循环有啥用-.-
for (int i = 2; i >= 0; i--) {
AppLogUtil.infoLog("核销券码开始==", JSON.toJSONString(couponCodeVerificationDto), null);
// AppLogUtil.infoLog("核销券码开始==", JSON.toJSONString(couponCodeVerificationDto), null);
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);
if (Objects.nonNull(couponCodeResponseDto) && Objects.equals(couponCodeResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())) {
ok = true;
AppLogUtil.infoLog("CouponReverseServiceImpl", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
// AppLogUtil.infoLog("CouponReverseServiceImpl", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));
}
break;
}
......
order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
......@@ -244,7 +244,7 @@ public class AppOrderServiceImpl implements AppOrderService {
@Override
public String paySuccessCallback(PaysuccessNoticeMessage message, ConfirmOrderDto confirmOrderDto, Map<String, QueryOrdersResponseDto.DataBean.OrderBean> 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()));
// 删除支付交易号订单关系缓存
......
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
......@@ -288,6 +288,7 @@ public class CheckOrder {
//获取门店配送信息
StoreDeliveryInfoDto storeDeliveryInfoDto = null;
if (storeDeliveryUseOld) {
//todo storeDeliveryUseOld　配置删除，老逻辑删除
storeDeliveryInfoDto = getStoreDeliveryInfo(storeResponseDto, config, appId);
} else {
storeDeliveryInfoDto = getNewStoreDeliveryInfo(storeResponseDto, config, appId, trackingNo);
......@@ -821,6 +822,7 @@ public class CheckOrder {
storeDeliveryInfoDto.setDeliveryRadius(0);
}
// 只有小程序设置了外卖，并且开通了第三方配送账户，才是第三方配送单
//todo　判断多余
if (openPlatformIappWxappConfig == null) {
openPlatformIappWxappConfig = openPlatformIappWxappConfigManager.selectIappWxappConfigByWxAppId(wxAppid);
}
......@@ -931,6 +933,7 @@ public class CheckOrder {
* @param storeCode 门店号
* @return
*/
//todo　预计送达时间购物车接口返回，免去多调用一次接口
private Date getEstimateDeliveryCompleteTime(String userLat,
String userLong,
String partnerId,
......
order-application-service/src/main/java/cn/freemud/service/impl/CouponActivityServiceImpl.java
......@@ -92,7 +92,7 @@ public class CouponActivityServiceImpl implements CouponActivityService {
return ResponseUtil.success();
} catch (Exception 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);
}
}
......
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
......@@ -30,6 +30,7 @@ import cn.freemud.entities.dto.QueryOrdersResponseDto.DataBean.OrderBean;
import cn.freemud.entities.dto.delivery.*;
import cn.freemud.entities.dto.order.CreateOrderOperateDto;
import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
import cn.freemud.entities.dto.pay.PaymentMqMessageDto;
import cn.freemud.entities.dto.product.AttributeValue;
import cn.freemud.entities.dto.product.GroupDetail;
import cn.freemud.entities.dto.product.ProductAttributeGroup;
......@@ -104,8 +105,6 @@ import cn.freemud.service.mccafe.CouponClientService;
import cn.freemud.service.mccafe.MCCafeOrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
import com.freemud.sdk.api.assortment.orderdistributor.entity.dto.PaymentMqMessageDto;
import com.freemud.sdk.api.assortment.orderdistributor.service.PaymentQueueService;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
......@@ -960,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()))) {
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);
return gson.toJson(message);
}
......@@ -1078,7 +1077,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
private QueryOrdersResponseDto.DataBean.OrderBean getOrderBean(ConfirmOrderDto confirmOrderDto) {
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());
}
......@@ -2102,7 +2101,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
}
}
AppLogUtil.infoLog("生成参数完成：", req, null);
// AppLogUtil.infoLog("生成参数完成：", req, null);
orderSdkService.updateCostCouponCodeNew(req, LogTreadLocal.getTrackingNo());
......@@ -2118,7 +2117,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
* @param orderBean
*/
public boolean withOrderBuyCoupon3(QueryOrdersResponseDto.DataBean.OrderBean orderBean, String thirdPartyMemberId){
AppLogUtil.infoLog("发券入参：", thirdPartyMemberId, JSON.toJSONString(orderBean));
// AppLogUtil.infoLog("发券入参：", thirdPartyMemberId, JSON.toJSONString(orderBean));
try{
UpdateCouponCodeReq req = new UpdateCouponCodeReq();
......@@ -2146,7 +2145,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
SendCouponForqujiaDtoResponseDto responseDto = customerExtendClient.sendCouponForqujia(request);
if(!Objects.equals(responseDto.getCode(), ResponseResult.SUCCESS.getCode())
|| 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;
}
......@@ -2166,7 +2165,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponClientService.batchQuery(mcCafeCouponRequest);
if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())
|| CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) {
log.error("获取优惠券详情失败，发券失败" + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse));
// log.error("获取优惠券详情失败，发券失败" + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse));
return false;
}
......@@ -2182,7 +2181,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
Optional<McdNetBatchQueryResponse.Coupon> couponOptional = mcdNetBatchQueryResponse.getCouponlist().stream()
.filter(o -> ResponseCodeConstant.RESPONSE_SUCCESS.equals(o.getStatusCode())).findFirst();
if(!couponOptional.isPresent()) {
log.error("没有有效的优惠券，更新失败 " + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse));
// log.error("没有有效的优惠券，更新失败 " + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse));
continue;
} else {
couponCode = couponOptional.get().getCode();
......@@ -2192,14 +2191,14 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
Optional<McdNetBatchQueryResponse.Coupon> couponOptional = mcdNetBatchQueryResponse.getCouponlist().stream()
.filter(o -> ResponseCodeConstant.RESPONSE_SUCCESS.equals(o.getStatusCode())).findFirst();
if(!couponOptional.isPresent()) {
log.error("没有有效的优惠券，更新失败 " + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse));
// log.error("没有有效的优惠券，更新失败 " + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse));
continue;
} else {
couponCode = couponOptional.get().getCode();
}
}
if(StringUtils.isBlank(couponCode)) {
log.error("没有匹配的优惠券，更新失败 " + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse));
// log.error("没有匹配的优惠券，更新失败 " + JSON.toJSONString(mcCafeCouponRequest) + JSON.toJSONString(mcdNetBatchQueryResponse));
continue;
}
UpdateCouponCodeReq.CouponUpdateInfo couponUpdateInfo = new UpdateCouponCodeReq.CouponUpdateInfo();
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
......@@ -16,6 +16,7 @@ import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.PayAccessResponse;
import cn.freemud.entities.dto.ecology.VirtualBindStoreResponse;
import cn.freemud.entities.dto.ecology.VirtualStoreRequest;
import cn.freemud.entities.dto.pay.PaymentMqMessageDto;
import cn.freemud.entities.dto.product.AttributeValue;
import cn.freemud.entities.dto.product.GroupDetail;
import cn.freemud.entities.dto.product.ProductAttributeGroup;
......@@ -72,8 +73,6 @@ import com.freemud.sdk.api.assortment.order.response.order.*;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
import com.freemud.sdk.api.assortment.orderdistributor.entity.dto.PaymentMqMessageDto;
import com.freemud.sdk.api.assortment.orderdistributor.service.PaymentQueueService;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
......@@ -185,6 +184,7 @@ public class MallOrderServiceImpl implements MallOrderService {
* 订单确认完成
*/
@Override
@Deprecated
public BaseResponse orderAffirm(OrderAffirmRequestVO requestVO) {
String trackingNo = LogTreadLocal.getTrackingNo();
......@@ -519,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()))) {
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);
}
......@@ -556,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);
if (message.getSource() != null && message.getSource().equals(PaySuccessSource.OUTSIDE.getSource())) {
log.info("微商城调用券码核销==" + message.getTrans_id());
// log.info("微商城调用券码核销==" + message.getTrans_id());
verificationCoupon(message.getTrans_id());
log.info("微商城调用券码结束==" + message.getTrans_id());
// log.info("微商城调用券码结束==" + message.getTrans_id());
}
orderIds.add(orderBean.getOid());
orderIds = orderIds.stream().distinct().collect(Collectors.toList());
//接单
if(orderIds.size() > 1 || orderBean.getMarketingType() != OrderMarketType.GROUPB.getIndex()){
POSOrderOperationBaseReq acceptOrderReq = new POSOrderOperationBaseReq();
for(String orderId : orderIds){
......@@ -701,7 +700,7 @@ public class MallOrderServiceImpl implements MallOrderService {
if (StringUtils.isEmpty(oid)) {
return;
}
AppLogUtil.infoLog("backOrdersStatusChange", oid, String.valueOf(status));
// AppLogUtil.infoLog("backOrdersStatusChange", oid, String.valueOf(status));
OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
requestDto.setOid(oid);
requestDto.setOrderStatus(status);
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
......@@ -308,12 +308,10 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
// 蜜雪+混合支付专用：通过交易号从缓存中拿订单号，如果有数据则实际订单号为其value值
String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(message.getTrans_id()));
if (StringUtils.isNotBlank(orderId)) {
AppLogUtil.debugLotsParams("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(), confirmOrderDto.getOrderId(), orderId);
confirmOrderDto.setOrderId(orderId);
}
Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans = orderService.getOrderBeanByOrderId(confirmOrderDto.getOrderId());
if (MapUtils.isEmpty(orderBeans)) {
AppLogUtil.debugLotsParams("paySuccessCallback_queryOrderById_faild, trackingNo:{},PaysuccessNoticeMessage:{}", LogTreadLocal.getTrackingNo(), gson.toJson(message));
return gson.toJson(message);
}
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 {
shoppingCartClearDto.setTableNumber(orderBean.getBarCounter());
shoppingCartClearDto.setOperationType(3);
ShoppingCartBaseResponse cartBaseResponse = shoppingCartClient.clearShoppingCart(shoppingCartClearDto);
if(cartBaseResponse == null || ObjectUtils.notEqual(cartBaseResponse.getCode(),RESPONSE_SUCCESS_CODE)){
AppLogUtil.infoLog("支付成功回调通知清除购物车信息失败 request:{},response:{}",shoppingCartClearDto,cartBaseResponse);
}
// if(cartBaseResponse == null || ObjectUtils.notEqual(cartBaseResponse.getCode(),RESPONSE_SUCCESS_CODE)){
// AppLogUtil.infoLog("支付成功回调通知清除购物车信息失败 request:{},response:{}",shoppingCartClearDto,cartBaseResponse);
// }
//调用围餐订单完成接口
AssortmentGroupOrderAffirmRequest affirmRequest = new AssortmentGroupOrderAffirmRequest();
affirmRequest.setOrderClient(OrderClientType.WAI_MEAL.getIndex());
......@@ -276,7 +276,7 @@ public class OrderCommonService {
affirmRequest.setOperator(orderBean.getUserName());
AssortmentAffirmGroupOrderResponse groupOrderResponse = orderCenterSdkService.affirmGroupOrder(affirmRequest);
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();
}
......
order-application-service/src/main/java/cn/freemud/service/impl/PaymentQueueService.java 0 → 100644
package cn.freemud.service.impl;
import cn.freemud.amp.config.DlPaymentMqConfig;
import cn.freemud.amqp.Header;
import cn.freemud.amqp.MQMessage;
import cn.freemud.amqp.MQService;
import cn.freemud.entities.dto.pay.PaymentMqMessageDto;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.config.TopicExchangeConfig;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageProperties;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class PaymentQueueService {
// @Autowired
// private RabbitTemplate restTemplate;
@Autowired
private MQService mqService;
public void paymentCallback(PaymentMqMessageDto dto){
MQMessage<PaymentMqMessageDto> mqMessage = new MQMessage<PaymentMqMessageDto>();
mqMessage.setBody(dto);
Integer ttl = 20 * 1000;
Header header=new Header();
header.setKey("1");
mqMessage.setHeader(header);
byte[] notifyMsgBytes = JSON.toJSONString(mqMessage).getBytes();
MessageProperties messageProperties = new MessageProperties();
messageProperties.setExpiration(ttl.toString());
messageProperties.setContentType(MessageProperties.CONTENT_TYPE_JSON);
Message delmessage = new Message(notifyMsgBytes, messageProperties);
// logger.info("restTemplate.convertAndSend:"+dto);
mqService.convertAndSend(TopicExchangeConfig.EXCHANGE_NAME, DlPaymentMqConfig.OPEN_STORE_PAYMENT_QUERY_DL_KEY, delmessage);
// restTemplate.convertAndSend(TopicExchangeConfig.EXCHANGE_NAME, DlPaymentMqConfig.OPEN_STORE_PAYMENT_QUERY_DL_KEY, delmessage);
}
}
order-application-service/src/main/java/cn/freemud/service/impl/SpellGroupOrderServiceImpl.java
......@@ -228,8 +228,8 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
ActivityUpdateStockRequest activityUpdateStockRequest = spellGroupOrderAdapter.convert2ActivityUpdateStockRequest(orderBean, createSpellGroupOrderDto);
if (activityUpdateStockRequest != null && (CollectionUtils.isNotEmpty(activityUpdateStockRequest.getStock()) || CollectionUtils.isNotEmpty(activityUpdateStockRequest.getActivityList()))) {
com.freemud.application.sdk.api.base.BaseResponse activityResponse = promotionSdkService.subtractStock(activityUpdateStockRequest, "");
ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(),
"subtractStock", JSONObject.toJSONString(activityUpdateStockRequest), JSONObject.toJSONString(activityResponse));
// ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(),
// "subtractStock", JSONObject.toJSONString(activityUpdateStockRequest), JSONObject.toJSONString(activityResponse));
if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getCode())) {
//TODO 失败取消订单,异步冲正库存
CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
......@@ -356,7 +356,7 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
if (StringUtils.isEmpty(oid)) {
return;
}
AppLogUtil.infoLog("backOrdersStatusChange", oid, String.valueOf(status));
// AppLogUtil.infoLog("backOrdersStatusChange", oid, String.valueOf(status));
OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
requestDto.setOid(oid);
requestDto.setOrderStatus(status);
......
order-application-service/src/main/java/cn/freemud/service/impl/StoreServiceImpl.java
......@@ -83,6 +83,7 @@ public class StoreServiceImpl implements StoreService {
* @param userLatitude 用户配送地址维度
* @return
*/
// TODO: 21-7-22　可去掉
public UserDeliveryInfoDto getUserDeliveryInfo(StoreDeliveryInfoDto storeDeliveryInfoDto, String userLongitude, String userLatitude) {
UserDeliveryInfoDto userDeliveryInfoDto = UserDeliveryInfoDto.builder()
.userLongitude(userLongitude)
......@@ -105,6 +106,7 @@ public class StoreServiceImpl implements StoreService {
* @param userLatitude 用户维度
* @return
*/
//todo 可去掉
public boolean checkUserEnableDelivery(StoreDeliveryInfoDto storeDeliveryInfoDto, String userLongitude, String userLatitude) {
if (!storeDeliveryInfoDto.getEnableTakeaway()) {
return false;
......
order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
......@@ -81,7 +81,7 @@ public class CouponClientServiceImpl implements CouponClientService {
McdNetBatchQueryResponse mcdNetBatchQueryResponse = batchQuery(mcCafeCouponRequest);
if (mcdNetBatchQueryResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())
|| CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) {
AppLogUtil.errorLog("获取优惠券详情失败，无法核销", mcCafeCouponRequest, mcdNetBatchQueryResponse);
// AppLogUtil.errorLog("获取优惠券详情失败，无法核销", mcCafeCouponRequest, mcdNetBatchQueryResponse);
return null;
}
......@@ -107,10 +107,10 @@ public class CouponClientServiceImpl implements CouponClientService {
couponRedeemResponseList.add(couponRedeemResponse);
couponRedeemResponseListAll.add(couponRedeemResponse);
}
if(CollectionUtils.isNotEmpty(couponRedeemResponseList)) {
AppLogUtil.infoLog(LogTreadLocal.getTrackingNo(), "麦咖啡核销券失败",
JSON.toJSONString(list), JSON.toJSONString(couponRedeemResponseListAll));
}
// if(CollectionUtils.isNotEmpty(couponRedeemResponseList)) {
// AppLogUtil.infoLog(LogTreadLocal.getTrackingNo(), "麦咖啡核销券失败",
// JSON.toJSONString(list), JSON.toJSONString(couponRedeemResponseListAll));
// }
return couponRedeemResponseList;
}
......
order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
......@@ -15,6 +15,7 @@ import cn.freemud.entities.dto.SvcComPayResponseDto;
import cn.freemud.entities.dto.order.CreateOrderOperateDto;
import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
import cn.freemud.entities.dto.pay.CombPayResponse;
import cn.freemud.entities.dto.pay.PaymentMqMessageDto;
import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.vo.*;
......@@ -23,6 +24,7 @@ import cn.freemud.interceptor.ServiceException;
import cn.freemud.redis.RedisCache;
import cn.freemud.service.CheckOrderUniversal;
import cn.freemud.service.OrderAdapterService;
import cn.freemud.service.impl.PaymentQueueService;
import cn.freemud.service.thirdparty.ComPayClient;
import cn.freemud.service.thirdparty.SvcComPayClient;
import cn.freemud.service.universal.factory.CreateOrderServiceFactory;
......@@ -83,8 +85,6 @@ import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.orderdistributor.entity.dto.PaymentMqMessageDto;
import com.freemud.sdk.api.assortment.orderdistributor.service.PaymentQueueService;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
import com.freemud.sdk.api.assortment.payment.service.StandardPaymentService;
......
order-application-service/src/main/java/cn/freemud/xxljob/OrderCountJobHandler.java
......@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
*/
@Component
//@JobHandler("orderCountJobHandler")
@Log4j2
//@Log4j2
public class OrderCountJobHandler extends IJobHandler {
@Autowired
......@@ -54,13 +54,13 @@ public class OrderCountJobHandler extends IJobHandler {
@Override
public ReturnT<String> execute(String param) throws Exception {
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();
// 获取需要 上报的商户号
try {
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
|| filterPartner.getResult() == null
|| !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(filterPartner.getCode())
......@@ -81,7 +81,7 @@ public class OrderCountJobHandler extends IJobHandler {
if (Objects.isNull(result)) {
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())) {
return ReturnT.SUCCESS;
......@@ -90,7 +90,7 @@ public class OrderCountJobHandler extends IJobHandler {
List<OrderCountResp> orderCounts = result.getResult();
SendOrderCountsMsg build = SendOrderCountsMsg.builder().partnerRequests(orderCounts).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) {
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