init

src/main/java/com/szwl/config/FeignLogger.java

@@ -0,0 +1,56 @@
+package com.szwl.config;
+
+import feign.Request;
+import feign.Response;
+import feign.Util;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+
+import static feign.Util.UTF_8;
+import static feign.Util.decodeOrDefault;
+
+@Slf4j
+public class FeignLogger extends feign.Logger {
+
+
+    public FeignLogger() {
+    }
+
+    @Override
+    protected void log(String configKey, String format, Object... args) {
+    }
+
+    //自定义请求日志
+    @Override
+    protected void logRequest(String configKey, Level logLevel, Request request) {
+        Request.HttpMethod httpMethod = request.httpMethod();
+        String url = request.url();
+        String param = " ";
+        if (request.body() != null) {
+            param = new String(request.body(), UTF_8);
+        }
+        log.info(configKey + " 请求--> {} url:{}, param:{}", httpMethod, url, param);
+    }
+
+    //自定义响应日志
+    @Override
+    protected Response logAndRebufferResponse(String configKey, Level logLevel, Response response, long elapsedTime) throws IOException {
+        String result = "";
+        int status = response.status();
+        try {
+            if (response.body() != null) {
+                byte[] bodyData = Util.toByteArray(response.body().asInputStream());
+                result = decodeOrDefault(bodyData, UTF_8, "Binary data");
+                return response.toBuilder().body(bodyData).build();
+            }
+            return response;
+        } finally {
+            if (response.status() == 200) {
+                log.info(configKey + " 返回<-- status:{}, result:{}, ElapsedTime:[{}ms]", status,result,elapsedTime);
+            } else {
+                log.error(configKey + " 返回<-- status:{}, result:{}, ElapsedTime:[{}ms]",status, result,elapsedTime);
+            }
+        }
+    }
+}

src/main/java/com/szwl/config/MyFeignLoggerFactory.java

@@ -0,0 +1,31 @@
+package com.szwl.config;
+
+import feign.Logger;
+import org.springframework.cloud.openfeign.FeignLoggerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MyFeignLoggerFactory implements FeignLoggerFactory {
+
+    private Logger logger;
+
+    public MyFeignLoggerFactory() {
+    }
+
+    public MyFeignLoggerFactory(Logger logger) {
+        this.logger = logger;
+    }
+
+    //实现create方法 new自定义的CustomizationFeignLogger
+    @Override
+    public Logger create(Class<?> type) {
+        return this.logger != null ? this.logger : new FeignLogger();
+    }
+    //开启openfeign的日志，因为要自定义所以只开启（最低级别）即可
+    @Bean
+    Logger.Level feignLoggerLevel(){
+        return Logger.Level.BASIC;
+    }
+
+}

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

@@ -1,80 +0,0 @@
-package com.szwl.controller;
-
-
-import cn.hutool.core.util.StrUtil;
-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.constant.ResponseCodesEnum;
-import com.szwl.model.bo.R;
-import com.szwl.model.bo.ResponseModel;
-import com.szwl.model.entity.TAdmin;
-import com.szwl.model.query.TAdminParam;
-import com.szwl.service.TAdminService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-
-@Api(value = "/test", tags = {"测试接口"})
-@RestController
-@RequestMapping("/test")
-public class DemoController {
-    @Value("${test.value:bbb}")
-    private String testValue;
-    @Autowired
-    TAdminService tAdminService;
-
-
-    @ApiOperation(value = "测试更新")
-    @PostMapping("/update")
-    public ResponseModel<?> testUpdate(TAdmin entity) {
-        return R.ok(tAdminService.saveOrUpdate(entity));
-    }
-
-
-    @ApiOperation(value = "分页查询")
-    @GetMapping("/testPage")
-    public ResponseModel<IPage<?>> testPage(TAdminParam param) {
-        LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
-        query.eq(TAdmin::getIsEnabled,true);
-        if(StrUtil.isNotBlank(param.getName())){
-            query.like(TAdmin::getName,param.getName());
-        }
-        query.orderByDesc(TAdmin::getApplyStartTime);
-        Page<TAdmin> page = new Page<>(param.getCurrent(), param.getSize(), true);
-        IPage<TAdmin> iPage = tAdminService.page(page, query);
-        return R.ok(iPage);
-    }
-
-    @ApiOperation(value = "列表查询")
-    @GetMapping("/testList")
-    public ResponseModel<List<?>> testList(TAdminParam param) {
-        LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
-        query.eq(TAdmin::getIsEnabled,true);
-        if(StrUtil.isNotBlank(param.getName())){
-            query.like(TAdmin::getName,param.getName());
-        }
-        query.orderByDesc(TAdmin::getApplyStartTime);
-        List<TAdmin> list = tAdminService.list(query);
-        return R.ok(list);
-    }
-    @ApiOperation(value = "返回失败")
-    @GetMapping("/testError")
-    public ResponseModel<List<?>> testError(boolean success) {
-        if(success){
-            return R.ok();
-        }else{
-            return R.fail(ResponseCodesEnum.B0001,"你的错误信息");
-        }
-    }
-}
-

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

