Skip to content

O
order-group
Commit fe29c8de by 徐康
Options

循环依赖 代码注释掉

parent 2473c4da
Showing with 351 additions and 351 deletions
order-application-service/src/main/java/cn/freemud/fuyou/service/FuYouOrderService.java
...@@ -221,7 +221,7 @@ public class FuYouOrderService { ...@@ -221,7 +221,7 @@ public class FuYouOrderService {
* @return * @return
*/ */
public BaseResponse complete(CompleteRequest request) { public BaseResponse complete(CompleteRequest request) {
OrderInfoReqs orderInfoReqs = cashEventProcessor.getOrderByThirdOrderCode(request.getThirdOrderCode(), request.getOrderClient()); OrderInfoReqs orderInfoReqs = null;
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/OrderDiscountService.java
...@@ -40,7 +40,7 @@ public class OrderDiscountService { ...@@ -40,7 +40,7 @@ public class OrderDiscountService {
baseResponse.setMessage(ResponseResult.COUPON_TYPE_ERROR.getMessage()); baseResponse.setMessage(ResponseResult.COUPON_TYPE_ERROR.getMessage());
return baseResponse; return baseResponse;
} }
return eventProcessorRegister.getEventProcessor(payChannelEnum.getCode()).process(request); return null;
} }
} }
order-application-service/src/main/java/cn/freemud/fuyou/service/PaymentService.java
...@@ -75,7 +75,7 @@ public class PaymentService { ...@@ -75,7 +75,7 @@ public class PaymentService {
return baseResponse; return baseResponse;
} }
DiscountRequest discountRequest = mapperFacade.map(request, DiscountRequest.class); DiscountRequest discountRequest = mapperFacade.map(request, DiscountRequest.class);
return eventProcessorRegister.getEventProcessor(payChannelEnum.getCode()).process(discountRequest); return null;
} }
......
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();
} // }
} }
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