docs: "汇付支付+订单明细优化等。test分支用于测试服务器"

pom.xml

@@ -92,10 +92,10 @@
 <!--			<artifactId>spring-boot-starter-jdbc</artifactId>-->
 <!--		</dependency>-->
 		<!-- springcloud组件 end -->
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.projectlombok</groupId>-->
+<!--			<artifactId>lombok</artifactId>-->
+<!--		</dependency>-->
 
 		<!-- mybatis-plus -->
 		<dependency>
@@ -210,10 +210,10 @@
 			<version>RELEASE</version>
 		</dependency>
 		<!--定时任务-->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.springframework.boot</groupId>-->
+<!--			<artifactId>spring-boot-starter-web</artifactId>-->
+<!--		</dependency>-->
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/com/szwl/controller/TCoinOrderController.java

@@ -72,7 +72,7 @@ public class TCoinOrderController {
 //    }
 
     /**
-     * 保存 线下 订单
+     * 保存 线下+海外 订单
      * @param coinOrderVO
      * @return
      */
@@ -85,6 +85,7 @@ public class TCoinOrderController {
         BigDecimal price = coinOrderVO.getPrice();
         String sn = coinOrderVO.getSn();
         TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(clientId));
+//        System.out.println("设备信息》》》" + equipment);
         Long adminId = equipment.getAdminId();
         if (adminId == null) {
             return JsonMessage.error("找不到设备商家");
@@ -99,6 +100,8 @@ public class TCoinOrderController {
         coinOrder.setPrice(price);
         coinOrder.setProductNo(coinOrderVO.getNo());
         coinOrder.setSn(sn);
+        coinOrder.setStatus("1"); // 线下纸币器订单都是已付款
+        coinOrder.setIsAir("0"); // 非空中云汇
         if(coinOrderVO.getProductNumber()==null||coinOrderVO.getProductNumber()==0){
             coinOrderVO.setProductNumber(1);
         }else {

src/main/java/com/szwl/feign/SzwlFeign.java

@@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-
 @FeignClient(name = "szwl-server")
+//@FeignClient(name = "szwl-server", url = "http://127.0.0.1:49011")
 public interface SzwlFeign {
 
     @GetMapping("/test/testList")

src/main/java/com/szwl/model/entity/TOrder.java

@@ -11,7 +11,6 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.util.List;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/szwl/service/es/EsTOrderService.java

@@ -293,7 +293,7 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
 
     public ChartColumn getStatistics(StatisticsParam param, String format, DateHistogramInterval interval) {
         try {
-            //  仅为名称，用以获取返回结果
+            // 仅为名称，用以获取返回结果
             String aggregationResultName = "aggregationResult";
             // 仅为名称，用以获取返回结果
             String aggSumName = "sales";

src/main/resources/bootstrap.yml

@@ -47,6 +47,8 @@ eureka:
     serviceUrl:
       defaultZone: http://120.25.151.99:49001/eureka/
     register-with-eureka: true
+#    本地测试的时候改成 false
+#    register-with-eureka: false
   instance:
     prefer-ip-address: true
     ip-address: 120.25.151.99

src/test/java/com/szwl/ApplicationTests.java

@@ -1,11 +1,12 @@
 package com.szwl;
 
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @Slf4j
 @SpringBootTest
 class ApplicationTests {
 
-
 }

src/test/java/com/szwl/AutoGeneratorTests.java

@@ -39,7 +39,7 @@ class AutoGeneratorTests {
 		//配置数据源
 		DataSourceConfig dataSourceConfig = new DataSourceConfig();
 		dataSourceConfig.setDriverName("com.mysql.cj.jdbc.Driver")
-				.setUrl("jdbc:mysql://rm-wz995mu26a1479kz0so.mysql.rds.aliyuncs.com:3306/orderdb")
+				.setUrl("jdbc:mysql://rm-wz995mu26a1479kz0so.mysql.rds.aliyuncs.com:3306/orderdb-test")
 				.setUsername("root").setPassword("sunzee@020");
 
 		//策略配置
@@ -47,7 +47,7 @@ class AutoGeneratorTests {
 		strategyConfig
 //				.setCapitalMode(true)//设置全局大写命名
 				.setInclude(new String[]{
-						""
+						"t_coin_order"
 				})//只会生成该表
 				.setEntityLombokModel(true)//实体类生成之后自动添加lombok注解
 				.setNaming(NamingStrategy.underline_to_camel)//数据库表映射到实体的命名策略