@@ -0,0 +1,36 @@
+package com.szwl.controller;
+
+
+import com.szwl.feign.SzwlFeign;
+import com.szwl.feign.bean.TAdminParam;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-06-14
+ */
+@RestController
+@RequestMapping("/tOrder")
+public class TOrderController {
+    @Autowired
+    SzwlFeign szwlFeign;
+
+    @ApiOperation(value = "测试feign")
+    @GetMapping("/testFeign")
+    public ResponseModel<List> testFeign(String name) {
+        List list = R.getDataIfSuccess(szwlFeign.testList(new TAdminParam().setName(name)));
+        return R.ok(list);
+    }
+}
+

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

@@ -0,0 +1,16 @@
+package com.szwl.feign;
+
+import com.szwl.feign.bean.TAdminParam;
+import com.szwl.model.bo.ResponseModel;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+
+@FeignClient(name = "szwl-server")
+public interface SzwlFeign {
+
+    @GetMapping("/test/testList")
+    public ResponseModel<List<?>> testList(TAdminParam param);
+}

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

@@ -1,14 +0,0 @@
-package com.szwl.feign.bean;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.szwl.model.bo.ResponseModel;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-
-
-@FeignClient(name = "order-server")
-public interface SzwlFeign {
-
-    @GetMapping("/test/testPay")
-    ResponseModel<IPage<?>> testPay(String id);
-}

src/main/java/com/szwl/model/query/TAdminParam.java

@@ -1,15 +1,10 @@
-package com.szwl.model.query;
+package com.szwl.feign.bean;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.szwl.model.bo.BasePageQuery;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
+import lombok.experimental.Accessors;
 
 /**
  * <p>
@@ -22,6 +17,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="查询 TAdmin", description="")
+@Accessors(chain = true)
 public class TAdminParam extends BasePageQuery {
     String name;
 }

src/main/java/com/szwl/mapper/TCoinOrderMapper.java

@@ -0,0 +1,16 @@
+package com.szwl.mapper;
+
+import com.szwl.model.entity.TCoinOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 线下支付订单 Mapper 接口
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-06-14
+ */
+public interface TCoinOrderMapper extends BaseMapper<TCoinOrder> {
+
+}

src/main/java/com/szwl/mapper/TAdminMapper.java

@@ -1,6 +1,6 @@
 package com.szwl.mapper;
 
-import com.szwl.model.entity.TAdmin;
+import com.szwl.model.entity.TOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author wuhs
- * @since 2022-03-28
+ * @since 2022-06-14
  */
