From a80483de9611431bfccceb09f0a6f3819fbdf457 Mon Sep 17 00:00:00 2001 From: wuxicheng <1441859745@qq.com> Date: Thu, 4 May 2023 10:19:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0order=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bnyer-api/bnyer-api-order/pom.xml | 26 +++++++++++++++++++ .../order}/api/dto/QueryVipOrderDto.java | 2 +- .../RemoteVipOrderFallbackFactory.java | 8 +++--- .../api/remote/RemoteVipOrderService.java | 8 +++--- .../com/bnyer/order}/api/vo/VipOrderVo.java | 3 +-- bnyer-api/pom.xml | 1 + bnyer-services/bnyer-pay/pom.xml | 8 +++++- .../pay/service/impl/PayInfoServiceImpl.java | 9 +++---- 8 files changed, 47 insertions(+), 18 deletions(-) create mode 100644 bnyer-api/bnyer-api-order/pom.xml rename bnyer-api/{bnyer-api-img/src/main/java/com/bnyer/img => bnyer-api-order/src/main/java/com/bnyer/order}/api/dto/QueryVipOrderDto.java (92%) rename bnyer-api/{bnyer-api-img/src/main/java/com/bnyer/img => bnyer-api-order/src/main/java/com/bnyer/order}/api/factory/RemoteVipOrderFallbackFactory.java (83%) rename bnyer-api/{bnyer-api-img/src/main/java/com/bnyer/img => bnyer-api-order/src/main/java/com/bnyer/order}/api/remote/RemoteVipOrderService.java (80%) rename bnyer-api/{bnyer-api-img/src/main/java/com/bnyer/img => bnyer-api-order/src/main/java/com/bnyer/order}/api/vo/VipOrderVo.java (95%) diff --git a/bnyer-api/bnyer-api-order/pom.xml b/bnyer-api/bnyer-api-order/pom.xml new file mode 100644 index 0000000..11675c8 --- /dev/null +++ b/bnyer-api/bnyer-api-order/pom.xml @@ -0,0 +1,26 @@ + + + + com.dimensionalnode + bnyer-api + 1.0.0 + + 4.0.0 + + bnyer-api-order + + + bnyer-api-order订单服务接口模块 + + + + + + com.dimensionalnode + bnyer-common-core + + + + diff --git a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/QueryVipOrderDto.java b/bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/dto/QueryVipOrderDto.java similarity index 92% rename from bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/QueryVipOrderDto.java rename to bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/dto/QueryVipOrderDto.java index 3a182f0..f4f4d1a 100644 --- a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/QueryVipOrderDto.java +++ b/bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/dto/QueryVipOrderDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.api.dto; +package com.bnyer.order.api.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/factory/RemoteVipOrderFallbackFactory.java b/bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/factory/RemoteVipOrderFallbackFactory.java similarity index 83% rename from bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/factory/RemoteVipOrderFallbackFactory.java rename to bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/factory/RemoteVipOrderFallbackFactory.java index 8b90bfc..be0e0f9 100644 --- a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/factory/RemoteVipOrderFallbackFactory.java +++ b/bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/factory/RemoteVipOrderFallbackFactory.java @@ -1,9 +1,9 @@ -package com.bnyer.img.api.factory; +package com.bnyer.order.api.factory; import com.bnyer.common.core.domain.R; -import com.bnyer.img.api.dto.QueryVipOrderDto; -import com.bnyer.img.api.remote.RemoteVipOrderService; -import com.bnyer.img.api.vo.VipOrderVo; +import com.bnyer.order.api.dto.QueryVipOrderDto; +import com.bnyer.order.api.remote.RemoteVipOrderService; +import com.bnyer.order.api.vo.VipOrderVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; diff --git a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/remote/RemoteVipOrderService.java b/bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/remote/RemoteVipOrderService.java similarity index 80% rename from bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/remote/RemoteVipOrderService.java rename to bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/remote/RemoteVipOrderService.java index 2d1dd2c..32319bb 100644 --- a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/remote/RemoteVipOrderService.java +++ b/bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/remote/RemoteVipOrderService.java @@ -1,10 +1,10 @@ -package com.bnyer.img.api.remote; +package com.bnyer.order.api.remote; import com.bnyer.common.core.constant.ServiceNameConstants; import com.bnyer.common.core.domain.R; -import com.bnyer.img.api.dto.QueryVipOrderDto; -import com.bnyer.img.api.factory.RemoteVipOrderFallbackFactory; -import com.bnyer.img.api.vo.VipOrderVo; +import com.bnyer.order.api.dto.QueryVipOrderDto; +import com.bnyer.order.api.factory.RemoteVipOrderFallbackFactory; +import com.bnyer.order.api.vo.VipOrderVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/vo/VipOrderVo.java b/bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/vo/VipOrderVo.java similarity index 95% rename from bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/vo/VipOrderVo.java rename to bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/vo/VipOrderVo.java index 05757dc..9c1c480 100644 --- a/bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/vo/VipOrderVo.java +++ b/bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/vo/VipOrderVo.java @@ -1,6 +1,5 @@ -package com.bnyer.img.api.vo; +package com.bnyer.order.api.vo; -import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-api/pom.xml b/bnyer-api/pom.xml index 69e5e4d..c3f6e43 100644 --- a/bnyer-api/pom.xml +++ b/bnyer-api/pom.xml @@ -12,6 +12,7 @@ bnyer-api-system bnyer-api-img bnyer-api-file + bnyer-api-order bnyer-api diff --git a/bnyer-services/bnyer-pay/pom.xml b/bnyer-services/bnyer-pay/pom.xml index 978d241..3eec3b1 100644 --- a/bnyer-services/bnyer-pay/pom.xml +++ b/bnyer-services/bnyer-pay/pom.xml @@ -107,6 +107,12 @@ weixin-java-pay + + com.dimensionalnode + bnyer-api-order + 1.0.0 + + @@ -145,4 +151,4 @@ - \ No newline at end of file + diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayInfoServiceImpl.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayInfoServiceImpl.java index 0544772..e55f2b5 100644 --- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayInfoServiceImpl.java +++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayInfoServiceImpl.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bnyer.common.core.context.SecurityContextHolder; import com.bnyer.common.core.domain.PayInfo; import com.bnyer.common.core.domain.R; import com.bnyer.common.core.enums.EnumSceneCode; @@ -15,9 +14,9 @@ import com.bnyer.common.core.utils.OrderUtil; import com.bnyer.common.core.utils.bean.EntityConvertUtil; import com.bnyer.common.core.utils.ip.IpUtils; import com.bnyer.common.rocketmq.config.RocketMqConstant; -import com.bnyer.img.api.dto.QueryVipOrderDto; -import com.bnyer.img.api.remote.RemoteVipOrderService; -import com.bnyer.img.api.vo.VipOrderVo; +import com.bnyer.order.api.dto.QueryVipOrderDto; +import com.bnyer.order.api.remote.RemoteVipOrderService; +import com.bnyer.order.api.vo.VipOrderVo; import com.bnyer.pay.constant.KSPayConstants; import com.bnyer.pay.design.factory.PayFactory; import com.bnyer.pay.design.strategy.IPayStrategy; @@ -34,9 +33,7 @@ import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.support.GenericMessage; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal;