From 3183d1a910d72eefb96d4cb72f556a54a5d2f874 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 25 五月 2023 11:42:39 +0800
Subject: [PATCH] 完善数据库和框架
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopFundRecordService.java | 16
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopProportionMapper.xml | 7
ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponRelGoodsMapper.xml | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java | 20
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppBuyGoodsDto.java | 2
ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponRelUserMapper.xml | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CooperationServiceImpl.java | 20
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java | 6
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShopGoodsPageDto.java | 3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java | 1
ruoyi-modules/ruoyi-order/pom.xml | 6
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/BrowseRecordService.java | 16
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ArticleService.java | 16
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberTotalMapper.java | 16
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponTotalMapper.java | 4
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppRecommendGoodsPageDto.java | 19
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/BrowseRecord.java | 78 +
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponRelUserServiceImpl.java | 8
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/BrowseRecordServiceImpl.java | 20
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/RecommendCooperation.java | 2
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberShopTotalMapper.xml | 7
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/StaffSuggestServiceImpl.java | 20
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityRecordMapper.java | 16
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopProportion.java | 73 +
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponRelUser.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java | 4
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberCouponMapper.xml | 38
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml | 7
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopFundRecordMapper.xml | 7
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberShopTotal.java | 188 ++++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberCoupon.java | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopFundRecordServiceImpl.java | 20
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MerShopRecommendPageVo.java | 6
ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ArticleMapper.xml | 7
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberTotalService.java | 16
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/IntegralRecordServiceImpl.java | 20
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Activeness.java | 82 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java | 6
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java | 31
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopFundRecordMapper.java | 16
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberShopTotalMapper.java | 16
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/RecommendCooperationMapper.java | 8
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopStaff.java | 2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/RecommendCooperationMapper.xml | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponRelUserMapper.java | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponTotal.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserMapper.java | 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java | 8
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/Coupon.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CooperationService.java | 16
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponTotalService.java | 4
ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponTotalMapper.xml | 2
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 22
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/ArticleMapper.java | 16
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopProportionService.java | 16
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java | 13
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppGoodsInfoGetDto.java | 3
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppMemberCouponVo.java | 6
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityRecordService.java | 16
ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/CooperationMapper.xml | 7
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java | 6
ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponMapper.xml | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/IntegralRecord.java | 83 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerRecommendCooperationDto.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppSearchGoodsPageDto.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/CooperationMapper.java | 16
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberTotal.java | 138 +++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponMapper.java | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/IntegralRecordMapper.java | 16
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponRelGoodsService.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java | 83 +
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java | 20
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/BrowseRecordMapper.java | 16
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponRelGoods.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponTotalServiceImpl.java | 8
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberShopTotalServiceImpl.java | 20
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/BrowseRecordMapper.xml | 7
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java | 14
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberShopTotalService.java | 16
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberTotalMapper.xml | 7
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponRelUserService.java | 4
ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ActivenessMapper.xml | 7
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponRelGoodsServiceImpl.java | 8
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopFundRecord.java | 88 ++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java | 8
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 50
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityRecordServiceImpl.java | 20
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java | 16
ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/StaffSuggestMapper.xml | 7
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/ActivenessMapper.java | 16
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/RecommendCooperationService.java | 10
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Cooperation.java | 67 +
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberSuggest.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java | 16
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/AgencyTaskRecord.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/activity/ActivityRecord.java | 73 +
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponRelGoodsMapper.java | 4
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityRecordMapper.xml | 6
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java | 38
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java | 20
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Article.java | 98 ++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java | 35
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java | 16
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/StaffSuggestMapper.java | 16
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppBuyGoodsDto.java | 2
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/IntegralRecordService.java | 16
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 20
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java | 4
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/IntegralRecordMapper.xml | 7
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 124 +-
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopProportionMapper.java | 16
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberCouponMapper.java | 26
/dev/null | 26
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/activity/Activity.java | 122 ++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderGoodsVo.java | 6
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberCouponService.java | 26
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerShopRecommendPageDto.java | 3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/StaffSuggestService.java | 16
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 14
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberTotalServiceImpl.java | 20
123 files changed, 2,266 insertions(+), 283 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java
index c52a842..fec6ea2 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java
@@ -126,4 +126,6 @@
String BEYOND_SURP_NUM = "超过剩余次数";
+ String NO_POSITION = "商品信息需要获取定位";
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
index 889a0a6..ffe3250 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
@@ -30,21 +30,20 @@
private static final long serialVersionUID = 1L;
/**
+ * 会员id
+ */
+ @TableId("member_id")
+ private String memberId;
+ /**
* 用户id
*/
- @TableId("user_id")
+ @TableField("user_id")
private Long userId;
-
/**
* 删除标记
*/
@TableField("del_flag")
private Integer delFlag;
- /**
- * 会员id
- */
- @TableField("member_id")
- private String memberId;
/**
* 会员编号
*/
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppUserCouponVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppMemberCouponVo.java
similarity index 91%
rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppUserCouponVo.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppMemberCouponVo.java
index c45c7c3..215a930 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppUserCouponVo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppMemberCouponVo.java
@@ -10,15 +10,15 @@
/**
* @author jqs34
* @version 1.0
- * @classname AppUserCouponVo
+ * @classname AppMemberCouponVo
* @description: TODO
* @date 2023 2023/5/2 21:53
*/
@Data
-public class AppUserCouponVo {
+public class AppMemberCouponVo {
@ApiModelProperty(value = "优惠券id")
- private Long userCouponId;
+ private Long memberCouponId;
@ApiModelProperty(value = "商品id")
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 6d9f6bd..b5cc560 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
@@ -7,7 +7,7 @@
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.vo.AppUserCouponVo;
+import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import org.slf4j.Logger;
@@ -51,7 +51,7 @@
@Override
- public R<List<AppUserCouponVo>> listVoUserCouponByUserId(Long userId) {
+ public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(Long userId) {
return R.fail("获取用户优惠券失败:" + throwable.getMessage());
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java
index e53cf29..3cd05dc 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java
@@ -7,7 +7,7 @@
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
-import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
+import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import com.ruoyi.system.api.factory.RemoteMemberFallbackFactory;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
@@ -44,8 +44,8 @@
* @param userId
* @return
*/
- @PostMapping("/member/listVoUserCouponByUserId")
- public R<List<AppUserCouponVo>> listVoUserCouponByUserId(@RequestBody Long userId);
+ @PostMapping("/member/listVoMemberCouponByUserId")
+ public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(@RequestBody Long userId);
/**
* 更新绑定
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
index 5354c45..e935f67 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
+import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
import com.ruoyi.goods.domain.dto.AppGoodsInfoGetDto;
import com.ruoyi.goods.domain.dto.AppShoppingCartAddDto;
@@ -54,9 +55,12 @@
if(member!=null&&member.getRelationShopId()!=null){
appGoodsInfoGetDto.setShopId(member.getRelationShopId());
}else{
- throw new ServiceException("请先获取附近商户定位");
+ appGoodsInfoGetDto.setShopId(appGoodsInfoGetDto.getPositionShopId());
}
}
+ if(appGoodsInfoGetDto.getShopId()==null){
+ throw new ServiceException(AppErrorConstant.NO_POSITION);
+ }
AppGoodsInfoVo appGoodsInfoVo = goodsService.getGoodsInfo(appGoodsInfoGetDto);
return R.ok(appGoodsInfoVo);
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
index 3f01cbb..9983fbd 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
@@ -2,8 +2,11 @@
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.goods.domain.dto.AppRecommendGoodsPageDto;
+import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppPageDto;
import com.ruoyi.goods.domain.dto.AppSearchGoodsPageDto;
import com.ruoyi.goods.domain.dto.AppShopGoodsPageDto;
@@ -45,25 +48,24 @@
@RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
@ApiOperation(value = "推荐商品")
- public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppPageDto appPageDto) {
+ public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppRecommendGoodsPageDto appRecommendGoodsPageDto) {
Long userId = SecurityUtils.getUserId();
- logger.info("userId-----"+userId.toString());
Long shopId = null;
if(userId!=null){
Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRelationShopId()!=null){
shopId = member.getRelationShopId();
}
+ }else{
+ shopId = appRecommendGoodsPageDto.getPositionShopId();
}
if(shopId==null){
- shopId = 1L;
+ throw new ServiceException(AppErrorConstant.NO_POSITION);
}
Page<AppSimpleGoodsVo> page = new Page<>();
- page.setSize(appPageDto.getPageSize());
- page.setCurrent(appPageDto.getPageNum());
- //logger.info("shopId"+shopId.toString());
+ page.setSize(appRecommendGoodsPageDto.getPageSize());
+ page.setCurrent(appRecommendGoodsPageDto.getPageNum());
List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageRecommendGoods(page,shopId);
- //logger.info("appSimpleGoodsVoList"+appSimpleGoodsVoList.toString());
return R.ok(page.setRecords(appSimpleGoodsVoList));
}
@@ -76,8 +78,11 @@
if(member!=null&&member.getRelationShopId()!=null){
appShopGoodsPageDto.setShopId(member.getRelationShopId());
}else{
- appShopGoodsPageDto.setShopId(1L);
+ appShopGoodsPageDto.setShopId(appShopGoodsPageDto.getPositionShopId());
}
+ }
+ if(appShopGoodsPageDto.getShopId()==null){
+ throw new ServiceException(AppErrorConstant.NO_POSITION);
}
Page<AppSimpleGoodsVo> page = new Page<>();
page.setSize(appShopGoodsPageDto.getPageSize());
@@ -95,8 +100,11 @@
if(member!=null&&member.getRelationShopId()!=null){
appSearchGoodsPageDto.setShopId(member.getRelationShopId());
}else{
- appSearchGoodsPageDto.setShopId(1L);
+ appSearchGoodsPageDto.setShopId(appSearchGoodsPageDto.getPositionShopId());
}
+ }
+ if(appSearchGoodsPageDto.getShopId()==null){
+ throw new ServiceException(AppErrorConstant.NO_POSITION);
}
Page<AppSimpleGoodsVo> page = new Page<>();
page.setSize(appSearchGoodsPageDto.getPageSize());
@@ -114,9 +122,12 @@
if(member!=null&&member.getRelationShopId()!=null){
appSearchGoodsPageDto.setShopId(member.getRelationShopId());
}else{
- appSearchGoodsPageDto.setShopId(1L);
+ appSearchGoodsPageDto.setShopId(appSearchGoodsPageDto.getPositionShopId());
}
}
+ if(appSearchGoodsPageDto.getShopId()==null){
+ throw new ServiceException(AppErrorConstant.NO_POSITION);
+ }
Page<AppSimpleActivityGoodsVo> page = new Page<>();
page.setSize(appSearchGoodsPageDto.getPageSize());
page.setCurrent(appSearchGoodsPageDto.getPageNum());
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
index e65e8a0..aa03a9b 100644
--- 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
@@ -23,6 +23,6 @@
private Integer buyNum;
@ApiModelProperty(value = "用户优惠券id")
- private Long userCouponId;
+ private Long memberCouponId;
}
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
index 6234c59..117392e 100644
--- 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
@@ -19,4 +19,7 @@
@ApiModelProperty(value = "商户id",hidden = true)
private Long shopId;
+
+ @ApiModelProperty(value = "定位获取商户id")
+ private Long positionShopId;
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppRecommendGoodsPageDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppRecommendGoodsPageDto.java
new file mode 100644
index 0000000..aee96d6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppRecommendGoodsPageDto.java
@@ -0,0 +1,19 @@
+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 AppRecommandGoodsPageDto
+ * @description: TODO
+ * @date 2023年05月24日
+ * @version: 1.0
+ */
+@Data
+public class AppRecommendGoodsPageDto extends AppPageDto {
+
+ @ApiModelProperty(value = "定位获取商户id")
+ private Long positionShopId;
+}
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
index 4418fd7..0041f42 100644
--- 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
@@ -20,4 +20,6 @@
@ApiModelProperty(value = "搜索关键词")
private String keyword;
+ @ApiModelProperty(value = "定位获取商户id")
+ private Long positionShopId;
}
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
index 1a0f220..51e42ee 100644
--- 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
@@ -28,4 +28,7 @@
@ApiModelProperty(value = "排序方式1.全部2.价格正序3.价格倒序4.销量正序5.销量倒序")
private Integer sort;
+
+ @ApiModelProperty(value = "定位获取商户id")
+ private Long positionShopId;
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/activity/Activity.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/activity/Activity.java
new file mode 100644
index 0000000..33e8572
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/activity/Activity.java
@@ -0,0 +1,122 @@
+package com.ruoyi.goods.domain.pojo.activity;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 活动
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_activity")
+public class Activity extends Model<Activity> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 活动id
+ */
+ @TableId("activity_id")
+ private String activityId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 活动状态-1删除0未开始1进行中2已结束
+ */
+ @TableField("activity_status")
+ private Integer activityStatus;
+ /**
+ * 活动名称
+ */
+ @TableField("activity_name")
+ private String activityName;
+ /**
+ * 活动开始时间
+ */
+ @TableField("activity_start_time")
+ private Date activityStartTime;
+ /**
+ * 活动结束时间
+ */
+ @TableField("activity_end_time")
+ private Date activityEndTime;
+ /**
+ * 成团人数
+ */
+ @TableField("group_buy_number")
+ private Integer groupBuyNumber;
+ /**
+ * 限购标记0否1是
+ */
+ @TableField("purchase_limitation_flag")
+ private Integer purchaseLimitationFlag;
+ /**
+ * 限购数量
+ */
+ @TableField("propaganda_poster")
+ private String propagandaPoster;
+ /**
+ * 适用地区标记1全部2指定
+ */
+ @TableField("area_flag")
+ private Integer areaFlag;
+ /**
+ * 适用地区code集合
+ */
+ @TableField("designated_area")
+ private String designatedArea;
+ /**
+ * 适用店铺标记1全部2指定
+ */
+ @TableField("shop_flag")
+ private Integer shopFlag;
+ /**
+ * 适用店铺
+ */
+ @TableField("applicable_shop")
+ private String applicableShop;
+ /**
+ * 创建用户id
+ */
+ @TableField("create_user_id")
+ private Integer createUserId;
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ private Date createTime;
+ /**
+ * 更新用户id
+ */
+ @TableField("update_user_id")
+ private Integer updateUserId;
+ /**
+ * 更新时间
+ */
+ @TableField("update_time")
+ private Date updateTime;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.activityId;
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/activity/ActivityRecord.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/activity/ActivityRecord.java
new file mode 100644
index 0000000..723aec4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/activity/ActivityRecord.java
@@ -0,0 +1,73 @@
+package com.ruoyi.goods.domain.pojo.activity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 活动记录
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_activity_record")
+public class ActivityRecord extends Model<ActivityRecord> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 记录id
+ */
+ @TableId(value = "record_id", type = IdType.AUTO)
+ private Long recordId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 活动id
+ */
+ @TableField("activity_id")
+ private String activityId;
+ /**
+ * 用户id
+ */
+ @TableField("user_id")
+ private Integer userId;
+ /**
+ * 下单时间
+ */
+ @TableField("order_time")
+ private String orderTime;
+ /**
+ * 下单金额
+ */
+ @TableField("order_money")
+ private BigDecimal orderMoney;
+ /**
+ * 关联订单id
+ */
+ @TableField("order_id")
+ private String orderId;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.recordId;
+ }
+
+}
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
index 7b2535e..d7125f7 100644
--- 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
@@ -1,6 +1,6 @@
package com.ruoyi.goods.domain.vo;
-import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
+import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -36,7 +36,7 @@
private Integer buyNum;
@ApiModelProperty(value = "优惠券id")
- private Long userCouponId;
+ private Long memberCouponId;
@ApiModelProperty(value = "商品售价")
private BigDecimal goodsPrice;
@@ -57,6 +57,6 @@
private BigDecimal goodsRealPrice;
@ApiModelProperty(value = "优惠券列表")
- private List<AppUserCouponVo> appUserCouponVoList;
+ private List<AppMemberCouponVo> appMemberCouponVoList;
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java
new file mode 100644
index 0000000..540e9d5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.goods.mapper.activity;
+
+import com.ruoyi.goods.domain.pojo.activity.Activity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 活动 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface ActivityMapper extends BaseMapper<Activity> {
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityRecordMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityRecordMapper.java
new file mode 100644
index 0000000..f2527b0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityRecordMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.goods.mapper.activity;
+
+import com.ruoyi.goods.domain.pojo.activity.ActivityRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 活动记录 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface ActivityRecordMapper extends BaseMapper<ActivityRecord> {
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityRecordService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityRecordService.java
new file mode 100644
index 0000000..054d99e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityRecordService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.goods.service.activity;
+
+import com.ruoyi.goods.domain.pojo.activity.ActivityRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 活动记录 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface ActivityRecordService extends IService<ActivityRecord> {
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java
new file mode 100644
index 0000000..bc0ef75
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.goods.service.activity;
+
+import com.ruoyi.goods.domain.pojo.activity.Activity;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 活动 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface ActivityService extends IService<Activity> {
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityRecordServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityRecordServiceImpl.java
new file mode 100644
index 0000000..a8522e5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.goods.service.impl.activity;
+
+import com.ruoyi.goods.domain.pojo.activity.ActivityRecord;
+import com.ruoyi.goods.mapper.activity.ActivityRecordMapper;
+import com.ruoyi.goods.service.activity.ActivityRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 活动记录 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Service
+public class ActivityRecordServiceImpl extends ServiceImpl<ActivityRecordMapper, ActivityRecord> implements ActivityRecordService {
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
new file mode 100644
index 0000000..5a0aa94
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.goods.service.impl.activity;
+
+import com.ruoyi.goods.domain.pojo.activity.Activity;
+import com.ruoyi.goods.mapper.activity.ActivityMapper;
+import com.ruoyi.goods.service.activity.ActivityService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 活动 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Service
+public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> implements ActivityService {
+
+}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml
new file mode 100644
index 0000000..5ce5682
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml
@@ -0,0 +1,7 @@
+<?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.goods.mapper.activity.ActivityMapper">
+
+
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityRecordMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityRecordMapper.xml
new file mode 100644
index 0000000..789e25e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityRecordMapper.xml
@@ -0,0 +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.goods.mapper.activity.ActivityRecordMapper">
+
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
index ce77d77..bb5a959 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
@@ -6,11 +6,11 @@
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
import com.ruoyi.member.service.member.MemberService;
-import com.ruoyi.member.service.member.UserCouponService;
+import com.ruoyi.member.service.member.MemberCouponService;
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.vo.AppUserCouponVo;
+import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import io.swagger.annotations.ApiOperation;
@@ -27,7 +27,7 @@
private MemberService memberService;
@Autowired
- private UserCouponService userCouponService;
+ private MemberCouponService memberCouponService;
/**
* @description: getMember
@@ -77,10 +77,10 @@
* @date 2023/5/3 1:45
* @version 1.0
*/
- @PostMapping("/listVoUserCouponByUserId")
- public R<List<AppUserCouponVo>> listVoUserCouponByUserId(@RequestBody Long userId){
- List<AppUserCouponVo> appUserCouponVoList = userCouponService.listVoUserCouponByUserId(userId);
- return R.ok(appUserCouponVoList);
+ @PostMapping("/listVoMemberCouponByUserId")
+ public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(@RequestBody Long userId){
+ List<AppMemberCouponVo> appMemberCouponVoList = memberCouponService.listVoMemberCouponByUserId(userId);
+ return R.ok(appMemberCouponVoList);
}
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/Coupon.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/Coupon.java
similarity index 98%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/Coupon.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/Coupon.java
index 4715b1c..034f741 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/Coupon.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/Coupon.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain.pojo.coupon;
+package com.ruoyi.member.domain.pojo.coupon;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/CouponRelGoods.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponRelGoods.java
similarity index 95%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/CouponRelGoods.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponRelGoods.java
index a2c0562..8d463b4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/CouponRelGoods.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponRelGoods.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain.pojo.coupon;
+package com.ruoyi.member.domain.pojo.coupon;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/CouponRelUser.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponRelUser.java
similarity index 95%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/CouponRelUser.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponRelUser.java
index f704eab..4a917ec 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/CouponRelUser.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponRelUser.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain.pojo.coupon;
+package com.ruoyi.member.domain.pojo.coupon;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/CouponTotal.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponTotal.java
similarity index 95%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/CouponTotal.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponTotal.java
index a559ba7..9f1628f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/CouponTotal.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponTotal.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain.pojo.coupon;
+package com.ruoyi.member.domain.pojo.coupon;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/BrowseRecord.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/BrowseRecord.java
new file mode 100644
index 0000000..0c0b5d7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/BrowseRecord.java
@@ -0,0 +1,78 @@
+package com.ruoyi.member.domain.pojo.member;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_browse_record")
+public class BrowseRecord extends Model<BrowseRecord> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 记录id
+ */
+ @TableId(value = "record_id", type = IdType.AUTO)
+ private Integer recordId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private String delFlag;
+ /**
+ * 用户id
+ */
+ @TableField("user_id")
+ private Integer userId;
+ /**
+ * 浏览类型
+ */
+ @TableField("browse_type")
+ private Integer browseType;
+ /**
+ * 浏览id
+ */
+ @TableField("browse_id")
+ private String browseId;
+ /**
+ * 浏览时间
+ */
+ @TableField("browse_time")
+ private String browseTime;
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ private Date createTime;
+ /**
+ * 退出时间
+ */
+ @TableField("quit_time")
+ private Date quitTime;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.recordId;
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/IntegralRecord.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/IntegralRecord.java
new file mode 100644
index 0000000..71a5d78
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/IntegralRecord.java
@@ -0,0 +1,83 @@
+package com.ruoyi.member.domain.pojo.member;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_integral_record")
+public class IntegralRecord extends Model<IntegralRecord> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 记录id
+ */
+ @TableId(value = "record_id", type = IdType.AUTO)
+ private Integer recordId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 变动类型
+ */
+ @TableField("change_type")
+ private Integer changeType;
+ /**
+ * 变动积分
+ */
+ @TableField("change_integral")
+ private Integer changeIntegral;
+ /**
+ * 剩余积分
+ */
+ @TableField("surp_integral")
+ private Integer surpIntegral;
+ /**
+ * 变动时间
+ */
+ @TableField("create_time")
+ private Date createTime;
+ /**
+ * 订单id
+ */
+ @TableField("order_id")
+ private String orderId;
+ /**
+ * 订单号
+ */
+ @TableField("order_no")
+ private String orderNo;
+ /**
+ * 变动理由
+ */
+ @TableField("change_reason")
+ private String changeReason;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.recordId;
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/UserCoupon.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberCoupon.java
similarity index 98%
rename from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/UserCoupon.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberCoupon.java
index cfebaed..45825fa 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/UserCoupon.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberCoupon.java
@@ -25,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_user_coupon")
-public class UserCoupon extends Model<UserCoupon> {
+public class MemberCoupon extends Model<MemberCoupon> {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberShopTotal.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberShopTotal.java
new file mode 100644
index 0000000..170cf09
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberShopTotal.java
@@ -0,0 +1,188 @@
+package com.ruoyi.member.domain.pojo.member;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 会员商户统计
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_member_shop_total")
+public class MemberShopTotal extends Model<MemberShopTotal> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 会员id
+ */
+ @TableId("member_id")
+ private String memberId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 商户id
+ */
+ @TableField("shop_id")
+ private Integer shopId;
+ /**
+ * 总积分
+ */
+ @TableField("total_integral")
+ private Integer totalIntegral;
+ /**
+ * 使用积分
+ */
+ @TableField("used_integral")
+ private Integer usedIntegral;
+ /**
+ * 可用积分
+ */
+ @TableField("useable_integral")
+ private Integer useableIntegral;
+ /**
+ * 总消费金额
+ */
+ @TableField("total_pay_money")
+ private BigDecimal totalPayMoney;
+ /**
+ * 总消费次数
+ */
+ @TableField("total_pay_count")
+ private Integer totalPayCount;
+ /**
+ * 最后消费金额
+ */
+ @TableField("last_pay_money")
+ private BigDecimal lastPayMoney;
+ /**
+ * 最后消费时间
+ */
+ @TableField("last_pay_time")
+ private Date lastPayTime;
+ /**
+ * 最后服务时间
+ */
+ @TableField("last_service_time")
+ private Date lastServiceTime;
+ /**
+ * 下次跟进时间
+ */
+ @TableField("next_task_time")
+ private Date nextTaskTime;
+ /**
+ * 总服务次数
+ */
+ @TableField("total_service_count")
+ private Integer totalServiceCount;
+ /**
+ * 使用服务次数
+ */
+ @TableField("used_service_count")
+ private Integer usedServiceCount;
+ /**
+ * 可用服务次数
+ */
+ @TableField("useable_service_count")
+ private Integer useableServiceCount;
+ /**
+ * 总活动次数
+ */
+ @TableField("total_activity_count")
+ private String totalActivityCount;
+ /**
+ * 最后活动时间
+ */
+ @TableField("last_activity_time")
+ private Date lastActivityTime;
+ /**
+ * 总周期订单数
+ */
+ @TableField("total_cycle_order")
+ private Integer totalCycleOrder;
+ /**
+ * 总体验订单数
+ */
+ @TableField("tolta_experience_order")
+ private Integer toltaExperienceOrder;
+ /**
+ * 总服务订单数
+ */
+ @TableField("total_service_order")
+ private Integer totalServiceOrder;
+ /**
+ * 总单品订单数
+ */
+ @TableField("total_goods_order")
+ private Integer totalGoodsOrder;
+ /**
+ * 总周期服务次数
+ */
+ @TableField("total_cycle_service")
+ private Integer totalCycleService;
+ /**
+ * 已用周期服务次数
+ */
+ @TableField("used_cycle_service")
+ private Integer usedCycleService;
+ /**
+ * 可用周期服务次数
+ */
+ @TableField("useable_cycle_service")
+ private Integer useableCycleService;
+ /**
+ * 总体验服务次数
+ */
+ @TableField("total_experience_service")
+ private Integer totalExperienceService;
+ /**
+ * 已用体验服务次数
+ */
+ @TableField("used_experience_service")
+ private Integer usedExperienceService;
+ /**
+ * 可用体验服务次数
+ */
+ @TableField("useable_experience_service")
+ private Integer useableExperienceService;
+ /**
+ * 总服务服务次数
+ */
+ @TableField("total_service_service")
+ private Integer totalServiceService;
+ /**
+ * 已用服务服务次数
+ */
+ @TableField("used_service_service")
+ private Integer usedServiceService;
+ /**
+ * 可用服务服务次数
+ */
+ @TableField("useablel_service_service")
+ private Integer useablelServiceService;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.memberId;
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberSuggest.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberSuggest.java
index 8c4f623..76a2de7 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberSuggest.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberSuggest.java
@@ -8,7 +8,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.Version;
+import com.baomidou.mybatisplus.annotation.Version;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberTotal.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberTotal.java
new file mode 100644
index 0000000..3501a19
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberTotal.java
@@ -0,0 +1,138 @@
+package com.ruoyi.member.domain.pojo.member;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_member_total")
+public class MemberTotal extends Model<MemberTotal> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 会员id
+ */
+ @TableId("member_id")
+ private String memberId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 总积分
+ */
+ @TableField("total_integral")
+ private Integer totalIntegral;
+ /**
+ * 使用积分
+ */
+ @TableField("used_integral")
+ private Integer usedIntegral;
+ /**
+ * 可用积分
+ */
+ @TableField("useable_integral")
+ private Integer useableIntegral;
+ /**
+ * 总消费金额
+ */
+ @TableField("total_pay_money")
+ private BigDecimal totalPayMoney;
+ /**
+ * 总消费次数
+ */
+ @TableField("total_pay_count")
+ private Integer totalPayCount;
+ /**
+ * 最后消费金额
+ */
+ @TableField("last_pay_money")
+ private BigDecimal lastPayMoney;
+ /**
+ * 最后消费时间
+ */
+ @TableField("last_pay_time")
+ private Date lastPayTime;
+ /**
+ * 最后服务时间
+ */
+ @TableField("last_service_time")
+ private Date lastServiceTime;
+ /**
+ * 下次跟进时间
+ */
+ @TableField("next_task_time")
+ private Date nextTaskTime;
+ /**
+ * 总服务次数
+ */
+ @TableField("total_service_count")
+ private Integer totalServiceCount;
+ /**
+ * 使用服务次数
+ */
+ @TableField("used_service_count")
+ private Integer usedServiceCount;
+ /**
+ * 可用服务次数
+ */
+ @TableField("useable_service_count")
+ private Integer useableServiceCount;
+ /**
+ * 总活动次数
+ */
+ @TableField("total_activity_count")
+ private String totalActivityCount;
+ /**
+ * 最后活动时间
+ */
+ @TableField("last_activity_time")
+ private Date lastActivityTime;
+ /**
+ * 总周期订单数
+ */
+ @TableField("total_cycle_order")
+ private Integer totalCycleOrder;
+ /**
+ * 总体验订单数
+ */
+ @TableField("tolta_experience_order")
+ private Integer toltaExperienceOrder;
+ /**
+ * 总服务订单数
+ */
+ @TableField("total_service_order")
+ private Integer totalServiceOrder;
+ /**
+ * 总单品订单数
+ */
+ @TableField("total_goods_order")
+ private Integer totalGoodsOrder;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.memberId;
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponMapper.java
similarity index 69%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponMapper.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponMapper.java
index 953fedd..2249033 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponMapper.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponMapper.java
@@ -1,6 +1,6 @@
-package com.ruoyi.system.mapper.coupon;
+package com.ruoyi.member.mapper.coupon;
-import com.ruoyi.system.domain.pojo.coupon.Coupon;
+import com.ruoyi.member.domain.pojo.coupon.Coupon;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponRelGoodsMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponRelGoodsMapper.java
similarity index 70%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponRelGoodsMapper.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponRelGoodsMapper.java
index 39decb3..c5803a2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponRelGoodsMapper.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponRelGoodsMapper.java
@@ -1,6 +1,6 @@
-package com.ruoyi.system.mapper.coupon;
+package com.ruoyi.member.mapper.coupon;
-import com.ruoyi.system.domain.pojo.coupon.CouponRelGoods;
+import com.ruoyi.member.domain.pojo.coupon.CouponRelGoods;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponRelUserMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponRelUserMapper.java
similarity index 70%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponRelUserMapper.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponRelUserMapper.java
index 5f00b88..8ca8bc3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponRelUserMapper.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponRelUserMapper.java
@@ -1,6 +1,6 @@
-package com.ruoyi.system.mapper.coupon;
+package com.ruoyi.member.mapper.coupon;
-import com.ruoyi.system.domain.pojo.coupon.CouponRelUser;
+import com.ruoyi.member.domain.pojo.coupon.CouponRelUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponTotalMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponTotalMapper.java
similarity index 69%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponTotalMapper.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponTotalMapper.java
index 052e10d..8e4a83b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponTotalMapper.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponTotalMapper.java
@@ -1,6 +1,6 @@
-package com.ruoyi.system.mapper.coupon;
+package com.ruoyi.member.mapper.coupon;
-import com.ruoyi.system.domain.pojo.coupon.CouponTotal;
+import com.ruoyi.member.domain.pojo.coupon.CouponTotal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/BrowseRecordMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/BrowseRecordMapper.java
new file mode 100644
index 0000000..77cb8c8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/BrowseRecordMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.member.mapper.member;
+
+import com.ruoyi.member.domain.pojo.member.BrowseRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface BrowseRecordMapper extends BaseMapper<BrowseRecord> {
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/IntegralRecordMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/IntegralRecordMapper.java
new file mode 100644
index 0000000..6d7e0b4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/IntegralRecordMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.member.mapper.member;
+
+import com.ruoyi.member.domain.pojo.member.IntegralRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface IntegralRecordMapper extends BaseMapper<IntegralRecord> {
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberCouponMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberCouponMapper.java
new file mode 100644
index 0000000..d64ae8a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberCouponMapper.java
@@ -0,0 +1,26 @@
+package com.ruoyi.member.mapper.member;
+
+import com.ruoyi.member.domain.pojo.member.MemberCoupon;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户关联优惠券 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-25
+ */
+public interface MemberCouponMapper extends BaseMapper<MemberCoupon> {
+
+ /**
+ * @description: TODO
+ * @author jqs34
+ * @date 2023/5/3 1:47
+ * @version 1.0
+ */
+ List<AppMemberCouponVo> listVoMemberCouponByUserId(Long userId);
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberShopTotalMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberShopTotalMapper.java
new file mode 100644
index 0000000..0313ec9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberShopTotalMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.member.mapper.member;
+
+import com.ruoyi.member.domain.pojo.member.MemberShopTotal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 会员商户统计 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface MemberShopTotalMapper extends BaseMapper<MemberShopTotal> {
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberTotalMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberTotalMapper.java
new file mode 100644
index 0000000..a31589c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberTotalMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.member.mapper.member;
+
+import com.ruoyi.member.domain.pojo.member.MemberTotal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface MemberTotalMapper extends BaseMapper<MemberTotal> {
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/UserCouponMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/UserCouponMapper.java
deleted file mode 100644
index 5825710..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/UserCouponMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.ruoyi.member.mapper.member;
-
-import com.ruoyi.member.domain.pojo.member.UserCoupon;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
-
-import java.util.List;
-
-/**
- * <p>
- * 用户关联优惠券 Mapper 接口
- * </p>
- *
- * @author jqs
- * @since 2023-04-25
- */
-public interface UserCouponMapper extends BaseMapper<UserCoupon> {
-
- /**
- * @description: TODO
- * @author jqs34
- * @date 2023/5/3 1:47
- * @version 1.0
- */
- List<AppUserCouponVo> listVoUserCouponByUserId(Long userId);
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponRelGoodsService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponRelGoodsService.java
similarity index 70%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponRelGoodsService.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponRelGoodsService.java
index a880c2b..335a6a2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponRelGoodsService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponRelGoodsService.java
@@ -1,6 +1,6 @@
-package com.ruoyi.system.service.coupon;
+package com.ruoyi.member.service.coupon;
-import com.ruoyi.system.domain.pojo.coupon.CouponRelGoods;
+import com.ruoyi.member.domain.pojo.coupon.CouponRelGoods;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponRelUserService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponRelUserService.java
similarity index 70%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponRelUserService.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponRelUserService.java
index b92af35..64eecd8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponRelUserService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponRelUserService.java
@@ -1,6 +1,6 @@
-package com.ruoyi.system.service.coupon;
+package com.ruoyi.member.service.coupon;
-import com.ruoyi.system.domain.pojo.coupon.CouponRelUser;
+import com.ruoyi.member.domain.pojo.coupon.CouponRelUser;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java
similarity index 69%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponService.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java
index 727e17e..a9d4a0c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java
@@ -1,6 +1,6 @@
-package com.ruoyi.system.service.coupon;
+package com.ruoyi.member.service.coupon;
-import com.ruoyi.system.domain.pojo.coupon.Coupon;
+import com.ruoyi.member.domain.pojo.coupon.Coupon;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponTotalService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponTotalService.java
similarity index 69%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponTotalService.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponTotalService.java
index 7c308d7..5710c43 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponTotalService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponTotalService.java
@@ -1,6 +1,6 @@
-package com.ruoyi.system.service.coupon;
+package com.ruoyi.member.service.coupon;
-import com.ruoyi.system.domain.pojo.coupon.CouponTotal;
+import com.ruoyi.member.domain.pojo.coupon.CouponTotal;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponRelGoodsServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponRelGoodsServiceImpl.java
similarity index 61%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponRelGoodsServiceImpl.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponRelGoodsServiceImpl.java
index 21c9a40..b31301c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponRelGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponRelGoodsServiceImpl.java
@@ -1,8 +1,8 @@
-package com.ruoyi.system.service.impl.coupon;
+package com.ruoyi.member.service.impl.coupon;
-import com.ruoyi.system.domain.pojo.coupon.CouponRelGoods;
-import com.ruoyi.system.mapper.coupon.CouponRelGoodsMapper;
-import com.ruoyi.system.service.coupon.CouponRelGoodsService;
+import com.ruoyi.member.domain.pojo.coupon.CouponRelGoods;
+import com.ruoyi.member.mapper.coupon.CouponRelGoodsMapper;
+import com.ruoyi.member.service.coupon.CouponRelGoodsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponRelUserServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponRelUserServiceImpl.java
similarity index 61%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponRelUserServiceImpl.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponRelUserServiceImpl.java
index b751786..8a46d14 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponRelUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponRelUserServiceImpl.java
@@ -1,8 +1,8 @@
-package com.ruoyi.system.service.impl.coupon;
+package com.ruoyi.member.service.impl.coupon;
-import com.ruoyi.system.domain.pojo.coupon.CouponRelUser;
-import com.ruoyi.system.mapper.coupon.CouponRelUserMapper;
-import com.ruoyi.system.service.coupon.CouponRelUserService;
+import com.ruoyi.member.domain.pojo.coupon.CouponRelUser;
+import com.ruoyi.member.mapper.coupon.CouponRelUserMapper;
+import com.ruoyi.member.service.coupon.CouponRelUserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
similarity index 61%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponServiceImpl.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
index ec4b231..60612d4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
@@ -1,8 +1,8 @@
-package com.ruoyi.system.service.impl.coupon;
+package com.ruoyi.member.service.impl.coupon;
-import com.ruoyi.system.domain.pojo.coupon.Coupon;
-import com.ruoyi.system.mapper.coupon.CouponMapper;
-import com.ruoyi.system.service.coupon.CouponService;
+import com.ruoyi.member.domain.pojo.coupon.Coupon;
+import com.ruoyi.member.mapper.coupon.CouponMapper;
+import com.ruoyi.member.service.coupon.CouponService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponTotalServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponTotalServiceImpl.java
similarity index 61%
rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponTotalServiceImpl.java
rename to ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponTotalServiceImpl.java
index 3af43f4..a70fef7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponTotalServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponTotalServiceImpl.java
@@ -1,8 +1,8 @@
-package com.ruoyi.system.service.impl.coupon;
+package com.ruoyi.member.service.impl.coupon;
-import com.ruoyi.system.domain.pojo.coupon.CouponTotal;
-import com.ruoyi.system.mapper.coupon.CouponTotalMapper;
-import com.ruoyi.system.service.coupon.CouponTotalService;
+import com.ruoyi.member.domain.pojo.coupon.CouponTotal;
+import com.ruoyi.member.mapper.coupon.CouponTotalMapper;
+import com.ruoyi.member.service.coupon.CouponTotalService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/BrowseRecordServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/BrowseRecordServiceImpl.java
new file mode 100644
index 0000000..2469a76
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/BrowseRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.member.service.impl.member;
+
+import com.ruoyi.member.domain.pojo.member.BrowseRecord;
+import com.ruoyi.member.mapper.member.BrowseRecordMapper;
+import com.ruoyi.member.service.member.BrowseRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Service
+public class BrowseRecordServiceImpl extends ServiceImpl<BrowseRecordMapper, BrowseRecord> implements BrowseRecordService {
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/IntegralRecordServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/IntegralRecordServiceImpl.java
new file mode 100644
index 0000000..bfa0bff
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/IntegralRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.member.service.impl.member;
+
+import com.ruoyi.member.domain.pojo.member.IntegralRecord;
+import com.ruoyi.member.mapper.member.IntegralRecordMapper;
+import com.ruoyi.member.service.member.IntegralRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Service
+public class IntegralRecordServiceImpl extends ServiceImpl<IntegralRecordMapper, IntegralRecord> implements IntegralRecordService {
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
new file mode 100644
index 0000000..f2dd1c1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
@@ -0,0 +1,38 @@
+package com.ruoyi.member.service.impl.member;
+
+import com.ruoyi.member.domain.pojo.member.MemberCoupon;
+import com.ruoyi.member.mapper.member.MemberCouponMapper;
+import com.ruoyi.member.service.member.MemberCouponService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户关联优惠券 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-25
+ */
+@Service
+public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, MemberCoupon> implements MemberCouponService {
+
+ @Resource
+ private MemberCouponMapper memberCouponMapper;
+
+ /**
+ * @description: TODO
+ * @author jqs34
+ * @date 2023/5/3 1:47
+ * @version 1.0
+ */
+ @Override
+ public List<AppMemberCouponVo> listVoMemberCouponByUserId(Long userId){
+ List<AppMemberCouponVo> appMemberCouponVoList = memberCouponMapper.listVoMemberCouponByUserId(userId);
+ return appMemberCouponVoList;
+ }
+}
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 f78db0a..6c734a0 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
@@ -79,9 +79,6 @@
private MemberMapper memberMapper;
@Resource
- private StringRedisTemplate stringRedisTemplate;
-
- @Resource
private RemoteShopService shopService;
@Resource
@@ -149,7 +146,7 @@
}
/**
- * 获取授权信息
+ * 小程序注册
* @param appUserRegisterDto
* @return
*/
@@ -220,7 +217,6 @@
member.setNickName("鸿瑞堂用户");
member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
member.setMemberId(memberId);
- member.setRelationShopId(1L);
member.setBindingFlag(0);
member.setCreateTime(new Date());
}else{
@@ -469,7 +465,7 @@
SysUser sysUser = sysUserService.getSysUserByMobile(phonenumber).getData();
if(sysUser==null){
sysUser = new SysUser();
- sysUser.setUserName(phonenumber);
+ sysUser.setUserName(phonenumber+"-3");
sysUser.setUserType("03");
sysUser.setNickName(merMemberAddDto.getNickName());
sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
@@ -477,27 +473,29 @@
sysUser.setPassword(SecurityUtils.encryptPassword(password));
log.debug("sysUser"+sysUser.toString());
sysUser = sysUserService.registerUser(sysUser).getData();
+ String memberId = IdUtils.simpleUUID();
+ Member member = new Member();
+ member.setMemberId(memberId);
+ member.setUserId(sysUser.getUserId());
+ member.setDelFlag(0);
+ member.setNickName(merMemberAddDto.getNickName());
+ member.setRealName(merMemberAddDto.getNickName());
+ member.setGender(merMemberAddDto.getGender());
+ member.setMobile(phonenumber);
+ member.setReferrer(merMemberAddDto.getReferrer());
+ member.setBirthday(merMemberAddDto.getBirthday());
+ member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
+ member.setRelationShopId(merMemberAddDto.getShopId());
+ member.setWxUnionid(null);
+ member.setMiniOpenid(null);
+ member.setBindingFlag(1);
+ member.setRelationShopId(merMemberAddDto.getShopId());
+ member.setCreateTime(new Date());
+ log.info("member-----------------"+member.toString());
+ this.saveOrUpdate(member);
}
- log.info("sysUser1-----------------"+sysUser.toString());
- String memberId = IdUtils.simpleUUID();
- Member member = new Member();
- member.setUserId(sysUser.getUserId());
- member.setDelFlag(0);
- member.setNickName(merMemberAddDto.getNickName());
- member.setGender(merMemberAddDto.getGender());
- member.setMobile(phonenumber);
- member.setReferrer(merMemberAddDto.getReferrer());
- member.setBirthday(merMemberAddDto.getBirthday());
- member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
- member.setMemberId(memberId);
- member.setRelationShopId(1L);
- member.setWxUnionid(null);
- member.setMiniOpenid(null);
- member.setBindingFlag(1);
- member.setRelationShopId(merMemberAddDto.getShopId());
- member.setCreateTime(new Date());
- log.info("member-----------------"+member.toString());
- this.saveOrUpdate(member);
+
+
}
/**
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberShopTotalServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberShopTotalServiceImpl.java
new file mode 100644
index 0000000..1dcb1e4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberShopTotalServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.member.service.impl.member;
+
+import com.ruoyi.member.domain.pojo.member.MemberShopTotal;
+import com.ruoyi.member.mapper.member.MemberShopTotalMapper;
+import com.ruoyi.member.service.member.MemberShopTotalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 会员商户统计 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Service
+public class MemberShopTotalServiceImpl extends ServiceImpl<MemberShopTotalMapper, MemberShopTotal> implements MemberShopTotalService {
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberTotalServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberTotalServiceImpl.java
new file mode 100644
index 0000000..803ac2a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberTotalServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.member.service.impl.member;
+
+import com.ruoyi.member.domain.pojo.member.MemberTotal;
+import com.ruoyi.member.mapper.member.MemberTotalMapper;
+import com.ruoyi.member.service.member.MemberTotalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Service
+public class MemberTotalServiceImpl extends ServiceImpl<MemberTotalMapper, MemberTotal> implements MemberTotalService {
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/UserCouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/UserCouponServiceImpl.java
deleted file mode 100644
index a073f61..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/UserCouponServiceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.ruoyi.member.service.impl.member;
-
-import com.ruoyi.member.domain.pojo.member.UserCoupon;
-import com.ruoyi.member.mapper.member.UserCouponMapper;
-import com.ruoyi.member.service.member.UserCouponService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <p>
- * 用户关联优惠券 服务实现类
- * </p>
- *
- * @author jqs
- * @since 2023-04-25
- */
-@Service
-public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCoupon> implements UserCouponService {
-
- @Resource
- private UserCouponMapper userCouponMapper;
-
- /**
- * @description: TODO
- * @author jqs34
- * @date 2023/5/3 1:47
- * @version 1.0
- */
- @Override
- public List<AppUserCouponVo> listVoUserCouponByUserId(Long userId){
- List<AppUserCouponVo> appUserCouponVoList = userCouponMapper.listVoUserCouponByUserId(userId);
- return appUserCouponVoList;
- }
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/BrowseRecordService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/BrowseRecordService.java
new file mode 100644
index 0000000..7d9e193
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/BrowseRecordService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.member.service.member;
+
+import com.ruoyi.member.domain.pojo.member.BrowseRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface BrowseRecordService extends IService<BrowseRecord> {
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/IntegralRecordService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/IntegralRecordService.java
new file mode 100644
index 0000000..03edd35
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/IntegralRecordService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.member.service.member;
+
+import com.ruoyi.member.domain.pojo.member.IntegralRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface IntegralRecordService extends IService<IntegralRecord> {
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberCouponService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberCouponService.java
new file mode 100644
index 0000000..4cf368b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberCouponService.java
@@ -0,0 +1,26 @@
+package com.ruoyi.member.service.member;
+
+import com.ruoyi.member.domain.pojo.member.MemberCoupon;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户关联优惠券 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-25
+ */
+public interface MemberCouponService extends IService<MemberCoupon> {
+
+ /**
+ * @description: TODO
+ * @author jqs34
+ * @date 2023/5/3 1:47
+ * @version 1.0
+ */
+ List<AppMemberCouponVo> listVoMemberCouponByUserId(Long userId);
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberShopTotalService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberShopTotalService.java
new file mode 100644
index 0000000..b01f965
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberShopTotalService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.member.service.member;
+
+import com.ruoyi.member.domain.pojo.member.MemberShopTotal;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 会员商户统计 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface MemberShopTotalService extends IService<MemberShopTotal> {
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberTotalService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberTotalService.java
new file mode 100644
index 0000000..4076d67
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberTotalService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.member.service.member;
+
+import com.ruoyi.member.domain.pojo.member.MemberTotal;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface MemberTotalService extends IService<MemberTotal> {
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/UserCouponService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/UserCouponService.java
deleted file mode 100644
index 22563ef..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/UserCouponService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.ruoyi.member.service.member;
-
-import com.ruoyi.member.domain.pojo.member.UserCoupon;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
-
-import java.util.List;
-
-/**
- * <p>
- * 用户关联优惠券 服务类
- * </p>
- *
- * @author jqs
- * @since 2023-04-25
- */
-public interface UserCouponService extends IService<UserCoupon> {
-
- /**
- * @description: TODO
- * @author jqs34
- * @date 2023/5/3 1:47
- * @version 1.0
- */
- List<AppUserCouponVo> listVoUserCouponByUserId(Long userId);
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponMapper.xml
similarity index 98%
rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponMapper.xml
rename to ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponMapper.xml
index 92ed1d7..e64208b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponMapper.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.system.mapper.coupon.CouponMapper">
+<mapper namespace="com.ruoyi.member.mapper.coupon.CouponMapper">
<resultMap type="Coupon" id="CouponResult">
<result property="couponId" column="coupon_id" />
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponRelGoodsMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponRelGoodsMapper.xml
similarity index 97%
rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponRelGoodsMapper.xml
rename to ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponRelGoodsMapper.xml
index 870bde8..3ce0c95 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponRelGoodsMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponRelGoodsMapper.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.system.mapper.coupon.CouponRelGoodsMapper">
+<mapper namespace="com.ruoyi.member.mapper.coupon.CouponRelGoodsMapper">
<resultMap type="CouponRelGoods" id="CouponRelGoodsResult">
<result property="id" column="id" />
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponRelUserMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponRelUserMapper.xml
similarity index 97%
rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponRelUserMapper.xml
rename to ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponRelUserMapper.xml
index 5485a2d..a3b8676 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponRelUserMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponRelUserMapper.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.system.mapper.coupon.CouponRelUserMapper">
+<mapper namespace="com.ruoyi.member.mapper.coupon.CouponRelUserMapper">
<resultMap type="CouponRelUser" id="CouponRelUserResult">
<result property="id" column="id" />
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponTotalMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponTotalMapper.xml
similarity index 97%
rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponTotalMapper.xml
rename to ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponTotalMapper.xml
index f9a74d6..7b70040 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponTotalMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponTotalMapper.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.system.mapper.CouponTotalMapper">
+<mapper namespace="com.ruoyi.member.mapper.coupon.CouponTotalMapper">
<resultMap type="CouponTotal" id="CouponTotalResult">
<result property="couponId" column="coupon_id" />
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/BrowseRecordMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/BrowseRecordMapper.xml
new file mode 100644
index 0000000..7147b17
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/BrowseRecordMapper.xml
@@ -0,0 +1,7 @@
+<?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.member.mapper.member.BrowseRecordMapper">
+
+
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/IntegralRecordMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/IntegralRecordMapper.xml
new file mode 100644
index 0000000..b28325b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/IntegralRecordMapper.xml
@@ -0,0 +1,7 @@
+<?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.member.mapper.member.IntegralRecordMapper">
+
+
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/UserCouponMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberCouponMapper.xml
similarity index 88%
rename from ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/UserCouponMapper.xml
rename to ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberCouponMapper.xml
index 227f652..10e7cc4 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/UserCouponMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberCouponMapper.xml
@@ -1,8 +1,8 @@
<?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.member.mapper.member.UserCouponMapper">
+<mapper namespace="com.ruoyi.member.mapper.member.MemberCouponMapper">
- <resultMap type="UserCoupon" id="UserCouponResult">
+ <resultMap type="MemberCoupon" id="MemberCouponResult">
<result property="id" column="id" />
<result property="delFlag" column="del_flag" />
<result property="couponId" column="coupon_id" />
@@ -27,12 +27,12 @@
<result property="relGoodsIds" column="rel_goods_ids" />
</resultMap>
- <sql id="selectUserCouponVo">
- select id, del_flag, coupon_id, user_id, coupon_type, coupon_status, coupon_name, send_type, send_time_type, send_time, money_threshold, discount_money, discount_percent, use_scope, valid_time_type, valid_start_time, valid_end_time, valid_day, receive_time, user_time, deadline_time, rel_goods_ids from t_user_coupon
+ <sql id="selectMemberCouponVo">
+ select id, del_flag, coupon_id, user_id, coupon_type, coupon_status, coupon_name, send_type, send_time_type, send_time, money_threshold, discount_money, discount_percent, use_scope, valid_time_type, valid_start_time, valid_end_time, valid_day, receive_time, user_time, deadline_time, rel_goods_ids from t_member_coupon
</sql>
- <select id="selectUserCouponList" parameterType="UserCoupon" resultMap="UserCouponResult">
- <include refid="selectUserCouponVo"/>
+ <select id="selectMemberCouponList" parameterType="MemberCoupon" resultMap="MemberCouponResult">
+ <include refid="selectMemberCouponVo"/>
<where>
<if test="couponId != null and couponId != ''"> and coupon_id = #{couponId}</if>
<if test="userId != null "> and user_id = #{userId}</if>
@@ -57,13 +57,13 @@
</where>
</select>
- <select id="selectUserCouponById" parameterType="Long" resultMap="UserCouponResult">
- <include refid="selectUserCouponVo"/>
+ <select id="selectMemberCouponById" parameterType="Long" resultMap="MemberCouponResult">
+ <include refid="selectMemberCouponVo"/>
where id = #{id}
</select>
- <insert id="insertUserCoupon" parameterType="UserCoupon" useGeneratedKeys="true" keyProperty="id">
- insert into t_user_coupon
+ <insert id="insertMemberCoupon" parameterType="MemberCoupon" useGeneratedKeys="true" keyProperty="id">
+ insert into t_member_coupon
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="delFlag != null">del_flag,</if>
<if test="couponId != null">coupon_id,</if>
@@ -112,8 +112,8 @@
</trim>
</insert>
- <update id="updateUserCoupon" parameterType="UserCoupon">
- update t_user_coupon
+ <update id="updateMemberCoupon" parameterType="MemberCoupon">
+ update t_member_coupon
<trim prefix="SET" suffixOverrides=",">
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="couponId != null">coupon_id = #{couponId},</if>
@@ -140,20 +140,20 @@
where id = #{id}
</update>
- <delete id="deleteUserCouponById" parameterType="Long">
- delete from t_user_coupon where id = #{id}
+ <delete id="deleteMemberCouponById" parameterType="Long">
+ delete from t_member_coupon where id = #{id}
</delete>
- <delete id="deleteUserCouponByIds" parameterType="String">
- delete from t_user_coupon where id in
+ <delete id="deleteMemberCouponByIds" parameterType="String">
+ delete from t_member_coupon where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
- <select id="listVoUserCouponByUserId" resultType="com.ruoyi.system.api.domain.vo.AppUserCouponVo">
+ <select id="listVoMemberCouponByUserId" resultType="com.ruoyi.system.api.domain.vo.AppMemberCouponVo">
SELECT
- tuc.id userCouponId,
+ tuc.id memberCouponId,
tuc.coupon_type couponType,
tuc.coupon_name couponName,
tuc.money_threshold moneyThreshold,
@@ -162,7 +162,7 @@
tuc.valid_start_time validStartTime,
tuc.deadline_time deadlineTime,
tuc.rel_goods_ids relGoodsIds
- FROM t_user_coupon tuc
+ FROM t_member_coupon tuc
WHERE tuc.del_flag = 1 AND tuc.coupon_status = 1 AND tuc.coupon_type IN (1,2,3)
ORDER BY tuc.receive_time
</select>
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberShopTotalMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberShopTotalMapper.xml
new file mode 100644
index 0000000..401a1cc
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberShopTotalMapper.xml
@@ -0,0 +1,7 @@
+<?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.member.mapper.member.MemberShopTotalMapper">
+
+
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberTotalMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberTotalMapper.xml
new file mode 100644
index 0000000..ef1fe26
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberTotalMapper.xml
@@ -0,0 +1,7 @@
+<?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.member.mapper.member.MemberTotalMapper">
+
+
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-order/pom.xml b/ruoyi-modules/ruoyi-order/pom.xml
index 29f30d0..a896f97 100644
--- a/ruoyi-modules/ruoyi-order/pom.xml
+++ b/ruoyi-modules/ruoyi-order/pom.xml
@@ -106,7 +106,11 @@
<artifactId>mybatis-plus-generate</artifactId>
<version>2.3</version>
</dependency>
-
+ <dependency>
+ <groupId>com.github.wechatpay-apiv3</groupId>
+ <artifactId>wechatpay-java</artifactId>
+ <version>0.2.7</version>
+ </dependency>
</dependencies>
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 f3ac0be..e9b348e 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/domain/dto/AppBuyGoodsDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppBuyGoodsDto.java
index a155c43..6c453ab 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppBuyGoodsDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppBuyGoodsDto.java
@@ -23,6 +23,6 @@
private Integer buyNum;
@ApiModelProperty(value = "用户优惠券id")
- private Long userCouponId;
+ private Long memberCouponId;
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
index d754808..9838ae5 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
@@ -1,6 +1,6 @@
package com.ruoyi.order.domain.vo;
-import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
+import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -36,7 +36,7 @@
private Integer buyNum;
@ApiModelProperty(value = "优惠券id")
- private Long userCouponId;
+ private Long memberCouponId;
@ApiModelProperty(value = "商品售价")
private BigDecimal goodsPrice;
@@ -57,6 +57,6 @@
private BigDecimal goodsRealPrice;
@ApiModelProperty(value = "优惠券列表")
- private List<AppUserCouponVo> appUserCouponVoList;
+ private List<AppMemberCouponVo> appMemberCouponVoList;
}
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 3005650..8dba62e 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
@@ -27,7 +27,7 @@
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.system.api.domain.vo.AppMemberCouponVo;
import com.ruoyi.order.mapper.order.OrderMapper;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
@@ -92,15 +92,15 @@
String goodsId;
Integer buyNum;
BigDecimal buyNumBig;
- Long userCouponId;
+ Long memberCouponId;
Goods goods;
BigDecimal goodsPrice;
BigDecimal goodsTotalPrice;
BigDecimal goodsRealPrice;
- List<AppUserCouponVo> appUserCouponVoList = remoteMemberService.listVoUserCouponByUserId(userId).getData();
- List<AppUserCouponVo> appGoodsUserCouponVoList;
- Map<Long,AppUserCouponVo> appUserCouponVoMap = appUserCouponVoList.stream().collect(Collectors.toMap(AppUserCouponVo::getUserCouponId, Function.identity()));
- AppUserCouponVo appUserCouponVo;
+ List<AppMemberCouponVo> appMemberCouponVoList = remoteMemberService.listVoMemberCouponByUserId(userId).getData();
+ List<AppMemberCouponVo> appGoodsMemberCouponVoList;
+ Map<Long,AppMemberCouponVo> appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
+ AppMemberCouponVo appMemberCouponVo;
Integer couponType;
BigDecimal moneyThreshold;
BigDecimal discountMoney = new BigDecimal("0.00");
@@ -117,7 +117,7 @@
useCoupon = 0;
goodsId = appBuyGoodsDto.getGoodsId();
buyNum = appBuyGoodsDto.getBuyNum();
- userCouponId = appBuyGoodsDto.getUserCouponId();
+ memberCouponId = appBuyGoodsDto.getMemberCouponId();
goods = remoteGoodsService.getGoods(goodsId).getData();
appSureOrderGoodsVo.setGoodsId(goodsId);
appSureOrderGoodsVo.setGoodsName(goods.getGoodsName());
@@ -141,24 +141,24 @@
buyNumBig = BigDecimal.valueOf(buyNum);
goodsTotalPrice = goodsPrice.multiply(buyNumBig);
goodsRealPrice = goodsTotalPrice;
- if(userCouponId!=null){
- appUserCouponVo = appUserCouponVoMap.get(userCouponId);
- if(StringUtils.isBlank(appUserCouponVo.getRelGoodsIds()) || appUserCouponVo.getRelGoodsIds().contains(goodsId)){
- couponType = appUserCouponVo.getCouponType();
- if(couponType == 1 && appUserCouponVo.getMoneyThreshold()!=null && appUserCouponVo.getDiscountMoney()!=null){
- moneyThreshold = appUserCouponVo.getMoneyThreshold();
+ if(memberCouponId!=null){
+ appMemberCouponVo = appMemberCouponVoMap.get(memberCouponId);
+ if(StringUtils.isBlank(appMemberCouponVo.getRelGoodsIds()) || appMemberCouponVo.getRelGoodsIds().contains(goodsId)){
+ couponType = appMemberCouponVo.getCouponType();
+ if(couponType == 1 && appMemberCouponVo.getMoneyThreshold()!=null && appMemberCouponVo.getDiscountMoney()!=null){
+ moneyThreshold = appMemberCouponVo.getMoneyThreshold();
if(goodsTotalPrice.compareTo(moneyThreshold)>=0){
- discountMoney = appUserCouponVo.getDiscountMoney();
+ discountMoney = appMemberCouponVo.getDiscountMoney();
goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
useCoupon = 1;
}
- }else if(couponType == 2 && appUserCouponVo.getDiscountPercent()!=null){
- discountPercent = appUserCouponVo.getDiscountPercent();
+ }else if(couponType == 2 && appMemberCouponVo.getDiscountPercent()!=null){
+ discountPercent = appMemberCouponVo.getDiscountPercent();
goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN).setScale(2,BigDecimal.ROUND_HALF_UP);
discountMoney = goodsRealPrice.subtract(goodsTotalPrice);
useCoupon = 1;
- }else if(couponType == 3 && appUserCouponVo.getDiscountMoney()!=null){
- discountMoney = appUserCouponVo.getDiscountMoney();
+ }else if(couponType == 3 && appMemberCouponVo.getDiscountMoney()!=null){
+ discountMoney = appMemberCouponVo.getDiscountMoney();
goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
useCoupon = 1;
}
@@ -178,16 +178,16 @@
orderPayDeposit = orderPayDeposit.add(goodsDeposit);
orderPayMoney = orderPayMoney.add(goodsRealPrice);
//商品关联优惠券
- appGoodsUserCouponVoList = new ArrayList<>();
- if(appUserCouponVoList!=null && !appUserCouponVoList.isEmpty()){
- for(AppUserCouponVo entity : appUserCouponVoList){
+ appGoodsMemberCouponVoList = new ArrayList<>();
+ if(appMemberCouponVoList!=null && !appMemberCouponVoList.isEmpty()){
+ for(AppMemberCouponVo entity : appMemberCouponVoList){
if(StringUtils.isBlank(entity.getRelGoodsIds())){
- appGoodsUserCouponVoList.add(entity);
+ appGoodsMemberCouponVoList.add(entity);
}else if(entity.getRelGoodsIds().contains(goodsId)){
- appGoodsUserCouponVoList.add(entity);
+ appGoodsMemberCouponVoList.add(entity);
}
}
- appSureOrderGoodsVo.setAppUserCouponVoList(appGoodsUserCouponVoList);
+ appSureOrderGoodsVo.setAppMemberCouponVoList(appGoodsMemberCouponVoList);
}
appSureOrderGoodsVoList.add(appSureOrderGoodsVo);
}
@@ -216,14 +216,14 @@
BigDecimal buyNumBig;
Integer serviceNum;
Integer goodsNum = 0;
- Long userCouponId;
+ Long memberCouponId;
Goods goods;
BigDecimal goodsPrice;
BigDecimal goodsTotalPrice;
BigDecimal goodsRealPrice;
- List<AppUserCouponVo> appUserCouponVoList = remoteMemberService.listVoUserCouponByUserId(userId).getData();
- Map<Long,AppUserCouponVo> appUserCouponVoMap = appUserCouponVoList.stream().collect(Collectors.toMap(AppUserCouponVo::getUserCouponId, Function.identity()));
- AppUserCouponVo appUserCouponVo;
+ List<AppMemberCouponVo> appMemberCouponVoList = remoteMemberService.listVoMemberCouponByUserId(userId).getData();
+ Map<Long,AppMemberCouponVo> appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
+ AppMemberCouponVo appMemberCouponVo;
Integer couponType;
BigDecimal moneyThreshold;
BigDecimal discountMoney = new BigDecimal("0.00");
@@ -244,7 +244,7 @@
appSureOrderGoodsVo = new AppSureOrderGoodsVo();
useCoupon = 0;
goodsId = appBuyGoodsDto.getGoodsId();
- userCouponId = appBuyGoodsDto.getUserCouponId();
+ memberCouponId = appBuyGoodsDto.getMemberCouponId();
goods = remoteGoodsService.getGoods(goodsId).getData();
appSureOrderGoodsVo.setGoodsId(goodsId);
appSureOrderGoodsVo.setGoodsName(goods.getGoodsName());
@@ -270,24 +270,24 @@
buyNumBig = BigDecimal.valueOf(buyNum);
goodsTotalPrice = goodsPrice.multiply(buyNumBig);
goodsRealPrice = goodsTotalPrice;
- if(userCouponId!=null){
- appUserCouponVo = appUserCouponVoMap.get(userCouponId);
- if(StringUtils.isBlank(appUserCouponVo.getRelGoodsIds()) || appUserCouponVo.getRelGoodsIds().contains(goodsId)){
- couponType = appUserCouponVo.getCouponType();
- if(couponType == 1 && appUserCouponVo.getMoneyThreshold()!=null && appUserCouponVo.getDiscountMoney()!=null){
- moneyThreshold = appUserCouponVo.getMoneyThreshold();
+ if(memberCouponId!=null){
+ appMemberCouponVo = appMemberCouponVoMap.get(memberCouponId);
+ if(StringUtils.isBlank(appMemberCouponVo.getRelGoodsIds()) || appMemberCouponVo.getRelGoodsIds().contains(goodsId)){
+ couponType = appMemberCouponVo.getCouponType();
+ if(couponType == 1 && appMemberCouponVo.getMoneyThreshold()!=null && appMemberCouponVo.getDiscountMoney()!=null){
+ moneyThreshold = appMemberCouponVo.getMoneyThreshold();
if(goodsTotalPrice.compareTo(moneyThreshold)>=0){
- discountMoney = appUserCouponVo.getDiscountMoney();
+ discountMoney = appMemberCouponVo.getDiscountMoney();
goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
useCoupon = 1;
}
- }else if(couponType == 2 && appUserCouponVo.getDiscountPercent()!=null){
- discountPercent = appUserCouponVo.getDiscountPercent();
+ }else if(couponType == 2 && appMemberCouponVo.getDiscountPercent()!=null){
+ discountPercent = appMemberCouponVo.getDiscountPercent();
goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN).setScale(2,BigDecimal.ROUND_HALF_UP);
discountMoney = goodsRealPrice.subtract(goodsTotalPrice);
useCoupon = 1;
- }else if(couponType == 3 && appUserCouponVo.getDiscountMoney()!=null){
- discountMoney = appUserCouponVo.getDiscountMoney();
+ }else if(couponType == 3 && appMemberCouponVo.getDiscountMoney()!=null){
+ discountMoney = appMemberCouponVo.getDiscountMoney();
goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
useCoupon = 1;
}
@@ -315,8 +315,8 @@
orderGoods.setOrderId(orderId);
orderGoods.setGoodsId(goodsId);
orderGoods.setBuyNum(buyNum);
- if(userCouponId!=null){
- orderGoods.setCouponId(userCouponId.toString());
+ if(memberCouponId!=null){
+ orderGoods.setCouponId(memberCouponId.toString());
}
orderGoods.setGoodsPrice(goodsPrice);
orderGoods.setGoodsTotalMoney(orderGoodsMoney);
@@ -680,18 +680,18 @@
BigDecimal buyNumBig;
Integer serviceNum;
Integer goodsNum = 0;
- Long userCouponId;
+ Long memberCouponId;
Goods goods;
BigDecimal goodsPrice;
BigDecimal goodsTotalPrice;
BigDecimal goodsRealPrice;
- List<AppUserCouponVo> appUserCouponVoList = remoteMemberService.listVoUserCouponByUserId(userId).getData();
- Map<Long,AppUserCouponVo> appUserCouponVoMap = new HashMap<>();
- if(null != appUserCouponVoList){
- appUserCouponVoMap = appUserCouponVoList.stream().collect(Collectors.toMap(AppUserCouponVo::getUserCouponId, Function.identity()));
+ List<AppMemberCouponVo> appMemberCouponVoList = remoteMemberService.listVoMemberCouponByUserId(userId).getData();
+ Map<Long,AppMemberCouponVo> appMemberCouponVoMap = new HashMap<>();
+ if(null != appMemberCouponVoList){
+ appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
}
- AppUserCouponVo appUserCouponVo;
+ AppMemberCouponVo appMemberCouponVo;
Integer couponType;
BigDecimal moneyThreshold;
BigDecimal discountMoney = new BigDecimal("0.00");
@@ -707,7 +707,7 @@
String orderGoodsId;
for(AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList){
goodsId = appBuyGoodsDto.getGoodsId();
- userCouponId = appBuyGoodsDto.getUserCouponId();
+ memberCouponId = appBuyGoodsDto.getMemberCouponId();
goods = remoteGoodsService.getGoods(goodsId).getData();
buyNum = appBuyGoodsDto.getBuyNum();
goodsPrice = goods.getSalesPrice();
@@ -724,22 +724,22 @@
buyNumBig = BigDecimal.valueOf(buyNum);
goodsTotalPrice = goodsPrice.multiply(buyNumBig);
goodsRealPrice = goodsTotalPrice;
- if(userCouponId!=null){
- appUserCouponVo = appUserCouponVoMap.get(userCouponId);
- if(null != appUserCouponVo && (StringUtils.isBlank(appUserCouponVo.getRelGoodsIds()) || appUserCouponVo.getRelGoodsIds().contains(goodsId))){
- couponType = appUserCouponVo.getCouponType();
- if(couponType == 1 && appUserCouponVo.getMoneyThreshold()!=null && appUserCouponVo.getDiscountMoney()!=null){
- moneyThreshold = appUserCouponVo.getMoneyThreshold();
+ if(memberCouponId!=null){
+ appMemberCouponVo = appMemberCouponVoMap.get(memberCouponId);
+ if(null != appMemberCouponVo && (StringUtils.isBlank(appMemberCouponVo.getRelGoodsIds()) || appMemberCouponVo.getRelGoodsIds().contains(goodsId))){
+ couponType = appMemberCouponVo.getCouponType();
+ if(couponType == 1 && appMemberCouponVo.getMoneyThreshold()!=null && appMemberCouponVo.getDiscountMoney()!=null){
+ moneyThreshold = appMemberCouponVo.getMoneyThreshold();
if(goodsTotalPrice.compareTo(moneyThreshold)>=0){
- discountMoney = appUserCouponVo.getDiscountMoney();
+ discountMoney = appMemberCouponVo.getDiscountMoney();
goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
}
- }else if(couponType == 2 && appUserCouponVo.getDiscountPercent()!=null){
- discountPercent = appUserCouponVo.getDiscountPercent();
+ }else if(couponType == 2 && appMemberCouponVo.getDiscountPercent()!=null){
+ discountPercent = appMemberCouponVo.getDiscountPercent();
goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN).setScale(2,BigDecimal.ROUND_HALF_UP);
discountMoney = goodsRealPrice.subtract(goodsTotalPrice);
- }else if(couponType == 3 && appUserCouponVo.getDiscountMoney()!=null){
- discountMoney = appUserCouponVo.getDiscountMoney();
+ }else if(couponType == 3 && appMemberCouponVo.getDiscountMoney()!=null){
+ discountMoney = appMemberCouponVo.getDiscountMoney();
goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
}
}
@@ -762,8 +762,8 @@
orderGoods.setOrderId(orderId);
orderGoods.setGoodsId(goodsId);
orderGoods.setBuyNum(buyNum);
- if(null != userCouponId){
- orderGoods.setCouponId(userCouponId.toString());
+ if(null != memberCouponId){
+ orderGoods.setCouponId(memberCouponId.toString());
}
orderGoods.setGoodsPrice(goodsPrice);
orderGoods.setGoodsTotalMoney(orderGoodsMoney);
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
index 23ab52c..e6808ed 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -41,8 +41,7 @@
@Autowired
private ShopStaffService shopStaffService;
- @Autowired
- private RecommendCooperationService recommendCooperationService;
+
@Autowired
private ShopSuggestService shopSuggestService;
@@ -113,26 +112,7 @@
return R.ok();
}
- @RequestMapping(value = "/pageMerShopRecommend", method = RequestMethod.POST)
- @ApiOperation(value = "分页获取商户推荐列表")
- public R<Page<MerShopRecommendPageVo>> pageMerShopRecommend(@RequestBody MerShopRecommendPageDto merShopRecommendPageDto) {
- Long userId = SecurityUtils.getUserId();
- merShopRecommendPageDto.setUserId(userId);
- Page<MerShopRecommendPageVo> page = new Page<>();
- page.setSize(merShopRecommendPageDto.getPageSize());
- page.setCurrent(merShopRecommendPageDto.getPageNum());
- List<MerShopRecommendPageVo> merShopRecommendPageVoList = recommendCooperationService.pageMerShopRecommend(page,merShopRecommendPageDto);
- return R.ok(page.setRecords(merShopRecommendPageVoList));
- }
- @RequestMapping(value = "/recommendCooperation", method = RequestMethod.POST)
- @ApiOperation(value = "推荐合作")
- public R recommendCooperation(@RequestBody MerRecommendCooperationDto merRecommendCooperationDto) {
- Long userId = SecurityUtils.getUserId();
- merRecommendCooperationDto.setUserId(userId);
- recommendCooperationService.recommendCooperation(merRecommendCooperationDto);
- return R.ok();
- }
@RequestMapping(value = "/pageMerShopSuggest", method = RequestMethod.POST)
@ApiOperation(value = "分页获取商户建议")
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopFundRecord.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopFundRecord.java
new file mode 100644
index 0000000..78bf61d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopFundRecord.java
@@ -0,0 +1,88 @@
+package com.ruoyi.shop.domain.pojo.shop;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 商户资金记录
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_shop_fund_record")
+public class ShopFundRecord extends Model<ShopFundRecord> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 记录id
+ */
+ @TableId(value = "record_id", type = IdType.AUTO)
+ private Integer recordId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 商户id
+ */
+ @TableField("shop_id")
+ private Integer shopId;
+ /**
+ * 记录类型1订单支付2取消订单3
+ */
+ @TableField("record_type")
+ private String recordType;
+ /**
+ * 变动类型1收入2支出
+ */
+ @TableField("change_type")
+ private String changeType;
+ /**
+ * 变动前金额
+ */
+ @TableField("last_money")
+ private String lastMoney;
+ /**
+ * 变动后金额
+ */
+ @TableField("current_money")
+ private String currentMoney;
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ private Date createTime;
+ /**
+ * 关联用户id
+ */
+ @TableField("relation_user_id")
+ private Integer relationUserId;
+ /**
+ * 关联订单id
+ */
+ @TableField("relation_order_id")
+ private String relationOrderId;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.recordId;
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopProportion.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopProportion.java
new file mode 100644
index 0000000..6677094
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopProportion.java
@@ -0,0 +1,73 @@
+package com.ruoyi.shop.domain.pojo.shop;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 商户分成
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_shop_proportion")
+public class ShopProportion extends Model<ShopProportion> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 分成id
+ */
+ @TableId("proportion_id")
+ private Integer proportionId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 商户id
+ */
+ @TableField("shop_id")
+ private Integer shopId;
+ /**
+ * 商户类型
+ */
+ @TableField("shop_type")
+ private Integer shopType;
+ /**
+ * 分成比例
+ */
+ @TableField("proportion_percent")
+ private BigDecimal proportionPercent;
+ /**
+ * 更新时间
+ */
+ @TableField("update_time")
+ private Date updateTime;
+ /**
+ * 更新用户id
+ */
+ @TableField("update_user_id")
+ private Integer updateUserId;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.proportionId;
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopStaff.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopStaff.java
index 65e706e..34a5b99 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopStaff.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopStaff.java
@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.Version;
+import com.baomidou.mybatisplus.annotation.Version;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java
index 7f19cc5..1c62c78 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java
@@ -8,7 +8,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.Version;
+import com.baomidou.mybatisplus.annotation.Version;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/AgencyTaskRecord.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/AgencyTaskRecord.java
index 332c9cd..53e1ec2 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/AgencyTaskRecord.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/AgencyTaskRecord.java
@@ -10,7 +10,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotations.Version;
+import com.baomidou.mybatisplus.annotation.Version;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopFundRecordMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopFundRecordMapper.java
new file mode 100644
index 0000000..3965b7e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopFundRecordMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.shop.mapper.shop;
+
+import com.ruoyi.shop.domain.pojo.shop.ShopFundRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 商户资金记录 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface ShopFundRecordMapper extends BaseMapper<ShopFundRecord> {
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopProportionMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopProportionMapper.java
new file mode 100644
index 0000000..b832b94
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopProportionMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.shop.mapper.shop;
+
+import com.ruoyi.shop.domain.pojo.shop.ShopProportion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 商户分成 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface ShopProportionMapper extends BaseMapper<ShopProportion> {
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopFundRecordServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopFundRecordServiceImpl.java
new file mode 100644
index 0000000..994c8f8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopFundRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.shop.service.impl.shop;
+
+import com.ruoyi.shop.domain.pojo.shop.ShopFundRecord;
+import com.ruoyi.shop.mapper.shop.ShopFundRecordMapper;
+import com.ruoyi.shop.service.shop.ShopFundRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商户资金记录 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Service
+public class ShopFundRecordServiceImpl extends ServiceImpl<ShopFundRecordMapper, ShopFundRecord> implements ShopFundRecordService {
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java
new file mode 100644
index 0000000..8f2f8f0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.shop.service.impl.shop;
+
+import com.ruoyi.shop.domain.pojo.shop.ShopProportion;
+import com.ruoyi.shop.mapper.shop.ShopProportionMapper;
+import com.ruoyi.shop.service.shop.ShopProportionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商户分成 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Service
+public class ShopProportionServiceImpl extends ServiceImpl<ShopProportionMapper, ShopProportion> implements ShopProportionService {
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopFundRecordService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopFundRecordService.java
new file mode 100644
index 0000000..2710505
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopFundRecordService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.shop.service.shop;
+
+import com.ruoyi.shop.domain.pojo.shop.ShopFundRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 商户资金记录 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface ShopFundRecordService extends IService<ShopFundRecord> {
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopProportionService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopProportionService.java
new file mode 100644
index 0000000..2a383a2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopProportionService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.shop.service.shop;
+
+import com.ruoyi.shop.domain.pojo.shop.ShopProportion;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 商户分成 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface ShopProportionService extends IService<ShopProportion> {
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopFundRecordMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopFundRecordMapper.xml
new file mode 100644
index 0000000..dec6f12
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopFundRecordMapper.xml
@@ -0,0 +1,7 @@
+<?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.shop.mapper.shop.ShopFundRecordMapper">
+
+
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopProportionMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopProportionMapper.xml
new file mode 100644
index 0000000..ce17cdd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopProportionMapper.xml
@@ -0,0 +1,7 @@
+<?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.shop.mapper.shop.ShopProportionMapper">
+
+
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java
index 3c86752..e94c566 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java
@@ -1,14 +1,21 @@
package com.ruoyi.system.controller.business;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.domain.dto.AppAgreementDto;
-import com.ruoyi.system.domain.vo.AppAgreementVo;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.domain.dto.MerRecommendCooperationDto;
+import com.ruoyi.system.domain.dto.MerShopRecommendPageDto;
+import com.ruoyi.system.domain.vo.MerShopRecommendPageVo;
+import com.ruoyi.system.service.config.RecommendCooperationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* @author jqs34
@@ -21,6 +28,28 @@
@RestController
@RequestMapping("/mer/config")
public class MerConfigController {
-
+ @Autowired
+ private RecommendCooperationService recommendCooperationService;
+
+ @RequestMapping(value = "/pageMerShopRecommend", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取商户推荐列表")
+ public R<Page<MerShopRecommendPageVo>> pageMerShopRecommend(@RequestBody MerShopRecommendPageDto merShopRecommendPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ merShopRecommendPageDto.setUserId(userId);
+ Page<MerShopRecommendPageVo> page = new Page<>();
+ page.setSize(merShopRecommendPageDto.getPageSize());
+ page.setCurrent(merShopRecommendPageDto.getPageNum());
+ List<MerShopRecommendPageVo> merShopRecommendPageVoList = recommendCooperationService.pageMerShopRecommend(page,merShopRecommendPageDto);
+ return R.ok(page.setRecords(merShopRecommendPageVoList));
+ }
+
+ @RequestMapping(value = "/recommendCooperation", method = RequestMethod.POST)
+ @ApiOperation(value = "推荐合作")
+ public R recommendCooperation(@RequestBody MerRecommendCooperationDto merRecommendCooperationDto) {
+ Long userId = SecurityUtils.getUserId();
+ merRecommendCooperationDto.setUserId(userId);
+ recommendCooperationService.recommendCooperation(merRecommendCooperationDto);
+ return R.ok();
+ }
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerRecommendCooperationDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerRecommendCooperationDto.java
similarity index 93%
rename from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerRecommendCooperationDto.java
rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerRecommendCooperationDto.java
index ed12c78..b56387b 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerRecommendCooperationDto.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerRecommendCooperationDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.shop.domain.dto;
+package com.ruoyi.system.domain.dto;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopRecommendPageDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerShopRecommendPageDto.java
similarity index 81%
rename from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopRecommendPageDto.java
rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerShopRecommendPageDto.java
index 420ca71..5fcd9da 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopRecommendPageDto.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerShopRecommendPageDto.java
@@ -1,6 +1,5 @@
-package com.ruoyi.shop.domain.dto;
+package com.ruoyi.system.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;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Activeness.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Activeness.java
new file mode 100644
index 0000000..f5d23c3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Activeness.java
@@ -0,0 +1,82 @@
+package com.ruoyi.system.domain.pojo.config;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 活跃度配置
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_activeness")
+public class Activeness extends Model<Activeness> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 活跃度id
+ */
+ @TableId("activeness_id")
+ private Integer activenessId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 活跃度名称
+ */
+ @TableField("activeness_name")
+ private String activenessName;
+ /**
+ * 开始天数
+ */
+ @TableField("start_day")
+ private Integer startDay;
+ /**
+ * 结束天数
+ */
+ @TableField("end_day")
+ private Integer endDay;
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ private Date createTime;
+ /**
+ * 创建用户id
+ */
+ @TableField("create_user_id")
+ private Integer createUserId;
+ /**
+ * 更新时间
+ */
+ @TableField("update_time")
+ private Date updateTime;
+ /**
+ * 更新用户id
+ */
+ @TableField("update_user_id")
+ private Integer updateUserId;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.activenessId;
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Article.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Article.java
new file mode 100644
index 0000000..e115b11
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Article.java
@@ -0,0 +1,98 @@
+package com.ruoyi.system.domain.pojo.config;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 关于鸿瑞堂
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_article")
+public class Article extends Model<Article> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 文章id
+ */
+ @TableId(value = "article_id", type = IdType.AUTO)
+ private Integer articleId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private String delFlag;
+ /**
+ * 分类id
+ */
+ @TableField("class_id")
+ private Integer classId;
+ /**
+ * 文章排序
+ */
+ @TableField("article_sort")
+ private Integer articleSort;
+ /**
+ * 文章标题
+ */
+ @TableField("article_title")
+ private String articleTitle;
+ /**
+ * 文章详情
+ */
+ @TableField("article_detail")
+ private String articleDetail;
+ /**
+ * 文章封面
+ */
+ @TableField("article_cover")
+ private String articleCover;
+ /**
+ * 文章视频
+ */
+ @TableField("article_video")
+ private String articleVideo;
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ private Date createTime;
+ /**
+ * 创建用户id
+ */
+ @TableField("create_user_id")
+ private Integer createUserId;
+ /**
+ * 更新时间
+ */
+ @TableField("update_time")
+ private Date updateTime;
+ /**
+ * 更新用户id
+ */
+ @TableField("update_user_id")
+ private Integer updateUserId;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.articleId;
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Cooperation.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Cooperation.java
new file mode 100644
index 0000000..d102531
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Cooperation.java
@@ -0,0 +1,67 @@
+package com.ruoyi.system.domain.pojo.config;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 合作
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_cooperation")
+public class Cooperation extends Model<Cooperation> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 合作id
+ */
+ @TableId("cooper_id")
+ private Integer cooperId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 顶部图片
+ */
+ @TableField("top_picture")
+ private String topPicture;
+ /**
+ * 文章详情
+ */
+ @TableField("cooper_detail")
+ private String cooperDetail;
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ private Date createTime;
+ /**
+ * 创建用户id
+ */
+ @TableField("create_user_id")
+ private Integer createUserId;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.cooperId;
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommendCooperation.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/RecommendCooperation.java
similarity index 96%
rename from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommendCooperation.java
rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/RecommendCooperation.java
index 26b597f..fcd962e 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommendCooperation.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/RecommendCooperation.java
@@ -1,4 +1,4 @@
-package com.ruoyi.shop.domain.pojo.shop;
+package com.ruoyi.system.domain.pojo.config;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java
new file mode 100644
index 0000000..9e9a65a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java
@@ -0,0 +1,83 @@
+package com.ruoyi.system.domain.pojo.config;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 员工建议
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_staff_suggest")
+public class StaffSuggest extends Model<StaffSuggest> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 建议id
+ */
+ @TableId(value = "suggest_id", type = IdType.AUTO)
+ private Integer suggestId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 建议内容
+ */
+ @TableField("suggest_content")
+ private String suggestContent;
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ private Date createTime;
+ /**
+ * 创建人id
+ */
+ @TableField("create_user_id")
+ private Integer createUserId;
+ /**
+ * 回复内容
+ */
+ @TableField("replay_content")
+ private String replayContent;
+ /**
+ * 回复用户id
+ */
+ @TableField("replay_user_id")
+ private Integer replayUserId;
+ /**
+ * 回复时间
+ */
+ @TableField("replay_time")
+ private Date replayTime;
+ /**
+ * 商户id
+ */
+ @TableField("shop_id")
+ private Integer shopId;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.suggestId;
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopRecommendPageVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MerShopRecommendPageVo.java
similarity index 72%
rename from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopRecommendPageVo.java
rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MerShopRecommendPageVo.java
index e9bf8ac..29cdacd 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopRecommendPageVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MerShopRecommendPageVo.java
@@ -1,9 +1,5 @@
-package com.ruoyi.shop.domain.vo;
+package com.ruoyi.system.domain.vo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/ActivenessMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/ActivenessMapper.java
new file mode 100644
index 0000000..2b60b0c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/ActivenessMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.mapper.config;
+
+import com.ruoyi.system.domain.pojo.config.Activeness;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 活跃度配置 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface ActivenessMapper extends BaseMapper<Activeness> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/ArticleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/ArticleMapper.java
new file mode 100644
index 0000000..1627732
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/ArticleMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.mapper.config;
+
+import com.ruoyi.system.domain.pojo.config.Article;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 关于鸿瑞堂 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface ArticleMapper extends BaseMapper<Article> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/CooperationMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/CooperationMapper.java
new file mode 100644
index 0000000..66195da
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/CooperationMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.mapper.config;
+
+import com.ruoyi.system.domain.pojo.config.Cooperation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 合作 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface CooperationMapper extends BaseMapper<Cooperation> {
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/RecommendCooperationMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/RecommendCooperationMapper.java
similarity index 72%
rename from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/RecommendCooperationMapper.java
rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/RecommendCooperationMapper.java
index 38bfc16..b08a921 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/RecommendCooperationMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/RecommendCooperationMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.shop.mapper.shop;
+package com.ruoyi.system.mapper.config;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.shop.domain.dto.MerShopRecommendPageDto;
-import com.ruoyi.shop.domain.pojo.shop.RecommendCooperation;
-import com.ruoyi.shop.domain.vo.MerShopRecommendPageVo;
+import com.ruoyi.system.domain.dto.MerShopRecommendPageDto;
+import com.ruoyi.system.domain.pojo.config.RecommendCooperation;
+import com.ruoyi.system.domain.vo.MerShopRecommendPageVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/StaffSuggestMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/StaffSuggestMapper.java
new file mode 100644
index 0000000..472044f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/StaffSuggestMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.mapper.config;
+
+import com.ruoyi.system.domain.pojo.config.StaffSuggest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 员工建议 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface StaffSuggestMapper extends BaseMapper<StaffSuggest> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserMapper.java
index 281955f..054e19f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserMapper.java
@@ -3,7 +3,6 @@
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.system.domain.pojo.coupon.Coupon;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java
new file mode 100644
index 0000000..d27d103
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.service.config;
+
+import com.ruoyi.system.domain.pojo.config.Activeness;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 活跃度配置 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface ActivenessService extends IService<Activeness> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ArticleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ArticleService.java
new file mode 100644
index 0000000..fff375c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ArticleService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.service.config;
+
+import com.ruoyi.system.domain.pojo.config.Article;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 关于鸿瑞堂 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface ArticleService extends IService<Article> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CooperationService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CooperationService.java
new file mode 100644
index 0000000..5f531b9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CooperationService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.service.config;
+
+import com.ruoyi.system.domain.pojo.config.Cooperation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 合作 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface CooperationService extends IService<Cooperation> {
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/RecommendCooperationService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/RecommendCooperationService.java
similarity index 70%
rename from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/RecommendCooperationService.java
rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/RecommendCooperationService.java
index 5afd4da..11d61a0 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/RecommendCooperationService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/RecommendCooperationService.java
@@ -1,11 +1,11 @@
-package com.ruoyi.shop.service.shop;
+package com.ruoyi.system.service.config;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.shop.domain.dto.MerRecommendCooperationDto;
-import com.ruoyi.shop.domain.dto.MerShopRecommendPageDto;
-import com.ruoyi.shop.domain.pojo.shop.RecommendCooperation;
-import com.ruoyi.shop.domain.vo.MerShopRecommendPageVo;
+import com.ruoyi.system.domain.dto.MerRecommendCooperationDto;
+import com.ruoyi.system.domain.dto.MerShopRecommendPageDto;
+import com.ruoyi.system.domain.pojo.config.RecommendCooperation;
+import com.ruoyi.system.domain.vo.MerShopRecommendPageVo;
import java.util.List;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/StaffSuggestService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/StaffSuggestService.java
new file mode 100644
index 0000000..c775fe0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/StaffSuggestService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.service.config;
+
+import com.ruoyi.system.domain.pojo.config.StaffSuggest;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 员工建议 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+public interface StaffSuggestService extends IService<StaffSuggest> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java
new file mode 100644
index 0000000..90cbc32
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.system.service.impl.config;
+
+import com.ruoyi.system.domain.pojo.config.Activeness;
+import com.ruoyi.system.mapper.config.ActivenessMapper;
+import com.ruoyi.system.service.config.ActivenessService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 活跃度配置 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Service
+public class ActivenessServiceImpl extends ServiceImpl<ActivenessMapper, Activeness> implements ActivenessService {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java
new file mode 100644
index 0000000..5c701c3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.system.service.impl.config;
+
+import com.ruoyi.system.domain.pojo.config.Article;
+import com.ruoyi.system.mapper.config.ArticleMapper;
+import com.ruoyi.system.service.config.ArticleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 关于鸿瑞堂 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Service
+public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> implements ArticleService {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CooperationServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CooperationServiceImpl.java
new file mode 100644
index 0000000..30128c0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CooperationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.system.service.impl.config;
+
+import com.ruoyi.system.domain.pojo.config.Cooperation;
+import com.ruoyi.system.mapper.config.CooperationMapper;
+import com.ruoyi.system.service.config.CooperationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 合作 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Service
+public class CooperationServiceImpl extends ServiceImpl<CooperationMapper, Cooperation> implements CooperationService {
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/RecommendCooperationServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java
similarity index 79%
rename from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/RecommendCooperationServiceImpl.java
rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java
index 68bbfa8..b592228 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/RecommendCooperationServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java
@@ -1,15 +1,15 @@
-package com.ruoyi.shop.service.impl.shop;
+package com.ruoyi.system.service.impl.config;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.bean.BeanUtils;
-import com.ruoyi.shop.domain.dto.MerRecommendCooperationDto;
-import com.ruoyi.shop.domain.dto.MerShopRecommendPageDto;
-import com.ruoyi.shop.domain.pojo.shop.RecommendCooperation;
-import com.ruoyi.shop.domain.vo.MerShopRecommendPageVo;
-import com.ruoyi.shop.mapper.shop.RecommendCooperationMapper;
-import com.ruoyi.shop.service.shop.RecommendCooperationService;
+import com.ruoyi.system.domain.dto.MerRecommendCooperationDto;
+import com.ruoyi.system.domain.dto.MerShopRecommendPageDto;
+import com.ruoyi.system.domain.pojo.config.RecommendCooperation;
+import com.ruoyi.system.domain.vo.MerShopRecommendPageVo;
+import com.ruoyi.system.mapper.config.RecommendCooperationMapper;
+import com.ruoyi.system.service.config.RecommendCooperationService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/StaffSuggestServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/StaffSuggestServiceImpl.java
new file mode 100644
index 0000000..f74f764
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/StaffSuggestServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.system.service.impl.config;
+
+import com.ruoyi.system.domain.pojo.config.StaffSuggest;
+import com.ruoyi.system.mapper.config.StaffSuggestMapper;
+import com.ruoyi.system.service.config.StaffSuggestService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 员工建议 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-05-25
+ */
+@Service
+public class StaffSuggestServiceImpl extends ServiceImpl<StaffSuggestMapper, StaffSuggest> implements StaffSuggestService {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
index eb87b94..17e8fda 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java
@@ -7,17 +7,10 @@
import javax.annotation.Resource;
import javax.validation.Validator;
-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.system.api.domain.dto.AppEditUserDto;
-import com.ruoyi.system.api.domain.poji.config.SysTag;
-import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.domain.pojo.coupon.Coupon;
-import com.ruoyi.system.mapper.coupon.CouponMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -40,7 +33,6 @@
import com.ruoyi.system.mapper.sys.SysUserRoleMapper;
import com.ruoyi.system.service.sys.ISysConfigService;
import com.ruoyi.system.service.sys.ISysUserService;
-import org.springframework.util.ObjectUtils;
/**
* 用户 业务层处理
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
index 62f7eed..800902d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
-import com.ruoyi.system.domain.pojo.coupon.Coupon;
/**
* 用户 业务层
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ActivenessMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ActivenessMapper.xml
new file mode 100644
index 0000000..01c3534
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ActivenessMapper.xml
@@ -0,0 +1,7 @@
+<?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.system.mapper.config.ActivenessMapper">
+
+
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ArticleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ArticleMapper.xml
new file mode 100644
index 0000000..559c709
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ArticleMapper.xml
@@ -0,0 +1,7 @@
+<?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.system.mapper.config.ArticleMapper">
+
+
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/CooperationMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/CooperationMapper.xml
new file mode 100644
index 0000000..5e47aea
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/CooperationMapper.xml
@@ -0,0 +1,7 @@
+<?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.system.mapper.config.CooperationMapper">
+
+
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/RecommendCooperationMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/RecommendCooperationMapper.xml
similarity index 77%
rename from ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/RecommendCooperationMapper.xml
rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/RecommendCooperationMapper.xml
index eff376d..b233a2c 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/RecommendCooperationMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/RecommendCooperationMapper.xml
@@ -1,8 +1,8 @@
<?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.shop.mapper.shop.RecommendCooperationMapper">
+<mapper namespace="com.ruoyi.system.mapper.config.RecommendCooperationMapper">
- <select id="pageMerShopRecommend" resultType="com.ruoyi.shop.domain.vo.MerShopRecommendPageVo">
+ <select id="pageMerShopRecommend" resultType="com.ruoyi.system.domain.vo.MerShopRecommendPageVo">
SELECT
id id,
corp_status corpStatus,
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/StaffSuggestMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/StaffSuggestMapper.xml
new file mode 100644
index 0000000..6e22641
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/StaffSuggestMapper.xml
@@ -0,0 +1,7 @@
+<?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.system.mapper.config.StaffSuggestMapper">
+
+
+
+</mapper>
--
Gitblit v1.7.1