aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TASK:代码合并;

Browse Source
This commit is contained in:
shahaibo
2024-02-20 10:35:50 +08:00
parent ca70371585
commit f8d468d55b
22 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/common/task/AliPayTask.java
View File

@@ -1,6 +1,6 @@
package com.ai.da.common.task;
import com.ai.da.mapper.entity.OrderInfo;
import com.ai.da.mapper.primary.entity.OrderInfo;
import com.ai.da.common.enums.PayTypeEnum;
import com.ai.da.service.AliPayService;
import com.ai.da.service.OrderInfoService;

2
src/main/java/com/ai/da/controller/AliPayController.java
View File

@@ -1,7 +1,7 @@
package com.ai.da.controller;
import com.ai.da.common.response.Response;
import com.ai.da.mapper.entity.OrderInfo;
import com.ai.da.mapper.primary.entity.OrderInfo;
import com.ai.da.service.AliPayService;
import com.ai.da.service.OrderInfoService;
import com.alipay.api.AlipayApiException;

2
src/main/java/com/ai/da/controller/OrderInfoController.java
View File

@@ -2,7 +2,7 @@ package com.ai.da.controller;
import com.ai.da.common.enums.OrderStatusEnum;
import com.ai.da.common.response.Response;
import com.ai.da.mapper.entity.OrderInfo;
import com.ai.da.mapper.primary.entity.OrderInfo;
import com.ai.da.service.OrderInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

2
src/main/java/com/ai/da/controller/ProductController.java
View File

@@ -2,7 +2,7 @@ package com.ai.da.controller;
import com.ai.da.common.response.Response;
import com.ai.da.mapper.entity.Product;
import com.ai.da.mapper.primary.entity.Product;
import com.ai.da.service.ProductService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

4
src/main/java/com/ai/da/mapper/OrderInfoMapper.java → src/main/java/com/ai/da/mapper/primary/OrderInfoMapper.java
View File

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

4
src/main/java/com/ai/da/mapper/PaymentInfoMapper.java → src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java
View File

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

4
src/main/java/com/ai/da/mapper/ProductMapper.java → src/main/java/com/ai/da/mapper/primary/ProductMapper.java
View File

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

4
src/main/java/com/ai/da/mapper/RefundInfoMapper.java → src/main/java/com/ai/da/mapper/primary/RefundInfoMapper.java
View File

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

3
src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java
View File

