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/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;