添加order接口模块

bnyer-api/bnyer-api-order/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.dimensionalnode</groupId>
+        <artifactId>bnyer-api</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>bnyer-api-order</artifactId>
+
+    <description>
+        bnyer-api-order订单服务接口模块
+    </description>
+
+    <dependencies>
+        <!-- bnyer Common Core-->
+        <dependency>
+            <groupId>com.dimensionalnode</groupId>
+            <artifactId>bnyer-common-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/QueryVipOrderDto.java → 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;

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/factory/RemoteVipOrderFallbackFactory.java → 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;

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/remote/RemoteVipOrderService.java → 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;

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/vo/VipOrderVo.java → 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;

bnyer-api/pom.xml

@@ -12,6 +12,7 @@
         <module>bnyer-api-system</module>
         <module>bnyer-api-img</module>
         <module>bnyer-api-file</module>
+        <module>bnyer-api-order</module>
     </modules>
 
     <artifactId>bnyer-api</artifactId>

bnyer-services/bnyer-pay/pom.xml

@@ -107,6 +107,12 @@
             <artifactId>weixin-java-pay</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.dimensionalnode</groupId>
+            <artifactId>bnyer-api-order</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
         <!--任务调度中心-->
         <!--        <dependency>-->
         <!--            <groupId>com.xuxueli</groupId>-->
@@ -145,4 +151,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

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;