添加汇付支付，以及优化订单明细等

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

@@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.com.crbank.ommo.bean.ResultMessage;
 import cn.com.crbank.ommo.esclient.ElasticsearchRunner;
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -16,6 +17,7 @@ import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.feign.SzwlFeign;
 import com.szwl.model.bean.ChartColumn;
 import com.szwl.model.bean.OrderDaoChuDTO;
+import com.szwl.model.bean.OrderDetailsVo;
 import com.szwl.model.bean.OrderVo;
 import com.szwl.model.bo.JsonMessage;
 import com.szwl.model.bo.R;
@@ -29,10 +31,7 @@ import com.szwl.model.query.*;
 import com.szwl.model.utils.DateUtils;
 import com.szwl.model.utils.FgObjectUtil;
 import com.szwl.model.utils.JsonUtils;
-import com.szwl.service.TAreaService;
-import com.szwl.service.TCoinOrderService;
-import com.szwl.service.TEquipmentService;
-import com.szwl.service.TOrderService;
+import com.szwl.service.*;
 import com.szwl.service.es.EsTEquipmentService;
 import com.szwl.service.es.EsTOrderService;
 import io.swagger.annotations.ApiOperation;
@@ -78,7 +77,8 @@ public class TOrderController {
     TCoinOrderService coinOrderService;
     @Autowired
     SzwlFeign szwlFeign;
-
+    @Autowired
+    TOrderDetailsService orderDetailsService;
     @GetMapping("/pageOrder")
     public ResponseModel<IPage<?>> pageOrder(String equipmentId, String adminId, String adminType,
                                              String type, String sn, String status, String userName,
@@ -283,32 +283,117 @@ public class TOrderController {
             query.orderByDesc(TOrder::getCreateDate);
             Page<TOrder> page = new Page<>(current, size, true);
             IPage<TOrder> iPage = orderService.page(page, query);
+            IPage<OrderDetailsVo> pageList = new Page<>();
             //显示订单所属机器的设备名称
-            if (admin.getType() != null && admin.getType() < 2) {
-                //公司人员
-                List<TOrder> orderList = iPage.getRecords();
-                if (orderList.size() > 0) {
-                    for (TOrder order : orderList) {
-                        TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(order.getClientId()));
-                        order.setEs(equipment.getName());
-                    }
-                    iPage.setRecords(orderList);
+//            if(admin.getType()!=null&&admin.getType()<2){
+//                //公司人员
+//                List<TOrder> orderList = iPage.getRecords();
+//                if(orderList.size()>0){
+//                    List<String> clientIds = new ArrayList<>();
+//                    for (TOrder order : orderList) {
+//                        clientIds.add(order.getClientId());
+//                    }
+//                    Map<String, String> equipmentMap = new HashMap<>();
+//                    List<TEquipment> equipmentList = R.getDataIfSuccess(szwlFeign.findEquipmentByClientIds(clientIds));
+//                    for (TEquipment equipment : equipmentList) {
+//                        equipmentMap.put(equipment.getClientId(), equipment.getName());
+//                    }
+//                    // 设置设备信息到订单中
+//                    for (TOrder order : orderList) {
+//                        String name = equipmentMap.get(order.getClientId());
+//                        if (StringUtils.isNotEmpty(name)) {
+//                            order.setEs(name);
+//                        }
+//                    }
+////                    for(TOrder order:orderList){
+////                        TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(order.getClientId()));
+////                        order.setEs(equipment.getName());
+////                    }
+//                    iPage.setRecords(orderList);
+//                }
+//            }
+//            if(admin.getType()!=null&&admin.getType()>1){
+//                //商家
+//                List<TOrder> orderList = iPage.getRecords();
+//                if(orderList.size()>0){
+////                    for(TOrder order:orderList){
+////                        TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(order.getClientId()));
+////                        order.setEs(equipment.getName());
+////                    }
+//                    // 设备编号集合
+//                    List<String> clientIds = new ArrayList<>();
+//                    for (TOrder order : orderList) {
+//                        clientIds.add(order.getClientId());
+//                    }
+//                    // 设备编号名称集合
+//                    Map<String, String> equipmentMap = new HashMap<>();
+//                    // 设备编号名称集合
+//                    List<TEquipment> equipmentList = R.getDataIfSuccess(szwlFeign.findEquipmentByClientIds(clientIds));
+//                    for (TEquipment equipment : equipmentList) {
+//                        equipmentMap.put(equipment.getClientId(), equipment.getName());
+//                    }
+//                    LambdaQueryWrapper<TOrderDetails> wrapper = new LambdaQueryWrapper<>();
+//
+//                    // 设置设备信息到订单中
+//                    for (TOrder order : orderList) {
+//                        String name = equipmentMap.get(order.getClientId());
+//                        if (StringUtils.isNotEmpty(name)) {
+//                            order.setEs(name);
+//                        }
+//                        wrapper.in(TOrderDetails::getOrderSn,order.getSn());
+//                        List<TOrderDetails> orderDetailsList = orderDetailsService.list(wrapper);
+//                        if(orderDetailsList != null) {
+//                            order.setOrderDetails(orderDetailsList);
+//                        }
+//                    }
+//                }
+//                iPage.setRecords(orderList);
+//            }
+            List<TOrder> orderList = iPage.getRecords();
+            List<OrderDetailsVo> orderDetailsVos = new ArrayList<>();
+            if(orderList.size()>0){
+//                    for(TOrder order:orderList){
+//                        TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(order.getClientId()));
+//                        order.setEs(equipment.getName());
+//                    }
+                // 设备编号集合
+                List<String> clientIds = new ArrayList<>();
+                for (TOrder order : orderList) {
+                    clientIds.add(order.getClientId());
                 }
-            }
-            if (admin.getType() != null && admin.getType() > 1) {
-                //商家
-                List<TOrder> orderList = iPage.getRecords();
-                if (orderList.size() > 0) {
-//                    TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(orderList.get(0).getClientId()));
-                    for (TOrder order : orderList) {
-                        TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(order.getClientId()));
-                        order.setEs(equipment.getName());
+                // 设备编号名称集合
+                Map<String, String> equipmentMap = new HashMap<>();
+                // 设备编号名称集合
+                List<TEquipment> equipmentList = R.getDataIfSuccess(szwlFeign.findEquipmentByClientIds(clientIds));
+                for (TEquipment equipment : equipmentList) {
+                    equipmentMap.put(equipment.getClientId(), equipment.getName());
+                }
+
+
+                // 设置设备信息到订单中
+                for (TOrder order : orderList) {
+                    String name = equipmentMap.get(order.getClientId());
+                    if (StringUtils.isNotEmpty(name)) {
+                        order.setEs(name);
                     }
+                    OrderDetailsVo orderDetailsVo = new OrderDetailsVo();
+                    BeanUtil.copyProperties(order, orderDetailsVo);
+                    LambdaQueryWrapper<TOrderDetails> queryWrapper = Wrappers.lambdaQuery();
+                    queryWrapper.eq(TOrderDetails::getOrderSn, order.getSn());
+                    List<TOrderDetails> orderDetailsList = orderDetailsService.list(queryWrapper);
+                    if(orderDetailsList != null) {
+                        orderDetailsVo.setOrderDetails(orderDetailsList);
+                    }
+                    orderDetailsVos.add(orderDetailsVo);
                 }
-                iPage.setRecords(orderList);
             }
-            return R.ok(iPage);
-        }
+            pageList.setRecords(orderDetailsVos);
+            pageList.setPages(iPage.getPages());
+            pageList.setCurrent(iPage.getCurrent());
+            pageList.setTotal(iPage.getTotal());
+            pageList.setSize(iPage.getSize());
+            return R.ok(pageList);
+        };
 
         //1,线下
         if (type.equals("1")) {

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

@@ -0,0 +1,21 @@
+package com.szwl.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 订单明细表 前端控制器
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-08-12
+ */
+@RestController
+@RequestMapping("/tOrderDetails")
+public class TOrderDetailsController {
+
+}
+

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

@@ -18,33 +18,48 @@ public interface SzwlFeign {
 
     @GetMapping("/test/testList")
     public ResponseModel<List<?>> testList(TAdminParam param);
+
     @GetMapping("/tAdmin/getAdminIdList")
     ResponseModel<List<Long>>  getAdminIdList(@RequestParam String adminId);
+
     @GetMapping("/tAdmin/getAdminByUsername")
     ResponseModel<TAdmin>  getAdminByUsername(@RequestParam String username);
+
     @GetMapping("/tAdmin/getAdmin")
     ResponseModel<TAdmin>  getAdmin(@RequestParam String id);
+
     @GetMapping("/tEquipment/getClientIdList")
     ResponseModel<TAdminEquipment>  getClientIdList(@RequestParam String adminId);
+
     @GetMapping("/tEquipment/getClientIds")
     ResponseModel<List<String>>  getClientIds(@RequestParam String adminId);
+
     @GetMapping("/tEquipment/findEquipmentByClientId")
     ResponseModel<TEquipment> findEquipmentByClientId(@RequestParam String clientId);
+
     @PostMapping("/tEquipment/getEquipmentByNameAndId")
     ResponseModel<TEquipment> getEquipmentByNameAndId(@RequestBody TEquipment equipment);
+
 //    @PostMapping("/tEquipment/findById2")
 //    ResponseModel<TEquipment> findById(@RequestParam String id);
     @GetMapping("/tEquipment/findEquipmentById")
     ResponseModel<TEquipment> findById(@RequestParam String id);
+
     @GetMapping("/tAdmin/pageAdmin2")
     ResponseModel<IPage<TAdmin>>  pageAdmin2(@RequestParam(value = "current") long current, @RequestParam(value = "size") long size);
+
     @GetMapping("/tEquipment/pageEquipment2")
     ResponseModel<IPage<TEquipment>>  pageEquipment2(@RequestParam(value = "current") long current, @RequestParam(value = "size") long size);
+
     @GetMapping("/tShandeMch/getShandeMch")
     ResponseModel<TShandeMch> getShandeMch(@RequestParam String adminId);
+
     @PostMapping("/tShandeMch/updateShandeMch")
     ResponseModel<TShandeMch> updateShandeMch(@RequestBody TShandeMch shandeMch);
 
+    @GetMapping("/tEquipment/findEquipmentByClientIds")
+    ResponseModel<List<TEquipment>> findEquipmentByClientIds(@RequestParam("clientIds") List<String> clientIds);
+
     @GetMapping("/tAdmin/getAdminType")
     ResponseModel<Integer> getAdminType(@RequestParam Long adminId);
 

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

@@ -0,0 +1,16 @@
+package com.szwl.mapper;
+
+import com.szwl.model.entity.TOrderDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 订单明细表 Mapper 接口
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-08-12
+ */
+public interface TOrderDetailsMapper extends BaseMapper<TOrderDetails> {
+
+}

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

@@ -0,0 +1,28 @@
+<?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.TOrderDetailsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.szwl.model.entity.TOrderDetails">
+        <id column="id" property="id" />
+        <result column="admin_id" property="adminId" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="create_date" property="createDate" />
+        <result column="order_sn" property="orderSn" />
+        <result column="product_no" property="productNo" />
+        <result column="product_name" property="productName" />
+        <result column="product_number" property="productNumber" />
+        <result column="price" property="price" />
+        <result column="amount" property="amount" />
+        <result column="refund_quantity" property="refundQuantity" />
+        <result column="refund_amout" property="refundAmout" />
+        <result column="refund_status" property="refundStatus" />
+        <result column="company_type" property="companyType" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, admin_id, equipment_id, create_date, order_sn, product_no, product_name, product_number, price, amount, refund_quantity, refund_amout, refund_status, company_type
+    </sql>
+
+</mapper>

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

@@ -44,6 +44,8 @@
         <result column="product_number" property="productNumber" />
         <result column="refund_order_no" property="refundOrderNo" />
         <result column="company_type" property="companyType" />
+        <result column="acct_split_bunch" property="acctSplitBunch" />
+        <result column="refund_quantity" property="refundQuantity" />
     </resultMap>
     <resultMap id="chartBean" type="com.szwl.model.bean.ChartBean">
         <result column="categorie" jdbcType="VARCHAR" property="categorie" />
@@ -68,7 +70,10 @@
     </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, company_type
+        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, company_type, acct_split_bunch, refund_quantity
     </sql>
 
     <!-- 日统计select concat(DATE_FORMAT( a.create_date,'%H'),'点') as categorie,count(1) as saleNum,sum(a.price) as salePrice -->

src/main/java/com/szwl/model/bean/OrderDetailsVo.java

@@ -0,0 +1,15 @@
+package com.szwl.model.bean;
+
+import com.szwl.model.entity.TOrder;
+import com.szwl.model.entity.TOrderDetails;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrderDetailsVo extends TOrder {
+
+    @ApiModelProperty(value = "订单明细")
+    private List<TOrderDetails> orderDetails;
+}

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

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 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;
@@ -151,5 +153,10 @@ public class TOrder implements Serializable {
     @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
     private String companyType;
 
+    @ApiModelProperty(value = "汇付分账明细")
+    private String acctSplitBunch;
+
+    @ApiModelProperty(value = "退款数量")
+    private Integer refundQuantity;
 
 }

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

@@ -0,0 +1,72 @@
+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 2023-08-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TOrderDetails对象", description="订单明细表")
+public class TOrderDetails implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "订单明细表ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "用户ID")
+    private Long adminId;
+
+    @ApiModelProperty(value = "设备ID")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "订单编号")
+    private String orderSn;
+
+    @ApiModelProperty(value = "商品编号")
+    private String productNo;
+
+    @ApiModelProperty(value = "商品名称")
+    private String productName;
+
+    @ApiModelProperty(value = "商品数量")
+    private Integer productNumber;
+
+    @ApiModelProperty(value = "商品单价")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "小计金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "退款数量")
+    private Integer refundQuantity;
+
+    @ApiModelProperty(value = "退款金额")
+    private BigDecimal refundAmout;
+
+    @ApiModelProperty(value = "退款状态，0：未退款，1：部分退款，2：已退款")
+    private String refundStatus;
+
+    @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
+    private String companyType;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.szwl.service;
+
+import com.szwl.model.entity.TOrderDetails;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 订单明细表 服务类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-08-12
+ */
+public interface TOrderDetailsService extends IService<TOrderDetails> {
+
+}

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

@@ -293,9 +293,16 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
 
     public ChartColumn getStatistics(StatisticsParam param, String format, DateHistogramInterval interval) {
         try {
-            String aggregationResultName = "aggregationResult";//  仅为名称，用以获取返回结果
-            String aggSumName = "sales"; //  仅为名称，用以获取返回结果
-            String aggName_productNumber = "productNumber"; //  仅为名称，用以获取返回结果
+            //  仅为名称，用以获取返回结果
+            String aggregationResultName = "aggregationResult";
+            // 仅为名称，用以获取返回结果
+            String aggSumName = "sales";
+            // 仅为名称，用以获取返回结果
+            String aggName_productNumber = "productNumber";
+            // 仅为名称，用以获取返回结果
+            String aggName_refundQuantity = "refundQuantity";
+            // 仅为名称，用以获取返回结果
+            String aggName_refundAmount = "refundAmount";
 
 
             //Bool查询
@@ -325,10 +332,18 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
                     .format(format);
 
             // 根据字段price 求和 sum, sales 仅为名称，用以获取返回结果
+            // 订单金额
             SumAggregationBuilder sumAggregationBuilder = AggregationBuilders.sum(aggSumName).field("price");
             dateHistogram.subAggregation(sumAggregationBuilder);
+            // 订单数量
             SumAggregationBuilder sumAggregationBuilder2 = AggregationBuilders.sum(aggName_productNumber).field("productNumber");
             dateHistogram.subAggregation(sumAggregationBuilder2);
+            // 退款数量
+            SumAggregationBuilder sumAggregationBuilder3 = AggregationBuilders.sum(aggName_refundQuantity).field("refundQuantity");
+            dateHistogram.subAggregation(sumAggregationBuilder3);
+            // 退款金额
+            SumAggregationBuilder sumAggregationBuilder4 = AggregationBuilders.sum(aggName_refundAmount).field("refundAmount");
+            dateHistogram.subAggregation(sumAggregationBuilder4);
             SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
             // 指定size为0，不返回文档 因为只需要数量
             sourceBuilder.query(queryBuilder).aggregation(dateHistogram).size(0);
@@ -346,18 +361,22 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
                 chartBean.setCategorie(bucket.getKeyAsString());
 //                chartBean.setSaleNum(Float.valueOf(bucket.getDocCount()));
                 //统计商品数
-                ParsedSum saleNum = bucket.getAggregations().get(aggName_productNumber);
-                String saleNumStr = format1((float) saleNum.getValue());
-                if(StringUtils.isEmpty(saleNumStr)){
-                    saleNumStr = "1";
+                ParsedSum saleNum1 = bucket.getAggregations().get(aggName_productNumber);
+                ParsedSum saleNum2 = bucket.getAggregations().get(aggName_refundQuantity);
+                String saleNumStr1 = format1((float) saleNum1.getValue());
+                String saleNumStr2 = format1((float) saleNum2.getValue());
+                if(StringUtils.isEmpty(saleNumStr1)){
+                    saleNumStr1 = "1";
                 }
-                chartBean.setSaleNum(Float.valueOf(saleNumStr));
+                chartBean.setSaleNum(Float.valueOf(saleNumStr1) - Float.valueOf(saleNumStr2));
                 //统计订单数
                 chartBean.setOrderNum(Float.valueOf(bucket.getDocCount()));
 //                chartBean.setSaleNum(Long.valueOf(bucket.getDocCount()).intValue());
                 ParsedSum sum = bucket.getAggregations().get(aggSumName);
-                String s = format1((float) sum.getValue());
-                chartBean.setSalePrice(Float.valueOf(s));
+                ParsedSum refundSum = bucket.getAggregations().get(aggName_refundAmount);
+                String s1 = format1((float) sum.getValue());
+                String s2 = format1((float) refundSum.getValue());
+                chartBean.setSalePrice(Float.valueOf(s1) - Float.valueOf(s2));
 //                chartBean.setSalePrice(Double.valueOf(sum.getValue()).intValue());
                 chartBeanList.add(chartBean);
             }

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

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.szwl.model.entity.TOrderDetails;
+import com.szwl.mapper.TOrderDetailsMapper;
+import com.szwl.service.TOrderDetailsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 订单明细表 服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-08-12
+ */
+@Service
+public class TOrderDetailsServiceImpl extends ServiceImpl<TOrderDetailsMapper, TOrderDetails> implements TOrderDetailsService {
+
+}

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