From 05765c74d95856ed0fd82e659181ed906c1c6dd8 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 30 四月 2023 16:39:45 +0800
Subject: [PATCH] 分服务
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java | 2 -
/dev/null | 25 ------------
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java | 7 ++-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java | 7 ++-
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 1
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java | 7 ++-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java | 7 ++-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java | 7 ++-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 7 ++-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java | 7 ++-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java | 7 ++-
11 files changed, 32 insertions(+), 52 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppAgreementDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppAgreementDto.java
deleted file mode 100644
index f76a1a5..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppAgreementDto.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppAgreementDto
- * @description: TODO
- * @date 2023年03月07日
- * @version: 1.0
- */
-@Data
-public class AppAgreementDto extends AppBaseDto{
-
-
- @ApiModelProperty(value = "协议类型1用户协议 2隐私协议")
- private Integer type;
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppGoodsInfoGetDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppGoodsInfoGetDto.java
deleted file mode 100644
index cc5cb68..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppGoodsInfoGetDto.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppGoodsInfoGetDto
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppGoodsInfoGetDto extends AppBaseGetDto {
-
- @ApiModelProperty(value = "是否活动跳转0否1是")
- private Integer activityFlag;
-
- @ApiModelProperty(value = "商户id",hidden = true)
- private Long shopId;
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppNearbyShopDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppNearbyShopDto.java
deleted file mode 100644
index 55f3427..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppNearbyShopDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppNearbyShopDto
- * @description: TODO
- * @date 2023年04月19日
- * @version: 1.0
- */
-@Data
-public class AppNearbyShopDto extends AppBaseDto{
-
-
- @ApiModelProperty(value = "经度")
- private String longitude;
-
- @ApiModelProperty(value = "维度")
- private String latitude;
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppSearchGoodsPageDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppSearchGoodsPageDto.java
deleted file mode 100644
index 1feb218..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppSearchGoodsPageDto.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppShopGoodsPageDto
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppSearchGoodsPageDto extends AppPageDto {
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "搜索关键词")
- private String keyword;
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppShopGoodsPageDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppShopGoodsPageDto.java
deleted file mode 100644
index 47c22e1..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppShopGoodsPageDto.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppShopGoodsPageDto
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppShopGoodsPageDto extends AppPageDto{
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "搜索关键词")
- private String keyword;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "商品分类id")
- private Long goodsClassId;
-
- @ApiModelProperty(value = "排序方式1.全部2.价格正序3.价格倒序4.销量正序5.销量倒序")
- private Integer sort;
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppShoppingCartAddDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppShoppingCartAddDto.java
deleted file mode 100644
index b980c69..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppShoppingCartAddDto.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppShoppingCartAddDto
- * @description: TODO
- * @date 2023年04月26日
- * @version: 1.0
- */
-@Data
-public class AppShoppingCartAddDto extends AppBaseDto{
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "购买数量")
- private Integer buyNum;
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppShoppingCartChangeDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppShoppingCartChangeDto.java
deleted file mode 100644
index 854f3f6..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/AppShoppingCartChangeDto.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppShoppingCartAddDto
- * @description: TODO
- * @date 2023年04月26日
- * @version: 1.0
- */
-@Data
-public class AppShoppingCartChangeDto extends AppBaseDto{
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "变化后数量")
- private Integer buyNum;
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtBaseDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtBaseDto.java
deleted file mode 100644
index 8826237..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtBaseDto.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MGTBaseDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtBaseDto {
-
- @ApiModelProperty(value = "userId",hidden = true)
- private Long userId;
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtBaseGetDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtBaseGetDto.java
deleted file mode 100644
index cc4252a..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtBaseGetDto.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MgtBaseGetDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtBaseGetDto extends MgtBaseDto{
-
- @ApiModelProperty(value = "请求对象id")
- private String id;
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtChangeCoopDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtChangeCoopDto.java
deleted file mode 100644
index 1eee545..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtChangeCoopDto.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MGTChangeCooperDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtChangeCoopDto extends MgtBaseDto {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty("合作开始时间")
- private String coopStartTime;
-
- @ApiModelProperty("合作结束时间")
- private String coopEndTime;
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtEditShopDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtEditShopDto.java
deleted file mode 100644
index e615b09..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtEditShopDto.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName ManageCreateShopDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtEditShopDto extends MgtBaseDto{
-
-
- @ApiModelProperty(value = "商户id，新增不传")
- private Long shopId;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty("商户类型1.经销商2.代理商")
- private Integer shopType;
-
- @ApiModelProperty("营业开始时间")
- private String businessStartTime;
-
- @ApiModelProperty("营业结束时间")
- private String businessEndTime;
-
- @ApiModelProperty("店主姓名")
- private String shopownerName;
-
- @ApiModelProperty("店主联系方式")
- private String shopownerPhone;
-
- @ApiModelProperty("签约区域")
- private String signAreaCode;
-
- @ApiModelProperty("商户服务电话")
- private String shopServicePhone;
-
- @ApiModelProperty("管辖员工")
- private Long belongUserId;
-
- @ApiModelProperty("所属经销商")
- private Long belongShopId;
-
- @ApiModelProperty("扶持能力1.有2.没有")
- private Integer supportingCapacityFlag;
-
- @ApiModelProperty("店面操作人数1.1人2.1人以上")
- private Integer operationPersonFlag;
-
- @ApiModelProperty("执行力1.强2.弱")
- private Integer executiveForceFlag;
-
- @ApiModelProperty("格局1.大2.小")
- private Integer patternFlag;
-
- @ApiModelProperty("人脉1.宽2.窄")
- private Integer connectionFlag;
-
- @ApiModelProperty("经济能力1.强2.差")
- private Integer economicAbilityFlag;
-
- @ApiModelProperty("与合作商关系1.好2.差")
- private Integer relationPartner;
-
- @ApiModelProperty("曾从事事业")
- private String businessHistory;
-
- @ApiModelProperty("店铺地址省code")
- private String shopProvinceCode;
-
- @ApiModelProperty("店铺地址市code")
- private String shopCityCode;
-
- @ApiModelProperty("店铺地址区code")
- private String shopAreaCode;
-
- @ApiModelProperty("店铺区域全称")
- private String shopAreaName;
-
- @ApiModelProperty("店铺详细地址")
- private String shopAddress;
-
- @ApiModelProperty("店铺经度")
- private String shopLongitude;
-
- @ApiModelProperty("店铺维度")
- private String shopLatitude;
-
- @ApiModelProperty("店铺详情")
- private String shopDetail;
-
- @ApiModelProperty("营销功能1开2关")
- private Integer marketingFunctionFlag;
-
- @ApiModelProperty("领券1开2关")
- private Integer platformCouponFlag;
-
- @ApiModelProperty("生日卡1开2关")
- private Integer platformBirthdayFlag;
-
- @ApiModelProperty("推荐人")
- private String recommendPerson;
-
- @ApiModelProperty("商户标签id 多个用,隔开")
- private String shopTagIds;
-
- @ApiModelProperty("关联用户id 多个用,隔开")
- private String relUserIds;
-
- @ApiModelProperty("商户封面")
- private String shopPicture;
-
- @ApiModelProperty("商户banner 多个用,隔开")
- private String shopBanners;
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtEditShopTagDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtEditShopTagDto.java
deleted file mode 100644
index 3ba7d7a..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtEditShopTagDto.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MgtEditShopTagDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtEditShopTagDto extends MgtBaseGetDto {
-
- @ApiModelProperty("商户标签id 多个用,隔开")
- private String shopTagIds;
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtPageDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtPageDto.java
deleted file mode 100644
index d3fe5a4..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtPageDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppPageDto
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class MgtPageDto extends MgtBaseDto{
-
- @ApiModelProperty(name = "pagenum", value = "页码")
- private Integer pageNum = 1;
-
-
- @ApiModelProperty(name = "pagesize", value = "每页显示条数")
- private Integer pageSize = 20;
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtShopPageDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtShopPageDto.java
deleted file mode 100644
index f94339f..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtShopPageDto.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.member.domain.dto;
-
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MgtShopPageDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtShopPageDto extends MgtPageDto {
-
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppAdvertVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppAdvertVo.java
deleted file mode 100644
index 14f5400..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppAdvertVo.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppQuickEntryVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppAdvertVo {
-
- @ApiModelProperty(value = "广告入口")
- private Long adId;
-
- @ApiModelProperty(value = "广告图片地址")
- private String adUrl;
-
- @ApiModelProperty(value = "广告语")
- private String adContent;
-
- @ApiModelProperty(value = "对象类型1.外链2.内链3.无")
- private Integer targetType;
-
- @ApiModelProperty(value = "链接地址")
- private String linkUrl;
-
- @ApiModelProperty(value = "跳转id")
- private String jumpId;
-
- @ApiModelProperty(value = "logo地址")
- private String logoUrl;
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppAgreementVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppAgreementVo.java
deleted file mode 100644
index cb16e9b..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppAgreementVo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppAgreementVo
- * @description: TODO
- * @date 2023年03月07日
- * @version: 1.0
- */
-@Data
-public class AppAgreementVo {
-
- @ApiModelProperty(value = "协议id")
- private Long agreementId;
-
- @ApiModelProperty(value = "协议内容")
- private String agreementContent;
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppBannerVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppBannerVo.java
deleted file mode 100644
index ff566f7..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppBannerVo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppBannerVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-
-@Data
-public class AppBannerVo {
-
- @ApiModelProperty(value = "bannerid")
- private Long bannerId;
-
- @ApiModelProperty(value = "banner图片地址")
- private String bannerUrl;
-
- @ApiModelProperty(value = "链接类型1.外部2.内部3.无")
- private Integer targetType;
-
- @ApiModelProperty(value = "链接类型1.手动输入2.选择已有")
- private Integer linkType;
-
- @ApiModelProperty(value = "链接地址")
- private String linkUrl;
-
- @ApiModelProperty(value = "跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂")
- private Integer jumpType;
-
- @ApiModelProperty(value = "跳转id")
- private String jumpId;
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppGoodsInfoVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppGoodsInfoVo.java
deleted file mode 100644
index 0f03996..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppGoodsInfoVo.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author jqs34
- * @ClassName AppGoodsInfoVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppGoodsInfoVo {
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "商品名称")
- private String goodsName;
-
- @ApiModelProperty(value = "商品简介")
- private String goodsIntroduction;
-
- @ApiModelProperty(value = "商品视频")
- private String goodsVideo;
-
- @ApiModelProperty(value = "商品banner")
- private String goodsBanners;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "商品标签")
- private String goodsTag;
-
- @ApiModelProperty(value = "商品调理问题")
- private BigDecimal goodsNurses;
-
- @ApiModelProperty("服务次数")
- private Integer serviceNum;
-
- @ApiModelProperty(value = "商品售价")
- private BigDecimal salesPrice;
-
- @ApiModelProperty(value = "商品详情")
- private String goodsDetail;
-
- @ApiModelProperty(value = "销售数量")
- private Integer salesNum;
-
- @ApiModelProperty(value = "是否活动跳转0否1是")
- private Integer activityFlag;
-
- @ApiModelProperty(value = "商品活动价")
- private BigDecimal activityPrice;
-
- @ApiModelProperty(value = "售罄标记0否1是")
- private Integer sellOutFlag;
-
- @ApiModelProperty(value = "活动截止时间")
- private Date activityDeadline;
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppNearbyShopVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppNearbyShopVo.java
deleted file mode 100644
index a819e6f..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppNearbyShopVo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppNearbyShopDto
- * @description: TODO
- * @date 2023年04月19日
- * @version: 1.0
- */
-@Data
-public class AppNearbyShopVo {
-
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty(value = "商户名称")
- private String shopName;
-
- @ApiModelProperty(value = "商户地址")
- private String shopAddress;
-
- @ApiModelProperty(value = "经度")
- private String shopLongitude;
-
- @ApiModelProperty(value = "维度")
- private String shopLatitude;
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppQuickEntryVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppQuickEntryVo.java
deleted file mode 100644
index 462b82b..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppQuickEntryVo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppQuickEntryVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppQuickEntryVo {
-
- @ApiModelProperty(value = "快速入口")
- private Long entryId;
-
- @ApiModelProperty(value = "入口图片地址")
- private String entryUrl;
-
- @ApiModelProperty(value = "入口名称")
- private String entryName;
-
- @ApiModelProperty(value = "对象类型1.外链2.内链3.无")
- private Integer targetType;
-
- @ApiModelProperty(value = "链接地址")
- private String linkUrl;
-
- @ApiModelProperty(value = "跳转id")
- private String jumpId;
-
-
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppShopInfoVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppShopInfoVo.java
deleted file mode 100644
index 8736e79..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppShopInfoVo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import com.ruoyi.system.domain.pojo.shop.ShopCertificate;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName AppShopInfoVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppShopInfoVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty(value = "商户名称")
- private String shopName;
-
- @ApiModelProperty(value = "商户地址")
- private String shopAddress;
-
- @ApiModelProperty(value = "经度")
- private String shopLongitude;
-
- @ApiModelProperty(value = "维度")
- private String shopLatitude;
-
- @ApiModelProperty("营业开始时间")
- private String businessStartTime;
-
- @ApiModelProperty("营业结束时间")
- private String businessEndTime;
-
- @ApiModelProperty("商户标签")
- private String shopTags;
-
- @ApiModelProperty("商户服务电话")
- private String shopServicePhone;
-
- @ApiModelProperty("商户封面")
- private String shopPicture;
-
- @ApiModelProperty("商户banners")
- private String shopBanners;
-
- @ApiModelProperty("店铺详情")
- private String shopDetail;
-
- @ApiModelProperty("店铺证书")
- private List<ShopCertificate> shopCertificateList;
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppSimpleActivityGoodsVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppSimpleActivityGoodsVo.java
deleted file mode 100644
index f076753..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppSimpleActivityGoodsVo.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName AppSimpleGoodsVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppSimpleActivityGoodsVo {
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "商品名称")
- private String goodsName;
-
- @ApiModelProperty(value = "商品简介")
- private String goodsIntroduction;
-
- @ApiModelProperty(value = "商品图片")
- private String goodsPicture;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "商品标签")
- private String goodsTag;
-
- @ApiModelProperty(value = "商品调理问题")
- private BigDecimal goodsNurses;
-
- @ApiModelProperty(value = "商品售价")
- private BigDecimal salesPrice;
-
- @ApiModelProperty(value = "商品活动价")
- private BigDecimal activityPrice;
-
- @ApiModelProperty(value = "活动销售数量")
- private Integer activityNumber;
-
- @ApiModelProperty(value = "已售数量")
- private Integer salesNumber;
-
- @ApiModelProperty(value = "已售比例")
- private BigDecimal salesPercent;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppSimpleGoodsVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppSimpleGoodsVo.java
deleted file mode 100644
index a47b99c..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppSimpleGoodsVo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName AppSimpleGoodsVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppSimpleGoodsVo {
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "商品名称")
- private String goodsName;
-
- @ApiModelProperty(value = "商品简介")
- private String goodsIntroduction;
-
- @ApiModelProperty(value = "商品图片")
- private String goodsPicture;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "商品标签")
- private String goodsTag;
-
- @ApiModelProperty(value = "商品调理问题")
- private BigDecimal goodsNurses;
-
- @ApiModelProperty(value = "商品售价")
- private BigDecimal salesPrice;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerHomeShopTotalVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerHomeShopTotalVo.java
deleted file mode 100644
index 90de386..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerHomeShopTotalVo.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName MerHomeShopTotalVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MerHomeShopTotalVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty(value = "今日到店")
- private Integer todayShop;
-
- @ApiModelProperty(value = "待处理订单")
- private Integer unHandleOrder;
-
- @ApiModelProperty(value = "跟进任务")
- private Integer task;
-
- @ApiModelProperty(value = "店铺营业额")
- private BigDecimal shopTurnover;
-
- @ApiModelProperty(value = "剩余周期人数")
- private Integer cycleSurp;
-
- @ApiModelProperty(value = "剩余体验人数")
- private Integer explorationSurp;
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerShopInfoVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerShopInfoVo.java
deleted file mode 100644
index 1aa62c1..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerShopInfoVo.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import com.ruoyi.system.domain.pojo.shop.ShopCertificate;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName MerShopInfoVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MerShopInfoVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty("商户类型1.经销商2.代理商")
- private Integer shopType;
-
- @ApiModelProperty("营业开始时间")
- private String businessStartTime;
-
- @ApiModelProperty("营业结束时间")
- private String businessEndTime;
-
- @ApiModelProperty("店主姓名")
- private String shopownerName;
-
- @ApiModelProperty("店主联系方式")
- private String shopownerPhone;
-
- @ApiModelProperty("签约区域")
- private String signAreaCode;
-
- @ApiModelProperty("商户服务电话")
- private String shopServicePhone;
-
- @ApiModelProperty("管辖员工")
- private Long belongUserId;
-
- @ApiModelProperty("所属经销商")
- private Long belongShopId;
-
- @ApiModelProperty("扶持能力1.有2.没有")
- private Integer supportingCapacityFlag;
-
- @ApiModelProperty("店面操作人数1.1人2.1人以上")
- private Integer operationPersonFlag;
-
- @ApiModelProperty("执行力1.强2.弱")
- private Integer executiveForceFlag;
-
- @ApiModelProperty("格局1.大2.小")
- private Integer patternFlag;
-
- @ApiModelProperty("人脉1.宽2.窄")
- private Integer connectionFlag;
-
- @ApiModelProperty("经济能力1.强2.差")
- private Integer economicAbilityFlag;
-
- @ApiModelProperty("与合作商关系1.好2.差")
- private Integer relationPartner;
-
- @ApiModelProperty("曾从事事业")
- private String businessHistory;
-
- @ApiModelProperty("店铺地址省code")
- private String shopProvinceCode;
-
- @ApiModelProperty("店铺地址市code")
- private String shopCityCode;
-
- @ApiModelProperty("店铺地址区code")
- private String shopAreaCode;
-
- @ApiModelProperty("店铺区域全称")
- private String shopAreaName;
-
- @ApiModelProperty("店铺详细地址")
- private String shopAddress;
-
- @ApiModelProperty("店铺经度")
- private String shopLongitude;
-
- @ApiModelProperty("店铺维度")
- private String shopLatitude;
-
- @ApiModelProperty("店铺详情")
- private String shopDetail;
-
- @ApiModelProperty("营销功能1开2关")
- private Integer marketingFunctionFlag;
-
- @ApiModelProperty("领券1开2关")
- private Integer platformCouponFlag;
-
- @ApiModelProperty("生日卡1开2关")
- private Integer platformBirthdayFlag;
-
- @ApiModelProperty("推荐人")
- private String recommendPerson;
-
- @ApiModelProperty("商户标签id 多个用,隔开")
- private String shopTagIds;
-
- @ApiModelProperty("商户标签")
- private String shopTags;
-
- @ApiModelProperty("关联用户id 多个用,隔开")
- private String relUserIds;
-
- @ApiModelProperty("关联用户")
- private String relUsers;
-
- @ApiModelProperty("商户封面")
- private String shopPicture;
-
- @ApiModelProperty("商户banner 多个用,隔开")
- private String shopBanners;
-
- @ApiModelProperty("证书list")
- private List<ShopCertificate> shopCertificateList;
-
-
-
-
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtShopInfoVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtShopInfoVo.java
deleted file mode 100644
index bc16f17..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtShopInfoVo.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import com.ruoyi.system.domain.pojo.shop.ShopCertificate;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName MgtShopInfoVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtShopInfoVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty("商户类型1.经销商2.代理商")
- private Integer shopType;
-
- @ApiModelProperty("营业开始时间")
- private String businessStartTime;
-
- @ApiModelProperty("营业结束时间")
- private String businessEndTime;
-
- @ApiModelProperty("店主姓名")
- private String shopownerName;
-
- @ApiModelProperty("店主联系方式")
- private String shopownerPhone;
-
- @ApiModelProperty("签约区域")
- private String signAreaCode;
-
- @ApiModelProperty("商户服务电话")
- private String shopServicePhone;
-
- @ApiModelProperty("管辖员工")
- private Long belongUserId;
-
- @ApiModelProperty("所属经销商")
- private Long belongShopId;
-
- @ApiModelProperty("扶持能力1.有2.没有")
- private Integer supportingCapacityFlag;
-
- @ApiModelProperty("店面操作人数1.1人2.1人以上")
- private Integer operationPersonFlag;
-
- @ApiModelProperty("执行力1.强2.弱")
- private Integer executiveForceFlag;
-
- @ApiModelProperty("格局1.大2.小")
- private Integer patternFlag;
-
- @ApiModelProperty("人脉1.宽2.窄")
- private Integer connectionFlag;
-
- @ApiModelProperty("经济能力1.强2.差")
- private Integer economicAbilityFlag;
-
- @ApiModelProperty("与合作商关系1.好2.差")
- private Integer relationPartner;
-
- @ApiModelProperty("曾从事事业")
- private String businessHistory;
-
- @ApiModelProperty("店铺地址省code")
- private String shopProvinceCode;
-
- @ApiModelProperty("店铺地址市code")
- private String shopCityCode;
-
- @ApiModelProperty("店铺地址区code")
- private String shopAreaCode;
-
- @ApiModelProperty("店铺区域全称")
- private String shopAreaName;
-
- @ApiModelProperty("店铺详细地址")
- private String shopAddress;
-
- @ApiModelProperty("店铺经度")
- private String shopLongitude;
-
- @ApiModelProperty("店铺维度")
- private String shopLatitude;
-
- @ApiModelProperty("店铺详情")
- private String shopDetail;
-
- @ApiModelProperty("营销功能1开2关")
- private Integer marketingFunctionFlag;
-
- @ApiModelProperty("领券1开2关")
- private Integer platformCouponFlag;
-
- @ApiModelProperty("生日卡1开2关")
- private Integer platformBirthdayFlag;
-
- @ApiModelProperty("推荐人")
- private String recommendPerson;
-
- @ApiModelProperty("商户标签id 多个用,隔开")
- private String shopTagIds;
-
- @ApiModelProperty("商户标签")
- private String shopTags;
-
- @ApiModelProperty("关联用户id 多个用,隔开")
- private String relUserIds;
-
- @ApiModelProperty("关联用户")
- private String relUsers;
-
- @ApiModelProperty("商户封面")
- private String shopPicture;
-
- @ApiModelProperty("商户banner 多个用,隔开")
- private String shopBanners;
-
- @ApiModelProperty("证书list")
- private List<ShopCertificate> shopCertificateList;
-
-
-
-
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtShopPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtShopPageVo.java
deleted file mode 100644
index c3c6b37..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtShopPageVo.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName MgtShopPageVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtShopPageVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty("签约时间")
- private String signTime;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty("商户编号")
- private String shopNumber;
-
- @ApiModelProperty("商户标签")
- private String shopTags;
-
- @ApiModelProperty("签约人")
- private String signUser;
-
- @ApiModelProperty("首提金额")
- private BigDecimal firstWithdraw;
-
- @ApiModelProperty("关联员工")
- private BigDecimal belongUser;
-
- @ApiModelProperty("关联部门")
- private BigDecimal belongDept;
-
- @ApiModelProperty("来源渠道")
- private String shopSource;
-
- @ApiModelProperty("签约区域")
- private String signAreaName;
-
- @ApiModelProperty("合作期限")
- private String cooperationTime;
-
- @ApiModelProperty("店铺地址")
- private String shopAddress;
-
- @ApiModelProperty("店主姓名")
- private String shopownerName;
-
- @ApiModelProperty("店主联系方式")
- private String shopownerPhone;
-
- @ApiModelProperty("商户状态-1删除0冻结1正常2终止合作")
- private Integer shopStatus;
-
- @ApiModelProperty("商户活动次数")
- private Integer shopActivityCount;
-
- @ApiModelProperty("店铺设置状态")
- private String shopCustomStatus;
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtShopTagVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtShopTagVo.java
deleted file mode 100644
index 3128750..0000000
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtShopTagVo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.member.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MgtShopTagVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtShopTagVo {
-
- @ApiModelProperty(value = "标签id")
- private Long tagId;
-
- @ApiModelProperty(value = "标签名称")
- private String tagName;
-
- @ApiModelProperty(value = "是否选择0否1是")
- private Integer selectFlag;
-
-}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
index 8f8d60d..7f54065 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
@@ -1,11 +1,9 @@
package com.ruoyi.member.service.member;
-import com.ruoyi.member.domain.vo.AppNearbyShopVo;
import com.ruoyi.member.domain.vo.AppUserAuthorizeVo;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
-import com.ruoyi.member.domain.dto.AppNearbyShopDto;
import com.ruoyi.member.domain.dto.AppUserAuthorizeDto;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppAgreementDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppAgreementDto.java
deleted file mode 100644
index a48915a..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppAgreementDto.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.order.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppAgreementDto
- * @description: TODO
- * @date 2023年03月07日
- * @version: 1.0
- */
-@Data
-public class AppAgreementDto extends AppBaseDto{
-
-
- @ApiModelProperty(value = "协议类型1用户协议 2隐私协议")
- private Integer type;
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppNearbyShopDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppNearbyShopDto.java
deleted file mode 100644
index db50bb8..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppNearbyShopDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.order.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppNearbyShopDto
- * @description: TODO
- * @date 2023年04月19日
- * @version: 1.0
- */
-@Data
-public class AppNearbyShopDto extends AppBaseDto{
-
-
- @ApiModelProperty(value = "经度")
- private String longitude;
-
- @ApiModelProperty(value = "维度")
- private String latitude;
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppUserAuthorizeDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppUserAuthorizeDto.java
deleted file mode 100644
index 88e8dc5..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppUserAuthorizeDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.order.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppUserAuthorizeDto
- * @description: TODO
- * @date 2023年02月13日
- * @version: 1.0
- */
-@Data
-public class AppUserAuthorizeDto extends AppBaseDto{
-
- @ApiModelProperty(value = "手机iv")
- private String phoneIv;
-
- @ApiModelProperty(value = "手机encryptedData")
- private String phoneEncryptedData;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtBaseDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtBaseDto.java
deleted file mode 100644
index 0da46d0..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtBaseDto.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.order.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MGTBaseDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtBaseDto {
-
- @ApiModelProperty(value = "userId",hidden = true)
- private Long userId;
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtBaseGetDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtBaseGetDto.java
deleted file mode 100644
index 8c832dd..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtBaseGetDto.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.order.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MgtBaseGetDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtBaseGetDto extends MgtBaseDto{
-
- @ApiModelProperty(value = "请求对象id")
- private String id;
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtChangeCoopDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtChangeCoopDto.java
deleted file mode 100644
index 1c4a972..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtChangeCoopDto.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.order.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MGTChangeCooperDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtChangeCoopDto extends MgtBaseDto {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty("合作开始时间")
- private String coopStartTime;
-
- @ApiModelProperty("合作结束时间")
- private String coopEndTime;
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtEditShopDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtEditShopDto.java
deleted file mode 100644
index dbc45ae..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtEditShopDto.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.ruoyi.order.domain.dto;
-
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName ManageCreateShopDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtEditShopDto extends MgtBaseDto{
-
-
- @ApiModelProperty(value = "商户id，新增不传")
- private Long shopId;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty("商户类型1.经销商2.代理商")
- private Integer shopType;
-
- @ApiModelProperty("营业开始时间")
- private String businessStartTime;
-
- @ApiModelProperty("营业结束时间")
- private String businessEndTime;
-
- @ApiModelProperty("店主姓名")
- private String shopownerName;
-
- @ApiModelProperty("店主联系方式")
- private String shopownerPhone;
-
- @ApiModelProperty("签约区域")
- private String signAreaCode;
-
- @ApiModelProperty("商户服务电话")
- private String shopServicePhone;
-
- @ApiModelProperty("管辖员工")
- private Long belongUserId;
-
- @ApiModelProperty("所属经销商")
- private Long belongShopId;
-
- @ApiModelProperty("扶持能力1.有2.没有")
- private Integer supportingCapacityFlag;
-
- @ApiModelProperty("店面操作人数1.1人2.1人以上")
- private Integer operationPersonFlag;
-
- @ApiModelProperty("执行力1.强2.弱")
- private Integer executiveForceFlag;
-
- @ApiModelProperty("格局1.大2.小")
- private Integer patternFlag;
-
- @ApiModelProperty("人脉1.宽2.窄")
- private Integer connectionFlag;
-
- @ApiModelProperty("经济能力1.强2.差")
- private Integer economicAbilityFlag;
-
- @ApiModelProperty("与合作商关系1.好2.差")
- private Integer relationPartner;
-
- @ApiModelProperty("曾从事事业")
- private String businessHistory;
-
- @ApiModelProperty("店铺地址省code")
- private String shopProvinceCode;
-
- @ApiModelProperty("店铺地址市code")
- private String shopCityCode;
-
- @ApiModelProperty("店铺地址区code")
- private String shopAreaCode;
-
- @ApiModelProperty("店铺区域全称")
- private String shopAreaName;
-
- @ApiModelProperty("店铺详细地址")
- private String shopAddress;
-
- @ApiModelProperty("店铺经度")
- private String shopLongitude;
-
- @ApiModelProperty("店铺维度")
- private String shopLatitude;
-
- @ApiModelProperty("店铺详情")
- private String shopDetail;
-
- @ApiModelProperty("营销功能1开2关")
- private Integer marketingFunctionFlag;
-
- @ApiModelProperty("领券1开2关")
- private Integer platformCouponFlag;
-
- @ApiModelProperty("生日卡1开2关")
- private Integer platformBirthdayFlag;
-
- @ApiModelProperty("推荐人")
- private String recommendPerson;
-
- @ApiModelProperty("商户标签id 多个用,隔开")
- private String shopTagIds;
-
- @ApiModelProperty("关联用户id 多个用,隔开")
- private String relUserIds;
-
- @ApiModelProperty("商户封面")
- private String shopPicture;
-
- @ApiModelProperty("商户banner 多个用,隔开")
- private String shopBanners;
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtEditShopTagDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtEditShopTagDto.java
deleted file mode 100644
index c22c5d1..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtEditShopTagDto.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.order.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MgtEditShopTagDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtEditShopTagDto extends MgtBaseGetDto {
-
- @ApiModelProperty("商户标签id 多个用,隔开")
- private String shopTagIds;
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtPageDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtPageDto.java
deleted file mode 100644
index 3941a6b..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtPageDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.order.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppPageDto
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class MgtPageDto extends MgtBaseDto{
-
- @ApiModelProperty(name = "pagenum", value = "页码")
- private Integer pageNum = 1;
-
-
- @ApiModelProperty(name = "pagesize", value = "每页显示条数")
- private Integer pageSize = 20;
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtShopPageDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtShopPageDto.java
deleted file mode 100644
index b28f84d..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtShopPageDto.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.order.domain.dto;
-
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MgtShopPageDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtShopPageDto extends MgtPageDto {
-
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppAdvertVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppAdvertVo.java
deleted file mode 100644
index 43fd5e1..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppAdvertVo.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppQuickEntryVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppAdvertVo {
-
- @ApiModelProperty(value = "广告入口")
- private Long adId;
-
- @ApiModelProperty(value = "广告图片地址")
- private String adUrl;
-
- @ApiModelProperty(value = "广告语")
- private String adContent;
-
- @ApiModelProperty(value = "对象类型1.外链2.内链3.无")
- private Integer targetType;
-
- @ApiModelProperty(value = "链接地址")
- private String linkUrl;
-
- @ApiModelProperty(value = "跳转id")
- private String jumpId;
-
- @ApiModelProperty(value = "logo地址")
- private String logoUrl;
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppAgreementVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppAgreementVo.java
deleted file mode 100644
index 4a0604d..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppAgreementVo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppAgreementVo
- * @description: TODO
- * @date 2023年03月07日
- * @version: 1.0
- */
-@Data
-public class AppAgreementVo {
-
- @ApiModelProperty(value = "协议id")
- private Long agreementId;
-
- @ApiModelProperty(value = "协议内容")
- private String agreementContent;
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppBannerVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppBannerVo.java
deleted file mode 100644
index 1e41ce8..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppBannerVo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppBannerVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-
-@Data
-public class AppBannerVo {
-
- @ApiModelProperty(value = "bannerid")
- private Long bannerId;
-
- @ApiModelProperty(value = "banner图片地址")
- private String bannerUrl;
-
- @ApiModelProperty(value = "链接类型1.外部2.内部3.无")
- private Integer targetType;
-
- @ApiModelProperty(value = "链接类型1.手动输入2.选择已有")
- private Integer linkType;
-
- @ApiModelProperty(value = "链接地址")
- private String linkUrl;
-
- @ApiModelProperty(value = "跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂")
- private Integer jumpType;
-
- @ApiModelProperty(value = "跳转id")
- private String jumpId;
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppNearbyShopVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppNearbyShopVo.java
deleted file mode 100644
index 41c8055..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppNearbyShopVo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppNearbyShopDto
- * @description: TODO
- * @date 2023年04月19日
- * @version: 1.0
- */
-@Data
-public class AppNearbyShopVo {
-
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty(value = "商户名称")
- private String shopName;
-
- @ApiModelProperty(value = "商户地址")
- private String shopAddress;
-
- @ApiModelProperty(value = "经度")
- private String shopLongitude;
-
- @ApiModelProperty(value = "维度")
- private String shopLatitude;
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppQuickEntryVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppQuickEntryVo.java
deleted file mode 100644
index 5c2a268..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppQuickEntryVo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppQuickEntryVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppQuickEntryVo {
-
- @ApiModelProperty(value = "快速入口")
- private Long entryId;
-
- @ApiModelProperty(value = "入口图片地址")
- private String entryUrl;
-
- @ApiModelProperty(value = "入口名称")
- private String entryName;
-
- @ApiModelProperty(value = "对象类型1.外链2.内链3.无")
- private Integer targetType;
-
- @ApiModelProperty(value = "链接地址")
- private String linkUrl;
-
- @ApiModelProperty(value = "跳转id")
- private String jumpId;
-
-
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppShopInfoVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppShopInfoVo.java
deleted file mode 100644
index 54f0aac..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppShopInfoVo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import com.ruoyi.system.domain.pojo.shop.ShopCertificate;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName AppShopInfoVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppShopInfoVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty(value = "商户名称")
- private String shopName;
-
- @ApiModelProperty(value = "商户地址")
- private String shopAddress;
-
- @ApiModelProperty(value = "经度")
- private String shopLongitude;
-
- @ApiModelProperty(value = "维度")
- private String shopLatitude;
-
- @ApiModelProperty("营业开始时间")
- private String businessStartTime;
-
- @ApiModelProperty("营业结束时间")
- private String businessEndTime;
-
- @ApiModelProperty("商户标签")
- private String shopTags;
-
- @ApiModelProperty("商户服务电话")
- private String shopServicePhone;
-
- @ApiModelProperty("商户封面")
- private String shopPicture;
-
- @ApiModelProperty("商户banners")
- private String shopBanners;
-
- @ApiModelProperty("店铺详情")
- private String shopDetail;
-
- @ApiModelProperty("店铺证书")
- private List<ShopCertificate> shopCertificateList;
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserAuthorizeVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserAuthorizeVo.java
deleted file mode 100644
index f3e4db4..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserAuthorizeVo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppUserAuthorizeDto
- * @description: TODO
- * @date 2023年02月13日
- * @version: 1.0
- */
-@Data
-public class AppUserAuthorizeVo {
-
- @ApiModelProperty(value = "微信openid")
- private String openid;
-
- @ApiModelProperty(value = "微信unionid")
- private String unionid;
-
- @ApiModelProperty(value = "微信昵称")
- private String nickName;
-
- @ApiModelProperty(value = "用户手机")
- private String mobile;
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerHomeShopTotalVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerHomeShopTotalVo.java
deleted file mode 100644
index 2be1d12..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerHomeShopTotalVo.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName MerHomeShopTotalVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MerHomeShopTotalVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty(value = "今日到店")
- private Integer todayShop;
-
- @ApiModelProperty(value = "待处理订单")
- private Integer unHandleOrder;
-
- @ApiModelProperty(value = "跟进任务")
- private Integer task;
-
- @ApiModelProperty(value = "店铺营业额")
- private BigDecimal shopTurnover;
-
- @ApiModelProperty(value = "剩余周期人数")
- private Integer cycleSurp;
-
- @ApiModelProperty(value = "剩余体验人数")
- private Integer explorationSurp;
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerShopInfoVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerShopInfoVo.java
deleted file mode 100644
index f8856d0..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerShopInfoVo.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import com.ruoyi.system.domain.pojo.shop.ShopCertificate;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName MerShopInfoVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MerShopInfoVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty("商户类型1.经销商2.代理商")
- private Integer shopType;
-
- @ApiModelProperty("营业开始时间")
- private String businessStartTime;
-
- @ApiModelProperty("营业结束时间")
- private String businessEndTime;
-
- @ApiModelProperty("店主姓名")
- private String shopownerName;
-
- @ApiModelProperty("店主联系方式")
- private String shopownerPhone;
-
- @ApiModelProperty("签约区域")
- private String signAreaCode;
-
- @ApiModelProperty("商户服务电话")
- private String shopServicePhone;
-
- @ApiModelProperty("管辖员工")
- private Long belongUserId;
-
- @ApiModelProperty("所属经销商")
- private Long belongShopId;
-
- @ApiModelProperty("扶持能力1.有2.没有")
- private Integer supportingCapacityFlag;
-
- @ApiModelProperty("店面操作人数1.1人2.1人以上")
- private Integer operationPersonFlag;
-
- @ApiModelProperty("执行力1.强2.弱")
- private Integer executiveForceFlag;
-
- @ApiModelProperty("格局1.大2.小")
- private Integer patternFlag;
-
- @ApiModelProperty("人脉1.宽2.窄")
- private Integer connectionFlag;
-
- @ApiModelProperty("经济能力1.强2.差")
- private Integer economicAbilityFlag;
-
- @ApiModelProperty("与合作商关系1.好2.差")
- private Integer relationPartner;
-
- @ApiModelProperty("曾从事事业")
- private String businessHistory;
-
- @ApiModelProperty("店铺地址省code")
- private String shopProvinceCode;
-
- @ApiModelProperty("店铺地址市code")
- private String shopCityCode;
-
- @ApiModelProperty("店铺地址区code")
- private String shopAreaCode;
-
- @ApiModelProperty("店铺区域全称")
- private String shopAreaName;
-
- @ApiModelProperty("店铺详细地址")
- private String shopAddress;
-
- @ApiModelProperty("店铺经度")
- private String shopLongitude;
-
- @ApiModelProperty("店铺维度")
- private String shopLatitude;
-
- @ApiModelProperty("店铺详情")
- private String shopDetail;
-
- @ApiModelProperty("营销功能1开2关")
- private Integer marketingFunctionFlag;
-
- @ApiModelProperty("领券1开2关")
- private Integer platformCouponFlag;
-
- @ApiModelProperty("生日卡1开2关")
- private Integer platformBirthdayFlag;
-
- @ApiModelProperty("推荐人")
- private String recommendPerson;
-
- @ApiModelProperty("商户标签id 多个用,隔开")
- private String shopTagIds;
-
- @ApiModelProperty("商户标签")
- private String shopTags;
-
- @ApiModelProperty("关联用户id 多个用,隔开")
- private String relUserIds;
-
- @ApiModelProperty("关联用户")
- private String relUsers;
-
- @ApiModelProperty("商户封面")
- private String shopPicture;
-
- @ApiModelProperty("商户banner 多个用,隔开")
- private String shopBanners;
-
- @ApiModelProperty("证书list")
- private List<ShopCertificate> shopCertificateList;
-
-
-
-
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopInfoVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopInfoVo.java
deleted file mode 100644
index e7358c9..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopInfoVo.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import com.ruoyi.system.domain.pojo.shop.ShopCertificate;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName MgtShopInfoVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtShopInfoVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty("商户类型1.经销商2.代理商")
- private Integer shopType;
-
- @ApiModelProperty("营业开始时间")
- private String businessStartTime;
-
- @ApiModelProperty("营业结束时间")
- private String businessEndTime;
-
- @ApiModelProperty("店主姓名")
- private String shopownerName;
-
- @ApiModelProperty("店主联系方式")
- private String shopownerPhone;
-
- @ApiModelProperty("签约区域")
- private String signAreaCode;
-
- @ApiModelProperty("商户服务电话")
- private String shopServicePhone;
-
- @ApiModelProperty("管辖员工")
- private Long belongUserId;
-
- @ApiModelProperty("所属经销商")
- private Long belongShopId;
-
- @ApiModelProperty("扶持能力1.有2.没有")
- private Integer supportingCapacityFlag;
-
- @ApiModelProperty("店面操作人数1.1人2.1人以上")
- private Integer operationPersonFlag;
-
- @ApiModelProperty("执行力1.强2.弱")
- private Integer executiveForceFlag;
-
- @ApiModelProperty("格局1.大2.小")
- private Integer patternFlag;
-
- @ApiModelProperty("人脉1.宽2.窄")
- private Integer connectionFlag;
-
- @ApiModelProperty("经济能力1.强2.差")
- private Integer economicAbilityFlag;
-
- @ApiModelProperty("与合作商关系1.好2.差")
- private Integer relationPartner;
-
- @ApiModelProperty("曾从事事业")
- private String businessHistory;
-
- @ApiModelProperty("店铺地址省code")
- private String shopProvinceCode;
-
- @ApiModelProperty("店铺地址市code")
- private String shopCityCode;
-
- @ApiModelProperty("店铺地址区code")
- private String shopAreaCode;
-
- @ApiModelProperty("店铺区域全称")
- private String shopAreaName;
-
- @ApiModelProperty("店铺详细地址")
- private String shopAddress;
-
- @ApiModelProperty("店铺经度")
- private String shopLongitude;
-
- @ApiModelProperty("店铺维度")
- private String shopLatitude;
-
- @ApiModelProperty("店铺详情")
- private String shopDetail;
-
- @ApiModelProperty("营销功能1开2关")
- private Integer marketingFunctionFlag;
-
- @ApiModelProperty("领券1开2关")
- private Integer platformCouponFlag;
-
- @ApiModelProperty("生日卡1开2关")
- private Integer platformBirthdayFlag;
-
- @ApiModelProperty("推荐人")
- private String recommendPerson;
-
- @ApiModelProperty("商户标签id 多个用,隔开")
- private String shopTagIds;
-
- @ApiModelProperty("商户标签")
- private String shopTags;
-
- @ApiModelProperty("关联用户id 多个用,隔开")
- private String relUserIds;
-
- @ApiModelProperty("关联用户")
- private String relUsers;
-
- @ApiModelProperty("商户封面")
- private String shopPicture;
-
- @ApiModelProperty("商户banner 多个用,隔开")
- private String shopBanners;
-
- @ApiModelProperty("证书list")
- private List<ShopCertificate> shopCertificateList;
-
-
-
-
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopPageVo.java
deleted file mode 100644
index f13845c..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopPageVo.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName MgtShopPageVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtShopPageVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty("签约时间")
- private String signTime;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty("商户编号")
- private String shopNumber;
-
- @ApiModelProperty("商户标签")
- private String shopTags;
-
- @ApiModelProperty("签约人")
- private String signUser;
-
- @ApiModelProperty("首提金额")
- private BigDecimal firstWithdraw;
-
- @ApiModelProperty("关联员工")
- private BigDecimal belongUser;
-
- @ApiModelProperty("关联部门")
- private BigDecimal belongDept;
-
- @ApiModelProperty("来源渠道")
- private String shopSource;
-
- @ApiModelProperty("签约区域")
- private String signAreaName;
-
- @ApiModelProperty("合作期限")
- private String cooperationTime;
-
- @ApiModelProperty("店铺地址")
- private String shopAddress;
-
- @ApiModelProperty("店主姓名")
- private String shopownerName;
-
- @ApiModelProperty("店主联系方式")
- private String shopownerPhone;
-
- @ApiModelProperty("商户状态-1删除0冻结1正常2终止合作")
- private Integer shopStatus;
-
- @ApiModelProperty("商户活动次数")
- private Integer shopActivityCount;
-
- @ApiModelProperty("店铺设置状态")
- private String shopCustomStatus;
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopTagVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopTagVo.java
deleted file mode 100644
index 2698e13..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopTagVo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.order.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MgtShopTagVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtShopTagVo {
-
- @ApiModelProperty(value = "标签id")
- private Long tagId;
-
- @ApiModelProperty(value = "标签名称")
- private String tagName;
-
- @ApiModelProperty(value = "是否选择0否1是")
- private Integer selectFlag;
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java
index e58fda8..64002a4 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java
@@ -1,9 +1,10 @@
package com.ruoyi.order.service.impl.goods;
-import com.ruoyi.system.domain.pojo.goods.GoodsFile;
-import com.ruoyi.system.mapper.goods.GoodsFileMapper;
-import com.ruoyi.system.service.goods.GoodsFileService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.ruoyi.order.domain.pojo.goods.GoodsFile;
+import com.ruoyi.order.mapper.goods.GoodsFileMapper;
+import com.ruoyi.order.service.goods.GoodsFileService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java
index 8809ee1..77cab35 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java
@@ -1,9 +1,10 @@
package com.ruoyi.order.service.impl.goods;
-import com.ruoyi.system.domain.pojo.goods.GoodsRelNurse;
-import com.ruoyi.system.mapper.goods.GoodsRelNurseMapper;
-import com.ruoyi.system.service.goods.GoodsRelNurseService;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.domain.pojo.goods.GoodsRelNurse;
+import com.ruoyi.order.mapper.goods.GoodsRelNurseMapper;
+import com.ruoyi.order.service.goods.GoodsRelNurseService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java
index 4199440..e03582a 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java
@@ -1,9 +1,10 @@
package com.ruoyi.order.service.impl.goods;
-import com.ruoyi.system.domain.pojo.goods.GoodsRelTag;
-import com.ruoyi.system.mapper.goods.GoodsRelTagMapper;
-import com.ruoyi.system.service.goods.GoodsRelTagService;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.domain.pojo.goods.GoodsRelTag;
+import com.ruoyi.order.mapper.goods.GoodsRelTagMapper;
+import com.ruoyi.order.service.goods.GoodsRelTagService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java
index 71e184e..7086e56 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java
@@ -1,9 +1,10 @@
package com.ruoyi.order.service.impl.goods;
-import com.ruoyi.system.domain.pojo.goods.GoodsTotal;
-import com.ruoyi.system.mapper.goods.GoodsTotalMapper;
-import com.ruoyi.system.service.goods.GoodsTotalService;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.domain.pojo.goods.GoodsTotal;
+import com.ruoyi.order.mapper.goods.GoodsTotalMapper;
+import com.ruoyi.order.service.goods.GoodsTotalService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
index 11d6138..8f706f2 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
@@ -1,9 +1,10 @@
package com.ruoyi.order.service.impl.order;
-import com.ruoyi.system.domain.pojo.order.ConsumerGoods;
-import com.ruoyi.system.mapper.order.ConsumerGoodsMapper;
-import com.ruoyi.system.service.order.ConsumerGoodsService;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
+import com.ruoyi.order.mapper.order.ConsumerGoodsMapper;
+import com.ruoyi.order.service.order.ConsumerGoodsService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java
index 5f84b8a..f5869cc 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderGoodsServiceImpl.java
@@ -1,9 +1,10 @@
package com.ruoyi.order.service.impl.order;
-import com.ruoyi.system.domain.pojo.order.OrderGoods;
-import com.ruoyi.system.mapper.order.OrderGoodsMapper;
-import com.ruoyi.system.service.order.OrderGoodsService;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.domain.pojo.order.OrderGoods;
+import com.ruoyi.order.mapper.order.OrderGoodsMapper;
+import com.ruoyi.order.service.order.OrderGoodsService;
import org.springframework.stereotype.Service;
/**
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 db89aa6..736d713 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
@@ -1,9 +1,10 @@
package com.ruoyi.order.service.impl.order;
-import com.ruoyi.system.domain.pojo.order.Order;
-import com.ruoyi.system.mapper.order.OrderMapper;
-import com.ruoyi.system.service.order.OrderService;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.domain.pojo.order.Order;
+import com.ruoyi.order.mapper.order.OrderMapper;
+import com.ruoyi.order.service.order.OrderService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java
index 1c77604..7ed122d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/UserServiceRecordServiceImpl.java
@@ -1,9 +1,10 @@
package com.ruoyi.order.service.impl.order;
-import com.ruoyi.system.domain.pojo.order.UserServiceRecord;
-import com.ruoyi.system.mapper.order.UserServiceRecordMapper;
-import com.ruoyi.system.service.order.UserServiceRecordService;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.domain.pojo.order.UserServiceRecord;
+import com.ruoyi.order.mapper.order.UserServiceRecordMapper;
+import com.ruoyi.order.service.order.UserServiceRecordService;
import org.springframework.stereotype.Service;
/**
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
index 4251e5f..ad3e339 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -4,7 +4,6 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.*;
-import com.ruoyi.system.domain.dto.*;
import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
import com.ruoyi.shop.domain.vo.MgtShopPageVo;
import com.ruoyi.shop.domain.vo.MgtShopTagVo;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppAgreementDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppAgreementDto.java
deleted file mode 100644
index 68b5e1f..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppAgreementDto.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.shop.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppAgreementDto
- * @description: TODO
- * @date 2023年03月07日
- * @version: 1.0
- */
-@Data
-public class AppAgreementDto extends AppBaseDto{
-
-
- @ApiModelProperty(value = "协议类型1用户协议 2隐私协议")
- private Integer type;
-
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppGoodsInfoGetDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppGoodsInfoGetDto.java
deleted file mode 100644
index 43b2fc7..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppGoodsInfoGetDto.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.shop.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppGoodsInfoGetDto
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppGoodsInfoGetDto extends AppBaseGetDto {
-
- @ApiModelProperty(value = "是否活动跳转0否1是")
- private Integer activityFlag;
-
- @ApiModelProperty(value = "商户id",hidden = true)
- private Long shopId;
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppSearchGoodsPageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppSearchGoodsPageDto.java
deleted file mode 100644
index 24db72b..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppSearchGoodsPageDto.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ruoyi.shop.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppShopGoodsPageDto
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppSearchGoodsPageDto extends AppPageDto {
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "搜索关键词")
- private String keyword;
-
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppShopGoodsPageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppShopGoodsPageDto.java
deleted file mode 100644
index 25c6c11..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppShopGoodsPageDto.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.ruoyi.shop.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppShopGoodsPageDto
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppShopGoodsPageDto extends AppPageDto{
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "搜索关键词")
- private String keyword;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "商品分类id")
- private Long goodsClassId;
-
- @ApiModelProperty(value = "排序方式1.全部2.价格正序3.价格倒序4.销量正序5.销量倒序")
- private Integer sort;
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppShoppingCartAddDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppShoppingCartAddDto.java
deleted file mode 100644
index c3007f4..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppShoppingCartAddDto.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.shop.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppShoppingCartAddDto
- * @description: TODO
- * @date 2023年04月26日
- * @version: 1.0
- */
-@Data
-public class AppShoppingCartAddDto extends AppBaseDto{
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "购买数量")
- private Integer buyNum;
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppShoppingCartChangeDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppShoppingCartChangeDto.java
deleted file mode 100644
index 8ee6260..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppShoppingCartChangeDto.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.shop.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppShoppingCartAddDto
- * @description: TODO
- * @date 2023年04月26日
- * @version: 1.0
- */
-@Data
-public class AppShoppingCartChangeDto extends AppBaseDto{
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "变化后数量")
- private Integer buyNum;
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppUserAuthorizeDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppUserAuthorizeDto.java
deleted file mode 100644
index de87370..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/AppUserAuthorizeDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.shop.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppUserAuthorizeDto
- * @description: TODO
- * @date 2023年02月13日
- * @version: 1.0
- */
-@Data
-public class AppUserAuthorizeDto extends AppBaseDto{
-
- @ApiModelProperty(value = "手机iv")
- private String phoneIv;
-
- @ApiModelProperty(value = "手机encryptedData")
- private String phoneEncryptedData;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppAdvertVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppAdvertVo.java
deleted file mode 100644
index 4711b9e..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppAdvertVo.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.ruoyi.shop.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppQuickEntryVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppAdvertVo {
-
- @ApiModelProperty(value = "广告入口")
- private Long adId;
-
- @ApiModelProperty(value = "广告图片地址")
- private String adUrl;
-
- @ApiModelProperty(value = "广告语")
- private String adContent;
-
- @ApiModelProperty(value = "对象类型1.外链2.内链3.无")
- private Integer targetType;
-
- @ApiModelProperty(value = "链接地址")
- private String linkUrl;
-
- @ApiModelProperty(value = "跳转id")
- private String jumpId;
-
- @ApiModelProperty(value = "logo地址")
- private String logoUrl;
-
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppAgreementVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppAgreementVo.java
deleted file mode 100644
index 5b92e98..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppAgreementVo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.shop.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppAgreementVo
- * @description: TODO
- * @date 2023年03月07日
- * @version: 1.0
- */
-@Data
-public class AppAgreementVo {
-
- @ApiModelProperty(value = "协议id")
- private Long agreementId;
-
- @ApiModelProperty(value = "协议内容")
- private String agreementContent;
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppBannerVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppBannerVo.java
deleted file mode 100644
index 1bb3f40..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppBannerVo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.ruoyi.shop.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppBannerVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-
-@Data
-public class AppBannerVo {
-
- @ApiModelProperty(value = "bannerid")
- private Long bannerId;
-
- @ApiModelProperty(value = "banner图片地址")
- private String bannerUrl;
-
- @ApiModelProperty(value = "链接类型1.外部2.内部3.无")
- private Integer targetType;
-
- @ApiModelProperty(value = "链接类型1.手动输入2.选择已有")
- private Integer linkType;
-
- @ApiModelProperty(value = "链接地址")
- private String linkUrl;
-
- @ApiModelProperty(value = "跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂")
- private Integer jumpType;
-
- @ApiModelProperty(value = "跳转id")
- private String jumpId;
-
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppGoodsInfoVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppGoodsInfoVo.java
deleted file mode 100644
index c97c92c..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppGoodsInfoVo.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.ruoyi.shop.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author jqs34
- * @ClassName AppGoodsInfoVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppGoodsInfoVo {
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "商品名称")
- private String goodsName;
-
- @ApiModelProperty(value = "商品简介")
- private String goodsIntroduction;
-
- @ApiModelProperty(value = "商品视频")
- private String goodsVideo;
-
- @ApiModelProperty(value = "商品banner")
- private String goodsBanners;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "商品标签")
- private String goodsTag;
-
- @ApiModelProperty(value = "商品调理问题")
- private BigDecimal goodsNurses;
-
- @ApiModelProperty("服务次数")
- private Integer serviceNum;
-
- @ApiModelProperty(value = "商品售价")
- private BigDecimal salesPrice;
-
- @ApiModelProperty(value = "商品详情")
- private String goodsDetail;
-
- @ApiModelProperty(value = "销售数量")
- private Integer salesNum;
-
- @ApiModelProperty(value = "是否活动跳转0否1是")
- private Integer activityFlag;
-
- @ApiModelProperty(value = "商品活动价")
- private BigDecimal activityPrice;
-
- @ApiModelProperty(value = "售罄标记0否1是")
- private Integer sellOutFlag;
-
- @ApiModelProperty(value = "活动截止时间")
- private Date activityDeadline;
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppSimpleActivityGoodsVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppSimpleActivityGoodsVo.java
deleted file mode 100644
index dc2bd23..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppSimpleActivityGoodsVo.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.ruoyi.shop.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName AppSimpleGoodsVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppSimpleActivityGoodsVo {
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "商品名称")
- private String goodsName;
-
- @ApiModelProperty(value = "商品简介")
- private String goodsIntroduction;
-
- @ApiModelProperty(value = "商品图片")
- private String goodsPicture;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "商品标签")
- private String goodsTag;
-
- @ApiModelProperty(value = "商品调理问题")
- private BigDecimal goodsNurses;
-
- @ApiModelProperty(value = "商品售价")
- private BigDecimal salesPrice;
-
- @ApiModelProperty(value = "商品活动价")
- private BigDecimal activityPrice;
-
- @ApiModelProperty(value = "活动销售数量")
- private Integer activityNumber;
-
- @ApiModelProperty(value = "已售数量")
- private Integer salesNumber;
-
- @ApiModelProperty(value = "已售比例")
- private BigDecimal salesPercent;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppSimpleGoodsVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppSimpleGoodsVo.java
deleted file mode 100644
index edc7a66..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppSimpleGoodsVo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.ruoyi.shop.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName AppSimpleGoodsVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppSimpleGoodsVo {
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "商品名称")
- private String goodsName;
-
- @ApiModelProperty(value = "商品简介")
- private String goodsIntroduction;
-
- @ApiModelProperty(value = "商品图片")
- private String goodsPicture;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "商品标签")
- private String goodsTag;
-
- @ApiModelProperty(value = "商品调理问题")
- private BigDecimal goodsNurses;
-
- @ApiModelProperty(value = "商品售价")
- private BigDecimal salesPrice;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppUserAuthorizeVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppUserAuthorizeVo.java
deleted file mode 100644
index 44e9e1b..0000000
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/AppUserAuthorizeVo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.shop.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppUserAuthorizeDto
- * @description: TODO
- * @date 2023年02月13日
- * @version: 1.0
- */
-@Data
-public class AppUserAuthorizeVo {
-
- @ApiModelProperty(value = "微信openid")
- private String openid;
-
- @ApiModelProperty(value = "微信unionid")
- private String unionid;
-
- @ApiModelProperty(value = "微信昵称")
- private String nickName;
-
- @ApiModelProperty(value = "用户手机")
- private String mobile;
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ActivityController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ActivityController.java
deleted file mode 100644
index aaff49a..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ActivityController.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.ruoyi.system.controller.conslole;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
-import com.ruoyi.system.service.activity.ActivityGoodsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author jqs34
- * @version 1.0
- * @classname ActivityController
- * @description: TODO
- * @date 2023 2023/4/30 15:17
- */
-@RestController
-@RequestMapping("/activity")
-public class ActivityController {
-
-
- @Autowired
- private ActivityGoodsService activityGoodsService;
-
- @InnerAuth
- @PostMapping("/getActivityGoods")
- public R<ActivityGoods> getActivityGoods(@RequestBody String goodsId)
- {
- ActivityGoods activityGoods = activityGoodsService.getByGoodsId(goodsId);
- return R.ok(activityGoods);
- }
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppGoodsInfoGetDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppGoodsInfoGetDto.java
deleted file mode 100644
index abf9074..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppGoodsInfoGetDto.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppGoodsInfoGetDto
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppGoodsInfoGetDto extends AppBaseGetDto {
-
- @ApiModelProperty(value = "是否活动跳转0否1是")
- private Integer activityFlag;
-
- @ApiModelProperty(value = "商户id",hidden = true)
- private Long shopId;
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppNearbyShopDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppNearbyShopDto.java
deleted file mode 100644
index 7e219b9..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppNearbyShopDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppNearbyShopDto
- * @description: TODO
- * @date 2023年04月19日
- * @version: 1.0
- */
-@Data
-public class AppNearbyShopDto extends AppBaseDto{
-
-
- @ApiModelProperty(value = "经度")
- private String longitude;
-
- @ApiModelProperty(value = "维度")
- private String latitude;
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppSearchGoodsPageDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppSearchGoodsPageDto.java
deleted file mode 100644
index a8a720c..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppSearchGoodsPageDto.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppShopGoodsPageDto
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppSearchGoodsPageDto extends com.ruoyi.system.domain.dto.AppPageDto {
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "搜索关键词")
- private String keyword;
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppShopGoodsPageDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppShopGoodsPageDto.java
deleted file mode 100644
index a1c1473..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppShopGoodsPageDto.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppShopGoodsPageDto
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppShopGoodsPageDto extends AppPageDto{
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "搜索关键词")
- private String keyword;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "商品分类id")
- private Long goodsClassId;
-
- @ApiModelProperty(value = "排序方式1.全部2.价格正序3.价格倒序4.销量正序5.销量倒序")
- private Integer sort;
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppShoppingCartAddDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppShoppingCartAddDto.java
deleted file mode 100644
index 05c8f77..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppShoppingCartAddDto.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppShoppingCartAddDto
- * @description: TODO
- * @date 2023年04月26日
- * @version: 1.0
- */
-@Data
-public class AppShoppingCartAddDto extends AppBaseDto{
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "购买数量")
- private Integer buyNum;
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppShoppingCartChangeDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppShoppingCartChangeDto.java
deleted file mode 100644
index 1657fe9..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppShoppingCartChangeDto.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppShoppingCartAddDto
- * @description: TODO
- * @date 2023年04月26日
- * @version: 1.0
- */
-@Data
-public class AppShoppingCartChangeDto extends AppBaseDto{
-
- @ApiModelProperty(value = "shopId",hidden = true)
- private Long shopId;
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "变化后数量")
- private Integer buyNum;
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppUserAuthorizeDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppUserAuthorizeDto.java
deleted file mode 100644
index e162dc9..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AppUserAuthorizeDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppUserAuthorizeDto
- * @description: TODO
- * @date 2023年02月13日
- * @version: 1.0
- */
-@Data
-public class AppUserAuthorizeDto extends AppBaseDto{
-
- @ApiModelProperty(value = "手机iv")
- private String phoneIv;
-
- @ApiModelProperty(value = "手机encryptedData")
- private String phoneEncryptedData;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtBaseDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtBaseDto.java
deleted file mode 100644
index 7e5755f..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtBaseDto.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MGTBaseDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtBaseDto {
-
- @ApiModelProperty(value = "userId",hidden = true)
- private Long userId;
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtBaseGetDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtBaseGetDto.java
deleted file mode 100644
index 6383f99..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtBaseGetDto.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MgtBaseGetDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtBaseGetDto extends MgtBaseDto{
-
- @ApiModelProperty(value = "请求对象id")
- private String id;
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtChangeCoopDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtChangeCoopDto.java
deleted file mode 100644
index bf38db8..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtChangeCoopDto.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MGTChangeCooperDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtChangeCoopDto extends com.ruoyi.system.domain.dto.MgtBaseDto {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty("合作开始时间")
- private String coopStartTime;
-
- @ApiModelProperty("合作结束时间")
- private String coopEndTime;
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtEditShopDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtEditShopDto.java
deleted file mode 100644
index 2b799e1..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtEditShopDto.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName ManageCreateShopDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtEditShopDto extends MgtBaseDto{
-
-
- @ApiModelProperty(value = "商户id，新增不传")
- private Long shopId;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty("商户类型1.经销商2.代理商")
- private Integer shopType;
-
- @ApiModelProperty("营业开始时间")
- private String businessStartTime;
-
- @ApiModelProperty("营业结束时间")
- private String businessEndTime;
-
- @ApiModelProperty("店主姓名")
- private String shopownerName;
-
- @ApiModelProperty("店主联系方式")
- private String shopownerPhone;
-
- @ApiModelProperty("签约区域")
- private String signAreaCode;
-
- @ApiModelProperty("商户服务电话")
- private String shopServicePhone;
-
- @ApiModelProperty("管辖员工")
- private Long belongUserId;
-
- @ApiModelProperty("所属经销商")
- private Long belongShopId;
-
- @ApiModelProperty("扶持能力1.有2.没有")
- private Integer supportingCapacityFlag;
-
- @ApiModelProperty("店面操作人数1.1人2.1人以上")
- private Integer operationPersonFlag;
-
- @ApiModelProperty("执行力1.强2.弱")
- private Integer executiveForceFlag;
-
- @ApiModelProperty("格局1.大2.小")
- private Integer patternFlag;
-
- @ApiModelProperty("人脉1.宽2.窄")
- private Integer connectionFlag;
-
- @ApiModelProperty("经济能力1.强2.差")
- private Integer economicAbilityFlag;
-
- @ApiModelProperty("与合作商关系1.好2.差")
- private Integer relationPartner;
-
- @ApiModelProperty("曾从事事业")
- private String businessHistory;
-
- @ApiModelProperty("店铺地址省code")
- private String shopProvinceCode;
-
- @ApiModelProperty("店铺地址市code")
- private String shopCityCode;
-
- @ApiModelProperty("店铺地址区code")
- private String shopAreaCode;
-
- @ApiModelProperty("店铺区域全称")
- private String shopAreaName;
-
- @ApiModelProperty("店铺详细地址")
- private String shopAddress;
-
- @ApiModelProperty("店铺经度")
- private String shopLongitude;
-
- @ApiModelProperty("店铺维度")
- private String shopLatitude;
-
- @ApiModelProperty("店铺详情")
- private String shopDetail;
-
- @ApiModelProperty("营销功能1开2关")
- private Integer marketingFunctionFlag;
-
- @ApiModelProperty("领券1开2关")
- private Integer platformCouponFlag;
-
- @ApiModelProperty("生日卡1开2关")
- private Integer platformBirthdayFlag;
-
- @ApiModelProperty("推荐人")
- private String recommendPerson;
-
- @ApiModelProperty("商户标签id 多个用,隔开")
- private String shopTagIds;
-
- @ApiModelProperty("关联用户id 多个用,隔开")
- private String relUserIds;
-
- @ApiModelProperty("商户封面")
- private String shopPicture;
-
- @ApiModelProperty("商户banner 多个用,隔开")
- private String shopBanners;
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtEditShopTagDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtEditShopTagDto.java
deleted file mode 100644
index ce79bca..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtEditShopTagDto.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MgtEditShopTagDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtEditShopTagDto extends com.ruoyi.system.domain.dto.MgtBaseGetDto {
-
- @ApiModelProperty("商户标签id 多个用,隔开")
- private String shopTagIds;
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtPageDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtPageDto.java
deleted file mode 100644
index 529c3c8..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtPageDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppPageDto
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class MgtPageDto extends MgtBaseDto{
-
- @ApiModelProperty(name = "pagenum", value = "页码")
- private Integer pageNum = 1;
-
-
- @ApiModelProperty(name = "pagesize", value = "每页显示条数")
- private Integer pageSize = 20;
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtShopPageDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtShopPageDto.java
deleted file mode 100644
index a7b914c..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtShopPageDto.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.system.domain.dto;
-
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MgtShopPageDto
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtShopPageDto extends com.ruoyi.system.domain.dto.MgtPageDto {
-
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppGoodsInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppGoodsInfoVo.java
deleted file mode 100644
index 14122e5..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppGoodsInfoVo.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.ruoyi.system.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author jqs34
- * @ClassName AppGoodsInfoVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppGoodsInfoVo {
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "商品名称")
- private String goodsName;
-
- @ApiModelProperty(value = "商品简介")
- private String goodsIntroduction;
-
- @ApiModelProperty(value = "商品视频")
- private String goodsVideo;
-
- @ApiModelProperty(value = "商品banner")
- private String goodsBanners;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "商品标签")
- private String goodsTag;
-
- @ApiModelProperty(value = "商品调理问题")
- private BigDecimal goodsNurses;
-
- @ApiModelProperty("服务次数")
- private Integer serviceNum;
-
- @ApiModelProperty(value = "商品售价")
- private BigDecimal salesPrice;
-
- @ApiModelProperty(value = "商品详情")
- private String goodsDetail;
-
- @ApiModelProperty(value = "销售数量")
- private Integer salesNum;
-
- @ApiModelProperty(value = "是否活动跳转0否1是")
- private Integer activityFlag;
-
- @ApiModelProperty(value = "商品活动价")
- private BigDecimal activityPrice;
-
- @ApiModelProperty(value = "售罄标记0否1是")
- private Integer sellOutFlag;
-
- @ApiModelProperty(value = "活动截止时间")
- private Date activityDeadline;
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppNearbyShopVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppNearbyShopVo.java
deleted file mode 100644
index a4e1bf8..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppNearbyShopVo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.ruoyi.system.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppNearbyShopDto
- * @description: TODO
- * @date 2023年04月19日
- * @version: 1.0
- */
-@Data
-public class AppNearbyShopVo {
-
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty(value = "商户名称")
- private String shopName;
-
- @ApiModelProperty(value = "商户地址")
- private String shopAddress;
-
- @ApiModelProperty(value = "经度")
- private String shopLongitude;
-
- @ApiModelProperty(value = "维度")
- private String shopLatitude;
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppShopInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppShopInfoVo.java
deleted file mode 100644
index e178f67..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppShopInfoVo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.ruoyi.system.domain.vo;
-
-import com.ruoyi.system.domain.pojo.shop.ShopCertificate;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName AppShopInfoVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppShopInfoVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty(value = "商户名称")
- private String shopName;
-
- @ApiModelProperty(value = "商户地址")
- private String shopAddress;
-
- @ApiModelProperty(value = "经度")
- private String shopLongitude;
-
- @ApiModelProperty(value = "维度")
- private String shopLatitude;
-
- @ApiModelProperty("营业开始时间")
- private String businessStartTime;
-
- @ApiModelProperty("营业结束时间")
- private String businessEndTime;
-
- @ApiModelProperty("商户标签")
- private String shopTags;
-
- @ApiModelProperty("商户服务电话")
- private String shopServicePhone;
-
- @ApiModelProperty("商户封面")
- private String shopPicture;
-
- @ApiModelProperty("商户banners")
- private String shopBanners;
-
- @ApiModelProperty("店铺详情")
- private String shopDetail;
-
- @ApiModelProperty("店铺证书")
- private List<ShopCertificate> shopCertificateList;
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppSimpleActivityGoodsVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppSimpleActivityGoodsVo.java
deleted file mode 100644
index 4ab36d3..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppSimpleActivityGoodsVo.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.ruoyi.system.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName AppSimpleGoodsVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppSimpleActivityGoodsVo {
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "商品名称")
- private String goodsName;
-
- @ApiModelProperty(value = "商品简介")
- private String goodsIntroduction;
-
- @ApiModelProperty(value = "商品图片")
- private String goodsPicture;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "商品标签")
- private String goodsTag;
-
- @ApiModelProperty(value = "商品调理问题")
- private BigDecimal goodsNurses;
-
- @ApiModelProperty(value = "商品售价")
- private BigDecimal salesPrice;
-
- @ApiModelProperty(value = "商品活动价")
- private BigDecimal activityPrice;
-
- @ApiModelProperty(value = "活动销售数量")
- private Integer activityNumber;
-
- @ApiModelProperty(value = "已售数量")
- private Integer salesNumber;
-
- @ApiModelProperty(value = "已售比例")
- private BigDecimal salesPercent;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppSimpleGoodsVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppSimpleGoodsVo.java
deleted file mode 100644
index bb87099..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppSimpleGoodsVo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.ruoyi.system.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName AppSimpleGoodsVo
- * @description: TODO
- * @date 2023年04月20日
- * @version: 1.0
- */
-@Data
-public class AppSimpleGoodsVo {
-
- @ApiModelProperty(value = "商品id")
- private Long goodsId;
-
- @ApiModelProperty(value = "商品名称")
- private String goodsName;
-
- @ApiModelProperty(value = "商品简介")
- private String goodsIntroduction;
-
- @ApiModelProperty(value = "商品图片")
- private String goodsPicture;
-
- @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
- private Integer goodsType;
-
- @ApiModelProperty(value = "商品标签")
- private String goodsTag;
-
- @ApiModelProperty(value = "商品调理问题")
- private BigDecimal goodsNurses;
-
- @ApiModelProperty(value = "商品售价")
- private BigDecimal salesPrice;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppUserAuthorizeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppUserAuthorizeVo.java
deleted file mode 100644
index eb9cf35..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppUserAuthorizeVo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.system.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName AppUserAuthorizeDto
- * @description: TODO
- * @date 2023年02月13日
- * @version: 1.0
- */
-@Data
-public class AppUserAuthorizeVo {
-
- @ApiModelProperty(value = "微信openid")
- private String openid;
-
- @ApiModelProperty(value = "微信unionid")
- private String unionid;
-
- @ApiModelProperty(value = "微信昵称")
- private String nickName;
-
- @ApiModelProperty(value = "用户手机")
- private String mobile;
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MerShopInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MerShopInfoVo.java
deleted file mode 100644
index 3790666..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MerShopInfoVo.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.ruoyi.system.domain.vo;
-
-import com.ruoyi.system.domain.pojo.shop.ShopCertificate;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName MerShopInfoVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MerShopInfoVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty("商户类型1.经销商2.代理商")
- private Integer shopType;
-
- @ApiModelProperty("营业开始时间")
- private String businessStartTime;
-
- @ApiModelProperty("营业结束时间")
- private String businessEndTime;
-
- @ApiModelProperty("店主姓名")
- private String shopownerName;
-
- @ApiModelProperty("店主联系方式")
- private String shopownerPhone;
-
- @ApiModelProperty("签约区域")
- private String signAreaCode;
-
- @ApiModelProperty("商户服务电话")
- private String shopServicePhone;
-
- @ApiModelProperty("管辖员工")
- private Long belongUserId;
-
- @ApiModelProperty("所属经销商")
- private Long belongShopId;
-
- @ApiModelProperty("扶持能力1.有2.没有")
- private Integer supportingCapacityFlag;
-
- @ApiModelProperty("店面操作人数1.1人2.1人以上")
- private Integer operationPersonFlag;
-
- @ApiModelProperty("执行力1.强2.弱")
- private Integer executiveForceFlag;
-
- @ApiModelProperty("格局1.大2.小")
- private Integer patternFlag;
-
- @ApiModelProperty("人脉1.宽2.窄")
- private Integer connectionFlag;
-
- @ApiModelProperty("经济能力1.强2.差")
- private Integer economicAbilityFlag;
-
- @ApiModelProperty("与合作商关系1.好2.差")
- private Integer relationPartner;
-
- @ApiModelProperty("曾从事事业")
- private String businessHistory;
-
- @ApiModelProperty("店铺地址省code")
- private String shopProvinceCode;
-
- @ApiModelProperty("店铺地址市code")
- private String shopCityCode;
-
- @ApiModelProperty("店铺地址区code")
- private String shopAreaCode;
-
- @ApiModelProperty("店铺区域全称")
- private String shopAreaName;
-
- @ApiModelProperty("店铺详细地址")
- private String shopAddress;
-
- @ApiModelProperty("店铺经度")
- private String shopLongitude;
-
- @ApiModelProperty("店铺维度")
- private String shopLatitude;
-
- @ApiModelProperty("店铺详情")
- private String shopDetail;
-
- @ApiModelProperty("营销功能1开2关")
- private Integer marketingFunctionFlag;
-
- @ApiModelProperty("领券1开2关")
- private Integer platformCouponFlag;
-
- @ApiModelProperty("生日卡1开2关")
- private Integer platformBirthdayFlag;
-
- @ApiModelProperty("推荐人")
- private String recommendPerson;
-
- @ApiModelProperty("商户标签id 多个用,隔开")
- private String shopTagIds;
-
- @ApiModelProperty("商户标签")
- private String shopTags;
-
- @ApiModelProperty("关联用户id 多个用,隔开")
- private String relUserIds;
-
- @ApiModelProperty("关联用户")
- private String relUsers;
-
- @ApiModelProperty("商户封面")
- private String shopPicture;
-
- @ApiModelProperty("商户banner 多个用,隔开")
- private String shopBanners;
-
- @ApiModelProperty("证书list")
- private List<ShopCertificate> shopCertificateList;
-
-
-
-
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtShopInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtShopInfoVo.java
deleted file mode 100644
index ad71164..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtShopInfoVo.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.ruoyi.system.domain.vo;
-
-import com.ruoyi.system.domain.pojo.shop.ShopCertificate;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author jqs34
- * @ClassName MgtShopInfoVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtShopInfoVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty("商户类型1.经销商2.代理商")
- private Integer shopType;
-
- @ApiModelProperty("营业开始时间")
- private String businessStartTime;
-
- @ApiModelProperty("营业结束时间")
- private String businessEndTime;
-
- @ApiModelProperty("店主姓名")
- private String shopownerName;
-
- @ApiModelProperty("店主联系方式")
- private String shopownerPhone;
-
- @ApiModelProperty("签约区域")
- private String signAreaCode;
-
- @ApiModelProperty("商户服务电话")
- private String shopServicePhone;
-
- @ApiModelProperty("管辖员工")
- private Long belongUserId;
-
- @ApiModelProperty("所属经销商")
- private Long belongShopId;
-
- @ApiModelProperty("扶持能力1.有2.没有")
- private Integer supportingCapacityFlag;
-
- @ApiModelProperty("店面操作人数1.1人2.1人以上")
- private Integer operationPersonFlag;
-
- @ApiModelProperty("执行力1.强2.弱")
- private Integer executiveForceFlag;
-
- @ApiModelProperty("格局1.大2.小")
- private Integer patternFlag;
-
- @ApiModelProperty("人脉1.宽2.窄")
- private Integer connectionFlag;
-
- @ApiModelProperty("经济能力1.强2.差")
- private Integer economicAbilityFlag;
-
- @ApiModelProperty("与合作商关系1.好2.差")
- private Integer relationPartner;
-
- @ApiModelProperty("曾从事事业")
- private String businessHistory;
-
- @ApiModelProperty("店铺地址省code")
- private String shopProvinceCode;
-
- @ApiModelProperty("店铺地址市code")
- private String shopCityCode;
-
- @ApiModelProperty("店铺地址区code")
- private String shopAreaCode;
-
- @ApiModelProperty("店铺区域全称")
- private String shopAreaName;
-
- @ApiModelProperty("店铺详细地址")
- private String shopAddress;
-
- @ApiModelProperty("店铺经度")
- private String shopLongitude;
-
- @ApiModelProperty("店铺维度")
- private String shopLatitude;
-
- @ApiModelProperty("店铺详情")
- private String shopDetail;
-
- @ApiModelProperty("营销功能1开2关")
- private Integer marketingFunctionFlag;
-
- @ApiModelProperty("领券1开2关")
- private Integer platformCouponFlag;
-
- @ApiModelProperty("生日卡1开2关")
- private Integer platformBirthdayFlag;
-
- @ApiModelProperty("推荐人")
- private String recommendPerson;
-
- @ApiModelProperty("商户标签id 多个用,隔开")
- private String shopTagIds;
-
- @ApiModelProperty("商户标签")
- private String shopTags;
-
- @ApiModelProperty("关联用户id 多个用,隔开")
- private String relUserIds;
-
- @ApiModelProperty("关联用户")
- private String relUsers;
-
- @ApiModelProperty("商户封面")
- private String shopPicture;
-
- @ApiModelProperty("商户banner 多个用,隔开")
- private String shopBanners;
-
- @ApiModelProperty("证书list")
- private List<ShopCertificate> shopCertificateList;
-
-
-
-
-
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtShopPageVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtShopPageVo.java
deleted file mode 100644
index 2e83461..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtShopPageVo.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.ruoyi.system.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author jqs34
- * @ClassName MgtShopPageVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtShopPageVo {
-
- @ApiModelProperty(value = "商户id")
- private Long shopId;
-
- @ApiModelProperty("签约时间")
- private String signTime;
-
- @ApiModelProperty("商户名称")
- private String shopName;
-
- @ApiModelProperty("商户编号")
- private String shopNumber;
-
- @ApiModelProperty("商户标签")
- private String shopTags;
-
- @ApiModelProperty("签约人")
- private String signUser;
-
- @ApiModelProperty("首提金额")
- private BigDecimal firstWithdraw;
-
- @ApiModelProperty("关联员工")
- private BigDecimal belongUser;
-
- @ApiModelProperty("关联部门")
- private BigDecimal belongDept;
-
- @ApiModelProperty("来源渠道")
- private String shopSource;
-
- @ApiModelProperty("签约区域")
- private String signAreaName;
-
- @ApiModelProperty("合作期限")
- private String cooperationTime;
-
- @ApiModelProperty("店铺地址")
- private String shopAddress;
-
- @ApiModelProperty("店主姓名")
- private String shopownerName;
-
- @ApiModelProperty("店主联系方式")
- private String shopownerPhone;
-
- @ApiModelProperty("商户状态-1删除0冻结1正常2终止合作")
- private Integer shopStatus;
-
- @ApiModelProperty("商户活动次数")
- private Integer shopActivityCount;
-
- @ApiModelProperty("店铺设置状态")
- private String shopCustomStatus;
-}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtShopTagVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtShopTagVo.java
deleted file mode 100644
index 66cc35b..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtShopTagVo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.system.domain.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author jqs34
- * @ClassName MgtShopTagVo
- * @description: TODO
- * @date 2023年04月21日
- * @version: 1.0
- */
-@Data
-public class MgtShopTagVo {
-
- @ApiModelProperty(value = "标签id")
- private Long tagId;
-
- @ApiModelProperty(value = "标签名称")
- private String tagName;
-
- @ApiModelProperty(value = "是否选择0否1是")
- private Integer selectFlag;
-
-}
--
Gitblit v1.7.1