From 687dbd8e6ababc010a3da5503b95cd62cecf9f02 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 23 五月 2023 18:06:45 +0800
Subject: [PATCH] 拆分订单和商品服务
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsRelNurseServiceImpl.java | 8
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsService.java | 14
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsRelTagServiceImpl.java | 8
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsRelNurse.java | 2
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsRelNurseMapper.xml | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCodeVo.java | 28
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShopGoodsPageDto.java | 31
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppConsumerPageVo.java | 48
ruoyi-modules/ruoyi-order/pom.xml | 1
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteGoodsFallbackFactory.java | 51
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppSureOrderDto.java | 25
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsRelTagService.java | 4
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java | 5
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsDto.java | 23
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsTotalServiceImpl.java | 8
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderPageVo.java | 73 +
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityGoodsMapper.xml | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java | 8
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppShopGoodsGetDto.java | 23
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java | 6
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 8
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/GoodsFile.java | 2
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShoppingCartServiceImpl.java | 19
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityGoodsMapper.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerCloseOrderDto.java | 27
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java | 1
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java | 59 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ParamsAuthFilter.java | 103 +
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsFileMapper.xml | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyOrderDto.java | 27
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerServiceRecordPageDto.java | 21
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCouponVo.java | 15
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/ShopGoods.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java | 8
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsRelTagMapper.java | 4
pom.xml | 1
ruoyi-modules/pom.xml | 1
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java | 15
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/ShoppingCart.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/ShopGoodsMapper.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerShopGoodsEditDto.java | 28
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsTotal.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppServiceRecordPageVo.java | 31
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteFileService.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGoodsPageVo.java | 50
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteActivityService.java | 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java | 2
ruoyi-modules/ruoyi-file/pom.xml | 1
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppGoodsInfoGetDto.java | 22
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsRelTagMapper.xml | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsRelNurseMapper.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderVo.java | 39
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsListVo.java | 48
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java | 19
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerNewOrderDto.java | 40
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java | 5
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteGoodsService.java | 34
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsVo.java | 25
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ShopGoodsMapper.xml | 2
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsTotalMapper.xml | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java | 1
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java | 14
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGetVo.java | 82 +
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppSearchGoodsPageDto.java | 23
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/RepeatedlyRequestWrapper.java | 111 ++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/ShopGoodsService.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ShoppingCartController.java | 32
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerMemberNoClearOrderVo.java | 51
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppConsumerController.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShoppingCartFallbackFactory.java | 36
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml | 12
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppPlaceOrderDto.java | 31
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyCodeDto.java | 19
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/RuoYiGoodsApplication.java | 37
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityGoodsServiceImpl.java | 6
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsPageDto.java | 23
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/config/MyBatisPlusConfig.java | 32
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteLogService.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsFileMapper.java | 4
ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml | 27
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyOrderVo.java | 75 +
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShoppingCartChangeDto.java | 25
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderGoodsPageVo.java | 24
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerOrderPageDto.java | 36
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsFileService.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsMapper.java | 16
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 8
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ResponseWrapper.java | 63 +
ruoyi-modules/ruoyi-goods/pom.xml | 130 ++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerServiceRecordPageVo.java | 30
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleActivityGoodsVo.java | 55 +
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsRelNurseService.java | 4
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java | 3
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderPageVo.java | 56 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/Goods.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/ShoppingCartMapper.java | 6
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/EmojiUtil.java | 95 +
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShoppingCartAddDto.java | 25
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerGoodsPageVo.java | 54
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppShoppingCartDelDto.java | 22
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppPlaceOrderVo.java | 58 +
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppShoppingCartVo.java | 48
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/CodeFactoryUtil.java | 154 ++
ruoyi-modules/ruoyi-goods/src/main/resources/logback.xml | 74 +
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleGoodsVo.java | 43
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsTotalMapper.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityGoodsService.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java | 3
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ShoppingCartMapper.xml | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsListDto.java | 22
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerMemberNoClearOrderDto.java | 21
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerGoodsPageDto.java | 23
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java | 29
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteActivityFallbackFactory.java | 9
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsFileServiceImpl.java | 9
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteUserService.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsTotalService.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppBuyGoodsDto.java | 28
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsDto.java | 25
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 6
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java | 3
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsRelTag.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysProfileController.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 65
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/ShoppingCartService.java | 10
ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 7
/dev/null | 10
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShoppingCartService.java | 23
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderGoodsVo.java | 62 +
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppUserOrderPageDto.java | 25
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyAwardVo.java | 14
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShopGoodsServiceImpl.java | 8
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppConsumerPageDto.java | 22
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppGoodsInfoVo.java | 68 +
146 files changed, 3,003 insertions(+), 255 deletions(-)
diff --git a/pom.xml b/pom.xml
index 74152cb..f7b7a22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,6 +207,7 @@
<version>${ruoyi.version}</version>
</dependency>
+
<!-- lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppShopGoodsGetDto.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppShopGoodsGetDto.java
new file mode 100644
index 0000000..04f115f
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppShopGoodsGetDto.java
@@ -0,0 +1,23 @@
+package com.ruoyi.system.api.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppShopGoodsGetDto
+ * @description: TODO
+ * @date 2023年05月23日
+ * @version: 1.0
+ */
+@Data
+public class AppShopGoodsGetDto {
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "商户id")
+ private Long shopId;
+
+
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppShoppingCartDelDto.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppShoppingCartDelDto.java
new file mode 100644
index 0000000..b934706
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppShoppingCartDelDto.java
@@ -0,0 +1,22 @@
+package com.ruoyi.system.api.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppShoppingCartDelDto
+ * @description: TODO
+ * @date 2023年05月23日
+ * @version: 1.0
+ */
+@Data
+public class AppShoppingCartDelDto {
+
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/Goods.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/Goods.java
similarity index 97%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/Goods.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/Goods.java
index 9883d36..44cf8e7 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/Goods.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/Goods.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.domain.pojo.goods;
+package com.ruoyi.system.api.domain.poji.goods;
import java.math.BigDecimal;
import java.util.Date;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsFile.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/GoodsFile.java
similarity index 95%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsFile.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/GoodsFile.java
index 35c34aa..c7bae18 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsFile.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/GoodsFile.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.domain.pojo.goods;
+package com.ruoyi.system.api.domain.poji.goods;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/ShopGoods.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/ShopGoods.java
similarity index 96%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/ShopGoods.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/ShopGoods.java
index 19a2dfa..8ed0ac9 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/ShopGoods.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/ShopGoods.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.domain.pojo.goods;
+package com.ruoyi.system.api.domain.poji.goods;
import com.baomidou.mybatisplus.annotation.IdType;
import java.math.BigDecimal;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteActivityFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteActivityFallbackFactory.java
index 9ef9fe1..3625424 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteActivityFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteActivityFallbackFactory.java
@@ -1,19 +1,12 @@
package com.ruoyi.system.api.factory;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteActivityService;
-import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.service.RemoteActivityService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
-import com.ruoyi.system.api.domain.poji.sys.SysUser;
-import com.ruoyi.system.api.model.AppMiniLoginDto;
-import com.ruoyi.system.api.model.AppMiniLoginVo;
-import com.ruoyi.system.api.model.LoginUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
/**
* 活动服务
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java
index 5703683..fb5482e 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java
@@ -1,15 +1,12 @@
package com.ruoyi.system.api.factory;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteActivityService;
-import com.ruoyi.system.api.RemoteConfigService;
-import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
index 0457d5c..aa3c813 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java
@@ -6,7 +6,7 @@
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteFileService;
+import com.ruoyi.system.api.service.RemoteFileService;
import com.ruoyi.system.api.domain.poji.sys.SysFile;
/**
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteGoodsFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteGoodsFallbackFactory.java
new file mode 100644
index 0000000..ff46205
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteGoodsFallbackFactory.java
@@ -0,0 +1,51 @@
+package com.ruoyi.system.api.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.dto.AppShopGoodsGetDto;
+import com.ruoyi.system.api.domain.poji.goods.Goods;
+import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
+import com.ruoyi.system.api.domain.poji.goods.ShopGoods;
+import com.ruoyi.system.api.service.RemoteGoodsService;
+import com.ruoyi.system.api.service.RemoteMemberService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author jqs34
+ * @ClassName RemoteGoodsFallbackFactory
+ * @description: TODO
+ * @date 2023年05月23日
+ * @version: 1.0
+ */
+@Component
+public class RemoteGoodsFallbackFactory implements FallbackFactory<RemoteGoodsService> {
+
+ private static final Logger log = LoggerFactory.getLogger(RemoteMemberFallbackFactory.class);
+
+ @Override
+ public RemoteGoodsService create(Throwable throwable)
+ {
+ log.error("商品服务调用失败:{}", throwable.getMessage());
+ return new RemoteGoodsService()
+ {
+
+
+ @Override
+ public R<Goods> getGoods(String goodsId) {
+ return R.fail("获取商品失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R<GoodsFile> getGoodsFile(String goodsId) {
+ return R.fail("获取商品图片失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R<ShopGoods> getShopGoods(AppShopGoodsGetDto appShopGoodsGetDto) {
+ return R.fail("获取商户商品失败:" + throwable.getMessage());
+ }
+ };
+ }
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
index 359ea15..1fbb682 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
@@ -5,7 +5,7 @@
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteLogService;
+import com.ruoyi.system.api.service.RemoteLogService;
import com.ruoyi.system.api.domain.poji.sys.SysLogininfor;
import com.ruoyi.system.api.domain.poji.sys.SysOperLog;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java
index 3dd9eea..1560be8 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java
@@ -1,23 +1,17 @@
package com.ruoyi.system.api.factory;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteMemberService;
-import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto;
import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.api.domain.poji.sys.SysFile;
-import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
-import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.system.api.model.QwUserDetailDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
import java.util.List;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java
index 264c5cf..a1bef43 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteOrderFallbackFactory.java
@@ -1,8 +1,7 @@
package com.ruoyi.system.api.factory;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteMemberService;
-import com.ruoyi.system.api.RemoteOrderService;
+import com.ruoyi.system.api.service.RemoteOrderService;
import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import org.slf4j.Logger;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java
index b8be06a..a89b6d5 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShopFallbackFactory.java
@@ -1,8 +1,7 @@
package com.ruoyi.system.api.factory;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteMemberService;
-import com.ruoyi.system.api.RemoteShopService;
+import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
import org.slf4j.Logger;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShoppingCartFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShoppingCartFallbackFactory.java
new file mode 100644
index 0000000..d613c5e
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteShoppingCartFallbackFactory.java
@@ -0,0 +1,36 @@
+package com.ruoyi.system.api.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.dto.AppShoppingCartDelDto;
+import com.ruoyi.system.api.service.RemoteShoppingCartService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author jqs34
+ * @ClassName RemoteShoppingCartFallbackFactory
+ * @description: TODO
+ * @date 2023年05月23日
+ * @version: 1.0
+ */
+@Component
+public class RemoteShoppingCartFallbackFactory implements FallbackFactory<RemoteShoppingCartService> {
+
+ private static final Logger log = LoggerFactory.getLogger(RemoteMemberFallbackFactory.class);
+
+ @Override
+ public RemoteShoppingCartService create(Throwable throwable)
+ {
+ log.error("购物车服务调用失败:{}", throwable.getMessage());
+ return new RemoteShoppingCartService()
+ {
+
+ @Override
+ public R deleteShoppingCart(AppShoppingCartDelDto appShoppingCartDelDto) {
+ return R.fail("删除购物车户失败:" + throwable.getMessage());
+ }
+ };
+ }
+}
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
index f9758a1..217df68 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
@@ -8,7 +8,7 @@
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.service.RemoteUserService;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
/**
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteActivityService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteActivityService.java
similarity index 89%
rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteActivityService.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteActivityService.java
index 28e7323..25e7854 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteActivityService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteActivityService.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.api;
+package com.ruoyi.system.api.service;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
@@ -16,7 +16,7 @@
* @description: TODO
* @date 2023 2023/4/30 15:12
*/
-@FeignClient(contextId = "remoteActivityService", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = RemoteActivityFallbackFactory.class)
+@FeignClient(contextId = "remoteActivityService", value = ServiceNameConstants.GOODS_SERVICE, fallbackFactory = RemoteActivityFallbackFactory.class)
public interface RemoteActivityService {
@PostMapping("/activity/getActivityGoods")
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteConfigService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java
similarity index 96%
rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteConfigService.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java
index ce07fd4..8bb26a9 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteConfigService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.api;
+package com.ruoyi.system.api.service;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteFileService.java
similarity index 95%
rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteFileService.java
index fb3b7ff..d6d3193 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteFileService.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.api;
+package com.ruoyi.system.api.service;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteGoodsService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteGoodsService.java
new file mode 100644
index 0000000..82ec500
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteGoodsService.java
@@ -0,0 +1,34 @@
+package com.ruoyi.system.api.service;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.dto.AppShopGoodsGetDto;
+import com.ruoyi.system.api.domain.poji.goods.Goods;
+import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
+import com.ruoyi.system.api.domain.poji.goods.ShopGoods;
+import com.ruoyi.system.api.factory.RemoteGoodsFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author jqs34
+ * @ClassName RemoteGoodsService
+ * @description: TODO
+ * @date 2023年05月23日
+ * @version: 1.0
+ */
+@FeignClient(contextId = "remoteGoodsService", value = ServiceNameConstants.GOODS_SERVICE, fallbackFactory = RemoteGoodsFallbackFactory.class)
+public interface RemoteGoodsService {
+
+
+
+ @PostMapping("/goods/getGoods")
+ public R<Goods> getGoods(@RequestBody String goodsId);
+
+ @PostMapping("/goods/getGoodsFile")
+ public R<GoodsFile> getGoodsFile(@RequestBody String goodsId);
+
+ @PostMapping("/goods/getShopGoods")
+ public R<ShopGoods> getShopGoods(@RequestBody AppShopGoodsGetDto appShopGoodsGetDto);
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteLogService.java
similarity index 97%
rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteLogService.java
index 6cdfb55..59a14e0 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteLogService.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.api;
+package com.ruoyi.system.api.service;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMemberService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java
similarity index 91%
rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMemberService.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java
index 2c6f875..befd56f 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMemberService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.api;
+package com.ruoyi.system.api.service;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
@@ -7,10 +7,8 @@
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import com.ruoyi.system.api.factory.RemoteMemberFallbackFactory;
-import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
-import com.ruoyi.system.api.model.QwUserDetailDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteOrderService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java
similarity index 96%
rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteOrderService.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java
index b41f4b6..ced277b 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteOrderService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteOrderService.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.api;
+package com.ruoyi.system.api.service;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteShopService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
similarity index 96%
rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteShopService.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
index 08cf8d9..6ed877f 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteShopService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.api;
+package com.ruoyi.system.api.service;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShoppingCartService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShoppingCartService.java
new file mode 100644
index 0000000..2a61ec4
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShoppingCartService.java
@@ -0,0 +1,23 @@
+package com.ruoyi.system.api.service;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.dto.AppShoppingCartDelDto;
+import com.ruoyi.system.api.factory.RemoteShoppingCartFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author jqs34
+ * @ClassName RemoteShoppingCartService
+ * @description: TODO
+ * @date 2023年05月23日
+ * @version: 1.0
+ */
+@FeignClient(contextId = "remoteShoppingCartService", value = ServiceNameConstants.GOODS_SERVICE, fallbackFactory = RemoteShoppingCartFallbackFactory.class)
+public interface RemoteShoppingCartService {
+
+ @PostMapping("/shoppingCart/deleteShoppingCart")
+ public R deleteShoppingCart(@RequestBody AppShoppingCartDelDto appShoppingCartDelDto);
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteUserService.java
similarity index 98%
rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteUserService.java
index cafe2f4..217921d 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteUserService.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.api;
+package com.ruoyi.system.api.service;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
import com.ruoyi.system.api.domain.poji.config.SysTag;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 0a60da5..ef36eec 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +1,10 @@
com.ruoyi.system.api.factory.RemoteUserFallbackFactory
com.ruoyi.system.api.factory.RemoteLogFallbackFactory
+com.ruoyi.system.api.factory.RemoteActivityFallbackFactory
+com.ruoyi.system.api.factory.RemoteConfigFallbackFactory
com.ruoyi.system.api.factory.RemoteFileFallbackFactory
+com.ruoyi.system.api.factory.RemoteMemberFallbackFactory
+com.ruoyi.system.api.factory.RemoteOrderFallbackFactory
+com.ruoyi.system.api.factory.RemoteShopFallbackFactory
+com.ruoyi.system.api.factory.RemoteUserFallbackFactory
+com.ruoyi.system.api.factory.RemoteMemberFallbackFactory
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index 582ee8f..39973ac 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -1,7 +1,7 @@
package com.ruoyi.auth.service;
-import com.ruoyi.system.api.RemoteMemberService;
-import com.ruoyi.system.api.RemoteShopService;
+import com.ruoyi.system.api.service.RemoteMemberService;
+import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
import com.ruoyi.system.api.model.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +18,7 @@
import com.ruoyi.common.core.utils.ip.IpUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.service.RemoteUserService;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
/**
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
index 2c6748f..81270be 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
@@ -6,7 +6,7 @@
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.ip.IpUtils;
-import com.ruoyi.system.api.RemoteLogService;
+import com.ruoyi.system.api.service.RemoteLogService;
import com.ruoyi.system.api.domain.poji.sys.SysLogininfor;
/**
diff --git a/ruoyi-auth/src/main/resources/banner.txt b/ruoyi-auth/src/main/resources/banner.txt
deleted file mode 100644
index 97c5c27..0000000
--- a/ruoyi-auth/src/main/resources/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _ _ _
- (_) | | | |
- _ __ _ _ ___ _ _ _ ______ __ _ _ _ | |_ | |__
-| '__|| | | | / _ \ | | | || ||______| / _` || | | || __|| '_ \
-| | | |_| || (_) || |_| || | | (_| || |_| || |_ | | | |
-|_| \__,_| \___/ \__, ||_| \__,_| \__,_| \__||_| |_|
- __/ |
- |___/
\ No newline at end of file
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
index 3677ffc..c74af43 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
@@ -27,4 +27,6 @@
public static final String SHOP_SERVICE = "ruoyi-shop";
public static final String ORDER_SERVICE = "ruoyi-order";
+
+ public static final String GOODS_SERVICE = "ruoyi-goods";
}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java
index c23a030..4177ae0 100644
--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java
@@ -4,7 +4,7 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.system.api.RemoteLogService;
+import com.ruoyi.system.api.service.RemoteLogService;
import com.ruoyi.system.api.domain.poji.sys.SysOperLog;
/**
diff --git a/ruoyi-gateway/src/main/resources/banner.txt b/ruoyi-gateway/src/main/resources/banner.txt
deleted file mode 100644
index ceced29..0000000
--- a/ruoyi-gateway/src/main/resources/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _ _
- (_) | |
- _ __ _ _ ___ _ _ _ ______ __ _ __ _ | |_ ___ __ __ __ _ _ _
-| '__|| | | | / _ \ | | | || ||______| / _` | / _` || __| / _ \\ \ /\ / / / _` || | | |
-| | | |_| || (_) || |_| || | | (_| || (_| || |_ | __/ \ V V / | (_| || |_| |
-|_| \__,_| \___/ \__, ||_| \__, | \__,_| \__| \___| \_/\_/ \__,_| \__, |
- __/ | __/ | __/ |
- |___/ |___/ |___/
\ No newline at end of file
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index c0c51cb..208cf31 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -16,6 +16,7 @@
<module>ruoyi-member</module>
<module>ruoyi-shop</module>
<module>ruoyi-order</module>
+ <module>ruoyi-goods</module>
</modules>
<artifactId>ruoyi-modules</artifactId>
diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml
index 5bc9e09..c2c31bb 100644
--- a/ruoyi-modules/ruoyi-file/pom.xml
+++ b/ruoyi-modules/ruoyi-file/pom.xml
@@ -59,6 +59,7 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-api-system</artifactId>
</dependency>
+
<!-- RuoYi Common Swagger -->
<dependency>
diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/banner.txt b/ruoyi-modules/ruoyi-file/src/main/resources/banner.txt
deleted file mode 100644
index 27cacb9..0000000
--- a/ruoyi-modules/ruoyi-file/src/main/resources/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _ __ _ _
- (_) / _|(_)| |
- _ __ _ _ ___ _ _ _ ______ | |_ _ | | ___
-| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \
-| | | |_| || (_) || |_| || | | | | || || __/
-|_| \__,_| \___/ \__, ||_| |_| |_||_| \___|
- __/ |
- |___/
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/banner.txt b/ruoyi-modules/ruoyi-gen/src/main/resources/banner.txt
deleted file mode 100644
index 05f528c..0000000
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _
- (_)
- _ __ _ _ ___ _ _ _ ______ __ _ ___ _ __
-| '__|| | | | / _ \ | | | || ||______| / _` | / _ \| '_ \
-| | | |_| || (_) || |_| || | | (_| || __/| | | |
-|_| \__,_| \___/ \__, ||_| \__, | \___||_| |_|
- __/ | __/ |
- |___/ |___/
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-goods/pom.xml b/ruoyi-modules/ruoyi-goods/pom.xml
new file mode 100644
index 0000000..7a0746c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/pom.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-modules</artifactId>
+ <version>3.6.2</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>ruoyi-modules-goods</artifactId>
+
+ <description>
+ ruoyi-modules-goods商品模块
+ </description>
+
+ <dependencies>
+
+ <!-- SpringCloud Alibaba Nacos -->
+ <dependency>
+ <groupId>com.alibaba.cloud</groupId>
+ <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+ </dependency>
+
+ <!-- SpringCloud Alibaba Nacos Config -->
+ <dependency>
+ <groupId>com.alibaba.cloud</groupId>
+ <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+ </dependency>
+
+ <!-- SpringCloud Alibaba Sentinel -->
+ <dependency>
+ <groupId>com.alibaba.cloud</groupId>
+ <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+ </dependency>
+
+ <!-- SpringBoot Actuator -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+
+ <!-- Swagger UI -->
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger-ui</artifactId>
+ <version>${swagger.fox.version}</version>
+ </dependency>
+
+ <!-- Mysql Connector -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </dependency>
+
+ <!-- RuoYi Common DataSource -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-datasource</artifactId>
+ </dependency>
+
+ <!-- RuoYi Common DataScope -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-datascope</artifactId>
+ </dependency>
+
+ <!-- RuoYi Common Log -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-log</artifactId>
+ </dependency>
+
+ <!-- RuoYi Common Swagger -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common-swagger</artifactId>
+ </dependency>
+
+ <!-- lombok -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>3.4.1</version>
+ <!-- pagehelper 包含该依赖存在版本冲突，因此不建议和 mp 一起混用 -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.github.jsqlparser</groupId>
+ <artifactId>jsqlparser</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-annotation</artifactId>
+ <version>3.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-generate</artifactId>
+ <version>2.3</version>
+ </dependency>
+
+
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/RuoYiGoodsApplication.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/RuoYiGoodsApplication.java
new file mode 100644
index 0000000..83a80d4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/RuoYiGoodsApplication.java
@@ -0,0 +1,37 @@
+package com.ruoyi.goods;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import com.ruoyi.common.security.annotation.EnableCustomConfig;
+import com.ruoyi.common.security.annotation.EnableRyFeignClients;
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.ComponentScans;
+
+/**
+ * 商品模块
+ *
+ * @author jqs
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringBootApplication
+@ComponentScans(value = {@ComponentScan("com.ruoyi.system.api")})
+public class RuoYiGoodsApplication
+{
+ public static void main(String[] args)
+ {
+ SpringApplication.run(RuoYiGoodsApplication.class, args);
+ System.out.println("(♥◠‿◠)ﾉﾞ 商品模块启动成功 ლ(´ڡ`ლ)ﾞ \n" +
+ " .-------. ____ __ \n" +
+ " | _ _ \\ \\ \\ / / \n" +
+ " | ( ' ) | \\ _. / ' \n" +
+ " |(_ o _) / _( )_ .' \n" +
+ " | (_,_).' __ ___(_ o _)' \n" +
+ " | |\\ \\ | || |(_,_)' \n" +
+ " | | \\ `' /| `-' / \n" +
+ " | | \\ / \\ / \n" +
+ " ''-' `'-' `-..-' ");
+ }
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/config/MyBatisPlusConfig.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/config/MyBatisPlusConfig.java
new file mode 100644
index 0000000..a2d1074
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/config/MyBatisPlusConfig.java
@@ -0,0 +1,32 @@
+package com.ruoyi.goods.config;
+
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author jqs34
+ * @ClassName MyBatisPlusConfig
+ * @description: TODO
+ * @date 2023年05月09日
+ * @version: 1.0
+ */
+
+@Configuration
+public class MyBatisPlusConfig {
+
+ /**
+ * MyBatisPlus拦截器（用于分页）
+ */
+ @Bean
+ @ConditionalOnMissingBean
+ public PaginationInterceptor paginationInterceptor() {
+ PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+ return paginationInterceptor;
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
similarity index 85%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerGoodsController.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
index 698bc2d..fe384b5 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerGoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
@@ -1,14 +1,14 @@
-package com.ruoyi.order.controller.business;
+package com.ruoyi.goods.controller.business;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.dto.AppConsumerPageDto;
-import com.ruoyi.order.domain.dto.MerGoodsPageDto;
-import com.ruoyi.order.domain.dto.MerShopGoodsEditDto;
-import com.ruoyi.order.domain.vo.AppConsumerPageVo;
-import com.ruoyi.order.domain.vo.MerGoodsPageVo;
-import com.ruoyi.order.service.goods.GoodsService;
+import com.ruoyi.goods.domain.dto.AppConsumerPageDto;
+import com.ruoyi.goods.domain.dto.MerGoodsPageDto;
+import com.ruoyi.goods.domain.dto.MerShopGoodsEditDto;
+import com.ruoyi.goods.domain.vo.AppConsumerPageVo;
+import com.ruoyi.goods.domain.vo.MerGoodsPageVo;
+import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/ActivityController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java
similarity index 85%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/ActivityController.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java
index e95517e..d64bf3b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/ActivityController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java
@@ -1,8 +1,7 @@
-package com.ruoyi.order.controller.concole;
+package com.ruoyi.goods.controller.concole;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.order.service.activity.ActivityGoodsService;
+import com.ruoyi.goods.service.activity.ActivityGoodsService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +21,7 @@
public class ActivityController {
+
@Autowired
private ActivityGoodsService activityGoodsService;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java
new file mode 100644
index 0000000..a8314d0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java
@@ -0,0 +1,59 @@
+package com.ruoyi.goods.controller.concole;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.goods.service.activity.ActivityGoodsService;
+import com.ruoyi.goods.service.goods.GoodsFileService;
+import com.ruoyi.goods.service.goods.GoodsService;
+import com.ruoyi.goods.service.goods.ShopGoodsService;
+import com.ruoyi.system.api.domain.dto.AppShopGoodsGetDto;
+import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+import com.ruoyi.system.api.domain.poji.goods.Goods;
+import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
+import com.ruoyi.system.api.domain.poji.goods.ShopGoods;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author jqs34
+ * @ClassName GoodsController
+ * @description: TODO
+ * @date 2023年05月23日
+ * @version: 1.0
+ */
+@RestController
+@RequestMapping("/goods")
+public class GoodsController {
+
+ @Autowired
+ private GoodsService goodsService;
+
+ @Autowired
+ private GoodsFileService goodsFileService;
+
+ @Autowired
+ private ShopGoodsService shopGoodsService;
+
+ @PostMapping("/getGoods")
+ public R<Goods> getGoods(@RequestBody String goodsId)
+ {
+ Goods goods = goodsService.getById(goodsId);
+ return R.ok(goods);
+ }
+
+ @PostMapping("/getGoodsFile")
+ public R<GoodsFile> getGoodsFile(@RequestBody String goodsId)
+ {
+ GoodsFile goodsFile = goodsFileService.getGoodsPicture(goodsId);
+ return R.ok(goodsFile);
+ }
+
+ @PostMapping("/getShopGoods")
+ public R<ShopGoods> getShopGoods(@RequestBody AppShopGoodsGetDto appShopGoodsGetDto)
+ {
+ ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(appShopGoodsGetDto.getShopId(),appShopGoodsGetDto.getGoodsId());
+ return R.ok(shopGoods);
+ }
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ShoppingCartController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ShoppingCartController.java
new file mode 100644
index 0000000..344b640
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ShoppingCartController.java
@@ -0,0 +1,32 @@
+package com.ruoyi.goods.controller.concole;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.dto.AppShoppingCartDelDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.goods.service.goods.ShoppingCartService;
+/**
+ * @author jqs34
+ * @ClassName ShoppingCartController
+ * @description: TODO
+ * @date 2023年05月23日
+ * @version: 1.0
+ */
+@RestController
+@RequestMapping("/shoppingCart")
+public class ShoppingCartController {
+
+ @Autowired
+ private ShoppingCartService shoppingCartService;
+
+ @PostMapping("/deleteShoppingCart")
+ public R deleteShoppingCart(@RequestBody AppShoppingCartDelDto appShoppingCartDelDto)
+ {
+ shoppingCartService.deleteByUserIdAndGoodsId(appShoppingCartDelDto.getUserId(),appShoppingCartDelDto.getGoodsId());
+ return R.ok();
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
similarity index 88%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
index 36637bb..5354c45 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
@@ -1,20 +1,19 @@
-package com.ruoyi.order.controller.miniapp;
+package com.ruoyi.goods.controller.miniapp;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.vo.AppShoppingCartVo;
+import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
-import com.ruoyi.order.domain.dto.AppGoodsInfoGetDto;
-import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
-import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
-import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
-import com.ruoyi.order.service.goods.GoodsService;
-import com.ruoyi.order.service.order.ShoppingCartService;
-import com.ruoyi.system.api.RemoteMemberService;
-import com.ruoyi.system.api.domain.dto.AppBaseDto;
+import com.ruoyi.goods.domain.dto.AppGoodsInfoGetDto;
+import com.ruoyi.goods.domain.dto.AppShoppingCartAddDto;
+import com.ruoyi.goods.domain.dto.AppShoppingCartChangeDto;
+import com.ruoyi.goods.domain.vo.AppGoodsInfoVo;
+import com.ruoyi.goods.service.goods.GoodsService;
+import com.ruoyi.goods.service.goods.ShoppingCartService;
import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
similarity index 92%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
index b54b1a3..3f01cbb 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
@@ -1,18 +1,17 @@
-package com.ruoyi.order.controller.miniapp;
+package com.ruoyi.goods.controller.miniapp;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.dto.AppPageDto;
-import com.ruoyi.order.domain.dto.AppSearchGoodsPageDto;
-import com.ruoyi.order.domain.dto.AppShopGoodsPageDto;
-import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
-import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
-import com.ruoyi.order.service.goods.GoodsService;
-import com.ruoyi.system.api.RemoteMemberService;
+import com.ruoyi.goods.domain.dto.AppSearchGoodsPageDto;
+import com.ruoyi.goods.domain.dto.AppShopGoodsPageDto;
+import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
+import com.ruoyi.goods.domain.vo.AppSimpleGoodsVo;
+import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppBuyGoodsDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppBuyGoodsDto.java
new file mode 100644
index 0000000..e65e8a0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppBuyGoodsDto.java
@@ -0,0 +1,28 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.AppBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @version 1.0
+ * @classname AppBuyNowDto
+ * @description: TODO
+ * @date 2023 2023/5/2 20:52
+ */
+
+@Data
+public class AppBuyGoodsDto extends AppBaseDto {
+
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "购买数量")
+ private Integer buyNum;
+
+ @ApiModelProperty(value = "用户优惠券id")
+ private Long userCouponId;
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppConsumerPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppConsumerPageDto.java
new file mode 100644
index 0000000..ba2eb83
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppConsumerPageDto.java
@@ -0,0 +1,22 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.AppPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppConsumerPageDto
+ * @description: TODO
+ * @date 2023年05月03日
+ * @version: 1.0
+ */
+@Data
+public class AppConsumerPageDto extends AppPageDto {
+
+ @ApiModelProperty(value = "shopId",hidden = true)
+ private Long shopId;
+
+ @ApiModelProperty("商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppGoodsInfoGetDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppGoodsInfoGetDto.java
new file mode 100644
index 0000000..6234c59
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppGoodsInfoGetDto.java
@@ -0,0 +1,22 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppGoodsInfoGetDto
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppGoodsInfoGetDto extends AppBaseGetDto {
+
+ @ApiModelProperty(value = "是否活动跳转0否1是")
+ private Integer activityFlag;
+
+ @ApiModelProperty(value = "商户id",hidden = true)
+ private Long shopId;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppPlaceOrderDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppPlaceOrderDto.java
new file mode 100644
index 0000000..84e99bd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppPlaceOrderDto.java
@@ -0,0 +1,31 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.AppBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @version 1.0
+ * @classname AppShoppingcartDto
+ * @description: TODO
+ * @date 2023 2023/5/2 20:54
+ */
+@Data
+public class AppPlaceOrderDto extends AppBaseDto {
+
+ @ApiModelProperty(value = "shopId",hidden = true)
+ private Long shopId;
+
+ @ApiModelProperty(value = "支付方式1.全款2.订金")
+ private Integer payType;
+
+ @ApiModelProperty(value = "订单备注")
+ private String orderRemark;
+
+ @ApiModelProperty(value = "购物车列表")
+ List<AppBuyGoodsDto> appBuyGoodsDtoList;
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppSearchGoodsPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppSearchGoodsPageDto.java
new file mode 100644
index 0000000..4418fd7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppSearchGoodsPageDto.java
@@ -0,0 +1,23 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.AppPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppShopGoodsPageDto
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppSearchGoodsPageDto extends AppPageDto {
+
+ @ApiModelProperty(value = "shopId",hidden = true)
+ private Long shopId;
+
+ @ApiModelProperty(value = "搜索关键词")
+ private String keyword;
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShopGoodsPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShopGoodsPageDto.java
new file mode 100644
index 0000000..1a0f220
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShopGoodsPageDto.java
@@ -0,0 +1,31 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.AppPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppShopGoodsPageDto
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppShopGoodsPageDto extends AppPageDto {
+
+ @ApiModelProperty(value = "shopId",hidden = true)
+ private Long shopId;
+
+ @ApiModelProperty(value = "搜索关键词")
+ private String keyword;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "商品分类id")
+ private Long goodsClassId;
+
+ @ApiModelProperty(value = "排序方式1.全部2.价格正序3.价格倒序4.销量正序5.销量倒序")
+ private Integer sort;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShoppingCartAddDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShoppingCartAddDto.java
new file mode 100644
index 0000000..68c31ca
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShoppingCartAddDto.java
@@ -0,0 +1,25 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.AppBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppShoppingCartAddDto
+ * @description: TODO
+ * @date 2023年04月26日
+ * @version: 1.0
+ */
+@Data
+public class AppShoppingCartAddDto extends AppBaseDto {
+
+ @ApiModelProperty(value = "商户id")
+ private Long shopId;
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "购买数量")
+ private Integer buyNum;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShoppingCartChangeDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShoppingCartChangeDto.java
new file mode 100644
index 0000000..cf706b9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShoppingCartChangeDto.java
@@ -0,0 +1,25 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.AppBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppShoppingCartAddDto
+ * @description: TODO
+ * @date 2023年04月26日
+ * @version: 1.0
+ */
+@Data
+public class AppShoppingCartChangeDto extends AppBaseDto {
+
+ @ApiModelProperty(value = "shopId",hidden = true)
+ private Long shopId;
+
+ @ApiModelProperty(value = "购物车id")
+ private Long shoppingCartId;
+
+ @ApiModelProperty(value = "变化后数量")
+ private Integer buyNum;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppSureOrderDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppSureOrderDto.java
new file mode 100644
index 0000000..096ac4a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppSureOrderDto.java
@@ -0,0 +1,25 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.AppBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @version 1.0
+ * @classname AppShoppingcartDto
+ * @description: TODO
+ * @date 2023 2023/5/2 20:54
+ */
+@Data
+public class AppSureOrderDto extends AppBaseDto {
+
+ @ApiModelProperty(value = "shopId",hidden = true)
+ private Long shopId;
+
+ @ApiModelProperty(value = "购物车列表")
+ List<AppBuyGoodsDto> appBuyGoodsDtoList;
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppUserOrderPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppUserOrderPageDto.java
new file mode 100644
index 0000000..c6ae9fa
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppUserOrderPageDto.java
@@ -0,0 +1,25 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.AppPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppUserOrderPageDto
+ * @description: TODO
+ * @date 2023年05月03日
+ * @version: 1.0
+ */
+@Data
+public class AppUserOrderPageDto extends AppPageDto {
+
+ @ApiModelProperty(value = "shopId",hidden = true)
+ private Long shopId;
+
+ @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
+ private Integer orderStatus;
+
+ @ApiModelProperty(value = "搜索关键词")
+ private String keyword;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerCloseOrderDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerCloseOrderDto.java
new file mode 100644
index 0000000..2acdd09
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerCloseOrderDto.java
@@ -0,0 +1,27 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author jqs34
+ * @ClassName MerCloseOrderDto
+ * @description: TODO
+ * @date 2023年05月05日
+ * @version: 1.0
+ */
+@Data
+public class MerCloseOrderDto extends MerBaseDto {
+
+ @ApiModelProperty(value = "订单id")
+ private String orderId;
+
+ @ApiModelProperty(value = "支付金额")
+ private BigDecimal payMoney;
+
+ @ApiModelProperty(value = "支付备注")
+ private String payRemark;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsDto.java
new file mode 100644
index 0000000..46b7115
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsDto.java
@@ -0,0 +1,23 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerConsumerGoodsDto
+ * @description: TODO
+ * @date 2023年05月05日
+ * @version: 1.0
+ */
+@Data
+public class MerConsumerGoodsDto extends MerBaseDto {
+
+ @ApiModelProperty(value = "会员用户id")
+ private Long memberUserId;
+
+ @ApiModelProperty("商品类型1周期2服务3体验")
+ private Integer goodsType;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsPageDto.java
new file mode 100644
index 0000000..5e46932
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerConsumerGoodsPageDto.java
@@ -0,0 +1,23 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerConsumerGoodsDto
+ * @description: TODO
+ * @date 2023年05月05日
+ * @version: 1.0
+ */
+@Data
+public class MerConsumerGoodsPageDto extends MerPageDto {
+
+ @ApiModelProperty(value = "会员用户id")
+ private Long memberUserId;
+
+ @ApiModelProperty("商品类型1周期2服务3体验")
+ private Integer goodsType;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerGoodsPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerGoodsPageDto.java
new file mode 100644
index 0000000..29e1711
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerGoodsPageDto.java
@@ -0,0 +1,23 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerGoodsPageDto
+ * @description: TODO
+ * @date 2023年05月04日
+ * @version: 1.0
+ */
+@Data
+public class MerGoodsPageDto extends MerPageDto {
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerMemberNoClearOrderDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerMemberNoClearOrderDto.java
new file mode 100644
index 0000000..4ecd1e0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerMemberNoClearOrderDto.java
@@ -0,0 +1,21 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerMemberNoClearOrderDto
+ * @description: TODO
+ * @date 2023年05月05日
+ * @version: 1.0
+ */
+@Data
+public class MerMemberNoClearOrderDto extends MerPageDto {
+
+
+ @ApiModelProperty(value = "会员用户id")
+ private Long memberUserId;
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerNewOrderDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerNewOrderDto.java
new file mode 100644
index 0000000..dbaa6cc
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerNewOrderDto.java
@@ -0,0 +1,40 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName MerNewOrderDto
+ * @description: TODO
+ * @date 2023年05月05日
+ * @version: 1.0
+ */
+@Data
+public class MerNewOrderDto extends MerBaseDto {
+
+ @ApiModelProperty(value = "购买用户id")
+ private Long buyUserId;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "手机号")
+ private String mobile;
+
+ @ApiModelProperty(value = "购买列表")
+ private List<AppBuyGoodsDto> appBuyGoodsDtoList;
+
+ @ApiModelProperty(value = "支付金额")
+ private BigDecimal payMoney;
+
+ @ApiModelProperty(value = "支付方式")
+ private Integer payType;
+
+ @ApiModelProperty(value = "订单备注")
+ private String orderRemark;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerOrderPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerOrderPageDto.java
new file mode 100644
index 0000000..6e0d6f8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerOrderPageDto.java
@@ -0,0 +1,36 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerMemberNoClearOrderDto
+ * @description: TODO
+ * @date 2023年05月05日
+ * @version: 1.0
+ */
+@Data
+public class MerOrderPageDto extends MerPageDto {
+
+
+
+ @ApiModelProperty(value = "会员用户id")
+ private Long memberUserId;
+
+ @ApiModelProperty(value = "搜索关键词")
+ private String keyword;
+
+ @ApiModelProperty(value = "1.全部2.待核销3.已核销")
+ private Integer type;
+
+ @ApiModelProperty(value = "订单开始时间")
+ private String startOrderDate;
+
+ @ApiModelProperty(value = "订单结束时间")
+ private String endOrderDate;
+
+ @ApiModelProperty(value = "订单来源1.店铺商品2.平台秒杀活动3.线下创建")
+ private Integer orderFrom;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerServiceRecordPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerServiceRecordPageDto.java
new file mode 100644
index 0000000..a32eb88
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerServiceRecordPageDto.java
@@ -0,0 +1,21 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.AppPageDto;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppConsumerPageDto
+ * @description: TODO
+ * @date 2023年05月03日
+ * @version: 1.0
+ */
+@Data
+public class MerServiceRecordPageDto extends MerPageDto {
+
+
+ @ApiModelProperty("会员用户id")
+ private Long memberUserId;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerShopGoodsEditDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerShopGoodsEditDto.java
new file mode 100644
index 0000000..acecd6e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerShopGoodsEditDto.java
@@ -0,0 +1,28 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author jqs34
+ * @ClassName MerShopGoodsEditDto
+ * @description: TODO
+ * @date 2023年05月04日
+ * @version: 1.0
+ */
+@Data
+public class MerShopGoodsEditDto extends MerBaseDto {
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "售价")
+ private BigDecimal salePrice;
+
+ @ApiModelProperty(value = "服务次数")
+ private Integer serviceNum;
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsDto.java
new file mode 100644
index 0000000..9da0d92
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsDto.java
@@ -0,0 +1,25 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName MerSureConsumerGoodsDto
+ * @description: TODO
+ * @date 2023年05月05日
+ * @version: 1.0
+ */
+@Data
+public class MerSureConsumerGoodsDto extends MerBaseDto {
+
+ @ApiModelProperty(value = "会员用户id")
+ private Long memberUserId;
+
+ @ApiModelProperty(value = "确认服务列表")
+ private List<MerSureConsumerGoodsListDto> merSureConsumerGoodsListDtoList;
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsListDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsListDto.java
new file mode 100644
index 0000000..abb75ee
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerSureConsumerGoodsListDto.java
@@ -0,0 +1,22 @@
+package com.ruoyi.goods.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerSureConsumerGoodsListDto
+ * @description: TODO
+ * @date 2023年05月05日
+ * @version: 1.0
+ */
+@Data
+public class MerSureConsumerGoodsListDto {
+
+
+ @ApiModelProperty(value = "服务id")
+ private String consumerGoodsId;
+
+ @ApiModelProperty(value = "服务次数")
+ private Integer serviceNum;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyCodeDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyCodeDto.java
new file mode 100644
index 0000000..3572219
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyCodeDto.java
@@ -0,0 +1,19 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerVerifyCodeDto
+ * @description: TODO
+ * @date 2023年05月04日
+ * @version: 1.0
+ */
+@Data
+public class MerVerifyCodeDto extends MerBaseDto {
+
+ @ApiModelProperty(value = "核销码")
+ private String verifyCode;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyOrderDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyOrderDto.java
new file mode 100644
index 0000000..fe78d28
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerVerifyOrderDto.java
@@ -0,0 +1,27 @@
+package com.ruoyi.goods.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author jqs34
+ * @ClassName MerVerifyCodeDto
+ * @description: TODO
+ * @date 2023年05月04日
+ * @version: 1.0
+ */
+@Data
+public class MerVerifyOrderDto extends MerBaseDto {
+
+ @ApiModelProperty(value = "订单id")
+ private String orderId;
+
+ @ApiModelProperty(value = "实收金额")
+ private BigDecimal relReceiveMoney;
+
+ @ApiModelProperty(value = "实收金额")
+ private BigDecimal relPayMoney;
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsRelNurse.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsRelNurse.java
similarity index 95%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsRelNurse.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsRelNurse.java
index f97d86c..81e1641 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsRelNurse.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsRelNurse.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.domain.pojo.goods;
+package com.ruoyi.goods.domain.pojo.goods;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsRelTag.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsRelTag.java
similarity index 95%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsRelTag.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsRelTag.java
index 74976d0..3d0a177 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsRelTag.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsRelTag.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.domain.pojo.goods;
+package com.ruoyi.goods.domain.pojo.goods;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsTotal.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsTotal.java
similarity index 95%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsTotal.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsTotal.java
index a72cc35..af6d117 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsTotal.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsTotal.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.domain.pojo.goods;
+package com.ruoyi.goods.domain.pojo.goods;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/ShoppingCart.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/ShoppingCart.java
similarity index 96%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/ShoppingCart.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/ShoppingCart.java
index 7105e5e..a85a1cd 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/ShoppingCart.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/ShoppingCart.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.domain.pojo.order;
+package com.ruoyi.goods.domain.pojo.goods;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppConsumerPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppConsumerPageVo.java
new file mode 100644
index 0000000..027fd23
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppConsumerPageVo.java
@@ -0,0 +1,48 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppConsumerPageVo
+ * @description: TODO
+ * @date 2023年05月03日
+ * @version: 1.0
+ */
+@Data
+public class AppConsumerPageVo {
+
+ @ApiModelProperty("服务id")
+ private String consumerGoodsId;
+
+ @ApiModelProperty("服务状态-1删除1未完成2完成")
+ private Integer serviceStatus;
+
+ @ApiModelProperty("商户id")
+ private Long shopId;
+
+ @ApiModelProperty("商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty("商品名称")
+ private String goodsName;
+
+ @ApiModelProperty("商品图片")
+ private String goodsPicture;
+
+ @ApiModelProperty("商品调理问题")
+ private String goodsNurses;
+
+ @ApiModelProperty("周期标记")
+ private Integer cycleNumFlag;
+
+ @ApiModelProperty("服务次数")
+ private Integer serviceNum;
+
+ @ApiModelProperty("消耗次数")
+ private Integer usedNum;
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppGoodsInfoVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppGoodsInfoVo.java
new file mode 100644
index 0000000..6b7a8fb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppGoodsInfoVo.java
@@ -0,0 +1,68 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author jqs34
+ * @ClassName AppGoodsInfoVo
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppGoodsInfoVo {
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "商品简介")
+ private String goodsIntroduction;
+
+ @ApiModelProperty(value = "商品视频")
+ private String goodsVideo;
+
+ @ApiModelProperty(value = "商品banner")
+ private String goodsBanners;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "商品标签")
+ private String goodsTag;
+
+ @ApiModelProperty(value = "商品调理问题")
+ private BigDecimal goodsNurses;
+
+ @ApiModelProperty("服务次数")
+ private Integer serviceNum;
+
+ @ApiModelProperty(value = "商品售价")
+ private BigDecimal salesPrice;
+
+ @ApiModelProperty(value = "商品详情")
+ private String goodsDetail;
+
+ @ApiModelProperty(value = "销售数量")
+ private Integer salesNum;
+
+ @ApiModelProperty(value = "是否活动跳转0否1是")
+ private Integer activityFlag;
+
+ @ApiModelProperty(value = "商品活动价")
+ private BigDecimal activityPrice;
+
+ @ApiModelProperty(value = "售罄标记0否1是")
+ private Integer sellOutFlag;
+
+ @ApiModelProperty(value = "活动截止时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date activityDeadline;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppPlaceOrderVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppPlaceOrderVo.java
new file mode 100644
index 0000000..c4d3f60
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppPlaceOrderVo.java
@@ -0,0 +1,58 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author jqs34
+ * @ClassName AppResettlement
+ * @description: TODO
+ * @date 2023年02月27日
+ * @version: 1.0
+ */
+@Data
+public class AppPlaceOrderVo {
+
+ @ApiModelProperty(value = "订单id")
+ private String orderId;
+
+ @ApiModelProperty(value = "订单编号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "支付金额")
+ private BigDecimal payMoney;
+
+ @ApiModelProperty(value = "未支付金额")
+ private BigDecimal unpaidMoney;
+
+ @ApiModelProperty(value = "支付截止时间")
+ private String payDeadlineTime;
+
+ @ApiModelProperty(value = "appId")
+ private String appId;
+
+ @ApiModelProperty(value = "商户号")
+ private String mchId;
+
+ @ApiModelProperty(value = "时间戳")
+ private String timeStamp;
+
+ @ApiModelProperty(value = "随机串防重发")
+ private String nonceStr;
+
+ @ApiModelProperty(value = "package")
+ @JsonProperty("package")
+ private String packageStr;
+
+ @ApiModelProperty(value = "签名方式")
+ private String tradeType;
+
+ @ApiModelProperty(value = "签名")
+ private String paySign;
+
+ @ApiModelProperty(value = "预支付回话标识")
+ private String prepayId;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppServiceRecordPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppServiceRecordPageVo.java
new file mode 100644
index 0000000..a39abc7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppServiceRecordPageVo.java
@@ -0,0 +1,31 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author jqs34
+ * @ClassName AppServiceRecordPageVo
+ * @description: TODO
+ * @date 2023年05月03日
+ * @version: 1.0
+ */
+@Data
+public class AppServiceRecordPageVo {
+
+
+ @ApiModelProperty("服务名称")
+ private String consumerGoodsNames;
+
+ @ApiModelProperty("服务类型1.周期2.服务3.体验")
+ private Integer serviceType;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppShoppingCartVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppShoppingCartVo.java
new file mode 100644
index 0000000..f3b7ac4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppShoppingCartVo.java
@@ -0,0 +1,48 @@
+package com.ruoyi.goods.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author jqs34
+ * @ClassName AppShoppingCartVo
+ * @description: TODO
+ * @date 2023年05月06日
+ * @version: 1.0
+ */
+@Data
+public class AppShoppingCartVo {
+
+ @ApiModelProperty(value = "购物车id")
+ private Long shoppingCartId;
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "商品简介")
+ private String goodsIntroduction;
+
+ @ApiModelProperty(value = "商品图片")
+ private String goodsPicture;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "商品标签")
+ private String goodsTag;
+
+ @ApiModelProperty(value = "商品调理问题")
+ private String goodsNurses;
+
+ @ApiModelProperty(value = "商品售价")
+ private BigDecimal salesPrice;
+
+ @ApiModelProperty(value = "购买数量")
+ private Integer buyNum;
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleActivityGoodsVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleActivityGoodsVo.java
new file mode 100644
index 0000000..60a8589
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleActivityGoodsVo.java
@@ -0,0 +1,55 @@
+package com.ruoyi.goods.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author jqs34
+ * @ClassName AppSimpleGoodsVo
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppSimpleActivityGoodsVo {
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "商品简介")
+ private String goodsIntroduction;
+
+ @ApiModelProperty(value = "商品图片")
+ private String goodsPicture;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "商品标签")
+ private String goodsTag;
+
+ @ApiModelProperty(value = "商品调理问题")
+ private BigDecimal goodsNurses;
+
+ @ApiModelProperty(value = "商品售价")
+ private BigDecimal salesPrice;
+
+ @ApiModelProperty(value = "商品活动价")
+ private BigDecimal activityPrice;
+
+ @ApiModelProperty(value = "活动销售数量")
+ private Integer activityNumber;
+
+ @ApiModelProperty(value = "已售数量")
+ private Integer salesNumber;
+
+ @ApiModelProperty(value = "已售比例")
+ private BigDecimal salesPercent;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleGoodsVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleGoodsVo.java
new file mode 100644
index 0000000..6cd8c6a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSimpleGoodsVo.java
@@ -0,0 +1,43 @@
+package com.ruoyi.goods.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author jqs34
+ * @ClassName AppSimpleGoodsVo
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppSimpleGoodsVo {
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "商品简介")
+ private String goodsIntroduction;
+
+ @ApiModelProperty(value = "商品图片")
+ private String goodsPicture;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "商品标签")
+ private String goodsTag;
+
+ @ApiModelProperty(value = "商品调理问题")
+ private String goodsNurses;
+
+ @ApiModelProperty(value = "商品售价")
+ private BigDecimal salesPrice;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderGoodsVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderGoodsVo.java
new file mode 100644
index 0000000..7b2535e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderGoodsVo.java
@@ -0,0 +1,62 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @version 1.0
+ * @classname AppSureOrderGoodsVo
+ * @description: TODO
+ * @date 2023 2023/5/2 21:07
+ */
+@Data
+public class AppSureOrderGoodsVo {
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "商品简介")
+ private String goodsIntroduction;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "商品图片")
+ private String goodsPicture;
+
+ @ApiModelProperty(value = "购买数量")
+ private Integer buyNum;
+
+ @ApiModelProperty(value = "优惠券id")
+ private Long userCouponId;
+
+ @ApiModelProperty(value = "商品售价")
+ private BigDecimal goodsPrice;
+
+ @ApiModelProperty(value = "商品总价")
+ private BigDecimal goodsTotalPrice;
+
+ @ApiModelProperty(value = "商品订金")
+ private BigDecimal goodsDeposit;
+
+ @ApiModelProperty(value = "是否计算优惠券0否1是")
+ private Integer useCoupon;
+
+ @ApiModelProperty(value = "优惠券抵扣")
+ private BigDecimal couponDiscount;
+
+ @ApiModelProperty(value = "商品实际价格")
+ private BigDecimal goodsRealPrice;
+
+ @ApiModelProperty(value = "优惠券列表")
+ private List<AppUserCouponVo> appUserCouponVoList;
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderVo.java
new file mode 100644
index 0000000..de40568
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderVo.java
@@ -0,0 +1,39 @@
+package com.ruoyi.goods.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @version 1.0
+ * @classname AppSureOrderVo
+ * @description: TODO
+ * @date 2023 2023/5/2 20:57
+ */
+@Data
+public class AppSureOrderVo {
+
+
+ @ApiModelProperty(value = "商品总价")
+ private BigDecimal orderGoodsMoney;
+
+ @ApiModelProperty(value = "优惠券抵扣")
+ private BigDecimal couponDiscount;
+
+ @ApiModelProperty(value = "订单支付订金")
+ private BigDecimal orderPayDeposit;
+
+ @ApiModelProperty(value = "订单支付金额")
+ private BigDecimal orderPayMoney;
+
+ @ApiModelProperty(value = "订单商品列表")
+ List<AppSureOrderGoodsVo> appSureOrderGoodsVoList;
+
+
+
+
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGetVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGetVo.java
new file mode 100644
index 0000000..02b0152
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGetVo.java
@@ -0,0 +1,82 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName AppUserOrderPageVo
+ * @description: TODO
+ * @date 2023年05月03日
+ * @version: 1.0
+ */
+@Data
+public class AppUserOrderGetVo {
+
+ @ApiModelProperty(value = "订单id")
+ private String orderId;
+
+ @ApiModelProperty("订单编号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
+ private Integer orderStatus;
+
+ @ApiModelProperty("订单来源1.商城2.秒杀活动3.线下创建")
+ private Integer orderFrom;
+
+ @ApiModelProperty(value = "商品总价")
+ private BigDecimal orderGoodsMoney;
+
+ @ApiModelProperty(value = "优惠券抵扣")
+ private BigDecimal couponDiscount;
+
+ @ApiModelProperty("应收金额")
+ private BigDecimal receivableMoney;
+
+ @ApiModelProperty("应收订金")
+ private BigDecimal receivableDeposit;
+
+ @ApiModelProperty("订单商品列表")
+ private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
+
+ @ApiModelProperty("订单支付金额")
+ private BigDecimal payMoney;
+
+ @ApiModelProperty("商户id")
+ private Long shopId;
+
+ @ApiModelProperty("商户名称")
+ private String shopName;
+
+ @ApiModelProperty(value = "是否绑定商户0否1是")
+ private Integer sameShop;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty("支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date payTime;
+
+ @ApiModelProperty("核销时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date useTime;
+
+ @ApiModelProperty("取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date cancelTime;
+
+ @ApiModelProperty("订单备注")
+ private String orderRemark;
+
+ @ApiModelProperty(value = "核销码")
+ private String verifyCode;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGoodsPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGoodsPageVo.java
new file mode 100644
index 0000000..0bd690a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderGoodsPageVo.java
@@ -0,0 +1,50 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author jqs34
+ * @ClassName AppUserOrderPageVo
+ * @description: TODO
+ * @date 2023年05月03日
+ * @version: 1.0
+ */
+@Data
+public class AppUserOrderGoodsPageVo {
+
+ @ApiModelProperty("订单商品id")
+ private String orderGoodsId;
+
+ @ApiModelProperty("商品id")
+ private String goodsId;
+
+ @ApiModelProperty("商品名称")
+ private String goodsName;
+
+ @ApiModelProperty("商品图片")
+ private String goodsPicture;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "购买数量")
+ private Integer buyNum;
+
+ @ApiModelProperty(value = "商品售价")
+ private BigDecimal goodsPrice;
+
+ @ApiModelProperty(value = "商品实际价格")
+ private BigDecimal goodsRealPrice;
+
+ @ApiModelProperty("周期标记")
+ private Integer cycleNumFlag;
+
+ @ApiModelProperty("服务次数")
+ private Integer serviceNum;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderPageVo.java
new file mode 100644
index 0000000..32cb196
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppUserOrderPageVo.java
@@ -0,0 +1,56 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName AppUserOrderPageVo
+ * @description: TODO
+ * @date 2023年05月03日
+ * @version: 1.0
+ */
+@Data
+public class AppUserOrderPageVo {
+
+ @ApiModelProperty(value = "订单id")
+ private String orderId;
+
+ @ApiModelProperty("订单编号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
+ private Integer orderStatus;
+
+ @ApiModelProperty("订单来源1.商城订单2.秒杀活动3.线下创建")
+ private Integer orderFrom;
+
+ @ApiModelProperty("订单商品列表")
+ private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
+
+ @ApiModelProperty("订单支付金额")
+ private BigDecimal receivableMoney;
+
+ @ApiModelProperty("商品数量")
+ private Integer goodsNum;
+
+ @ApiModelProperty("商户id")
+ private Long shopId;
+
+ @ApiModelProperty("商户名称")
+ private String shopName;
+
+ @ApiModelProperty("商户服务电话")
+ private String shopServicePhone;
+
+ @ApiModelProperty(value = "是否绑定商户0否1是")
+ private Integer sameShop;
+
+ @ApiModelProperty(value = "核销码")
+ private String verifyCode;
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsListVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsListVo.java
new file mode 100644
index 0000000..36122db
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsListVo.java
@@ -0,0 +1,48 @@
+package com.ruoyi.goods.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerConsumerGoodsVo
+ * @description: TODO
+ * @date 2023年05月05日
+ * @version: 1.0
+ */
+@Data
+public class MerConsumerGoodsListVo {
+
+ @ApiModelProperty("服务id")
+ private String consumerGoodsId;
+
+ @ApiModelProperty("服务状态-1删除1未完成2完成")
+ private Integer serviceStatus;
+
+ @ApiModelProperty("商户id")
+ private Long shopId;
+
+ @ApiModelProperty("商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty("商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "商品简介")
+ private String goodsIntroduction;
+
+ @ApiModelProperty("商品图片")
+ private String goodsPicture;
+
+ @ApiModelProperty("商品调理问题")
+ private String goodsNurses;
+
+ @ApiModelProperty("周期标记")
+ private Integer cycleNumFlag;
+
+ @ApiModelProperty("服务次数")
+ private Integer serviceNum;
+
+ @ApiModelProperty("消耗次数")
+ private Integer usedNum;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsVo.java
new file mode 100644
index 0000000..16adc3d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsVo.java
@@ -0,0 +1,25 @@
+package com.ruoyi.goods.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName MerConsumerGoodsVo
+ * @description: TODO
+ * @date 2023年05月05日
+ * @version: 1.0
+ */
+@Data
+public class MerConsumerGoodsVo {
+
+ @ApiModelProperty("未确认商品")
+ private List<MerConsumerGoodsListVo> noSureList;
+
+ @ApiModelProperty("确认商品")
+ private List<MerConsumerGoodsListVo> sureList;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerGoodsPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerGoodsPageVo.java
new file mode 100644
index 0000000..043c2e4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerGoodsPageVo.java
@@ -0,0 +1,54 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author jqs34
+ * @ClassName MerGoodsPageVo
+ * @description: TODO
+ * @date 2023年05月04日
+ * @version: 1.0
+ */
+@Data
+public class MerGoodsPageVo {
+
+ @ApiModelProperty(value = "商品id")
+ private String goodsId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "商品简介")
+ private String goodsIntroduction;
+
+ @ApiModelProperty(value = "商品标签")
+ private String goodsTag;
+
+ @ApiModelProperty(value = "商品图片")
+ private String goodsPicture;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "商品调理问题")
+ private String goodsNurses;
+
+ @ApiModelProperty(value = "商品建议售价")
+ private BigDecimal suggestSalesPrice;;
+
+ @ApiModelProperty(value = "商品售价")
+ private BigDecimal salesPrice;;
+
+ @ApiModelProperty("周期次数标记0否1是")
+ private Integer cycleNumFlag;
+
+ @ApiModelProperty(value = "商品默认服务次数")
+ private Integer defaultServiceNum;;
+
+ @ApiModelProperty(value = "服务次数")
+ private Integer serviceNum;;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerMemberNoClearOrderVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerMemberNoClearOrderVo.java
new file mode 100644
index 0000000..0952b48
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerMemberNoClearOrderVo.java
@@ -0,0 +1,51 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName MerMemberUnclearOrder
+ * @description: TODO
+ * @date 2023年05月05日
+ * @version: 1.0
+ */
+@Data
+public class MerMemberNoClearOrderVo {
+
+ @ApiModelProperty(value = "订单id")
+ private String orderId;
+
+ @ApiModelProperty("订单编号")
+ private String orderNo;
+
+ @ApiModelProperty("订单状态")
+ private Integer orderStatus;
+
+ @ApiModelProperty(value = "商品总价")
+ private BigDecimal orderGoodsMoney;
+
+ @ApiModelProperty(value = "优惠券抵扣")
+ private BigDecimal couponDiscount;
+
+ @ApiModelProperty("应收金额")
+ private BigDecimal receivableMoney;
+
+ @ApiModelProperty("应收订金")
+ private BigDecimal receivableDeposit;
+
+ @ApiModelProperty("订单实际支付金额")
+ private BigDecimal payMoney;
+
+ @ApiModelProperty("订单未支付金额")
+ private BigDecimal unPaidMoney;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderGoodsPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderGoodsPageVo.java
new file mode 100644
index 0000000..50513ba
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderGoodsPageVo.java
@@ -0,0 +1,24 @@
+package com.ruoyi.goods.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerOrderGoodsVo
+ * @description: TODO
+ * @date 2023年05月06日
+ * @version: 1.0
+ */
+@Data
+public class MerOrderGoodsPageVo {
+
+ @ApiModelProperty("商品名字")
+ private String goodsName;
+
+ @ApiModelProperty("购买数量")
+ private Integer buyNum;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderPageVo.java
new file mode 100644
index 0000000..ae7f145
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderPageVo.java
@@ -0,0 +1,73 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName MerMemberUnclearOrder
+ * @description: TODO
+ * @date 2023年05月05日
+ * @version: 1.0
+ */
+@Data
+public class MerOrderPageVo {
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ @ApiModelProperty(value = "用户姓名")
+ private String userName;
+
+ @ApiModelProperty(value = "用户电话")
+ private String userMobile;
+
+ @ApiModelProperty(value = "订单id")
+ private String orderId;
+
+ @ApiModelProperty("订单编号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
+ private Integer orderStatus;
+
+ @ApiModelProperty(value = "商品总价")
+ private BigDecimal orderGoodsMoney;
+
+ @ApiModelProperty(value = "优惠券抵扣")
+ private BigDecimal couponDiscount;
+
+ @ApiModelProperty("应收金额")
+ private BigDecimal receivableMoney;
+
+ @ApiModelProperty("应收订金")
+ private BigDecimal receivableDeposit;
+
+ @ApiModelProperty("订单实际支付金额")
+ private BigDecimal payMoney;
+
+ @ApiModelProperty("订单未支付金额")
+ private BigDecimal unPaidMoney;
+
+ @ApiModelProperty("订单备注")
+ private String orderRemark;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty("订单来源")
+ private Integer orderFrom;
+
+ @ApiModelProperty("订单来源")
+ private String orderFromDesc;
+
+ @ApiModelProperty("订单商品列表")
+ private List<MerOrderGoodsPageVo> merOrderGoodsVoList;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerServiceRecordPageVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerServiceRecordPageVo.java
new file mode 100644
index 0000000..53da184
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerServiceRecordPageVo.java
@@ -0,0 +1,30 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author jqs34
+ * @ClassName AppServiceRecordPageVo
+ * @description: TODO
+ * @date 2023年05月03日
+ * @version: 1.0
+ */
+@Data
+public class MerServiceRecordPageVo {
+
+
+ @ApiModelProperty("服务名称")
+ private String consumerGoodsNames;
+
+ @ApiModelProperty("服务类型1.周期2.服务3.体验")
+ private Integer serviceType;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyAwardVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyAwardVo.java
new file mode 100644
index 0000000..bb646f1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyAwardVo.java
@@ -0,0 +1,14 @@
+package com.ruoyi.goods.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerVerifyAwardVo
+ * @description: TODO
+ * @date 2023年05月04日
+ * @version: 1.0
+ */
+@Data
+public class MerVerifyAwardVo {
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCodeVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCodeVo.java
new file mode 100644
index 0000000..a7b98e6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCodeVo.java
@@ -0,0 +1,28 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerVerifyCodeDto
+ * @description: TODO
+ * @date 2023年05月04日
+ * @version: 1.0
+ */
+@Data
+public class MerVerifyCodeVo{
+
+ @ApiModelProperty(value = "核销类型1订单2优惠券3奖品")
+ private Integer verifyType;
+
+ @ApiModelProperty(value = "核销订单信息")
+ private MerVerifyOrderVo merVerifyOrderVo;
+
+ @ApiModelProperty(value = "核销优惠券信息")
+ private MerVerifyCouponVo merVerifyCouponVo;
+
+ @ApiModelProperty(value = "核销奖品信息")
+ private MerVerifyAwardVo merVerifyAwardVo;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCouponVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCouponVo.java
new file mode 100644
index 0000000..c94aba6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCouponVo.java
@@ -0,0 +1,15 @@
+package com.ruoyi.goods.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName MerVerifyCouponVo
+ * @description: TODO
+ * @date 2023年05月04日
+ * @version: 1.0
+ */
+@Data
+public class MerVerifyCouponVo {
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyOrderVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyOrderVo.java
new file mode 100644
index 0000000..cff2865
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyOrderVo.java
@@ -0,0 +1,75 @@
+package com.ruoyi.goods.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName MerVerifyOrderVo
+ * @description: TODO
+ * @date 2023年05月04日
+ * @version: 1.0
+ */
+@Data
+public class MerVerifyOrderVo {
+
+ @ApiModelProperty(value = "订单id")
+ private String orderId;
+
+ @ApiModelProperty("订单编号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
+ private Integer orderStatus;
+
+ @ApiModelProperty("订单来源1.商城2.秒杀活动3.线下创建")
+ private Integer orderFrom;
+
+ @ApiModelProperty(value = "商品总价")
+ private BigDecimal orderGoodsMoney;
+
+ @ApiModelProperty(value = "优惠券抵扣")
+ private BigDecimal couponDiscount;
+
+ @ApiModelProperty("应收金额")
+ private BigDecimal receivableMoney;
+
+ @ApiModelProperty("应收订金")
+ private BigDecimal receivableDeposit;
+
+ @ApiModelProperty("订单商品列表")
+ private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
+
+ @ApiModelProperty("订单支付金额")
+ private BigDecimal payMoney;
+
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty("支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date payTime;
+
+ @ApiModelProperty("核销时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date useTime;
+
+ @ApiModelProperty("订单备注")
+ private String orderRemark;
+
+ @ApiModelProperty(value = "用户姓名")
+ private String userName;
+
+ @ApiModelProperty(value = "用户电话")
+ private String userMobile;
+
+ @ApiModelProperty("结清标记0否1是")
+ private Integer closeFlag;
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ParamsAuthFilter.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ParamsAuthFilter.java
new file mode 100644
index 0000000..33e33d0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ParamsAuthFilter.java
@@ -0,0 +1,103 @@
+package com.ruoyi.goods.fliter;
+
+
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.core.utils.StringUtils;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+@Log4j2
+public class ParamsAuthFilter implements Filter {
+
+ // 令牌自定义标识
+ //@Value("${token.header}")
+ private String header = "Authorization";
+
+
+ @Override
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+ HttpServletRequest request = (HttpServletRequest) servletRequest;
+ HttpServletResponse response = (HttpServletResponse) servletResponse;
+
+ RepeatedlyRequestWrapper wrapper = new RepeatedlyRequestWrapper(request, response);
+ getRequestParams(wrapper);
+
+ ResponseWrapper responseWrapper = new ResponseWrapper(response);
+ filterChain.doFilter(wrapper, responseWrapper);
+
+ // 返回的结果
+ String content = responseWrapper.getTextContent();
+ String requestUrl = request.getRequestURI();
+ log.info("-------------------- Response Data ----------------------");
+ log.info(requestUrl + " -> " + content);
+
+ response.getOutputStream().write(content.getBytes());
+ }
+
+
+ private void getRequestParams(HttpServletRequest request){
+ Map<String, String> params = getUrlParams(request);
+ try {
+ String requestUrl = request.getRequestURI();
+ Map<String, String> urlParams = getUrlParams(request);
+ Map<String, String> bodyParams = getBodyParams(request);
+
+ params.putAll(urlParams);
+ params.putAll(bodyParams);
+ log.info("-------------------- request header ----------------------");
+ log.info(header + " -> " + request.getHeader(header));
+ log.info("-------------------- request params ----------------------");
+ log.info(requestUrl + " -> " + JSONObject.toJSONString(params));
+
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ private Map<String, String> getBodyParams(HttpServletRequest request) throws IOException {
+ BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(request.getInputStream()));
+ StringBuilder stringBuilder = new StringBuilder();
+ String buffer = "";
+ while((buffer = bufferedReader.readLine()) != null){
+ stringBuilder.append(buffer);
+ }
+ String requestBodyStr = stringBuilder.toString();
+ if(StringUtils.isNotBlank(requestBodyStr)){
+ return JSONObject.parseObject(stringBuilder.toString(), Map.class);
+ }
+ return new HashMap<>();
+ }
+
+ private Map<String, String> getUrlParams(HttpServletRequest request){
+ String queryParams = "";
+ try {
+ queryParams = request.getQueryString();
+ if(StringUtils.isNotBlank(queryParams)) {
+ queryParams = URLDecoder.decode(request.getQueryString(), "utf-8");
+ }
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ Map<String, String> result = new HashMap<>();
+ if(StringUtils.isNotBlank(queryParams)) {
+ String[] spilt = queryParams.split("&");
+ for (String s : spilt) {
+ int index = s.indexOf("=");
+ result.put(s.substring(0, index), s.substring(index + 1));
+ }
+ }
+ return result;
+ }
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/RepeatedlyRequestWrapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/RepeatedlyRequestWrapper.java
new file mode 100644
index 0000000..3badf25
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/RepeatedlyRequestWrapper.java
@@ -0,0 +1,111 @@
+package com.ruoyi.goods.fliter;
+
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.*;
+import java.nio.charset.Charset;
+
+/**
+ * 构建可重复读取inputStream的request
+ *
+ * @author linzhang
+ */
+@Log4j2
+public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper
+{
+ private final byte[] body;
+
+ public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException
+ {
+ super(request);
+ request.setCharacterEncoding("UTF-8");
+ response.setCharacterEncoding("UTF-8");
+
+ body = getBodyString(request).getBytes("UTF-8");
+ }
+
+ public static String getBodyString(ServletRequest request)
+ {
+ StringBuilder sb = new StringBuilder();
+ BufferedReader reader = null;
+ try (InputStream inputStream = request.getInputStream())
+ {
+ reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
+ String line = "";
+ while ((line = reader.readLine()) != null)
+ {
+ sb.append(line);
+ }
+ }
+ catch (IOException e)
+ {
+ log.warn("getBodyString出现问题！");
+ }
+ finally
+ {
+ if (reader != null)
+ {
+ try
+ {
+ reader.close();
+ }
+ catch (IOException e)
+ {
+ log.error(ExceptionUtils.getMessage(e));
+ }
+ }
+ }
+ return sb.toString();
+ }
+
+ @Override
+ public BufferedReader getReader() throws IOException
+ {
+ return new BufferedReader(new InputStreamReader(getInputStream()));
+ }
+
+ @Override
+ public ServletInputStream getInputStream() throws IOException
+ {
+ final ByteArrayInputStream bais = new ByteArrayInputStream(body);
+ return new ServletInputStream()
+ {
+ @Override
+ public int read() throws IOException
+ {
+ return bais.read();
+ }
+
+ @Override
+ public int available() throws IOException
+ {
+ return body.length;
+ }
+
+ @Override
+ public boolean isFinished()
+ {
+ return false;
+ }
+
+ @Override
+ public boolean isReady()
+ {
+ return false;
+ }
+
+ @Override
+ public void setReadListener(ReadListener readListener)
+ {
+
+ }
+ };
+ }
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ResponseWrapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ResponseWrapper.java
new file mode 100644
index 0000000..1d8408b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ResponseWrapper.java
@@ -0,0 +1,63 @@
+package com.ruoyi.goods.fliter;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+public class ResponseWrapper extends HttpServletResponseWrapper {
+
+ private ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ private PrintWriter printWriter = new PrintWriter(outputStream);
+
+ public ResponseWrapper(HttpServletResponse response) {
+ super(response);
+ }
+
+ @Override
+ public PrintWriter getWriter() throws IOException {
+ return printWriter;
+ }
+
+ @Override
+ public ServletOutputStream getOutputStream() throws IOException {
+ return new ServletOutputStream() {
+ @Override
+ public boolean isReady() {
+ return false;
+ }
+
+ @Override
+ public void setWriteListener(WriteListener listener) {
+
+ }
+
+ @Override
+ public void write(int b) throws IOException {
+ outputStream.write(b);
+ }
+ };
+ }
+ public void flush(){
+ try {
+ printWriter.flush();
+ printWriter.close();
+ outputStream.flush();
+ outputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public ByteArrayOutputStream getByteArrayOutputStream(){
+ return outputStream;
+ }
+
+ public String getTextContent() {
+ flush();
+ return outputStream.toString();
+ }
+}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/activity/ActivityGoodsMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityGoodsMapper.java
similarity index 86%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/activity/ActivityGoodsMapper.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityGoodsMapper.java
index 8c44b4a..4f1b2da 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/activity/ActivityGoodsMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityGoodsMapper.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.mapper.activity;
+package com.ruoyi.goods.mapper.activity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsFileMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsFileMapper.java
similarity index 69%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsFileMapper.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsFileMapper.java
index 40cf884..4f7b57b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsFileMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsFileMapper.java
@@ -1,6 +1,6 @@
-package com.ruoyi.order.mapper.goods;
+package com.ruoyi.goods.mapper.goods;
-import com.ruoyi.order.domain.pojo.goods.GoodsFile;
+import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsMapper.java
similarity index 77%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsMapper.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsMapper.java
index cc17282..a0f5c91 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsMapper.java
@@ -1,14 +1,14 @@
-package com.ruoyi.order.mapper.goods;
+package com.ruoyi.goods.mapper.goods;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.order.domain.dto.MerGoodsPageDto;
-import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
-import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
-import com.ruoyi.order.domain.dto.AppSearchGoodsPageDto;
-import com.ruoyi.order.domain.dto.AppShopGoodsPageDto;
-import com.ruoyi.order.domain.pojo.goods.Goods;
+import com.ruoyi.goods.domain.dto.MerGoodsPageDto;
+import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
+import com.ruoyi.goods.domain.vo.AppSimpleGoodsVo;
+import com.ruoyi.goods.domain.dto.AppSearchGoodsPageDto;
+import com.ruoyi.goods.domain.dto.AppShopGoodsPageDto;
+import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.order.domain.vo.MerGoodsPageVo;
+import com.ruoyi.goods.domain.vo.MerGoodsPageVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsRelNurseMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsRelNurseMapper.java
similarity index 71%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsRelNurseMapper.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsRelNurseMapper.java
index bc598fc..bd1fd70 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsRelNurseMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsRelNurseMapper.java
@@ -1,6 +1,6 @@
-package com.ruoyi.order.mapper.goods;
+package com.ruoyi.goods.mapper.goods;
-import com.ruoyi.order.domain.pojo.goods.GoodsRelNurse;
+import com.ruoyi.goods.domain.pojo.goods.GoodsRelNurse;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsRelTagMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsRelTagMapper.java
similarity index 70%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsRelTagMapper.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsRelTagMapper.java
index fdb3d6e..a27f054 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsRelTagMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsRelTagMapper.java
@@ -1,6 +1,6 @@
-package com.ruoyi.order.mapper.goods;
+package com.ruoyi.goods.mapper.goods;
-import com.ruoyi.order.domain.pojo.goods.GoodsRelTag;
+import com.ruoyi.goods.domain.pojo.goods.GoodsRelTag;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsTotalMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsTotalMapper.java
similarity index 70%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsTotalMapper.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsTotalMapper.java
index 92d1794..97e161d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsTotalMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsTotalMapper.java
@@ -1,6 +1,6 @@
-package com.ruoyi.order.mapper.goods;
+package com.ruoyi.goods.mapper.goods;
-import com.ruoyi.order.domain.pojo.goods.GoodsTotal;
+import com.ruoyi.goods.domain.pojo.goods.GoodsTotal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/ShopGoodsMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/ShopGoodsMapper.java
similarity index 70%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/ShopGoodsMapper.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/ShopGoodsMapper.java
index 928fb16..8982e86 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/ShopGoodsMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/ShopGoodsMapper.java
@@ -1,8 +1,8 @@
-package com.ruoyi.order.mapper.goods;
+package com.ruoyi.goods.mapper.goods;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.order.domain.pojo.goods.ShopGoods;
+import com.ruoyi.system.api.domain.poji.goods.ShopGoods;
/**
* <p>
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ShoppingCartMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/ShoppingCartMapper.java
similarity index 84%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ShoppingCartMapper.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/ShoppingCartMapper.java
index 940dd1a..5007967 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ShoppingCartMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/ShoppingCartMapper.java
@@ -1,8 +1,8 @@
-package com.ruoyi.order.mapper.order;
+package com.ruoyi.goods.mapper.goods;
-import com.ruoyi.order.domain.pojo.order.ShoppingCart;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.order.domain.vo.AppShoppingCartVo;
+import com.ruoyi.goods.domain.pojo.goods.ShoppingCart;
+import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/activity/ActivityGoodsService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityGoodsService.java
similarity index 90%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/activity/ActivityGoodsService.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityGoodsService.java
index 4671c44..43c5929 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/activity/ActivityGoodsService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityGoodsService.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.service.activity;
+package com.ruoyi.goods.service.activity;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsFileService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsFileService.java
similarity index 84%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsFileService.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsFileService.java
index 720c428..df7a525 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsFileService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsFileService.java
@@ -1,6 +1,6 @@
-package com.ruoyi.order.service.goods;
+package com.ruoyi.goods.service.goods;
-import com.ruoyi.order.domain.pojo.goods.GoodsFile;
+import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsRelNurseService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsRelNurseService.java
similarity index 70%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsRelNurseService.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsRelNurseService.java
index b141df1..c3b7cac 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsRelNurseService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsRelNurseService.java
@@ -1,6 +1,6 @@
-package com.ruoyi.order.service.goods;
+package com.ruoyi.goods.service.goods;
-import com.ruoyi.order.domain.pojo.goods.GoodsRelNurse;
+import com.ruoyi.goods.domain.pojo.goods.GoodsRelNurse;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsRelTagService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsRelTagService.java
similarity index 70%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsRelTagService.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsRelTagService.java
index 8eabfc0..4f7fe6c 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsRelTagService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsRelTagService.java
@@ -1,6 +1,6 @@
-package com.ruoyi.order.service.goods;
+package com.ruoyi.goods.service.goods;
-import com.ruoyi.order.domain.pojo.goods.GoodsRelTag;
+import com.ruoyi.goods.domain.pojo.goods.GoodsRelTag;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsService.java
similarity index 82%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsService.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsService.java
index 0b6ef6c..6425a70 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsService.java
@@ -1,13 +1,13 @@
-package com.ruoyi.order.service.goods;
+package com.ruoyi.goods.service.goods;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.order.domain.dto.*;
-import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
-import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
-import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
-import com.ruoyi.order.domain.pojo.goods.Goods;
+import com.ruoyi.goods.domain.dto.*;
+import com.ruoyi.goods.domain.vo.AppGoodsInfoVo;
+import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
+import com.ruoyi.goods.domain.vo.AppSimpleGoodsVo;
+import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.order.domain.vo.MerGoodsPageVo;
+import com.ruoyi.goods.domain.vo.MerGoodsPageVo;
import java.util.List;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsTotalService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsTotalService.java
similarity index 70%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsTotalService.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsTotalService.java
index 7be181f..8d95dfe 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsTotalService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsTotalService.java
@@ -1,6 +1,6 @@
-package com.ruoyi.order.service.goods;
+package com.ruoyi.goods.service.goods;
-import com.ruoyi.order.domain.pojo.goods.GoodsTotal;
+import com.ruoyi.goods.domain.pojo.goods.GoodsTotal;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/ShopGoodsService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/ShopGoodsService.java
similarity index 80%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/ShopGoodsService.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/ShopGoodsService.java
index 7e40646..a6ab2af 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/ShopGoodsService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/ShopGoodsService.java
@@ -1,8 +1,8 @@
-package com.ruoyi.order.service.goods;
+package com.ruoyi.goods.service.goods;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.order.domain.pojo.goods.ShopGoods;
+import com.ruoyi.system.api.domain.poji.goods.ShopGoods;
/**
* <p>
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/ShoppingCartService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/ShoppingCartService.java
similarity index 79%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/ShoppingCartService.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/ShoppingCartService.java
index 9053ae9..a79a329 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/ShoppingCartService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/ShoppingCartService.java
@@ -1,10 +1,10 @@
-package com.ruoyi.order.service.order;
+package com.ruoyi.goods.service.goods;
-import com.ruoyi.order.domain.vo.AppShoppingCartVo;
+import com.ruoyi.goods.domain.pojo.goods.ShoppingCart;
+import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
-import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
-import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
-import com.ruoyi.order.domain.pojo.order.ShoppingCart;
+import com.ruoyi.goods.domain.dto.AppShoppingCartAddDto;
+import com.ruoyi.goods.domain.dto.AppShoppingCartChangeDto;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/activity/ActivityGoodsServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityGoodsServiceImpl.java
similarity index 84%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/activity/ActivityGoodsServiceImpl.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityGoodsServiceImpl.java
index ae99737..1f9dd6c 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/activity/ActivityGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityGoodsServiceImpl.java
@@ -1,10 +1,10 @@
-package com.ruoyi.order.service.impl.activity;
+package com.ruoyi.goods.service.impl.activity;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.order.mapper.activity.ActivityGoodsMapper;
-import com.ruoyi.order.service.activity.ActivityGoodsService;
+import com.ruoyi.goods.mapper.activity.ActivityGoodsMapper;
+import com.ruoyi.goods.service.activity.ActivityGoodsService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsFileServiceImpl.java
similarity index 85%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsFileServiceImpl.java
index d6c34ee..8ad35fa 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsFileServiceImpl.java
@@ -1,13 +1,12 @@
-package com.ruoyi.order.service.impl.goods;
+package com.ruoyi.goods.service.impl.goods;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.order.domain.pojo.goods.GoodsFile;
-import com.ruoyi.order.domain.pojo.order.ShoppingCart;
-import com.ruoyi.order.mapper.goods.GoodsFileMapper;
-import com.ruoyi.order.service.goods.GoodsFileService;
+import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
+import com.ruoyi.goods.mapper.goods.GoodsFileMapper;
+import com.ruoyi.goods.service.goods.GoodsFileService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsRelNurseServiceImpl.java
similarity index 62%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsRelNurseServiceImpl.java
index 77cab35..91971f6 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsRelNurseServiceImpl.java
@@ -1,10 +1,10 @@
-package com.ruoyi.order.service.impl.goods;
+package com.ruoyi.goods.service.impl.goods;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.order.domain.pojo.goods.GoodsRelNurse;
-import com.ruoyi.order.mapper.goods.GoodsRelNurseMapper;
-import com.ruoyi.order.service.goods.GoodsRelNurseService;
+import com.ruoyi.goods.domain.pojo.goods.GoodsRelNurse;
+import com.ruoyi.goods.mapper.goods.GoodsRelNurseMapper;
+import com.ruoyi.goods.service.goods.GoodsRelNurseService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsRelTagServiceImpl.java
similarity index 62%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsRelTagServiceImpl.java
index e03582a..663bcbd 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsRelTagServiceImpl.java
@@ -1,10 +1,10 @@
-package com.ruoyi.order.service.impl.goods;
+package com.ruoyi.goods.service.impl.goods;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.order.domain.pojo.goods.GoodsRelTag;
-import com.ruoyi.order.mapper.goods.GoodsRelTagMapper;
-import com.ruoyi.order.service.goods.GoodsRelTagService;
+import com.ruoyi.goods.domain.pojo.goods.GoodsRelTag;
+import com.ruoyi.goods.mapper.goods.GoodsRelTagMapper;
+import com.ruoyi.goods.service.goods.GoodsRelTagService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
similarity index 90%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsServiceImpl.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
index e05c10f..919be37 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
@@ -1,22 +1,21 @@
-package com.ruoyi.order.service.impl.goods;
+package com.ruoyi.goods.service.impl.goods;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.order.domain.dto.*;
-import com.ruoyi.order.domain.pojo.goods.Goods;
-import com.ruoyi.order.domain.pojo.goods.GoodsFile;
-import com.ruoyi.order.domain.pojo.goods.ShopGoods;
-import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
-import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
-import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
-import com.ruoyi.order.domain.vo.MerGoodsPageVo;
-import com.ruoyi.order.mapper.goods.GoodsMapper;
-import com.ruoyi.order.service.activity.ActivityGoodsService;
-import com.ruoyi.order.service.goods.GoodsFileService;
-import com.ruoyi.order.service.goods.GoodsService;
-import com.ruoyi.order.service.goods.ShopGoodsService;
-import com.ruoyi.system.api.RemoteActivityService;
+import com.ruoyi.goods.domain.dto.*;
+import com.ruoyi.system.api.domain.poji.goods.Goods;
+import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
+import com.ruoyi.system.api.domain.poji.goods.ShopGoods;
+import com.ruoyi.goods.domain.vo.AppGoodsInfoVo;
+import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
+import com.ruoyi.goods.domain.vo.AppSimpleGoodsVo;
+import com.ruoyi.goods.domain.vo.MerGoodsPageVo;
+import com.ruoyi.goods.mapper.goods.GoodsMapper;
+import com.ruoyi.goods.service.activity.ActivityGoodsService;
+import com.ruoyi.goods.service.goods.GoodsFileService;
+import com.ruoyi.goods.service.goods.GoodsService;
+import com.ruoyi.goods.service.goods.ShopGoodsService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import org.springframework.beans.BeanUtils;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsTotalServiceImpl.java
similarity index 62%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsTotalServiceImpl.java
index 7086e56..ddccaad 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsTotalServiceImpl.java
@@ -1,10 +1,10 @@
-package com.ruoyi.order.service.impl.goods;
+package com.ruoyi.goods.service.impl.goods;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.order.domain.pojo.goods.GoodsTotal;
-import com.ruoyi.order.mapper.goods.GoodsTotalMapper;
-import com.ruoyi.order.service.goods.GoodsTotalService;
+import com.ruoyi.goods.domain.pojo.goods.GoodsTotal;
+import com.ruoyi.goods.mapper.goods.GoodsTotalMapper;
+import com.ruoyi.goods.service.goods.GoodsTotalService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/ShopGoodsServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShopGoodsServiceImpl.java
similarity index 81%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/ShopGoodsServiceImpl.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShopGoodsServiceImpl.java
index 6eabd0e..249d8a5 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/ShopGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShopGoodsServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ruoyi.order.service.impl.goods;
+package com.ruoyi.goods.service.impl.goods;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.order.domain.pojo.goods.ShopGoods;
-import com.ruoyi.order.mapper.goods.ShopGoodsMapper;
-import com.ruoyi.order.service.goods.ShopGoodsService;
+import com.ruoyi.system.api.domain.poji.goods.ShopGoods;
+import com.ruoyi.goods.mapper.goods.ShopGoodsMapper;
+import com.ruoyi.goods.service.goods.ShopGoodsService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShoppingCartServiceImpl.java
similarity index 88%
rename from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java
rename to ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShoppingCartServiceImpl.java
index 8bd1025..e8e5312 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShoppingCartServiceImpl.java
@@ -1,23 +1,22 @@
-package com.ruoyi.order.service.impl.order;
+package com.ruoyi.goods.service.impl.goods;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
-import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
-import com.ruoyi.order.domain.pojo.goods.Goods;
-import com.ruoyi.order.domain.pojo.order.ShoppingCart;
-import com.ruoyi.order.domain.vo.AppShoppingCartVo;
-import com.ruoyi.order.mapper.order.ShoppingCartMapper;
-import com.ruoyi.order.service.goods.GoodsService;
-import com.ruoyi.order.service.order.ShoppingCartService;
+import com.ruoyi.goods.domain.dto.AppShoppingCartAddDto;
+import com.ruoyi.goods.domain.dto.AppShoppingCartChangeDto;
+import com.ruoyi.system.api.domain.poji.goods.Goods;
+import com.ruoyi.goods.domain.pojo.goods.ShoppingCart;
+import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
+import com.ruoyi.goods.mapper.goods.ShoppingCartMapper;
+import com.ruoyi.goods.service.goods.GoodsService;
+import com.ruoyi.goods.service.goods.ShoppingCartService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/CodeFactoryUtil.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/CodeFactoryUtil.java
new file mode 100644
index 0000000..b979a0a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/CodeFactoryUtil.java
@@ -0,0 +1,154 @@
+package com.ruoyi.goods.util;
+
+
+
+import com.ruoyi.common.redis.service.RedisService;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.security.SecureRandom;
+import java.util.Date;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author jqs34
+ * @ClassName CodeFactoryUtil
+ * @description: TODO
+ * @date 2023年02月13日
+ * @version: 1.0
+ */
+@Component
+public class CodeFactoryUtil {
+
+
+ //静态住入到自己的类中
+ private static RedisService redisService;
+
+ //将静态属性以入参（形参）的方式传入一个方法中，然后将此方法通过 @Autowired 注入到Spring容器中
+ @Autowired
+ public void setService(RedisService redisService) {
+ CodeFactoryUtil.redisService = redisService;
+ }
+
+ /**
+ * APP用户编码
+ */
+ private static final String APP_USER_PREFIX = "HRT_M";
+
+ /**
+ * 商户编号
+ */
+ private static final String SHOP_PREFIX = "HRT_S";
+
+ /**
+ * 商户订单前缀
+ */
+ private static final String ORDER_PREFIX = "SC";
+
+ /**
+ * 退款订单前缀
+ */
+ private static final String ORDER_REFUND_PREFIX = "RO";
+
+ /**
+ * 用户id和随机数总长度
+ */
+
+ private static final int maxLength = 4;
+
+ /**
+ * 更具id进行加密+加随机数组成固定长度编码
+ */
+
+ public static void main(String[] args) {
+ Long orderId = 1L;
+ String userNo = getShopNo(orderId);
+ System.out.println(userNo);
+ }
+
+ /**
+ * 获取商户编号
+ *
+ * @param shopId
+ * @return
+ */
+ public static String getShopNo(Long shopId) {
+ String prefix = SHOP_PREFIX;
+ return toFillZeroCode(prefix, maxLength, shopId);
+ }
+
+ public static String getShopOrderNo() {
+ String orderNo;
+ String timeTemp = DateFormatUtils.format(new Date(), "yyyyMMdd");
+ String prefix = ORDER_PREFIX + timeTemp;
+ String suffixNumber = getSuffixNumber(prefix);
+ orderNo = prefix + suffixNumber;
+ return orderNo;
+ }
+
+ private static String getSuffixNumber(String prefix){
+ Integer suffixNumberInt;
+ String suffixNumber = "0001";
+ if(redisService.hasKey(prefix)){
+ suffixNumberInt = redisService.getCacheObject(prefix);
+ suffixNumber = toFillZeroSuffixNumber(suffixNumberInt);
+ suffixNumberInt = suffixNumberInt + 1;
+ redisService.setCacheObject(prefix, suffixNumberInt, 24L, TimeUnit.HOURS);
+ }else{
+ redisService.setCacheObject(prefix, 1, 24L, TimeUnit.HOURS);
+ }
+ return suffixNumber;
+ }
+
+ private static String toFillZeroSuffixNumber(Integer suffixNumberInt){
+ String suffixNumberStr = suffixNumberInt.toString();
+ int length = suffixNumberStr.length();
+ int fillLength = 4 - length;
+ StringBuilder idsbs = new StringBuilder();
+ for (int i = 0; i < fillLength; i++) {
+ idsbs.append("0");
+ }
+ return idsbs.append(suffixNumberStr).toString();
+ }
+
+
+ /**
+ * 0补位
+ *
+ * @param prefix
+ * @param totalLength
+ * @param id
+ * @return
+ */
+ private static String toFillZeroCode(String prefix, int totalLength, Long id) {
+ String idStr = id.toString();
+ int length = idStr.length();
+
+ int fillLength = totalLength - length;
+ StringBuilder idsbs = new StringBuilder(prefix);
+ for (int i = 0; i < fillLength; i++) {
+ idsbs.append("0");
+ }
+ return idsbs.append(idStr).toString();
+ }
+
+ /**
+ * 随机6位数生成
+ */
+ public static String getRandStr(int num) {
+ // 默认6位
+ num = num != 0 ? num : 6;
+ Random r = new SecureRandom();
+ StringBuffer str = new StringBuffer();
+ int i = 0;
+ while (i < num) {
+ str.append(r.nextInt(10));
+ i++;
+ }
+ return str.toString();
+ }
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/EmojiUtil.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/EmojiUtil.java
new file mode 100644
index 0000000..32dddd0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/EmojiUtil.java
@@ -0,0 +1,95 @@
+package com.ruoyi.goods.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class EmojiUtil {
+ /**
+ * 编码
+ *
+ * @param str 待转换字符串
+ * @return 转换后字符串
+ * @throws UnsupportedEncodingException exception
+ * @Description 将字符串中的emoji表情转换成可以在utf-8字符集数据库中保存的格式（表情占4个字节，需要utf8mb4字符集）
+ */
+ public static String emojiEncode(String str)
+ throws UnsupportedEncodingException {
+ String patternString = "([\\x{10000}-\\x{10ffff}\ud800-\udfff])";
+
+ Pattern pattern = Pattern.compile(patternString);
+ Matcher matcher = pattern.matcher(str);
+ StringBuffer sb = new StringBuffer();
+ while (matcher.find()) {
+ try {
+ matcher.appendReplacement(
+ sb,
+ "[["
+ + URLEncoder.encode(matcher.group(1),
+ "UTF-8") + "]]");
+ } catch (UnsupportedEncodingException e) {
+// LOG.error("emojiConvert error", e);
+ throw e;
+ }
+ }
+ matcher.appendTail(sb);
+// LOG.debug("emojiConvert " + str + " to " + sb.toString()
+// + ", len：" + sb.length());
+ return sb.toString();
+ }
+
+ /**
+ * 解码
+ *
+ * @param str 转换后的字符串
+ * @return 转换前的字符串
+ * @throws UnsupportedEncodingException exception
+ * @Description 还原utf8数据库中保存的含转换后emoji表情的字符串
+ */
+ public static String emojiDecode(String str)
+ throws UnsupportedEncodingException {
+ String patternString = "\\[\\[(.*?)\\]\\]";
+
+ Pattern pattern = Pattern.compile(patternString);
+ if (str == null) {
+ return str;
+ }
+ Matcher matcher = pattern.matcher(str);
+
+ StringBuffer sb = new StringBuffer();
+ while (matcher.find()) {
+ try {
+ matcher.appendReplacement(sb,
+ URLDecoder.decode(matcher.group(1), "UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+// LOG.error("emojiRecovery error", e);
+ throw e;
+ }
+ }
+ matcher.appendTail(sb);
+// LOG.debug("emojiRecovery " + str + " to " + sb.toString());
+// System.out.println("emojiRecovery " + str + " to " + sb.toString());
+ return sb.toString();
+ }
+
+ /**
+ * @param str 待过滤字符串
+ * @return 过滤后字符串
+ * exception
+ * @Description 将字符串中的emoji表情过滤掉
+ */
+ public static String emojiSub(String str) {
+ String patternString = "([\\x{10000}-\\x{10ffff}\ud800-\udfff])";
+ Pattern pattern = Pattern.compile(patternString);
+ Matcher matcher = pattern.matcher(str);
+ StringBuffer sb = new StringBuffer();
+ while (matcher.find()) {
+ matcher.appendReplacement(sb, "");
+ }
+ matcher.appendTail(sb);
+ return sb.toString();
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..91e477e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
@@ -0,0 +1,27 @@
+# Tomcat
+server:
+ port: 10065
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: ruoyi-goods
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 47.109.78.184:5000
+ #server-addr: 127.0.0.1:8848
+ config:
+ # 配置中心地址
+ server-addr: 47.109.78.184:5000
+ #server-addr: 127.0.0.1:8848
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/logback.xml
new file mode 100644
index 0000000..61d523e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/logback.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+ <!-- 日志存放路径 -->
+ <property name="log.path" value="logs/ruoyi-order" />
+ <!-- 日志输出格式 -->
+ <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+ <!-- 控制台输出 -->
+ <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ </appender>
+
+ <!-- 系统日志输出 -->
+ <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/info.log</file>
+ <!-- 循环政策：基于时间创建日志文件 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 日志文件名格式 -->
+ <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!-- 日志最大的历史 60天 -->
+ <maxHistory>60</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <!-- 过滤的级别 -->
+ <level>INFO</level>
+ <!-- 匹配时的操作：接收（记录） -->
+ <onMatch>ACCEPT</onMatch>
+ <!-- 不匹配时的操作：拒绝（不记录） -->
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/error.log</file>
+ <!-- 循环政策：基于时间创建日志文件 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 日志文件名格式 -->
+ <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!-- 日志最大的历史 60天 -->
+ <maxHistory>60</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <!-- 过滤的级别 -->
+ <level>ERROR</level>
+ <!-- 匹配时的操作：接收（记录） -->
+ <onMatch>ACCEPT</onMatch>
+ <!-- 不匹配时的操作：拒绝（不记录） -->
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <!-- 系统模块日志级别控制 -->
+ <logger name="com.ruoyi" level="info" />
+ <!-- Spring日志级别控制 -->
+ <logger name="org.springframework" level="warn" />
+
+ <root level="info">
+ <appender-ref ref="console" />
+ </root>
+
+ <!--系统操作日志-->
+ <root level="info">
+ <appender-ref ref="file_info" />
+ <appender-ref ref="file_error" />
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/activity/ActivityGoodsMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityGoodsMapper.xml
similarity index 98%
rename from ruoyi-modules/ruoyi-order/src/main/resources/mapper/activity/ActivityGoodsMapper.xml
rename to ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityGoodsMapper.xml
index b09def9..e06c20a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/activity/ActivityGoodsMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityGoodsMapper.xml
@@ -1,6 +1,6 @@
<?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.ruoyi.order.mapper.activity.ActivityGoodsMapper">
+<mapper namespace="com.ruoyi.goods.mapper.activity.ActivityGoodsMapper">
<resultMap type="com.ruoyi.system.api.domain.poji.activity.ActivityGoods" id="ActivityGoodsResult">
<result property="agId" column="ag_id" />
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsFileMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsFileMapper.xml
similarity index 97%
rename from ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsFileMapper.xml
rename to ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsFileMapper.xml
index 5a804e6..af4c8a8 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsFileMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsFileMapper.xml
@@ -1,6 +1,6 @@
<?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.ruoyi.order.mapper.goods.GoodsFileMapper">
+<mapper namespace="com.ruoyi.goods.mapper.goods.GoodsFileMapper">
<resultMap type="GoodsFile" id="GoodsFileResult">
<result property="id" column="id" />
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
similarity index 97%
rename from ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsMapper.xml
rename to ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index 1fcebd4..531fa74 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -1,6 +1,6 @@
<?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.ruoyi.order.mapper.goods.GoodsMapper">
+<mapper namespace="com.ruoyi.goods.mapper.goods.GoodsMapper">
<resultMap type="Goods" id="GoodsResult">
<result property="goodsId" column="goods_id" />
@@ -147,7 +147,7 @@
</delete>
<!--分页获取推荐商品-->
- <select id="pageRecommendGoods" resultType="com.ruoyi.order.domain.vo.AppSimpleGoodsVo">
+ <select id="pageRecommendGoods" resultType="com.ruoyi.goods.domain.vo.AppSimpleGoodsVo">
SELECT
tg.goods_id goodsId,
tg.goods_name goodsName,
@@ -170,7 +170,7 @@
</select>
<!--分页获取商城商品列表-->
- <select id="pageShopGoods" resultType="com.ruoyi.order.domain.vo.AppSimpleGoodsVo">
+ <select id="pageShopGoods" resultType="com.ruoyi.goods.domain.vo.AppSimpleGoodsVo">
SELECT
tg.goods_id goodsId,
tg.goods_name goodsName,
@@ -225,7 +225,7 @@
</select>
<!--分页获取搜索商品列表-->
- <select id="pageSearchGoods" resultType="com.ruoyi.order.domain.vo.AppSimpleGoodsVo">
+ <select id="pageSearchGoods" resultType="com.ruoyi.goods.domain.vo.AppSimpleGoodsVo">
SELECT
tg.goods_id goodsId,
tg.goods_name goodsName,
@@ -251,7 +251,7 @@
</select>
<!--分页获取搜索活动商品列表-->
- <select id="pageSearchActivityGoods" resultType="com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo">
+ <select id="pageSearchActivityGoods" resultType="com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo">
SELECT
tg.goods_id goodsId,
tg.goods_name goodsName,
@@ -280,7 +280,7 @@
ORDER BY tg.create_time DESC
</select>
- <select id="pageMerShopGoods" resultType="com.ruoyi.order.domain.vo.MerGoodsPageVo">
+ <select id="pageMerShopGoods" resultType="com.ruoyi.goods.domain.vo.MerGoodsPageVo">
SELECT
tg.goods_id goodsId,
tg.goods_name goodsName,
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsRelNurseMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsRelNurseMapper.xml
similarity index 97%
rename from ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsRelNurseMapper.xml
rename to ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsRelNurseMapper.xml
index 61f4aa9..288a1e1 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsRelNurseMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsRelNurseMapper.xml
@@ -1,6 +1,6 @@
<?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.ruoyi.order.mapper.goods.GoodsRelNurseMapper">
+<mapper namespace="com.ruoyi.goods.mapper.goods.GoodsRelNurseMapper">
<resultMap type="GoodsRelNurse" id="GoodsRelNurseResult">
<result property="id" column="id" />
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsRelTagMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsRelTagMapper.xml
similarity index 97%
rename from ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsRelTagMapper.xml
rename to ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsRelTagMapper.xml
index a2b1fbd..fa927d4 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsRelTagMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsRelTagMapper.xml
@@ -1,6 +1,6 @@
<?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.ruoyi.order.mapper.goods.GoodsRelTagMapper">
+<mapper namespace="com.ruoyi.goods.mapper.goods.GoodsRelTagMapper">
<resultMap type="GoodsRelTag" id="GoodsRelTagResult">
<result property="id" column="id" />
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsTotalMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsTotalMapper.xml
similarity index 97%
rename from ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsTotalMapper.xml
rename to ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsTotalMapper.xml
index c72addf..f85f56e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsTotalMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsTotalMapper.xml
@@ -1,6 +1,6 @@
<?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.ruoyi.order.mapper.goods.GoodsTotalMapper">
+<mapper namespace="com.ruoyi.goods.mapper.goods.GoodsTotalMapper">
<resultMap type="GoodsTotal" id="GoodsTotalResult">
<result property="goodsId" column="goods_id" />
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/ShopGoodsMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ShopGoodsMapper.xml
similarity index 98%
rename from ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/ShopGoodsMapper.xml
rename to ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ShopGoodsMapper.xml
index b1ba1be..e75a25f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/ShopGoodsMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ShopGoodsMapper.xml
@@ -1,6 +1,6 @@
<?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.ruoyi.order.mapper.goods.ShopGoodsMapper">
+<mapper namespace="com.ruoyi.goods.mapper.goods.ShopGoodsMapper">
<resultMap type="ShopGoods" id="ShopGoodsResult">
<result property="id" column="id" />
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ShoppingCartMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ShoppingCartMapper.xml
similarity index 97%
rename from ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ShoppingCartMapper.xml
rename to ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ShoppingCartMapper.xml
index 3c4f30f..0be7bd5 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ShoppingCartMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ShoppingCartMapper.xml
@@ -1,6 +1,6 @@
<?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.ruoyi.order.mapper.order.ShoppingCartMapper">
+<mapper namespace="com.ruoyi.goods.mapper.goods.ShoppingCartMapper">
<resultMap type="ShoppingCart" id="ShoppingCartResult">
<result property="id" column="id" />
@@ -79,7 +79,7 @@
</foreach>
</delete>
- <select id="listShoppingCartVo" resultType="com.ruoyi.order.domain.vo.AppShoppingCartVo">
+ <select id="listShoppingCartVo" resultType="com.ruoyi.goods.domain.vo.AppShoppingCartVo">
SELECT
tsc.id shoppingCartId,
tg.goods_id goodsId,
diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/banner.txt b/ruoyi-modules/ruoyi-job/src/main/resources/banner.txt
deleted file mode 100644
index 0b9cd42..0000000
--- a/ruoyi-modules/ruoyi-job/src/main/resources/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _ _ _
- (_) (_) | |
- _ __ _ _ ___ _ _ _ ______ _ ___ | |__
-| '__|| | | | / _ \ | | | || ||______| | | / _ \ | '_ \
-| | | |_| || (_) || |_| || | | || (_) || |_) |
-|_| \__,_| \___/ \__, ||_| | | \___/ |_.__/
- __/ | _/ |
- |___/ |__/
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
index ed6f4b5..ecaef7a 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java
@@ -35,6 +35,7 @@
private MemberService memberService;
+
@RequestMapping(value = "/pageMerCashMember", method = RequestMethod.POST)
@ApiOperation(value = "分页获取收银搜索会员列表")
public R<Page<MerCashMemberPageVo>> pageMerCashMember(@RequestBody MerCashMemberPageDto merCashMemberPageDto) {
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index 37d8d0c..6225e26 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -19,10 +19,10 @@
import com.ruoyi.member.service.member.MemberNurseService;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.member.util.HttpUtils;
-import com.ruoyi.system.api.RemoteConfigService;
-import com.ruoyi.system.api.RemoteOrderService;
-import com.ruoyi.system.api.RemoteShopService;
-import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.service.RemoteConfigService;
+import com.ruoyi.system.api.service.RemoteOrderService;
+import com.ruoyi.system.api.service.RemoteShopService;
+import com.ruoyi.system.api.service.RemoteUserService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/banner.txt b/ruoyi-modules/ruoyi-member/src/main/resources/banner.txt
deleted file mode 100644
index fbd45f5..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/resources/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _ _
- (_) | |
- _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___
-| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \
-| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | |
-|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_|
- __/ | __/ |
- |___/ |___/
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-order/pom.xml b/ruoyi-modules/ruoyi-order/pom.xml
index 1a76f59..29f30d0 100644
--- a/ruoyi-modules/ruoyi-order/pom.xml
+++ b/ruoyi-modules/ruoyi-order/pom.xml
@@ -108,6 +108,7 @@
</dependency>
+
</dependencies>
<build>
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
index e9b348e..f3ac0be 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
@@ -40,7 +40,7 @@
- @RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
+ /*@RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
@ApiOperation(value = "核销code")
public R<MerVerifyCodeVo> verifyCode(@RequestBody MerVerifyCodeDto merVerifyCodeDto) {
Long userId = SecurityUtils.getUserId();
@@ -136,5 +136,5 @@
log.info("merMemberNoClearOrderDto----"+merMemberNoClearOrderDto.toString());
List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto);
return R.ok(page.setRecords(merMemberNoClearOrderVoList));
- }
+ }*/
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
index e76ae26..63eeb48 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
@@ -26,7 +26,7 @@
private OrderService orderService;
- @PostMapping("/getAppOrderTotal")
+ /*@PostMapping("/getAppOrderTotal")
public R<AppOrderTotalVo> getAppOrderTotal(@RequestBody Long userId){
AppOrderTotalVo appOrderTotalVo = orderService.getAppOrderTotal(userId);
return R.ok(appOrderTotalVo);
@@ -37,5 +37,5 @@
public R<MerHomeShopTotalVo> getMerHomeTotal(@RequestBody MerHomeShopTotalVo merHomeShopTotalVo){
merHomeShopTotalVo = orderService.getMerHomeTotal(merHomeShopTotalVo);
return R.ok(merHomeShopTotalVo);
- }
+ }*/
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppConsumerController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppConsumerController.java
index 779856f..50fa6e2 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppConsumerController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppConsumerController.java
@@ -8,8 +8,8 @@
import com.ruoyi.order.domain.vo.AppServiceRecordPageVo;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.UserServiceRecordService;
-import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
index b9dea8f..94236c6 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java
@@ -8,7 +8,6 @@
import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
-import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.poji.member.Member;
@@ -34,14 +33,13 @@
@RequestMapping("/app/order")
public class AppOrderController extends BaseController {
- @Autowired
- private RemoteMemberService memberService;
+
@Autowired
private OrderService orderService;
- @RequestMapping(value = "/buyGoods", method = RequestMethod.POST)
+ /*@RequestMapping(value = "/buyGoods", method = RequestMethod.POST)
@ApiOperation(value = "购买商品")
public R<AppSureOrderVo> buyGoods(@RequestBody AppSureOrderDto appSureOrderDto) {
Long userId = SecurityUtils.getUserId();
@@ -138,6 +136,6 @@
Long userId = SecurityUtils.getUserId();
orderService.cancelOrder(appBaseGetDto.getId());
return R.ok();
- }
+ }*/
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java
index e2c5e7f..ad208de 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java
@@ -25,6 +25,7 @@
@Resource
private OrderGoodsMapper orderGoodsMapper;
+
/**
*
* @param orderId
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 4708c86..3005650 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -10,34 +10,25 @@
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.*;
-import com.ruoyi.order.domain.pojo.goods.Goods;
-import com.ruoyi.order.domain.pojo.goods.GoodsFile;
-import com.ruoyi.order.domain.pojo.goods.ShopGoods;
import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.pojo.order.OrderGoods;
-import com.ruoyi.order.domain.pojo.order.ShoppingCart;
import com.ruoyi.order.domain.vo.*;
-import com.ruoyi.order.service.goods.GoodsFileService;
-import com.ruoyi.order.service.goods.ShopGoodsService;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderGoodsService;
-import com.ruoyi.order.service.order.ShoppingCartService;
import com.ruoyi.order.util.CodeFactoryUtil;
-import com.ruoyi.system.api.RemoteMemberService;
-import com.ruoyi.system.api.RemoteShopService;
-import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.service.*;
import com.ruoyi.system.api.constant.AppErrorConstant;
-import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
-import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
-import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto;
+import com.ruoyi.system.api.domain.poji.goods.Goods;
+import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
+import com.ruoyi.system.api.domain.poji.goods.ShopGoods;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import com.ruoyi.order.mapper.order.OrderMapper;
-import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import org.springframework.stereotype.Service;
@@ -63,16 +54,7 @@
private OrderMapper orderMapper;
@Resource
- private GoodsService goodsService;
-
- @Resource
- private ShopGoodsService shopGoodsService;
-
- @Resource
private RemoteMemberService remoteMemberService;
-
- @Resource
- private GoodsFileService goodsFileService;
@Resource
private OrderGoodsService orderGoodsService;
@@ -87,7 +69,11 @@
private ConsumerGoodsService consumerGoodsService;
@Resource
- private ShoppingCartService shoppingCartService;
+ private RemoteGoodsService remoteGoodsService;
+
+ @Resource
+ private RemoteShoppingCartService remoteShoppingCartService;
+
/**
* @description: buyGoods
@@ -132,19 +118,22 @@
goodsId = appBuyGoodsDto.getGoodsId();
buyNum = appBuyGoodsDto.getBuyNum();
userCouponId = appBuyGoodsDto.getUserCouponId();
- goods = goodsService.getById(goodsId);
+ goods = remoteGoodsService.getGoods(goodsId).getData();
appSureOrderGoodsVo.setGoodsId(goodsId);
appSureOrderGoodsVo.setGoodsName(goods.getGoodsName());
appSureOrderGoodsVo.setGoodsIntroduction(goods.getGoodsIntroduction());
appSureOrderGoodsVo.setGoodsType(goods.getGoodsType());
//商品图片
- goodsFile = goodsFileService.getGoodsPicture(goodsId);
+ goodsFile = remoteGoodsService.getGoodsFile(goodsId).getData();
appSureOrderGoodsVo.setGoodsPicture(goodsFile.getFileUrl());
buyNum = appBuyGoodsDto.getBuyNum();
appSureOrderGoodsVo.setBuyNum(buyNum);
goodsPrice = goods.getSalesPrice();
//商户定制价格
- ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(appSureOrderDto.getShopId(),goods.getGoodsId());
+ AppShopGoodsGetDto appShopGoodsGetDto = new AppShopGoodsGetDto();
+ appShopGoodsGetDto.setGoodsId(goods.getGoodsId());
+ appShopGoodsGetDto.setShopId(appSureOrderDto.getShopId());
+ ShopGoods shopGoods = remoteGoodsService.getShopGoods(appShopGoodsGetDto).getData();
if(shopGoods!=null){
goodsPrice = shopGoods.getSalesPrice();
}
@@ -250,27 +239,29 @@
String orderNo = CodeFactoryUtil.getShopOrderNo();
OrderGoods orderGoods;
String orderGoodsId;
- ShoppingCart shoppingCart;
HashSet<String> goodsTypeSet = new HashSet<>();
for(AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList){
appSureOrderGoodsVo = new AppSureOrderGoodsVo();
useCoupon = 0;
goodsId = appBuyGoodsDto.getGoodsId();
userCouponId = appBuyGoodsDto.getUserCouponId();
- goods = goodsService.getById(goodsId);
+ goods = remoteGoodsService.getGoods(goodsId).getData();
appSureOrderGoodsVo.setGoodsId(goodsId);
appSureOrderGoodsVo.setGoodsName(goods.getGoodsName());
appSureOrderGoodsVo.setGoodsIntroduction(goods.getGoodsIntroduction());
appSureOrderGoodsVo.setGoodsType(goods.getGoodsType());
//商品图片
- goodsFile = goodsFileService.getGoodsPicture(goodsId);
+ goodsFile = remoteGoodsService.getGoodsFile(goodsId).getData();
appSureOrderGoodsVo.setGoodsPicture(goodsFile.getFileUrl());
buyNum = appBuyGoodsDto.getBuyNum();
appSureOrderGoodsVo.setBuyNum(buyNum);
goodsPrice = goods.getSalesPrice();
serviceNum = goods.getServiceNum();
//商户定制价格
- ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(appPlaceOrderDto.getShopId(),goods.getGoodsId());
+ AppShopGoodsGetDto appShopGoodsGetDto = new AppShopGoodsGetDto();
+ appShopGoodsGetDto.setGoodsId(goods.getGoodsId());
+ appShopGoodsGetDto.setShopId(appPlaceOrderDto.getShopId());
+ ShopGoods shopGoods = remoteGoodsService.getShopGoods(appShopGoodsGetDto).getData();
if(shopGoods!=null){
goodsPrice = shopGoods.getSalesPrice();
serviceNum = shopGoods.getServiceNum();
@@ -335,7 +326,10 @@
orderGoods.setGoodsType(goods.getGoodsType());
orderGoodsService.save(orderGoods);
//清空购物车
- shoppingCartService.deleteByUserIdAndGoodsId(userId,goodsId);
+ AppShoppingCartDelDto appShoppingCartDelDto = new AppShoppingCartDelDto();
+ appShoppingCartDelDto.setGoodsId(goodsId);
+ appShoppingCartDelDto.setUserId(userId);
+ remoteShoppingCartService.deleteShoppingCart(appShoppingCartDelDto);
if(goods.getGoodsType()==1){
goodsTypeSet.add("周期");
}else if(goods.getGoodsType()==2){
@@ -714,12 +708,15 @@
for(AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList){
goodsId = appBuyGoodsDto.getGoodsId();
userCouponId = appBuyGoodsDto.getUserCouponId();
- goods = goodsService.getById(goodsId);
+ goods = remoteGoodsService.getGoods(goodsId).getData();
buyNum = appBuyGoodsDto.getBuyNum();
goodsPrice = goods.getSalesPrice();
serviceNum = goods.getServiceNum();
//商户定制价格
- ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(merNewOrderDto.getShopId(),goods.getGoodsId());
+ AppShopGoodsGetDto appShopGoodsGetDto = new AppShopGoodsGetDto();
+ appShopGoodsGetDto.setGoodsId(goods.getGoodsId());
+ appShopGoodsGetDto.setShopId(merNewOrderDto.getShopId());
+ ShopGoods shopGoods = remoteGoodsService.getShopGoods(appShopGoodsGetDto).getData();
if(shopGoods!=null){
goodsPrice = shopGoods.getSalesPrice();
serviceNum = shopGoods.getServiceNum();
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/banner.txt b/ruoyi-modules/ruoyi-order/src/main/resources/banner.txt
deleted file mode 100644
index fbd45f5..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/resources/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _ _
- (_) | |
- _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___
-| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \
-| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | |
-|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_|
- __/ | __/ |
- |___/ |___/
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
index 8217b64..6781191 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
@@ -2,12 +2,13 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.service.RemoteConfigService;
+import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.shop.domain.dto.AppNearbyShopDto;
import com.ruoyi.shop.domain.vo.AppNearbyShopVo;
import com.ruoyi.shop.domain.vo.AppShopInfoVo;
import com.ruoyi.shop.service.shop.ShopService;
-import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.poji.member.Member;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -35,6 +36,8 @@
@Autowired
private RemoteMemberService memberService;
+ RemoteConfigService remoteConfigService;
+
@Autowired
private ShopService shopService;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index 502dffa..94fb893 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -11,10 +11,10 @@
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.shop.service.task.ShopFileService;
import com.ruoyi.shop.util.CodeFactoryUtil;
-import com.ruoyi.system.api.RemoteConfigService;
-import com.ruoyi.system.api.RemoteMemberService;
-import com.ruoyi.system.api.RemoteOrderService;
-import com.ruoyi.system.api.RemoteUserService;
+import com.ruoyi.system.api.service.RemoteConfigService;
+import com.ruoyi.system.api.service.RemoteMemberService;
+import com.ruoyi.system.api.service.RemoteOrderService;
+import com.ruoyi.system.api.service.RemoteUserService;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.config.SysTag;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java
index d3d3772..9a791ff 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java
@@ -5,19 +5,15 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.bean.BeanUtils;
-import com.ruoyi.shop.domain.pojo.shop.ShopRelTag;
import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
import com.ruoyi.shop.mapper.shop.ShopStaffMapper;
import com.ruoyi.shop.service.shop.ShopRelUserService;
import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.shop.service.shop.ShopStaffService;
-import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.dto.MerEditUserDto;
-import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java
index dccaa4a..f8f5bc9 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java
@@ -15,8 +15,7 @@
import com.ruoyi.shop.service.task.MemberTaskRecordService;
import com.ruoyi.shop.service.task.MemberTaskService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.api.RemoteMemberService;
-import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.service.RemoteMemberService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/banner.txt b/ruoyi-modules/ruoyi-shop/src/main/resources/banner.txt
deleted file mode 100644
index fbd45f5..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _ _
- (_) | |
- _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___
-| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \
-| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | |
-|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_|
- __/ | __/ |
- |___/ |___/
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysProfileController.java
index e5f3716..0a45253 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysProfileController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysProfileController.java
@@ -20,7 +20,7 @@
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.RemoteFileService;
+import com.ruoyi.system.api.service.RemoteFileService;
import com.ruoyi.system.api.domain.poji.sys.SysFile;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.model.LoginUser;
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/banner.txt b/ruoyi-modules/ruoyi-system/src/main/resources/banner.txt
deleted file mode 100644
index fbd45f5..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/resources/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _ _
- (_) | |
- _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___
-| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \
-| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | |
-|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_|
- __/ | __/ |
- |___/ |___/
\ No newline at end of file
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt b/ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt
deleted file mode 100644
index ecaf8a4..0000000
--- a/ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _ _ _
- (_) (_)| |
- _ __ _ _ ___ _ _ _ ______ _ __ ___ ___ _ __ _ | |_ ___ _ __
-| '__|| | | | / _ \ | | | || ||______|| '_ ` _ \ / _ \ | '_ \ | || __| / _ \ | '__|
-| | | |_| || (_) || |_| || | | | | | | || (_) || | | || || |_ | (_) || |
-|_| \__,_| \___/ \__, ||_| |_| |_| |_| \___/ |_| |_||_| \__| \___/ |_|
- __/ |
- |___/
\ No newline at end of file
--
Gitblit v1.7.1