Przeglądaj źródła

feat: "新增海外用户时,默认新建一个 Airwallex 钱包,0.00 USD"

wangzeyu@tom.com 2 lat temu
rodzic
commit
49e8d3704c
26 zmienionych plików z 322 dodań i 30 usunięć
  1. 50 6
      src/main/java/com/szwl/controller/AirwallexPayController.java
  2. 1 1
      src/main/java/com/szwl/controller/DemoController.java
  3. 1 1
      src/main/java/com/szwl/controller/TAirwallexMchController.java
  4. 1 1
      src/main/java/com/szwl/controller/TAirwallexPaymentController.java
  5. 51 4
      src/main/java/com/szwl/controller/TAirwallexWalletController.java
  6. 1 0
      src/main/java/com/szwl/controller/TOrderController.java
  7. 9 0
      src/main/java/com/szwl/feign/bean/EsFeign.java
  8. 5 3
      src/main/java/com/szwl/feign/bean/OrderFeign.java
  9. 1 1
      src/main/java/com/szwl/mapper/TAirwallexMchMapper.java
  10. 1 1
      src/main/java/com/szwl/mapper/TAirwallexPaymentMapper.java
  11. 1 1
      src/main/java/com/szwl/mapper/TAirwallexWalletMapper.java
  12. 2 0
      src/main/java/com/szwl/model/dto/CaPaymentRequestDTO.java
  13. 2 2
      src/main/java/com/szwl/model/entity/TAirwallexMch.java
  14. 6 1
      src/main/java/com/szwl/model/entity/TAirwallexPayment.java
  15. 1 1
      src/main/java/com/szwl/model/entity/TAirwallexWallet.java
  16. 56 0
      src/main/java/com/szwl/model/query/TOrderAbroadParam.java
  17. 1 1
      src/main/java/com/szwl/service/TAirwallexMchService.java
  18. 1 1
      src/main/java/com/szwl/service/TAirwallexPaymentService.java
  19. 9 1
      src/main/java/com/szwl/service/TAirwallexWalletService.java
  20. 105 0
      src/main/java/com/szwl/service/es/EsTOrderAbroadService.java
  21. 1 0
      src/main/java/com/szwl/service/es/EsTOrderService.java
  22. 1 1
      src/main/java/com/szwl/service/impl/TAirwallexMchServiceImpl.java
  23. 1 1
      src/main/java/com/szwl/service/impl/TAirwallexPaymentServiceImpl.java
  24. 1 1
      src/main/java/com/szwl/service/impl/TAirwallexWalletServiceImpl.java
  25. 1 1
      src/main/resources/bootstrap.yml
  26. 12 0
      src/test/java/com/szwl/ApplicationTests.java

+ 50 - 6
src/main/java/com/szwl/controller/AirwallexPayController.java

@@ -14,21 +14,21 @@ import com.szwl.model.bean.RefundRequestBody;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.dto.*;
+import com.szwl.model.entity.TAirwallexPayment;
 import com.szwl.model.entity.TOrderAbroad;
 import com.szwl.model.utils.AccessTokenThreadUtil;