-public interface TAdminMapper extends BaseMapper<TAdmin> {
+public interface TOrderMapper extends BaseMapper<TOrder> {
 
 }

src/main/java/com/szwl/mapper/xml/TAdminMapper.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.szwl.mapper.TAdminMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.szwl.model.entity.TAdmin">
-        <id column="id" property="id" />
-        <result column="create_date" property="createDate" />
-        <result column="modify_date" property="modifyDate" />
-        <result column="area_id" property="areaId" />
-        <result column="email" property="email" />
-        <result column="is_admined" property="isAdmined" />
-        <result column="is_enabled" property="isEnabled" />
-        <result column="is_locked" property="isLocked" />
-        <result column="locked_date" property="lockedDate" />
-        <result column="login_date" property="loginDate" />
-        <result column="login_failure_count" property="loginFailureCount" />
-        <result column="login_ip" property="loginIp" />
-        <result column="trade_merchant_no" property="tradeMerchantNo" />
-        <result column="name" property="name" />
-        <result column="parent_id" property="parentId" />
-        <result column="password" property="password" />
-        <result column="notice_id" property="noticeId" />
-        <result column="type" property="type" />
-        <result column="username" property="username" />
-        <result column="phone" property="phone" />
-        <result column="is_refund" property="isRefund" />
-        <result column="if_foreign" property="ifForeign" />
-        <result column="open" property="open" />
-        <result column="promo_code_open" property="promoCodeOpen" />
-        <result column="apply_start_time" property="applyStartTime" />
-        <result column="apply_end_time" property="applyEndTime" />
-        <result column="code" property="code" />
-        <result column="pay_platform" property="payPlatform" />
-        <result column="relation_admin_id" property="relationAdminId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, create_date, modify_date, area_id, email, is_admined, is_enabled, is_locked, locked_date, login_date, login_failure_count, login_ip, trade_merchant_no, name, parent_id, password, notice_id, type, username, phone, is_refund, if_foreign, open, promo_code_open, apply_start_time, apply_end_time, code, pay_platform, relation_admin_id
-    </sql>
-
-</mapper>

src/main/java/com/szwl/mapper/xml/TCoinOrderMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.szwl.mapper.TCoinOrderMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.szwl.model.entity.TCoinOrder">
+        <id column="id" property="id" />
+        <result column="create_date" property="createDate" />
+        <result column="modify_date" property="modifyDate" />
+        <result column="admin_id" property="adminId" />
+        <result column="client_id" property="clientId" />
+        <result column="pay_type" property="payType" />
+        <result column="price" property="price" />
+        <result column="sn" property="sn" />
+        <result column="type" property="type" />
+        <result column="product_name" property="productName" />
+        <result column="es" property="es" />
+        <result column="pay_date" property="payDate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, create_date, modify_date, admin_id, client_id, pay_type, price, sn, type, product_name, es, pay_date
+    </sql>
+
+</mapper>

src/main/java/com/szwl/mapper/xml/TOrderMapper.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.szwl.mapper.TOrderMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.szwl.model.entity.TOrder">
+        <id column="id" property="id" />
+        <result column="create_date" property="createDate" />
+        <result column="modify_date" property="modifyDate" />
+        <result column="admin_id" property="adminId" />
+        <result column="admin_proportion" property="adminProportion" />
+        <result column="agency_id" property="agencyId" />
+        <result column="agency_proportion" property="agencyProportion" />
+        <result column="alt_info" property="altInfo" />
+        <result column="client_id" property="clientId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="frp_code" property="frpCode" />
+        <result column="merchant_id" property="merchantId" />
+        <result column="merchant_proportion" property="merchantProportion" />
+        <result column="pay_date" property="payDate" />
+        <result column="personage_id" property="personageId" />
+        <result column="personage_proportion" property="personageProportion" />
+        <result column="price" property="price" />
+        <result column="product_id" property="productId" />
+        <result column="product_name" property="productName" />
+        <result column="refund_date" property="refundDate" />
+        <result column="sn" property="sn" />
+        <result column="status" property="status" />
+        <result column="type" property="type" />
+        <result column="trx_no" property="trxNo" />
+        <result column="refund_trx_no" property="refundTrxNo" />
+        <result column="es" property="es" />
+        <result column="refund_amount" property="refundAmount" />
+        <result column="note" property="note" />
+        <result column="pay_platform" property="payPlatform" />
+        <result column="is_settlement" property="isSettlement" />
+        <result column="proportion_desc" property="proportionDesc" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, create_date, modify_date, admin_id, admin_proportion, agency_id, agency_proportion, alt_info, client_id, equipment_id, frp_code, merchant_id, merchant_proportion, pay_date, personage_id, personage_proportion, price, product_id, product_name, refund_date, sn, status, type, trx_no, refund_trx_no, es, refund_amount, note, pay_platform, is_settlement, proportion_desc
+    </sql>
+
+</mapper>

src/main/java/com/szwl/model/bo/R.java

@@ -2,6 +2,7 @@ package com.szwl.model.bo;
 
 
 import com.szwl.constant.ResponseCodesEnum;
+import com.szwl.exception.MyException;
 
 public class R<T> {
 
@@ -34,4 +35,17 @@ public class R<T> {
     public static <T> ResponseModel<T> fail(ResponseCodesEnum code, String formatter, Object... obj) {
         return ResponseModel.fail(code, String.format(formatter, obj));
     }
+    /**
+     * 获取feign结果，如果成功获取data，失败抛出异常
+     *
+     * @param resp
+     * @param <T>
+     * @return
+     */
+    public static <T> T getDataIfSuccess(ResponseModel<T> resp) {
+        if (!resp.isSuccess()) {
+            throw new MyException(resp.getMessage());
+        }
+        return resp.getData();
+    }
 }

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

@@ -1,109 +0,0 @@
-package com.szwl.model.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author wuhs
- * @since 2022-03-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="TAdmin对象", description="")
-public class TAdmin implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    private Date createDate;
-
-    private Date modifyDate;
-
-    private Long areaId;
-
-    @ApiModelProperty(value = "邮箱;")
-    private String email;
-
-    @ApiModelProperty(value = "设置是否普通管理员（0：管理员，1：子账户）;")
-    private Boolean isAdmined;
-
-    @ApiModelProperty(value = "是否启用;")
-    private Boolean isEnabled;
-
-    @ApiModelProperty(value = "是否锁定;")
-    private Boolean isLocked;
-
-    @ApiModelProperty(value = "锁定时间;")
-    private Date lockedDate;
-
-    @ApiModelProperty(value = "登录时间;")
-    private Date loginDate;
-
-    @ApiModelProperty(value = "连续登录失败次数;")
-    private Integer loginFailureCount;
-
-    private String loginIp;
-
-    @ApiModelProperty(value = "商户报备号;")
-    private String tradeMerchantNo;
-
-    private String name;
-
-    @ApiModelProperty(value = "如果is_admined=1,说明这个账户是子账户，它的拥有者的adminId就是parent_id;")
-    private Long parentId;
-
-    private String password;
-
-    @ApiModelProperty(value = "当前查看过公告的id;")
-    private Long noticeId;
-
-    @ApiModelProperty(value = "类型（暂时作废）;")
-    private Integer type;
-
-    @ApiModelProperty(value = "登录名;")
-    private String username;
-
-    @ApiModelProperty(value = "电话;")
-    private String phone;
-
-    @ApiModelProperty(value = "是否退款;")
-    private String isRefund;
-
-    @ApiModelProperty(value = "是否国外;")
-    private String ifForeign;
-
-    @ApiModelProperty(value = "是否开启远程开关机")
-    private String open;
-
-    @ApiModelProperty(value = "是否开通0折优惠码；0:开通;1：关闭")
-    private String promoCodeOpen;
-
-    @ApiModelProperty(value = "机器连接服务器免审核开始时间")
-    private Date applyStartTime;
-
-    @ApiModelProperty(value = "机器连接服务器免审核结束时间")
-    private Date applyEndTime;
-
-    @ApiModelProperty(value = "短信验证码;")
-    private String code;
-
-    @ApiModelProperty(value = "支付平台; 0或null为汇聚，1为杉德支付")
-    private String payPlatform;
-
-    @ApiModelProperty(value = "关联商家，相当于以前的parent_id")
-    private String relationAdminId;
-
-
-}

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

