Skip to content

O
order-group
Commit 8e06b40b by 徐康
Options

Merge remote-tracking branch 'origin/qa' into qa

parents bcb590e1 bad0411a
Showing with 383 additions and 374 deletions
order-application-service/src/main/java/cn/freemud/fuyou/service/FuYouOrderService.java
...@@ -55,7 +55,6 @@ import static cn.freemud.enums.ResponseResult.*; ...@@ -55,7 +55,6 @@ import static cn.freemud.enums.ResponseResult.*;
@Slf4j @Slf4j
public class FuYouOrderService { public class FuYouOrderService {
private final CashEventProcessor cashEventProcessor;
private final OrderSdkService orderSdkService; private final OrderSdkService orderSdkService;
private final MapperFacade mapperFacade; private final MapperFacade mapperFacade;
private final CouponFeignClient couponFeignClient; private final CouponFeignClient couponFeignClient;
...@@ -63,11 +62,10 @@ public class FuYouOrderService { ...@@ -63,11 +62,10 @@ public class FuYouOrderService {
private final OfflineCouponSdkService offlineCouponSdkService; private final OfflineCouponSdkService offlineCouponSdkService;
private final ScoreFeignClient scoreFeignClient; private final ScoreFeignClient scoreFeignClient;
public FuYouOrderService(CashEventProcessor cashEventProcessor, OrderSdkService orderSdkService, MapperFacade mapperFacade, public FuYouOrderService(OrderSdkService orderSdkService, MapperFacade mapperFacade,
CouponFeignClient couponFeignClient, CouponFeignClient couponFeignClient,
PaymentNewService paymentNewService, OfflineCouponSdkService offlineCouponSdkService, PaymentNewService paymentNewService, OfflineCouponSdkService offlineCouponSdkService,
ScoreFeignClient scoreFeignClient) { ScoreFeignClient scoreFeignClient) {
this.cashEventProcessor = cashEventProcessor;
this.orderSdkService = orderSdkService; this.orderSdkService = orderSdkService;
this.mapperFacade = mapperFacade; this.mapperFacade = mapperFacade;
this.couponFeignClient = couponFeignClient; this.couponFeignClient = couponFeignClient;
...@@ -214,6 +212,13 @@ public class FuYouOrderService { ...@@ -214,6 +212,13 @@ public class FuYouOrderService {
return payorderSeetlment; return payorderSeetlment;
} }
private OrderInfoReqs getOrderByThirdOrderCode(String thirdOrderCode,String orderClient) {
QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(orderClient,null,thirdOrderCode, null, LogThreadLocal.getTrackingNo());
if (ObjectUtils.notEqual(ResponseConstant.SUCCESS_RESPONSE_CODE, orderInfo.getCode())) {
throw new RuntimeException(orderInfo.getMessage());
}
return orderInfo.getResult();
}
/*** /***
* 支付完成 * 支付完成
...@@ -221,7 +226,7 @@ public class FuYouOrderService { ...@@ -221,7 +226,7 @@ public class FuYouOrderService {
* @return * @return
*/ */
public BaseResponse complete(CompleteRequest request) { public BaseResponse complete(CompleteRequest request) {
OrderInfoReqs orderInfoReqs = null; OrderInfoReqs orderInfoReqs = getOrderByThirdOrderCode(request.getThirdOrderCode(), request.getOrderClient());
BaseResponse response = new BaseResponse(); BaseResponse response = new BaseResponse();
if(ObjectUtils.notEqual(PayStatus.HAVE_PAID.getCode(),orderInfoReqs.getPayState())){ if(ObjectUtils.notEqual(PayStatus.HAVE_PAID.getCode(),orderInfoReqs.getPayState())){
return ResponseUtil.error(ORDER_NO_PAU); return ResponseUtil.error(ORDER_NO_PAU);
......
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/AliPayEventProcessor.java
...@@ -83,60 +83,60 @@ public class AliPayEventProcessor extends AbstractProcessor { ...@@ -83,60 +83,60 @@ public class AliPayEventProcessor extends AbstractProcessor {
//10216 扫呗公众号支付 //10216 扫呗公众号支付
//10217 商盟支付 //10217 商盟支付
//10300 扫呗支付宝 //10300 扫呗支付宝
//private final PaymentNewService paymentNewService; private final PaymentNewService paymentNewService;
//
// protected AliPayEventProcessor(OrderSdkService orderSdkService, PaymentService paymentService, PaymentNewService paymentNewService) { protected AliPayEventProcessor(OrderSdkService orderSdkService, PaymentService paymentService, PaymentNewService paymentNewService) {
// super(orderSdkService, paymentService); super(orderSdkService, paymentService);
// this.paymentNewService = paymentNewService; this.paymentNewService = paymentNewService;
// } }
//
// @Override @Override
// BaseResponse doProcess(DiscountRequest request) { BaseResponse doProcess(DiscountRequest request) {
// BaseResponse baseResponse =new BaseResponse(); BaseResponse baseResponse =new BaseResponse();
// baseResponse.setCode(ResponseResultEnum.SUCCESS.getCode()); baseResponse.setCode(ResponseResultEnum.SUCCESS.getCode());
// OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs(); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
//
// CodePayRequest codePayRequest =new CodePayRequest(); CodePayRequest codePayRequest =new CodePayRequest();
// codePayRequest.setCode(request.getCode()); codePayRequest.setCode(request.getCode());
// codePayRequest.setBody(orderInfoReqs.getStoreName()); codePayRequest.setBody(orderInfoReqs.getStoreName());
// codePayRequest.setBusinessDate(DateUtil.convert2String(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)); codePayRequest.setBusinessDate(DateUtil.convert2String(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
// codePayRequest.setStationId("1"); codePayRequest.setStationId("1");
// codePayRequest.setOperatorId("1"); codePayRequest.setOperatorId("1");
// //codePayRequest.setClientCode(10095); //codePayRequest.setClientCode(10095);
// //codePayRequest.setCode("10102"); //codePayRequest.setCode("10102");
// codePayRequest.setAmount(request.getPayAmount()); codePayRequest.setAmount(request.getPayAmount());
// codePayRequest.setPartnerId(orderInfoReqs.getPartnerId()); codePayRequest.setPartnerId(orderInfoReqs.getPartnerId());
// codePayRequest.setStoreId(orderInfoReqs.getStoreId()); codePayRequest.setStoreId(orderInfoReqs.getStoreId());
// codePayRequest.setFrontTransId(orderInfoReqs.getOrderCode()); codePayRequest.setFrontTransId(orderInfoReqs.getOrderCode());
// codePayRequest.setVer("2"); codePayRequest.setVer("2");
// // codePayRequest.setClientCode(10095L); // codePayRequest.setClientCode(10095L);
// codePayRequest.setTransId(orderInfoReqs.getOrderCode()); codePayRequest.setTransId(orderInfoReqs.getOrderCode());
// codePayRequest.setProducts(convertPayProduct(request.getOrderItemList())); codePayRequest.setProducts(convertPayProduct(request.getOrderItemList()));
// com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> codePayResponseBaseResponse = paymentNewService.codePay(codePayRequest, LogThreadLocal.getTrackingNo()); com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> codePayResponseBaseResponse = paymentNewService.codePay(codePayRequest, LogThreadLocal.getTrackingNo());
// log.info("aliPay.paymentFeignClient.codePay,request:{},response:{}", JSON.toJSONString(codePayRequest),JSON.toJSONString(codePayResponseBaseResponse)); log.info("aliPay.paymentFeignClient.codePay,request:{},response:{}", JSON.toJSONString(codePayRequest),JSON.toJSONString(codePayResponseBaseResponse));
// if(ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getCode()) || if(ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getCode()) ||
// ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getCode()) || ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getCode()) ||
// ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getData().getResultCode()) ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getData().getResultCode())
// ){ ){
// baseResponse.setCode(codePayResponseBaseResponse.getCode()); baseResponse.setCode(codePayResponseBaseResponse.getCode());
// baseResponse.setMessage(codePayResponseBaseResponse.getMessage()); baseResponse.setMessage(codePayResponseBaseResponse.getMessage());
// return baseResponse; return baseResponse;
// } }
// request.setFmId(codePayResponseBaseResponse.getData().getData().getFmId()); request.setFmId(codePayResponseBaseResponse.getData().getData().getFmId());
// return baseResponse; return baseResponse;
// } }
//
//
//
// @Override @Override
// OrderSettlementReq getOrderSettlement(DiscountRequest request) { OrderSettlementReq getOrderSettlement(DiscountRequest request) {
// OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs(); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
// return buildOrderSettlement("支付宝支付", OrderSettlementType.ALIPAY, true, orderInfoReqs, request); return buildOrderSettlement("支付宝支付", OrderSettlementType.ALIPAY, true, orderInfoReqs, request);
//
// } }
//
// @Override @Override
// public Integer getEvent() { public Integer getEvent() {
// return PayChannelEnum.ALIPAY.getCode(); return PayChannelEnum.ALIPAY.getCode();
// } }
} }
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/CashEventProcessor.java
...@@ -22,30 +22,30 @@ import static cn.freemud.management.util.ResponseCodeEnum.SUCCESS; ...@@ -22,30 +22,30 @@ import static cn.freemud.management.util.ResponseCodeEnum.SUCCESS;
public class CashEventProcessor extends AbstractProcessor { public class CashEventProcessor extends AbstractProcessor {
// protected CashEventProcessor(OrderSdkService orderSdkService, PaymentService paymentService) { protected CashEventProcessor(OrderSdkService orderSdkService, PaymentService paymentService) {
// //super(orderSdkService, paymentService); super(orderSdkService, paymentService);
// } }
//
// @Override @Override
// BaseResponse doProcess(DiscountRequest request) { BaseResponse doProcess(DiscountRequest request) {
// BaseResponse baseResponse =new BaseResponse(); BaseResponse baseResponse =new BaseResponse();
// baseResponse.setCode(SUCCESS.code); baseResponse.setCode(SUCCESS.code);
// return baseResponse; return baseResponse;
// } }
//
// public OrderInfoReqs getOrderByThirdOrderCode(String thirdOrderCode, String orderClient) { public OrderInfoReqs getOrderByThirdOrderCode(String thirdOrderCode, String orderClient) {
// return super.getOrderByThirdOrderCode(thirdOrderCode, orderClient); return super.getOrderByThirdOrderCode(thirdOrderCode, orderClient);
// } }
//
// @Override @Override
// OrderSettlementReq getOrderSettlement(DiscountRequest request) { OrderSettlementReq getOrderSettlement(DiscountRequest request) {
// OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs(); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
// return buildOrderSettlement("富有现金支付", OrderSettlementType.CASH, false, orderInfoReqs, request); return buildOrderSettlement("富有现金支付", OrderSettlementType.CASH, false, orderInfoReqs, request);
// } }
//
// @Override @Override
// public Integer getEvent() { public Integer getEvent() {
// return PayChannelEnum.CASH.getCode(); return PayChannelEnum.CASH.getCode();
// } }
} }
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/CouponEventProcessor.java
...@@ -35,76 +35,76 @@ import static cn.freemud.management.util.ResponseCodeEnum.SUCCESS; ...@@ -35,76 +35,76 @@ import static cn.freemud.management.util.ResponseCodeEnum.SUCCESS;
public class CouponEventProcessor extends AbstractProcessor { public class CouponEventProcessor extends AbstractProcessor {
// private final OfflineCouponSdkService offlineCouponSdkService; private final OfflineCouponSdkService offlineCouponSdkService;
//
// protected CouponEventProcessor(OrderSdkService orderSdkService, PaymentService paymentService, OfflineCouponSdkService offlineCouponSdkService) { protected CouponEventProcessor(OrderSdkService orderSdkService, PaymentService paymentService, OfflineCouponSdkService offlineCouponSdkService) {
// //super(orderSdkService, paymentService); super(orderSdkService, paymentService);
// this.offlineCouponSdkService = offlineCouponSdkService; this.offlineCouponSdkService = offlineCouponSdkService;
// } }
//
//
// @Override @Override
// com.freemud.application.sdk.api.ordercenter.response.BaseResponse doProcess(DiscountRequest request) { com.freemud.application.sdk.api.ordercenter.response.BaseResponse doProcess(DiscountRequest request) {
// com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = new com.freemud.application.sdk.api.ordercenter.response.BaseResponse(); com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = new com.freemud.application.sdk.api.ordercenter.response.BaseResponse();
// baseResponse.setCode(SUCCESS.code); baseResponse.setCode(SUCCESS.code);
// OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs(); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
// //1.核销券 //1.核销券
// CouponRequest couponCodeVerificationDto = new CouponRequest(); CouponRequest couponCodeVerificationDto = new CouponRequest();
// couponCodeVerificationDto.setVer(Integer.valueOf(Version.VERSION_1)); couponCodeVerificationDto.setVer(Integer.valueOf(Version.VERSION_1));
// couponCodeVerificationDto.setReqtype(71); couponCodeVerificationDto.setReqtype(71);
// couponCodeVerificationDto.setPartnerId(Integer.parseInt(orderInfoReqs.getPartnerId())); couponCodeVerificationDto.setPartnerId(Integer.parseInt(orderInfoReqs.getPartnerId()));
// //自取：pickup，外送：delivery，麦咖啡微信小程序：mocoffee_wx，麦咖啡支付宝小程序：mocoffee_zfb //自取：pickup，外送：delivery，麦咖啡微信小程序：mocoffee_wx，麦咖啡支付宝小程序：mocoffee_zfb
// couponCodeVerificationDto.setChannel("pickup"); couponCodeVerificationDto.setChannel("pickup");
// couponCodeVerificationDto.setStation_id(request.getPosId()); couponCodeVerificationDto.setStation_id(request.getPosId());
// couponCodeVerificationDto.setOperator_id("-1"); couponCodeVerificationDto.setOperator_id("-1");
// couponCodeVerificationDto.setStore_id(orderInfoReqs.getStoreId()); couponCodeVerificationDto.setStore_id(orderInfoReqs.getStoreId());
// //核销不需要核销通知 //核销不需要核销通知
// //couponCodeVerificationDto.setAppFlag("kgd.N"); //couponCodeVerificationDto.setAppFlag("kgd.N");
// // 订单号 替换成唯一序号 // 订单号 替换成唯一序号
// couponCodeVerificationDto.setTrans_id(orderInfoReqs.getOrderCode()); couponCodeVerificationDto.setTrans_id(orderInfoReqs.getOrderCode());
// couponCodeVerificationDto.setBusiness_date(cn.freemud.base.util.DateUtil.convert2Str(new Date(), cn.freemud.base.util.DateUtil.FORMAT_yyyyMMdd)); couponCodeVerificationDto.setBusiness_date(cn.freemud.base.util.DateUtil.convert2Str(new Date(), cn.freemud.base.util.DateUtil.FORMAT_yyyyMMdd));
// List<TransactionVO> transactions = new ArrayList<>(); List<TransactionVO> transactions = new ArrayList<>();
// TransactionVO couponCodeVerificationTransDto = new TransactionVO(); TransactionVO couponCodeVerificationTransDto = new TransactionVO();
// couponCodeVerificationTransDto.setCode(request.getCoupon()); couponCodeVerificationTransDto.setCode(request.getCoupon());
// couponCodeVerificationTransDto.setTotalAmount(request.getPayAmount()); couponCodeVerificationTransDto.setTotalAmount(request.getPayAmount());
// List<ProductRedeemVO> productRedeemVOS = convertOrderItemCreateReq(request.getOrderItemList()); List<ProductRedeemVO> productRedeemVOS = convertOrderItemCreateReq(request.getOrderItemList());
// couponCodeVerificationTransDto.setProducts(productRedeemVOS); couponCodeVerificationTransDto.setProducts(productRedeemVOS);
// transactions.add(couponCodeVerificationTransDto); transactions.add(couponCodeVerificationTransDto);
// couponCodeVerificationDto.setTransactions(transactions); couponCodeVerificationDto.setTransactions(transactions);
// final BaseResponse<CouponRedeemResponse> couponRedeemResponseBaseResponse = offlineCouponSdkService.couponRedeem(couponCodeVerificationDto, LogThreadLocal.getTrackingNo()); final BaseResponse<CouponRedeemResponse> couponRedeemResponseBaseResponse = offlineCouponSdkService.couponRedeem(couponCodeVerificationDto, LogThreadLocal.getTrackingNo());
// if (ObjectUtils.notEqual(FMStatusCode.SUCCESS.getCode(), couponRedeemResponseBaseResponse.getCode())) { if (ObjectUtils.notEqual(FMStatusCode.SUCCESS.getCode(), couponRedeemResponseBaseResponse.getCode())) {
// baseResponse.setCode(couponRedeemResponseBaseResponse.getCode()); baseResponse.setCode(couponRedeemResponseBaseResponse.getCode());
// baseResponse.setMessage(couponRedeemResponseBaseResponse.getMessage()); baseResponse.setMessage(couponRedeemResponseBaseResponse.getMessage());
// } }
// return baseResponse; return baseResponse;
// } }
//
// private List<ProductRedeemVO> convertOrderItemCreateReq(List<OrderItemCreateReq> orderItemList) { private List<ProductRedeemVO> convertOrderItemCreateReq(List<OrderItemCreateReq> orderItemList) {
// List<ProductRedeemVO> products = new ArrayList<>(); List<ProductRedeemVO> products = new ArrayList<>();
// if (CollectionUtils.isEmpty(orderItemList)) { if (CollectionUtils.isEmpty(orderItemList)) {
// return products; return products;
// } }
// for (int i = 0; i < orderItemList.size(); i++) { for (int i = 0; i < orderItemList.size(); i++) {
// //商品券核销核销参数 //商品券核销核销参数
// ProductRedeemVO couponCodeVerificationProductDto = new ProductRedeemVO(); ProductRedeemVO couponCodeVerificationProductDto = new ProductRedeemVO();
// couponCodeVerificationProductDto.setPid(UUID.randomUUID().toString()); couponCodeVerificationProductDto.setPid(UUID.randomUUID().toString());
// couponCodeVerificationProductDto.setConsume_num(orderItemList.get(i).getProductQuantity()); couponCodeVerificationProductDto.setConsume_num(orderItemList.get(i).getProductQuantity());
// couponCodeVerificationProductDto.setSeq(i); couponCodeVerificationProductDto.setSeq(i);
// // couponCodeVerificationProductDto.setMerchantProductId(orderItemList.get(i).getProductId()); // couponCodeVerificationProductDto.setMerchantProductId(orderItemList.get(i).getProductId());
// products.add(couponCodeVerificationProductDto); products.add(couponCodeVerificationProductDto);
// } }
// return products; return products;
// } }
//
//
// @Override @Override
// OrderSettlementReq getOrderSettlement(DiscountRequest request) { OrderSettlementReq getOrderSettlement(DiscountRequest request) {
// OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs(); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
// return buildOrderSettlement("富有优惠券", OrderSettlementType.COUPON, false, orderInfoReqs, request); return buildOrderSettlement("富有优惠券", OrderSettlementType.COUPON, false, orderInfoReqs, request);
// } }
//
// @Override @Override
// public Integer getEvent() { public Integer getEvent() {
// return PayChannelEnum.COUPON.getCode(); return PayChannelEnum.COUPON.getCode();
// } }
} }
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/EventProcessor.java
...@@ -9,21 +9,21 @@ import ma.glasnost.orika.impl.DefaultMapperFactory; ...@@ -9,21 +9,21 @@ import ma.glasnost.orika.impl.DefaultMapperFactory;
public interface EventProcessor { public interface EventProcessor {
// MapperFacade mapper = new DefaultMapperFactory.Builder().build().getMapperFacade(); MapperFacade mapper = new DefaultMapperFactory.Builder().build().getMapperFacade();
//
// /** /**
// * 处理 * 处理
// * *
// * @param request * @param request
// */ */
// BaseResponse process(DiscountRequest request); BaseResponse process(DiscountRequest request);
//
//
// /** /**
// * 消息类型 * 消息类型
// * {@link PayChannelEnum} * {@link PayChannelEnum}
// * *
// * @return * @return
// */ */
// Integer getEvent(); Integer getEvent();
} }
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/EventProcessorRegister.java
...@@ -16,27 +16,27 @@ import java.util.Map; ...@@ -16,27 +16,27 @@ import java.util.Map;
public class EventProcessorRegister extends ApplicationObjectSupport { public class EventProcessorRegister extends ApplicationObjectSupport {
//Collections.emptyMap() //Collections.emptyMap()
// private static Map<Integer, EventProcessor> processorMap = Maps.newHashMap(); private static Map<Integer, EventProcessor> processorMap = Maps.newHashMap();
//
// @PostConstruct @PostConstruct
// private void init() { private void init() {
// Map<String, EventProcessor> beans = getApplicationContext().getBeansOfType(EventProcessor.class); Map<String, EventProcessor> beans = getApplicationContext().getBeansOfType(EventProcessor.class);
// log.info("EventProcessorRegister:bean:{}",beans); log.info("EventProcessorRegister:bean:{}",beans);
// if (!CollectionUtils.isEmpty(beans)) { if (!CollectionUtils.isEmpty(beans)) {
// beans.values().stream().forEach((EventProcessor obj) -> { beans.values().stream().forEach((EventProcessor obj) -> {
// processorMap.put(obj.getEvent(), obj); processorMap.put(obj.getEvent(), obj);
// } }
//
//
// ); );
// } }
// } }
//
// public EventProcessor getEventProcessor(Integer event) { public EventProcessor getEventProcessor(Integer event) {
// //todo dev环境init初始化 beans =null //todo dev环境init初始化 beans =null
// if(processorMap.get(event) ==null){ if(processorMap.get(event) ==null){
// init(); init();
// } }
// return processorMap.get(event); return processorMap.get(event);
// } }
} }
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/IntegralEventProcessor.java
...@@ -25,53 +25,53 @@ import static cn.freemud.management.util.ResponseCodeEnum.SUCCESS; ...@@ -25,53 +25,53 @@ import static cn.freemud.management.util.ResponseCodeEnum.SUCCESS;
@Slf4j @Slf4j
public class IntegralEventProcessor extends AbstractProcessor { public class IntegralEventProcessor extends AbstractProcessor {
// private final ScoreFeignClient scoreFeignClient; private final ScoreFeignClient scoreFeignClient;
//
// protected IntegralEventProcessor(OrderSdkService orderSdkService, PaymentService paymentService, ScoreFeignClient scoreFeignClient) { protected IntegralEventProcessor(OrderSdkService orderSdkService, PaymentService paymentService, ScoreFeignClient scoreFeignClient) {
// //super(orderSdkService, paymentService); super(orderSdkService, paymentService);
// this.scoreFeignClient = scoreFeignClient; this.scoreFeignClient = scoreFeignClient;
// } }
//
//
// @Override @Override
// BaseResponse doProcess(DiscountRequest request) { BaseResponse doProcess(DiscountRequest request) {
// BaseResponse baseResponse = new BaseResponse(); BaseResponse baseResponse = new BaseResponse();
// baseResponse.setCode(SUCCESS.code); baseResponse.setCode(SUCCESS.code);
// final OrderInfoReqs order = request.getOrderInfoReqs(); final OrderInfoReqs order = request.getOrderInfoReqs();
//
// ScorePayRequest scorePayRequest = new ScorePayRequest(); ScorePayRequest scorePayRequest = new ScorePayRequest();
// scorePayRequest.setPartnerId(order.getPartnerId()); scorePayRequest.setPartnerId(order.getPartnerId());
// scorePayRequest.setChangeScore(request.getScore().intValue()); scorePayRequest.setChangeScore(request.getScore().intValue());
// scorePayRequest.setMemberId(order.getUserId()); scorePayRequest.setMemberId(order.getUserId());
// scorePayRequest.setOrderId(order.getOrderCode()); scorePayRequest.setOrderId(order.getOrderCode());
// scorePayRequest.setOperationType(14); scorePayRequest.setOperationType(14);
// scorePayRequest.setIdempotencyBussinessType("5"); scorePayRequest.setIdempotencyBussinessType("5");
// scorePayRequest.setChangeScore(request.getScore().intValue()); scorePayRequest.setChangeScore(request.getScore().intValue());
// scorePayRequest.setIdempotencyBussinessId(order.getOrderCode()); scorePayRequest.setIdempotencyBussinessId(order.getOrderCode());
// cn.freemud.base.entity.BaseResponse<UpdateScoreResponse> responseBaseResponse = scoreFeignClient.pay(scorePayRequest); cn.freemud.base.entity.BaseResponse<UpdateScoreResponse> responseBaseResponse = scoreFeignClient.pay(scorePayRequest);
// log.info("scoreFeignClient.pay,order:{},response:{}", order.getOrderCode(), JSON.toJSONString(responseBaseResponse)); log.info("scoreFeignClient.pay,order:{},response:{}", order.getOrderCode(), JSON.toJSONString(responseBaseResponse));
// if (ObjectUtils.notEqual(SUCCESS.code, responseBaseResponse.getCode())) { if (ObjectUtils.notEqual(SUCCESS.code, responseBaseResponse.getCode())) {
// baseResponse.setCode(responseBaseResponse.getCode()); baseResponse.setCode(responseBaseResponse.getCode());
// baseResponse.setMessage(responseBaseResponse.getMessage()); baseResponse.setMessage(responseBaseResponse.getMessage());
// } }
// return baseResponse; return baseResponse;
// } }
//
//
// @Override @Override
// OrderSettlementReq getOrderSettlement(DiscountRequest request) { OrderSettlementReq getOrderSettlement(DiscountRequest request) {
// OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs(); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
// return buildOrderSettlement("富有积分兑换", OrderSettlementType.POINTS, true, orderInfoReqs, request); return buildOrderSettlement("富有积分兑换", OrderSettlementType.POINTS, true, orderInfoReqs, request);
// } }
//
//
// @Override @Override
// protected boolean postProcessors(DiscountRequest request) { protected boolean postProcessors(DiscountRequest request) {
// return false; return false;
// } }
//
// @Override @Override
// public Integer getEvent() { public Integer getEvent() {
// return PayChannelEnum.INTEGRAL.getCode(); return PayChannelEnum.INTEGRAL.getCode();
// } }
} }
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/SvcEventProcessor.java
...@@ -27,59 +27,59 @@ import java.util.Date; ...@@ -27,59 +27,59 @@ import java.util.Date;
@Component @Component
@Slf4j @Slf4j
public class SvcEventProcessor extends AbstractProcessor { public class SvcEventProcessor extends AbstractProcessor {
// private final PaymentNewService paymentNewService; private final PaymentNewService paymentNewService;
//
// protected SvcEventProcessor(OrderSdkService orderSdkService, PaymentService paymentService, protected SvcEventProcessor(OrderSdkService orderSdkService, PaymentService paymentService,
// PaymentNewService paymentNewService) { PaymentNewService paymentNewService) {
// //super(orderSdkService, paymentService); super(orderSdkService, paymentService);
// this.paymentNewService = paymentNewService; this.paymentNewService = paymentNewService;
// } }
//
//
// @Override @Override
// BaseResponse doProcess(DiscountRequest request) BaseResponse doProcess(DiscountRequest request)
// { {
// BaseResponse baseResponse =new BaseResponse(); BaseResponse baseResponse =new BaseResponse();
// baseResponse.setCode(ResponseResultEnum.SUCCESS.getCode()); baseResponse.setCode(ResponseResultEnum.SUCCESS.getCode());
// OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs(); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
//
// CodePayRequest codePayRequest =new CodePayRequest(); CodePayRequest codePayRequest =new CodePayRequest();
// codePayRequest.setCode(request.getCode()); codePayRequest.setCode(request.getCode());
// codePayRequest.setAmount(request.getPayAmount()); codePayRequest.setAmount(request.getPayAmount());
// codePayRequest.setStoreId(orderInfoReqs.getStoreId()); codePayRequest.setStoreId(orderInfoReqs.getStoreId());
// codePayRequest.setFrontTransId(orderInfoReqs.getOrderCode()); codePayRequest.setFrontTransId(orderInfoReqs.getOrderCode());
// codePayRequest.setProducts(convertPayProduct(request.getOrderItemList())); codePayRequest.setProducts(convertPayProduct(request.getOrderItemList()));
// codePayRequest.setBody(orderInfoReqs.getStoreName()); codePayRequest.setBody(orderInfoReqs.getStoreName());
// codePayRequest.setBusinessDate(DateUtil.convert2String(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)); codePayRequest.setBusinessDate(DateUtil.convert2String(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
// codePayRequest.setStationId("1"); codePayRequest.setStationId("1");
// codePayRequest.setOperatorId("1"); codePayRequest.setOperatorId("1");
// codePayRequest.setVer("2"); codePayRequest.setVer("2");
// //codePayRequest.setCode("10102"); //codePayRequest.setCode("10102");
// codePayRequest.setPartnerId(orderInfoReqs.getPartnerId()); codePayRequest.setPartnerId(orderInfoReqs.getPartnerId());
// codePayRequest.setTransId(orderInfoReqs.getOrderCode()); codePayRequest.setTransId(orderInfoReqs.getOrderCode());
//
// final com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> codePayResponseBaseResponse = paymentNewService.codePay(codePayRequest, LogThreadLocal.getTrackingNo()); final com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> codePayResponseBaseResponse = paymentNewService.codePay(codePayRequest, LogThreadLocal.getTrackingNo());
// log.info("SVC.paymentFeignClient.codePay,request:{},response:{}", JSON.toJSONString(codePayRequest),JSON.toJSONString(codePayResponseBaseResponse)); log.info("SVC.paymentFeignClient.codePay,request:{},response:{}", JSON.toJSONString(codePayRequest),JSON.toJSONString(codePayResponseBaseResponse));
// if(ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getCode()) || if(ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getCode()) ||
// ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getCode()) || ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getCode()) ||
// ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getData().getResultCode()) ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getData().getResultCode())
// ){ ){
// baseResponse.setCode(codePayResponseBaseResponse.getCode()); baseResponse.setCode(codePayResponseBaseResponse.getCode());
// baseResponse.setMessage(codePayResponseBaseResponse.getMessage()); baseResponse.setMessage(codePayResponseBaseResponse.getMessage());
// return baseResponse; return baseResponse;
// } }
// request.setFmId(codePayResponseBaseResponse.getData().getData().getFmId()); request.setFmId(codePayResponseBaseResponse.getData().getData().getFmId());
// return baseResponse; return baseResponse;
// } }
//
// @Override @Override
// OrderSettlementReq getOrderSettlement(DiscountRequest request) { OrderSettlementReq getOrderSettlement(DiscountRequest request) {
// OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs(); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
// return buildOrderSettlement("SVV支付", OrderSettlementType.SVC, true, orderInfoReqs, request); return buildOrderSettlement("SVV支付", OrderSettlementType.SVC, true, orderInfoReqs, request);
// } }
//
// @Override @Override
// public Integer getEvent() { public Integer getEvent() {
// return PayChannelEnum.SVC.getCode(); return PayChannelEnum.SVC.getCode();
// } }
} }
order-application-service/src/main/java/cn/freemud/fuyou/service/processor/WeChatEventProcessor.java
...@@ -25,55 +25,55 @@ import java.util.Date; ...@@ -25,55 +25,55 @@ import java.util.Date;
@Slf4j @Slf4j
public class WeChatEventProcessor extends AbstractProcessor{ public class WeChatEventProcessor extends AbstractProcessor{
// private final PaymentNewService paymentNewService; private final PaymentNewService paymentNewService;
// protected WeChatEventProcessor(OrderSdkService orderSdkService, PaymentService paymentService, protected WeChatEventProcessor(OrderSdkService orderSdkService, PaymentService paymentService,
// PaymentNewService paymentNewService) { PaymentNewService paymentNewService) {
// //super(orderSdkService, paymentService); super(orderSdkService, paymentService);
// this.paymentNewService = paymentNewService; this.paymentNewService = paymentNewService;
// } }
//
// @Override @Override
// BaseResponse doProcess(DiscountRequest request) { BaseResponse doProcess(DiscountRequest request) {
// BaseResponse baseResponse =new BaseResponse(); BaseResponse baseResponse =new BaseResponse();
// baseResponse.setCode(ResponseResultEnum.SUCCESS.getCode()); baseResponse.setCode(ResponseResultEnum.SUCCESS.getCode());
// OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs(); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
// com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest codePayRequest =new CodePayRequest(); com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest codePayRequest =new CodePayRequest();
// codePayRequest.setCode(request.getCode()); codePayRequest.setCode(request.getCode());
// codePayRequest.setAmount(request.getPayAmount()); codePayRequest.setAmount(request.getPayAmount());
// codePayRequest.setStoreId(orderInfoReqs.getStoreId()); codePayRequest.setStoreId(orderInfoReqs.getStoreId());
// codePayRequest.setFrontTransId(orderInfoReqs.getOrderCode()); codePayRequest.setFrontTransId(orderInfoReqs.getOrderCode());
// codePayRequest.setProducts(convertPayProduct(request.getOrderItemList())); codePayRequest.setProducts(convertPayProduct(request.getOrderItemList()));
// codePayRequest.setBody(orderInfoReqs.getStoreName()); codePayRequest.setBody(orderInfoReqs.getStoreName());
// codePayRequest.setBusinessDate(DateUtil.convert2String(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)); codePayRequest.setBusinessDate(DateUtil.convert2String(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
// codePayRequest.setStationId("1"); codePayRequest.setStationId("1");
// codePayRequest.setOperatorId("1"); codePayRequest.setOperatorId("1");
// codePayRequest.setVer("2"); codePayRequest.setVer("2");
// //codePayRequest.setClientCode(100037L); //codePayRequest.setClientCode(100037L);
// codePayRequest.setPartnerId(orderInfoReqs.getPartnerId()); codePayRequest.setPartnerId(orderInfoReqs.getPartnerId());
// codePayRequest.setTransId(orderInfoReqs.getOrderCode()); codePayRequest.setTransId(orderInfoReqs.getOrderCode());
//
// final com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> codePayResponseBaseResponse = paymentNewService.codePay(codePayRequest, LogThreadLocal.getTrackingNo()); final com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> codePayResponseBaseResponse = paymentNewService.codePay(codePayRequest, LogThreadLocal.getTrackingNo());
// log.info("wechat.paymentFeignClient.codePay,request:{},response:{}", JSON.toJSONString(codePayRequest),JSON.toJSONString(codePayResponseBaseResponse)); log.info("wechat.paymentFeignClient.codePay,request:{},response:{}", JSON.toJSONString(codePayRequest),JSON.toJSONString(codePayResponseBaseResponse));
// if(ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getCode()) || if(ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getCode()) ||
// ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getCode()) || ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getCode()) ||
// ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getData().getResultCode()) ObjectUtils.notEqual(ResponseResultEnum.SUCCESS.getCode(),codePayResponseBaseResponse.getData().getData().getResultCode())
// ){ ){
// baseResponse.setCode(codePayResponseBaseResponse.getCode()); baseResponse.setCode(codePayResponseBaseResponse.getCode());
// baseResponse.setMessage(codePayResponseBaseResponse.getMessage()); baseResponse.setMessage(codePayResponseBaseResponse.getMessage());
// return baseResponse; return baseResponse;
// } }
// request.setFmId(codePayResponseBaseResponse.getData().getData().getFmId()); request.setFmId(codePayResponseBaseResponse.getData().getData().getFmId());
// return baseResponse; return baseResponse;
// } }
//
// @Override @Override
// OrderSettlementReq getOrderSettlement(DiscountRequest request) { OrderSettlementReq getOrderSettlement(DiscountRequest request) {
// OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs(); OrderInfoReqs orderInfoReqs = request.getOrderInfoReqs();
// return buildOrderSettlement("微信支付", OrderSettlementType.WEIXIN, true, orderInfoReqs, request); return buildOrderSettlement("微信支付", OrderSettlementType.WEIXIN, true, orderInfoReqs, request);
//
// } }
// @Override @Override
// public Integer getEvent() { public Integer getEvent() {
// return PayChannelEnum.WECHAT.getCode(); return PayChannelEnum.WECHAT.getCode();
// } }
} }
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
...@@ -203,19 +203,19 @@ public class OrderAdapterServiceImpl implements OrderAdapterService { ...@@ -203,19 +203,19 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())){ if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())){
return orderAdapter.sendPaySuccessNoticeMessage(); return orderAdapter.sendPaySuccessNoticeMessage();
} }
/** /*
* 围餐处理 * 围餐处理
*/ */
if ("meals".equals(orderBean.getSource())) { if ("meals".equals(orderBean.getSource())) {
return orderCommonService.paySuccessCallback(message, confirmOrderDto, orderBeans); return orderCommonService.paySuccessCallback(message, confirmOrderDto, orderBeans);
} }
/** /*
* 微商城处理 * 微商城处理
*/ */
if(OrderSourceType.SAASMALL.getCode().equals(orderBean.getSource())) { if(OrderSourceType.SAASMALL.getCode().equals(orderBean.getSource())) {
return mallOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans); return mallOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
} }
/** /*
* app订单处理 * app订单处理
*/ */
if(OrderSourceType.APP.getCode().equals(orderBean.getSource())) { if(OrderSourceType.APP.getCode().equals(orderBean.getSource())) {
...@@ -229,7 +229,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService { ...@@ -229,7 +229,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
if(mcCafePartnerId.equals(orderBean.getOid())) { if(mcCafePartnerId.equals(orderBean.getOid())) {
return mcCafeOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans); return mcCafeOrderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
} }
/** /*
* 默认点餐处理 * 默认点餐处理
*/ */
return orderService.paySuccessCallback(message, confirmOrderDto, orderBeans); return orderService.paySuccessCallback(message, confirmOrderDto, orderBeans);
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -402,6 +402,13 @@ public class OrderServiceImpl implements Orderservice { ...@@ -402,6 +402,13 @@ public class OrderServiceImpl implements Orderservice {
} }
//若该订单使用了优惠券，则移除卡包,移除失败也不退款，现在支付成功个调用核销，无需调用此功能 //若该订单使用了优惠券，则移除卡包,移除失败也不退款，现在支付成功个调用核销，无需调用此功能
// couponActivityService.callbackNotify(orderBean); // couponActivityService.callbackNotify(orderBean);
// 核销券码成功才能支付成功
BaseResponse baseResponse = verificationCoupon(message.getTrans_id());
if (!Objects.equals(ResponseResult.SUCCESS.getCode(), baseResponse.getCode())) {
// 核销失败
log.error("核销券码失败transId:{},message:{}", message.getTrans_id(), baseResponse.getMessage());
return newSendPayFaileMessage();
}
// 订单失败后 发消息重试 待实现 // 订单失败后 发消息重试 待实现
String takeCode; String takeCode;
String daySeq; String daySeq;
...@@ -567,26 +574,18 @@ public class OrderServiceImpl implements Orderservice { ...@@ -567,26 +574,18 @@ public class OrderServiceImpl implements Orderservice {
message.setPlatformMchId(newMessage.getPlatformMchId()); message.setPlatformMchId(newMessage.getPlatformMchId());
message.setTerminalId(newMessage.getAppId()); message.setTerminalId(newMessage.getAppId());
message.setRuleId(newMessage.getRuleId()); message.setRuleId(newMessage.getRuleId());
String res = orderAdapterService.paySuccessCallback(message); return orderAdapterService.paySuccessCallback(message);
JSONObject jsonObject = JSONObject.parseObject(res);
if (jsonObject.containsKey("code")) {
Integer code = (Integer) jsonObject.get("code");
if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_0, code) || Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, code)) {
log.info("调用券码核销=="+newMessage.getTransId());
verificationCoupon(newMessage.getTransId());
log.info("调用券码结束=="+newMessage.getTransId());
return newSendPaySuccessNoticeMessage();
} else {
return newSendPayFaileMessage();
}
}
return newSendPayFaileMessage();
} }
private String verificationCoupon(String transId){ private BaseResponse verificationCoupon(String transId){
String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(transId));
if (StringUtils.isNotBlank(orderId)) {
log.info("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(),transId, orderId);
transId=orderId;
}
QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(transId); QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(transId);
if (queryOrderByIdResponseDto.getData() == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, queryOrderByIdResponseDto.getErrcode())) { if (queryOrderByIdResponseDto.getData() == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, queryOrderByIdResponseDto.getErrcode())) {
return refundFaileMessage("order query fail" + queryOrderByIdResponseDto); return ResponseUtil.error(String.valueOf(queryOrderByIdResponseDto.getErrcode()), queryOrderByIdResponseDto.getErrmsg());
} }
OrderBean orderBean = new OrderBean(); OrderBean orderBean = new OrderBean();
if (1 == queryOrderByIdResponseDto.getData().size()) { if (1 == queryOrderByIdResponseDto.getData().size()) {
...@@ -598,8 +597,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -598,8 +597,7 @@ public class OrderServiceImpl implements Orderservice {
} }
} }
//核销券 //核销券
BaseResponse baseResponse = couponActivityService.verificationCoupon(orderBean,CouponReqType.WRITEOFF); return couponActivityService.verificationCoupon(orderBean,CouponReqType.WRITEOFF);
return "核销券码返回结果" + baseResponse.getCode() + "," + baseResponse.getMessage();
} }
@Override @Override
......
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java
...@@ -90,6 +90,11 @@ public class CartGoods { ...@@ -90,6 +90,11 @@ public class CartGoods {
* 购物车一行商品的数量 * 购物车一行商品的数量
*/ */
private Integer qty; private Integer qty;
/**
* 参与活动商品数量 前端展示参数
*/
private Integer activityNumber;
/** /**
* 购物车一行商品的名称 * 购物车一行商品的名称
*/ */
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/TimeSaleCalculation.java
...@@ -70,6 +70,7 @@ public class TimeSaleCalculation { ...@@ -70,6 +70,7 @@ public class TimeSaleCalculation {
if(discounts.contains(ActivityTypeEnum.TYPE_2.getCode()) || discounts.contains(ActivityTypeEnum.TYPE_21.getCode())){ if(discounts.contains(ActivityTypeEnum.TYPE_2.getCode()) || discounts.contains(ActivityTypeEnum.TYPE_21.getCode())){
cartGoods.setActivityType(ActivityTypeEnum.TYPE_2.getCode()); cartGoods.setActivityType(ActivityTypeEnum.TYPE_2.getCode());
} }
cartGoods.setActivityNumber(goodsDiscount.getActualGoodsNumber());
// 享受限时特价折扣的商品数量 // 享受限时特价折扣的商品数量
Integer specialActualGoodsNumber = null; Integer specialActualGoodsNumber = null;
// 商品现价 // 商品现价
......
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