-import com.szwl.service.AirwallexService;
-import com.szwl.service.TAdminService;
-import com.szwl.service.TOrderAbroadService;
+import com.szwl.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 //@CrossOrigin
@@ -46,10 +46,13 @@ public class AirwallexPayController {
 
     TOrderAbroadService tOrderAbroadService;
 
-    public AirwallexPayController(TAdminService tAdminService, AirwallexService airwallexService, TOrderAbroadService tOrderAbroadService) {
+    TAirwallexPaymentService tAirwallexPaymentService;
+
+    public AirwallexPayController(TAdminService tAdminService, AirwallexService airwallexService, TOrderAbroadService tOrderAbroadService, TAirwallexPaymentService tAirwallexPaymentService) {
         this.tAdminService = tAdminService;
         this.airwallexService = airwallexService;
         this.tOrderAbroadService = tOrderAbroadService;
+        this.tAirwallexPaymentService = tAirwallexPaymentService;
     }
 
     @ApiOperation(value = "创建收款人")
@@ -353,6 +356,8 @@ public class AirwallexPayController {
     @PostMapping("/caPayment")
     public R caPayment(@RequestBody CaPaymentRequestDTO caPaymentRequestDTO) {
 
+        Long adminId = caPaymentRequestDTO.getAdminId();
+
         String resp = airwallexService.caPayment(caPaymentRequestDTO);
 
         ObjectMapper objectMapper = new ObjectMapper();
@@ -366,6 +371,44 @@ public class AirwallexPayController {
         assert jsonNode != null;
         String paymentId = jsonNode.get("payment_id").asText();
 
+        String paymentCurrency = jsonNode.get("payment_currency").asText();
+        String paymentAmountStr = jsonNode.get("payment_amount").asText();
+        String beneficiaryId = jsonNode.get("beneficiary_id").asText();
+        String createdAtStr = jsonNode.get("created_at").asText();
+
+        // TODO: 保存支付提现明细
+        TAirwallexPayment tAirwallexPayment = new TAirwallexPayment();
+        tAirwallexPayment.setPaymentId(paymentId);
+        tAirwallexPayment.setPaymentCurrency(paymentCurrency);
+        BigDecimal paymentAmount = new BigDecimal(paymentAmountStr);
+        tAirwallexPayment.setPaymentAmount(paymentAmount);
+        tAirwallexPayment.setBeneficiaryId(beneficiaryId);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssZ");
+        OffsetDateTime createdAt = OffsetDateTime.parse(createdAtStr, formatter);
+        Timestamp from = Timestamp.from(createdAt.toInstant());
+        tAirwallexPayment.setCreateTime(from);
+        tAirwallexPayment.setAdminId(adminId);
+        tAirwallexPaymentService.save(tAirwallexPayment);
+
+        // TODO: 从当前余额中扣除提现金额,考虑货币
+        // TODO: 改成每次将余额全部提现
+//        tAirwallexWalletService.list()
+//        LambdaQueryWrapper<TAirwallexWallet> wrapper = Wrappers.lambdaQuery();
+//        wrapper.eq(TAirwallexWallet::getAdminId, adminId);
+////        List<TAirwallexWallet> list = tAirwallexWalletService.list(wrapper);
+//        TAirwallexWallet one = tAirwallexWalletService.getOne(wrapper);
+//        String accountCurrency = one.getAccountCurrency();
+//        BigDecimal accountAmount = one.getAccountAmount();
+
+        // 先判断货币是否一样
+//        if (accountCurrency.equals(paymentCurrency)) {
+//            accountAmount = accountAmount.subtract(paymentAmount);
+//        } else {
+//            //
+//        }
+
+
+
         // 返回 payment_id
         return R.ok(paymentId);
     }
@@ -388,4 +431,5 @@ public class AirwallexPayController {
 
         return R.ok(resp);
     }
+
 }

+ 1 - 1
src/main/java/com/szwl/controller/DemoController.java

@@ -39,11 +39,11 @@ public class DemoController {
         return R.ok(tAdminService.saveOrUpdate(entity));
     }
 
-
     @GetMapping("/testPay")
     public ResponseModel<?> testPay(String id) {
         return R.ok(tAdminService.getById(id));
     }
+
     @ApiOperation(value = "分页查询")
     @GetMapping("/testPage")
     public ResponseModel<IPage<?>> testPage(TAdminParam param) {

+ 1 - 1
src/main/java/com/szwl/controller/TAirwallexMchController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-06
+ * @since 2023-07-28
  */
 @RestController
 @RequestMapping("/tAirwallexMch")

+ 1 - 1
src/main/java/com/szwl/controller/TAirwallexPaymentController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @RestController
 @RequestMapping("/tAirwallexPayment")

+ 51 - 4
src/main/java/com/szwl/controller/TAirwallexWalletController.java

@@ -1,21 +1,68 @@
 package com.szwl.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import com.szwl.model.entity.TAirwallexWallet;
+import com.szwl.model.entity.TOrder;
+import com.szwl.service.TAirwallexWalletService;
+import io.swagger.annotations.ApiOperation;
+import lombok.Getter;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wuhs
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @RestController
 @RequestMapping("/tAirwallexWallet")
 public class TAirwallexWalletController {
 
+    TAirwallexWalletService airwallexWalletService;
+
+    public TAirwallexWalletController(TAirwallexWalletService airwallexWalletService) {
+        this.airwallexWalletService = airwallexWalletService;
+    }
+
+    @ApiOperation(value = "获取钱包信息")
+    @GetMapping("/getWallet")
+    public JsonNode getWallet(@RequestParam("adminId") Long adminId) {
+
+        JsonNode jsonNode = null;
+        TAirwallexWallet one = airwallexWalletService.getOne(Wrappers.<TAirwallexWallet>lambdaQuery().eq(TAirwallexWallet::getAdminId, adminId));
+
+        if (Objects.nonNull(one)) {
+            BigDecimal accountAmount = one.getAccountAmount();
+            String accountCurrency = one.getAccountCurrency();
+
+            TAirwallexWallet wallet = new TAirwallexWallet();
+            wallet.setAccountAmount(accountAmount);
+            wallet.setAccountCurrency(accountCurrency);
+
+            ObjectMapper objectMapper = new ObjectMapper();
+
+            jsonNode = objectMapper.valueToTree(wallet);
+        }
+
+        return jsonNode;
+    }
+
+
+    @ApiOperation(value = "设置默认钱包")
+    @PostMapping("/saveAirwallexWallet")
+    public ResponseModel<?> saveAirwallexWallet(@RequestBody TAirwallexWallet wallet) {
+        boolean save = airwallexWalletService.save(wallet);
+        return R.ok(save);
+    }
 }
 

+ 1 - 0
src/main/java/com/szwl/controller/TOrderController.java

@@ -3216,6 +3216,7 @@ public class TOrderController {
         }
         return JsonMessage.success(sta);
     }
+
     /**
      * 上传订单的做糖状态
      *

+ 9 - 0
src/main/java/com/szwl/feign/bean/EsFeign.java

@@ -0,0 +1,9 @@
+package com.szwl.feign.bean;
+
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(name = "es-server")
+public interface EsFeign {
+
+}

+ 5 - 3
src/main/java/com/szwl/feign/bean/OrderFeign.java

@@ -3,15 +3,17 @@ package com.szwl.feign.bean;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.*;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.Mapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 
 @FeignClient(name = "order-server")
 public interface OrderFeign {
-    //同步订单到es中
+    // 同步国内订单到es中
     @PostMapping("/tOrder/saveToEs")
     ResponseModel<?> saveToEs(@RequestBody TOrder order);
+
+    // 同步海外线上订单到es中
+    @PostMapping("/tOrderAbroad/saveOrderAbroadToEs")
+    ResponseModel<?> saveOrderAbroadToEs(@RequestBody TOrderAbroad orderAbroad);
 }

+ 1 - 1
src/main/java/com/szwl/mapper/TAirwallexMchMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-06
+ * @since 2023-07-28
  */
 public interface TAirwallexMchMapper extends BaseMapper<TAirwallexMch> {
 

+ 1 - 1
src/main/java/com/szwl/mapper/TAirwallexPaymentMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 public interface TAirwallexPaymentMapper extends BaseMapper<TAirwallexPayment> {
 

+ 1 - 1
src/main/java/com/szwl/mapper/TAirwallexWalletMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 public interface TAirwallexWalletMapper extends BaseMapper<TAirwallexWallet> {
 

+ 2 - 0
src/main/java/com/szwl/model/dto/CaPaymentRequestDTO.java

@@ -8,6 +8,8 @@ import lombok.Data;
 @ApiModel(value="CaPaymentRequestDTO", description="创建一笔付款,返回 Payment ID")
 public class CaPaymentRequestDTO {
 
+    private Long adminId;
+
     @JsonProperty("beneficiary_id")
     private String beneficiaryId;
 

+ 2 - 2
src/main/java/com/szwl/model/entity/TAirwallexMch.java

@@ -16,11 +16,11 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-06
+ * @since 2023-07-28
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="TAirwallexMch对象", description="空中云汇收款信息表")
+@ApiModel(value="TAirwallexMch对象", description="")
 public class TAirwallexMch implements Serializable {
 
     private static final long serialVersionUID = 1L;

+ 6 - 1
src/main/java/com/szwl/model/entity/TAirwallexPayment.java

@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -27,15 +27,20 @@ public class TAirwallexPayment implements Serializable {
 
     private Long adminId;
 
+    @ApiModelProperty(value = "提现id")
     @TableId(value = "payment_id", type = IdType.ASSIGN_ID)
     private String paymentId;
 
+    @ApiModelProperty(value = "付款币种")
     private String paymentCurrency;
 
+    @ApiModelProperty(value = "付款金额")
     private BigDecimal paymentAmount;
 
+    @ApiModelProperty(value = "受益人id")
     private String beneficiaryId;
 
+    @ApiModelProperty(value = "付款提现时间")
     private Date createTime;
 
 

+ 1 - 1
src/main/java/com/szwl/model/entity/TAirwallexWallet.java

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

+ 56 - 0
src/main/java/com/szwl/model/query/TOrderAbroadParam.java

@@ -0,0 +1,56 @@
+package com.szwl.model.query;
+
+import com.szwl.common.myAnnotation.CamelCaseToUnderscore;
+import com.szwl.model.entity.TOrderAbroad;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+@SuppressWarnings("serial")
+@Accessors(chain = true)
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+public class TOrderAbroadParam extends TOrderAbroad {
+
+    @CamelCaseToUnderscore
+    @ApiModelProperty(value = "排序,如:id desc")
+    private String orderByClause;
+    @ApiModelProperty(value = "是否distinct")
+    private boolean distinct;
+    @ApiModelProperty(value = "分页,展示多少条记录")
+    private Integer limit;
+    @ApiModelProperty(value = "分页,从第几条开始,默认从0开始")
+    private Integer offset;
+    @ApiModelProperty(value = "主键id 集合,用于批量删除和批量修改")
+    private List primaryKeyList;
+    private List<TOrderAbroad> entityList;//实体集合,用于批量新增
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDate_start;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDate_end;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date modifyDate_start;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date modifyDate_end;
+    private String clientId_like;
+    private List clientId_inList;
+    private String sn_like;
+    private String createDate_like;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date payDate_start;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date payDate_end;
+
+    private List adminId_inList;
+    private List productName_notInList;
+}

+ 1 - 1
src/main/java/com/szwl/service/TAirwallexMchService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-06
+ * @since 2023-07-28
  */
 public interface TAirwallexMchService extends IService<TAirwallexMch> {
 

+ 1 - 1
src/main/java/com/szwl/service/TAirwallexPaymentService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 public interface TAirwallexPaymentService extends IService<TAirwallexPayment> {
 

+ 9 - 1
src/main/java/com/szwl/service/TAirwallexWalletService.java

@@ -1,7 +1,15 @@
 package com.szwl.service;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.szwl.model.entity.TAirwallexWallet;
 import com.baomidou.mybatisplus.extension.service.IService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
 
 /**
  * <p>
@@ -9,7 +17,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 public interface TAirwallexWalletService extends IService<TAirwallexWallet> {
 

+ 105 - 0
src/main/java/com/szwl/service/es/EsTOrderAbroadService.java

@@ -0,0 +1,105 @@
+package com.szwl.service.es;
+
+import cn.com.crbank.ommo.esclient.EsBaseService;
+import cn.com.crbank.ommo.exception.MyException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.szwl.model.entity.TOrderAbroad;
+import com.szwl.model.query.TOrderAbroadParam;
+import com.szwl.service.TOrderAbroadService;
+import lombok.extern.slf4j.Slf4j;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.indices.GetIndexRequest;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+
+@Slf4j
+@Service
+public class EsTOrderAbroadService extends EsBaseService<TOrderAbroad, TOrderAbroadParam> {
+    private static boolean InitEsTableStatus = false; // 是否正常完成 es 初始化
+    public static final int MAX_ROW = 10000;
+
+    TOrderAbroadService tOrderAbroadService;
+
+    public EsTOrderAbroadService(TOrderAbroadService tOrderAbroadService) {
+        this.tOrderAbroadService = tOrderAbroadService;
+    }
+
+    @Override
+    public String getTableName() {
+        return "es_t_order_abroad";
+    }
+
+    @Override
+    public TOrderAbroad getInstanceOfEntity() {
+        return new TOrderAbroad();
+    }
+
+    @Override
+    public void setInitTableStatus(boolean flag) {
+        InitEsTableStatus = flag;
+    }
+
+    @Override
+    public boolean getInitTableStatus() {
+        return InitEsTableStatus;
+    }
+
+    @Override
+    public String getEntityPrimaryKey(TOrderAbroad tOrderAbroad) {
+        return String.valueOf(tOrderAbroad.getId());
+    }
+
+    @Override
+    public TOrderAbroad setEntityPrimaryKey(TOrderAbroad tOrderAbroad, String value) {
+        return null;
+    }
+
+    @Override
+    public void initTableFun() {
+        try {
+            String tableName = getTableName();
+            GetIndexRequest request = new GetIndexRequest(tableName);
+//            DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(this.getTableName());
+//            restHighLevelClient.indices().delete(deleteIndexRequest,RequestOptions.DEFAULT);
+            boolean isExists = restHighLevelClient.indices().exists(request, RequestOptions.DEFAULT);
+            if (!isExists) {
+                log.info("es 索引 开始创建" + tableName);
+                createTable();
+                // 初始化旧流水
+                int num = 0;
+                while (true) {
+                    int limit = MAX_ROW;
+                    int offset = num;
+                    LambdaQueryWrapper<TOrderAbroad> query = Wrappers.lambdaQuery();
+                    SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    String time = "2023-04-01 00:00:00";
+                    Date date = ft.parse(time);
+                    query.gt(TOrderAbroad::getCreateDate, date);
+//                    query.eq(TOrder::getStatus,"1");
+                    Page<TOrderAbroad> page = new Page<>(offset, limit, true);
+                    IPage<TOrderAbroad> iPage = tOrderAbroadService.page(page, query);
+                    List<TOrderAbroad> list = iPage.getRecords();
+                    insertBatch(list);
+                    num++;
+                    if (list.size() < MAX_ROW) { // 数据小于 最大值 ,证明后面已无数据,则跳出
+                        break;
+                    }
+                }
+            } else {
+                log.info("es 索引 " + tableName + " 已存在不再创建");
+            }
+            InitEsTableStatus = true;
+        } catch (Exception e) {
+            log.error("ElasticsearchRunner InitEsTOrderAbroadThread 发生错误:{}", e);
+            throw new MyException("ElasticsearchRunner InitEsTOrderAbroadThread 发生错误:" + e.getMessage());
+        }
+    }
+
+}

+ 1 - 0
src/main/java/com/szwl/service/es/EsTOrderService.java

@@ -324,6 +324,7 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
         bd = bd.setScale(2, RoundingMode.HALF_UP);//调用setScale方法进行数据格式化,保留两位小数,采用四舍五入规则
         return bd.toString(); //返回bd对象的值(转化为string形式)
     }
+
     public void tongbuByHour() throws ParseException {
         String startDate = null;
 

+ 1 - 1
src/main/java/com/szwl/service/impl/TAirwallexMchServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-06
+ * @since 2023-07-28
  */
 @Service
 public class TAirwallexMchServiceImpl extends ServiceImpl<TAirwallexMchMapper, TAirwallexMch> implements TAirwallexMchService {

+ 1 - 1
src/main/java/com/szwl/service/impl/TAirwallexPaymentServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @Service
 public class TAirwallexPaymentServiceImpl extends ServiceImpl<TAirwallexPaymentMapper, TAirwallexPayment> implements TAirwallexPaymentService {

+ 1 - 1
src/main/java/com/szwl/service/impl/TAirwallexWalletServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-25
+ * @since 2023-07-28
  */
 @Service
 public class TAirwallexWalletServiceImpl extends ServiceImpl<TAirwallexWalletMapper, TAirwallexWallet> implements TAirwallexWalletService {

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -36,7 +36,7 @@ spring:
   profiles: sit
   #数据库配置
   datasource:
-    url: jdbc:mysql://rm-wz995mu26a1479kz0so.mysql.rds.aliyuncs.com:3306/orderdb
+    url: jdbc:mysql://rm-wz995mu26a1479kz0so.mysql.rds.aliyuncs.com:3306/orderdb-test
     username: root
     password: sunzee@020
     driver-class-name: com.mysql.jdbc.Driver

+ 12 - 0
src/test/java/com/szwl/ApplicationTests.java

@@ -1,12 +1,24 @@
 package com.szwl;
 
+import com.szwl.service.es.EsTOrderAbroadService;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @Slf4j
 @SpringBootTest
 class ApplicationTests {
 
+    @Autowired
+    private EsTOrderAbroadService esTOrderAbroadService;
+
+    @Test
+    void testInitTableFun() {
+        esTOrderAbroadService.initTableFun();
+    }
+
 
 
 }