@@ -0,0 +1,63 @@
+package com.szwl.model.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 线下支付订单
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TCoinOrder对象", description="线下支付订单")
+public class TCoinOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Date createDate;
+
+    private Date modifyDate;
+
+    @ApiModelProperty(value = "用户id;")
+    private Long adminId;
+
+    @ApiModelProperty(value = "设备编号;")
+    private String clientId;
+
+    @ApiModelProperty(value = "支付方式;")
+    private Integer payType;
+
+    @ApiModelProperty(value = "金额;")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "订单号;")
+    private String sn;
+
+    @ApiModelProperty(value = "类型（省，市，终端）;")
+    private Integer type;
+
+    @ApiModelProperty(value = "商品名称;")
+    private String productName;
+
+    @ApiModelProperty(value = "是否发送到es报存;")
+    private String es;
+
+    @ApiModelProperty(value = "支付时间;")
+    private Date payDate;
+
+
+}

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

@@ -0,0 +1,120 @@
+package com.szwl.model.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TOrder对象", description="")
+public class TOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Date createDate;
+
+    private Date modifyDate;
+
+    @ApiModelProperty(value = "用户id;")
+    private Long adminId;
+
+    @ApiModelProperty(value = "平台分账;")
+    private BigDecimal adminProportion;
+
+    @ApiModelProperty(value = "一级分销商户id;")
+    private Long agencyId;
+
+    @ApiModelProperty(value = "分账比例;")
+    private BigDecimal agencyProportion;
+
+    @ApiModelProperty(value = "分销逻辑;")
+    private String altInfo;
+
+    @ApiModelProperty(value = "设备编号;")
+    private String clientId;
+
+    @ApiModelProperty(value = "设备id;")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "支付方式;")
+    private String frpCode;
+
+    @ApiModelProperty(value = "二级分销商户id;")
+    private Long merchantId;
+
+    @ApiModelProperty(value = "分账比例;")
+    private BigDecimal merchantProportion;
+
+    @ApiModelProperty(value = "支付时间;")
+    private Date payDate;
+
+    @ApiModelProperty(value = "三级分销商户id;")
+    private Long personageId;
+
+    @ApiModelProperty(value = "分账比例;")
+    private BigDecimal personageProportion;
+
+    @ApiModelProperty(value = "金额;")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "商品id;")
+    private Long productId;
+
+    @ApiModelProperty(value = "商品名称;")
+    private String productName;
+
+    @ApiModelProperty(value = "退款时间;")
+    private Date refundDate;
+
+    @ApiModelProperty(value = "订单编号;")
+    private String sn;
+
+    @ApiModelProperty(value = "支付状态;")
+    private Integer status;
+
+    @ApiModelProperty(value = "0：分账方2个，1：分账方3个，3：分账方4个，3：分账方超4个;")
+    private Integer type;
+
+    @ApiModelProperty(value = "支付流水号;")
+    private String trxNo;
+
+    @ApiModelProperty(value = "退款流水号;")
+    private String refundTrxNo;
+
+    @ApiModelProperty(value = "是否发送到es;")
+    private String es;
+
+    @ApiModelProperty(value = "退款金额;")
+    private BigDecimal refundAmount;
+
+    @ApiModelProperty(value = "标记;")
+    private String note;
+
+    @ApiModelProperty(value = "支付平台; 0或null为汇聚，1为杉德支付")
+    private String payPlatform;
+
+    @ApiModelProperty(value = "是否结算;0或null为未结算，1已结算。仅杉德支付有这个")
+    private String isSettlement;
+
+    @ApiModelProperty(value = "分账详情，当分账超过4方时，这个字段才启用")
+    private String proportionDesc;
+
+
+}

