Merge remote-tracking branch 'origin/dev/dev' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java
#	src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java
#	src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java
#	src/main/java/com/ai/da/mapper/primary/entity/Product.java
#	src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java
#	src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java

src/main/java/com/ai/da/mapper/OrderInfoMapper.java

@@ -0,0 +1,8 @@
+package com.ai.da.mapper;
+
+import com.ai.da.mapper.entity.OrderInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
+
+}

src/main/java/com/ai/da/mapper/PaymentInfoMapper.java

@@ -0,0 +1,7 @@
+package com.ai.da.mapper;
+
+import com.ai.da.mapper.entity.PaymentInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface PaymentInfoMapper extends BaseMapper<PaymentInfo> {
+}

src/main/java/com/ai/da/mapper/ProductMapper.java

@@ -0,0 +1,8 @@
+package com.ai.da.mapper;
+
+import com.ai.da.mapper.entity.Product;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface ProductMapper extends BaseMapper<Product> {
+
+}

src/main/java/com/ai/da/mapper/RefundInfoMapper.java

@@ -0,0 +1,9 @@
+package com.ai.da.mapper;
+
+
+import com.ai.da.mapper.entity.RefundInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface RefundInfoMapper extends BaseMapper<RefundInfo> {
+
+}

src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java

@@ -0,0 +1,25 @@
+package com.ai.da.mapper.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("t_order_info")
+public class OrderInfo  extends BaseEntity{
+
+    private String title;//订单标题
+
+    private String orderNo;//商户订单编号
+
+    private Long userId;//用户id
+
+    private Long productId;//支付产品id
+
+    private Integer totalFee;//订单金额(分)
+
+    private String codeUrl;//订单二维码连接
+
+    private String orderStatus;//订单状态
+
+    private String paymentType;//支付方式
+}

src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java

@@ -0,0 +1,23 @@
+package com.ai.da.mapper.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("t_payment_info")
+public class PaymentInfo extends BaseEntity{
+
+    private String orderNo;//商品订单编号
+
+    private String transactionId;//支付系统交易编号
+
+    private String paymentType;//支付类型
+
+    private String tradeType;//交易类型
+
+    private String tradeState;//交易状态
+
+    private Integer payerTotal;//支付金额(分)
+
+    private String content;//通知参数
+}

src/main/java/com/ai/da/mapper/primary/entity/Product.java

@@ -0,0 +1,13 @@
+package com.ai.da.mapper.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("t_product")
+public class Product extends BaseEntity{
+
+    private String title; //商品名称
+
+    private Integer price; //价格（分）
+}

src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java

@@ -0,0 +1,27 @@
+package com.ai.da.mapper.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("t_refund_info")
+public class RefundInfo extends BaseEntity{
+
+    private String orderNo;//商品订单编号
+
+    private String refundNo;//退款单编号
+
+    private String refundId;//支付系统退款单号
+
+    private Integer totalFee;//原订单金额(分)
+
+    private Integer refund;//退款金额(分)
+
+    private String reason;//退款原因
+
+    private String refundStatus;//退款单状态
+
+    private String contentReturn;//申请退款返回参数
+
+    private String contentNotify;//退款结果通知参数
+}