@@ -2,10 +2,8 @@ package com.ai.da.mapper.primary.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
@@ -19,6 +17,7 @@ public class BaseEntity implements Serializable {
/**
* ID
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**

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

@@ -1,4 +1,4 @@
package com.ai.da.mapper.entity;
package com.ai.da.mapper.primary.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

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

@@ -1,4 +1,4 @@
package com.ai.da.mapper.entity;
package com.ai.da.mapper.primary.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

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

@@ -1,4 +1,4 @@
package com.ai.da.mapper.entity;
package com.ai.da.mapper.primary.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

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

@@ -1,4 +1,4 @@
package com.ai.da.mapper.entity;
package com.ai.da.mapper.primary.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

2
src/main/java/com/ai/da/service/OrderInfoService.java
View File

@@ -2,7 +2,7 @@ package com.ai.da.service;
import com.ai.da.common.enums.OrderStatusEnum;
import com.ai.da.mapper.entity.OrderInfo;
import com.ai.da.mapper.primary.entity.OrderInfo;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;

2
src/main/java/com/ai/da/service/ProductService.java
View File

@@ -1,6 +1,6 @@
package com.ai.da.service;
import com.ai.da.mapper.entity.Product;
import com.ai.da.mapper.primary.entity.Product;
import com.baomidou.mybatisplus.extension.service.IService;
public interface ProductService extends IService<Product> {

2
src/main/java/com/ai/da/service/RefundInfoService.java
View File

@@ -1,7 +1,7 @@
package com.ai.da.service;
import com.ai.da.mapper.entity.RefundInfo;
import com.ai.da.mapper.primary.entity.RefundInfo;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;

4
src/main/java/com/ai/da/service/impl/AliPayServiceImpl.java
View File

@@ -3,8 +3,8 @@ package com.ai.da.service.impl;
import com.ai.da.common.enums.AliPayTradeStateEnum;
import com.ai.da.common.enums.OrderStatusEnum;
import com.ai.da.common.enums.PayTypeEnum;
import com.ai.da.mapper.entity.OrderInfo;
import com.ai.da.mapper.entity.RefundInfo;
import com.ai.da.mapper.primary.entity.OrderInfo;
import com.ai.da.mapper.primary.entity.RefundInfo;
import com.ai.da.service.AliPayService;
import com.ai.da.service.OrderInfoService;
import com.ai.da.service.PaymentInfoService;

2
src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
View File

@@ -9,7 +9,9 @@ import com.ai.da.common.enums.LibraryLevel1TypeEnum;
import com.ai.da.common.utils.CopyUtil;
import com.ai.da.common.utils.MD5Utils;
import com.ai.da.common.utils.MinioUtil;
import com.ai.da.mapper.primary.AccountMapper;
import com.ai.da.mapper.primary.LibraryMapper;
import com.ai.da.mapper.primary.entity.Account;
import com.ai.da.mapper.primary.entity.ChatRobot;
import com.ai.da.mapper.primary.ChatRobotMapper;
import com.ai.da.mapper.primary.entity.Library;

8
src/main/java/com/ai/da/service/impl/OrderInfoServiceImpl.java
View File

@@ -3,10 +3,10 @@ package com.ai.da.service.impl;
import com.ai.da.common.enums.OrderStatusEnum;
import com.ai.da.common.utils.OrderNoUtils;
import com.ai.da.mapper.OrderInfoMapper;
import com.ai.da.mapper.ProductMapper;
import com.ai.da.mapper.entity.OrderInfo;
import com.ai.da.mapper.entity.Product;
import com.ai.da.mapper.primary.OrderInfoMapper;
import com.ai.da.mapper.primary.ProductMapper;
import com.ai.da.mapper.primary.entity.OrderInfo;
import com.ai.da.mapper.primary.entity.Product;
import com.ai.da.service.OrderInfoService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

4
src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java
View File

@@ -1,8 +1,8 @@
package com.ai.da.service.impl;
import com.ai.da.common.enums.PayTypeEnum;
import com.ai.da.mapper.PaymentInfoMapper;
import com.ai.da.mapper.entity.PaymentInfo;
import com.ai.da.mapper.primary.PaymentInfoMapper;
import com.ai.da.mapper.primary.entity.PaymentInfo;
import com.ai.da.service.PaymentInfoService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.gson.Gson;

4
src/main/java/com/ai/da/service/impl/ProductServiceImpl.java
View File

@@ -1,7 +1,7 @@
package com.ai.da.service.impl;
import com.ai.da.mapper.ProductMapper;
import com.ai.da.mapper.entity.Product;
import com.ai.da.mapper.primary.ProductMapper;
import com.ai.da.mapper.primary.entity.Product;
import com.ai.da.service.ProductService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

6
src/main/java/com/ai/da/service/impl/RefundInfoServiceImpl.java
View File

@@ -1,9 +1,9 @@
package com.ai.da.service.impl;
import com.ai.da.common.utils.OrderNoUtils;
import com.ai.da.mapper.RefundInfoMapper;
import com.ai.da.mapper.entity.OrderInfo;
import com.ai.da.mapper.entity.RefundInfo;
import com.ai.da.mapper.primary.RefundInfoMapper;
import com.ai.da.mapper.primary.entity.OrderInfo;
import com.ai.da.mapper.primary.entity.RefundInfo;
import com.ai.da.service.OrderInfoService;
import com.ai.da.service.RefundInfoService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;