src/main/java/com/szwl/service/TCoinOrderService.java

@@ -0,0 +1,16 @@
+package com.szwl.service;
+
+import com.szwl.model.entity.TCoinOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 线下支付订单 服务类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-06-14
+ */
+public interface TCoinOrderService extends IService<TCoinOrder> {
+
+}

src/main/java/com/szwl/service/TAdminService.java

@@ -1,6 +1,6 @@
 package com.szwl.service;
 
-import com.szwl.model.entity.TAdmin;
+import com.szwl.model.entity.TOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author wuhs
- * @since 2022-03-28
+ * @since 2022-06-14
  */
-public interface TAdminService extends IService<TAdmin> {
+public interface TOrderService extends IService<TOrder> {
 
 }

src/main/java/com/szwl/service/impl/TAdminServiceImpl.java

@@ -1,20 +0,0 @@
-package com.szwl.service.impl;
-
-import com.szwl.model.entity.TAdmin;
-import com.szwl.mapper.TAdminMapper;
-import com.szwl.service.TAdminService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author wuhs
- * @since 2022-03-28
- */
-@Service
-public class TAdminServiceImpl extends ServiceImpl<TAdminMapper, TAdmin> implements TAdminService {
-
-}

src/main/java/com/szwl/service/impl/TCoinOrderServiceImpl.java

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.szwl.model.entity.TCoinOrder;
+import com.szwl.mapper.TCoinOrderMapper;
+import com.szwl.service.TCoinOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 线下支付订单 服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-06-14
+ */
+@Service
+public class TCoinOrderServiceImpl extends ServiceImpl<TCoinOrderMapper, TCoinOrder> implements TCoinOrderService {
+
+}

src/main/java/com/szwl/service/impl/TOrderServiceImpl.java

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.szwl.model.entity.TOrder;
+import com.szwl.mapper.TOrderMapper;
+import com.szwl.service.TOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-06-14
+ */
+@Service
+public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> implements TOrderService {
+
+}

src/main/resources/bootstrap.yml

@@ -9,13 +9,13 @@ spring:
         # 是否获取配置中心配置
         enabled: false
   datasource:
-    url: jdbc:mysql://rm-wz995mu26a1479kz0so.mysql.rds.aliyuncs.com:3306/szwl
+    url: jdbc:mysql://rm-wz995mu26a1479kz0so.mysql.rds.aliyuncs.com:3306/orderdb
     username: root
     password: sunzee@020
     driver-class-name: com.mysql.jdbc.Driver
 
 server:
-  port: 49011
+  port: 49012
 
 management:
   endpoints:

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

@@ -47,7 +47,7 @@ class AutoGeneratorTests {
 		strategyConfig
 //				.setCapitalMode(true)//设置全局大写命名
 				.setInclude(new String[]{
-						"t_admin"
+						"t_coin_order","t_order"
 				})//只会生成该表
 				.setEntityLombokModel(true)//实体类生成之后自动添加lombok注解
 				.setNaming(NamingStrategy.underline_to_camel)//数据库表映射到实体的命名策略