1

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/huiyuan/IMemberManagementService.java

@@ -0,0 +1,85 @@
+package com.iotechn.unimall.admin.api.huiyuan;
+
+
+import com.iotechn.unimall.core.annotation.HttpMethod;
+import com.iotechn.unimall.core.annotation.HttpOpenApi;
+import com.iotechn.unimall.core.annotation.HttpParam;
+import com.iotechn.unimall.core.annotation.HttpParamType;
+import com.iotechn.unimall.core.annotation.param.NotNull;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.domain.MemberManagement;
+import com.iotechn.unimall.data.model.Page;
+import java.util.Date;
+
+/**
+ * 会员管理Service接口
+ * 
+ * @author jlb
+ * @date 2023-02-08
+ */
+@HttpOpenApi(group = "admin.unimall.memberManagement", description = "会员管理")
+public interface IMemberManagementService{
+	@HttpMethod(description = "新增", permission = "admin:unimall:memberManagement:add", permissionParentName = "宠物管理", permissionName = "会员管理管理")
+	public Boolean add(@NotNull @HttpParam(name = "memberManagement", type = HttpParamType.COMMON, description = "会员管理") MemberManagement memberManagement,
+						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "列表", permission = "admin:unimall:memberManagement:list",permissionParentName = "宠物管理", permissionName = "会员管理管理")
+	public Page<MemberManagement> list(
+								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+							@HttpParam(name = "userName", type = HttpParamType.COMMON, description = "姓名") String userName,
+							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "手机号") String phone,
+							@HttpParam(name = "cartName", type = HttpParamType.COMMON, description = "卡名称") String cartName,
+							@HttpParam(name = "cartNo", type = HttpParamType.COMMON, description = "卡号") String cartNo,
+							@HttpParam(name = "cartEndTime", type = HttpParamType.COMMON, description = "卡到期时间") Date cartEndTime,
+							@HttpParam(name = "money", type = HttpParamType.COMMON, description = "金额（元）") Double money,
+							@HttpParam(name = "cartTime", type = HttpParamType.COMMON, description = "日期") Date cartTime,
+							@HttpParam(name = "leiChong", type = HttpParamType.COMMON, description = "累计充值") Double leiChong,
+							@HttpParam(name = "leiXiao", type = HttpParamType.COMMON, description = "累计消费") Double leiXiao,
+							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+							@HttpParam(name = "remark1", type = HttpParamType.COMMON, description = "备注1") String remark1,
+							@HttpParam(name = "remark2", type = HttpParamType.COMMON, description = "备注2") String remark2,
+							@HttpParam(name = "remark3", type = HttpParamType.COMMON, description = "备注3") String remark3,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Long deleteFlag,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+					@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
+		throws ServiceException;
+
+	@HttpMethod(description = "删除", permission = "admin:unimall:memberManagement:delete",permissionParentName = "宠物管理", permissionName = "会员管理管理")
+	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+
+	@HttpMethod(description = "修改", permission = "admin:unimall:memberManagement:update",permissionParentName = "宠物管理", permissionName = "会员管理管理")
+	public Boolean update(@NotNull @HttpParam(name = "memberManagement", type = HttpParamType.COMMON, description = "会员管理") MemberManagement memberManagement,
+						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "查询", permission = "admin:unimall:memberManagement:get",permissionParentName = "宠物管理", permissionName = "会员管理管理")
+	public MemberManagement get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
+	
+	@HttpMethod(description = "导出excl表", permission = "admin:unimall:memberManagement:export",permissionParentName = "宠物管理", permissionName = "会员管理管理")
+	public String export(
+								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+							@HttpParam(name = "userName", type = HttpParamType.COMMON, description = "姓名") String userName,
+							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "手机号") String phone,
+							@HttpParam(name = "cartName", type = HttpParamType.COMMON, description = "卡名称") String cartName,
+							@HttpParam(name = "cartNo", type = HttpParamType.COMMON, description = "卡号") String cartNo,
+							@HttpParam(name = "cartEndTime", type = HttpParamType.COMMON, description = "卡到期时间") Date cartEndTime,
+							@HttpParam(name = "money", type = HttpParamType.COMMON, description = "金额（元）") Double money,
+							@HttpParam(name = "cartTime", type = HttpParamType.COMMON, description = "日期") Date cartTime,
+							@HttpParam(name = "leiChong", type = HttpParamType.COMMON, description = "累计充值") Double leiChong,
+							@HttpParam(name = "leiXiao", type = HttpParamType.COMMON, description = "累计消费") Double leiXiao,
+							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+							@HttpParam(name = "remark1", type = HttpParamType.COMMON, description = "备注1") String remark1,
+							@HttpParam(name = "remark2", type = HttpParamType.COMMON, description = "备注2") String remark2,
+							@HttpParam(name = "remark3", type = HttpParamType.COMMON, description = "备注3") String remark3,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Long deleteFlag,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
+	
+}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/huiyuan/IMoneyHisService.java

@@ -0,0 +1,73 @@
+package com.iotechn.unimall.admin.api.huiyuan;
+
+
+import com.iotechn.unimall.core.annotation.HttpMethod;
+import com.iotechn.unimall.core.annotation.HttpOpenApi;
+import com.iotechn.unimall.core.annotation.HttpParam;
+import com.iotechn.unimall.core.annotation.HttpParamType;
+import com.iotechn.unimall.core.annotation.param.NotNull;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.domain.MoneyHis;
+import com.iotechn.unimall.data.model.Page;
+import java.util.Date;
+
+/**
+ * 充值消费记录Service接口
+ * 
+ * @author jlb
+ * @date 2023-02-10
+ */
+@HttpOpenApi(group = "admin.unimall.moneyHis", description = "充值消费记录")
+public interface IMoneyHisService{
+	@HttpMethod(description = "新增", permission = "admin:unimall:moneyHis:add", permissionParentName = "宠物管理", permissionName = "充值消费记录管理")
+	public Boolean add(@NotNull @HttpParam(name = "moneyHis", type = HttpParamType.COMMON, description = "充值消费记录") MoneyHis moneyHis,
+						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "列表", permission = "admin:unimall:moneyHis:list",permissionParentName = "宠物管理", permissionName = "充值消费记录管理")
+	public Page<MoneyHis> list(
+								@HttpParam(name = "xiaofeiId", type = HttpParamType.COMMON, description = "") Long xiaofeiId,
+							@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+							@HttpParam(name = "serviceObject", type = HttpParamType.COMMON, description = "充值1消费2") String serviceObject,
+							@HttpParam(name = "money", type = HttpParamType.COMMON, description = "金额（元）") Double money,
+							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+							@HttpParam(name = "remark1", type = HttpParamType.COMMON, description = "备注1") String remark1,
+							@HttpParam(name = "remark2", type = HttpParamType.COMMON, description = "备注2") String remark2,
+							@HttpParam(name = "remark3", type = HttpParamType.COMMON, description = "备注3") String remark3,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Long deleteFlag,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+					@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
+		throws ServiceException;
+
+	@HttpMethod(description = "删除", permission = "admin:unimall:moneyHis:delete",permissionParentName = "宠物管理", permissionName = "充值消费记录管理")
+	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+
+	@HttpMethod(description = "修改", permission = "admin:unimall:moneyHis:update",permissionParentName = "宠物管理", permissionName = "充值消费记录管理")
+	public Boolean update(@NotNull @HttpParam(name = "moneyHis", type = HttpParamType.COMMON, description = "充值消费记录") MoneyHis moneyHis,
+						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "查询", permission = "admin:unimall:moneyHis:get",permissionParentName = "宠物管理", permissionName = "充值消费记录管理")
+	public MoneyHis get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
+	
+	@HttpMethod(description = "导出excl表", permission = "admin:unimall:moneyHis:export",permissionParentName = "宠物管理", permissionName = "充值消费记录管理")
+	public String export(
+								@HttpParam(name = "xiaofeiId", type = HttpParamType.COMMON, description = "") Long xiaofeiId,
+							@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+							@HttpParam(name = "serviceObject", type = HttpParamType.COMMON, description = "充值1消费2") String serviceObject,
+							@HttpParam(name = "money", type = HttpParamType.COMMON, description = "金额（元）") Double money,
+							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+							@HttpParam(name = "remark1", type = HttpParamType.COMMON, description = "备注1") String remark1,
+							@HttpParam(name = "remark2", type = HttpParamType.COMMON, description = "备注2") String remark2,
+							@HttpParam(name = "remark3", type = HttpParamType.COMMON, description = "备注3") String remark3,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Long deleteFlag,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
+	
+}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/huiyuan/ISalesSlipService.java

@@ -0,0 +1,79 @@
+package com.iotechn.unimall.admin.api.huiyuan;
+
+
+import com.iotechn.unimall.core.annotation.HttpMethod;
+import com.iotechn.unimall.core.annotation.HttpOpenApi;
+import com.iotechn.unimall.core.annotation.HttpParam;
+import com.iotechn.unimall.core.annotation.HttpParamType;
+import com.iotechn.unimall.core.annotation.param.NotNull;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.domain.SalesSlip;
+import com.iotechn.unimall.data.model.Page;
+import java.util.Date;
+
+/**
+ * 销售单Service接口
+ * 
+ * @author jlb
+ * @date 2023-02-08
+ */
+@HttpOpenApi(group = "admin.unimall.salesSlip", description = "销售单")
+public interface ISalesSlipService{
+	@HttpMethod(description = "新增", permission = "admin:unimall:salesSlip:add", permissionParentName = "宠物管理", permissionName = "销售单管理")
+	public Boolean add(@NotNull @HttpParam(name = "salesSlip", type = HttpParamType.COMMON, description = "销售单") SalesSlip salesSlip,
+						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "列表", permission = "admin:unimall:salesSlip:list",permissionParentName = "宠物管理", permissionName = "销售单管理")
+	public Page<SalesSlip> list(
+								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+							@HttpParam(name = "serviceObject", type = HttpParamType.COMMON, description = "服务对象") String serviceObject,
+							@HttpParam(name = "serviceType", type = HttpParamType.COMMON, description = "服务分类") String serviceType,
+							@HttpParam(name = "color", type = HttpParamType.COMMON, description = "颜色") String color,
+							@HttpParam(name = "attribute", type = HttpParamType.COMMON, description = "属性") String attribute,
+							@HttpParam(name = "serviceItems", type = HttpParamType.COMMON, description = "服务项目") String serviceItems,
+							@HttpParam(name = "money", type = HttpParamType.COMMON, description = "金额（元）") Double money,
+							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+							@HttpParam(name = "remark1", type = HttpParamType.COMMON, description = "备注1") String remark1,
+							@HttpParam(name = "remark2", type = HttpParamType.COMMON, description = "备注2") String remark2,
+							@HttpParam(name = "remark3", type = HttpParamType.COMMON, description = "备注3") String remark3,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Long deleteFlag,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+					@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
+		throws ServiceException;
+
+	@HttpMethod(description = "删除", permission = "admin:unimall:salesSlip:delete",permissionParentName = "宠物管理", permissionName = "销售单管理")
+	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+
+	@HttpMethod(description = "修改", permission = "admin:unimall:salesSlip:update",permissionParentName = "宠物管理", permissionName = "销售单管理")
+	public Boolean update(@NotNull @HttpParam(name = "salesSlip", type = HttpParamType.COMMON, description = "销售单") SalesSlip salesSlip,
+						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "查询", permission = "admin:unimall:salesSlip:get",permissionParentName = "宠物管理", permissionName = "销售单管理")
+	public SalesSlip get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
+	
+	@HttpMethod(description = "导出excl表", permission = "admin:unimall:salesSlip:export",permissionParentName = "宠物管理", permissionName = "销售单管理")
+	public String export(
+								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+							@HttpParam(name = "serviceObject", type = HttpParamType.COMMON, description = "服务对象") String serviceObject,
+							@HttpParam(name = "serviceType", type = HttpParamType.COMMON, description = "服务分类") String serviceType,
+							@HttpParam(name = "color", type = HttpParamType.COMMON, description = "颜色") String color,
+							@HttpParam(name = "attribute", type = HttpParamType.COMMON, description = "属性") String attribute,
+							@HttpParam(name = "serviceItems", type = HttpParamType.COMMON, description = "服务项目") String serviceItems,
+							@HttpParam(name = "money", type = HttpParamType.COMMON, description = "金额（元）") Double money,
+							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+							@HttpParam(name = "remark1", type = HttpParamType.COMMON, description = "备注1") String remark1,
+							@HttpParam(name = "remark2", type = HttpParamType.COMMON, description = "备注2") String remark2,
+							@HttpParam(name = "remark3", type = HttpParamType.COMMON, description = "备注3") String remark3,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Long deleteFlag,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
+	
+}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/huiyuan/IServiceMangerService.java

@@ -0,0 +1,69 @@
+package com.iotechn.unimall.admin.api.huiyuan;
+
+
+import com.iotechn.unimall.core.annotation.HttpMethod;
+import com.iotechn.unimall.core.annotation.HttpOpenApi;
+import com.iotechn.unimall.core.annotation.HttpParam;
+import com.iotechn.unimall.core.annotation.HttpParamType;
+import com.iotechn.unimall.core.annotation.param.NotNull;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.domain.ServiceManger;
+import com.iotechn.unimall.data.model.Page;
+import java.util.Date;
+
+/**
+ * 服务管理Service接口
+ * 
+ * @author jlb
+ * @date 2023-02-08
+ */
+@HttpOpenApi(group = "admin.unimall.serviceManger", description = "服务管理")
+public interface IServiceMangerService{
+	@HttpMethod(description = "新增", permission = "admin:unimall:serviceManger:add", permissionParentName = "宠物管理", permissionName = "服务管理管理")
+	public Boolean add(@NotNull @HttpParam(name = "serviceManger", type = HttpParamType.COMMON, description = "服务管理") ServiceManger serviceManger,
+						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "列表", permission = "admin:unimall:serviceManger:list",permissionParentName = "宠物管理", permissionName = "服务管理管理")
+	public Page<ServiceManger> list(
+								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+							@HttpParam(name = "route", type = HttpParamType.COMMON, description = "服务项目") String route,
+							@HttpParam(name = "unitPrice", type = HttpParamType.COMMON, description = "价格") Double unitPrice,
+							@HttpParam(name = "remark1", type = HttpParamType.COMMON, description = "备注1") String remark1,
+							@HttpParam(name = "remark2", type = HttpParamType.COMMON, description = "备注2") String remark2,
+							@HttpParam(name = "remark3", type = HttpParamType.COMMON, description = "备注3") String remark3,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Long deleteFlag,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+					@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
+		throws ServiceException;
+
+	@HttpMethod(description = "删除", permission = "admin:unimall:serviceManger:delete",permissionParentName = "宠物管理", permissionName = "服务管理管理")
+	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+
+	@HttpMethod(description = "修改", permission = "admin:unimall:serviceManger:update",permissionParentName = "宠物管理", permissionName = "服务管理管理")
+	public Boolean update(@NotNull @HttpParam(name = "serviceManger", type = HttpParamType.COMMON, description = "服务管理") ServiceManger serviceManger,
+						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+
+	@HttpMethod(description = "查询", permission = "admin:unimall:serviceManger:get",permissionParentName = "宠物管理", permissionName = "服务管理管理")
+	public ServiceManger get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
+	
+	@HttpMethod(description = "导出excl表", permission = "admin:unimall:serviceManger:export",permissionParentName = "宠物管理", permissionName = "服务管理管理")
+	public String export(
+								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+							@HttpParam(name = "route", type = HttpParamType.COMMON, description = "服务项目") String route,
+							@HttpParam(name = "unitPrice", type = HttpParamType.COMMON, description = "价格") Double unitPrice,
+							@HttpParam(name = "remark1", type = HttpParamType.COMMON, description = "备注1") String remark1,
+							@HttpParam(name = "remark2", type = HttpParamType.COMMON, description = "备注2") String remark2,
+							@HttpParam(name = "remark3", type = HttpParamType.COMMON, description = "备注3") String remark3,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Long deleteFlag,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
+							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
+	
+}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/huiyuan/impl/MemberManagementServiceImpl.java

@@ -0,0 +1,197 @@
+package com.iotechn.unimall.admin.api.huiyuan.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.iotechn.unimall.admin.api.huiyuan.IMemberManagementService;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.domain.MemberManagement;
+import com.iotechn.unimall.data.mapper.MemberManagementMapper;
+import com.iotechn.unimall.data.model.Page;
+import com.iotechn.unimall.data.util.ExcelUtil;
+import org.apache.ibatis.session.RowBounds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 会员管理Service业务层处理
+ *
+ * @author jlb
+ * @date 2023-02-08
+ */
+@Service
+public class MemberManagementServiceImpl implements IMemberManagementService {
+    @Autowired
+    private MemberManagementMapper memberManagementMapper;
+
+    @Override
+    public Boolean add(MemberManagement memberManagement, Long adminId) throws ServiceException {
+        Date now = new Date();
+        memberManagement.setGmtCreate(now);
+        memberManagement.setGmtUpdate(now);
+        memberManagement.setAdminId(adminId);
+        return memberManagementMapper.insert(memberManagement) > 0;
+    }
+
+    @Override
+    public Page<MemberManagement> list(Long companyId, String userName, String phone, String cartName, String cartNo, Date cartEndTime, Double money, Date cartTime, Double leiChong, Double leiXiao, String status, String remark1, String remark2, String remark3, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<MemberManagement> wrapper = new EntityWrapper<MemberManagement>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(userName)) {
+            wrapper.eq("user_name", userName);
+        }
+        if (!StringUtils.isEmpty(phone)) {
+            wrapper.eq("phone", phone);
+        }
+        if (!StringUtils.isEmpty(cartName)) {
+            wrapper.eq("cart_name", cartName);
+        }
+        if (!StringUtils.isEmpty(cartNo)) {
+            wrapper.eq("cart_no", cartNo);
+        }
+        if (!StringUtils.isEmpty(cartEndTime)) {
+            wrapper.eq("cart_end_time", cartEndTime);
+        }
+        if (!StringUtils.isEmpty(money)) {
+            wrapper.eq("money", money);
+        }
+        if (!StringUtils.isEmpty(cartTime)) {
+            wrapper.eq("cart_time", cartTime);
+        }
+        if (!StringUtils.isEmpty(leiChong)) {
+            wrapper.eq("lei_chong", leiChong);
+        }
+        if (!StringUtils.isEmpty(leiXiao)) {
+            wrapper.eq("lei_xiao", leiXiao);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(remark1)) {
+            wrapper.eq("remark1", remark1);
+        }
+        if (!StringUtils.isEmpty(remark2)) {
+            wrapper.eq("remark2", remark2);
+        }
+        if (!StringUtils.isEmpty(remark3)) {
+            wrapper.eq("remark3", remark3);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<MemberManagement> list = memberManagementMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = memberManagementMapper.selectCount(wrapper);
+        return new Page<MemberManagement>(list, page, limit, count);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            MemberManagement tmp = memberManagementMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                memberManagementMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean update(MemberManagement memberManagement, Long adminId) throws ServiceException {
+        Date now = new Date();
+        memberManagement.setGmtUpdate(now);
+        memberManagement.setAdminId(adminId);
+        return memberManagementMapper.updateById(memberManagement) > 0;
+    }
+
+    @Override
+    public MemberManagement get(Long id) throws ServiceException {
+        return memberManagementMapper.selectById(id);
+    }
+
+    @Override
+    public String export(Long companyId, String userName, String phone, String cartName, String cartNo, Date cartEndTime, Double money, Date cartTime, Double leiChong, Double leiXiao, String status, String remark1, String remark2, String remark3, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<MemberManagement> wrapper = new EntityWrapper<MemberManagement>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(userName)) {
+            wrapper.eq("user_name", userName);
+        }
+        if (!StringUtils.isEmpty(phone)) {
+            wrapper.eq("phone", phone);
+        }
+        if (!StringUtils.isEmpty(cartName)) {
+            wrapper.eq("cart_name", cartName);
+        }
+        if (!StringUtils.isEmpty(cartNo)) {
+            wrapper.eq("cart_no", cartNo);
+        }
+        if (!StringUtils.isEmpty(cartEndTime)) {
+            wrapper.eq("cart_end_time", cartEndTime);
+        }
+        if (!StringUtils.isEmpty(money)) {
+            wrapper.eq("money", money);
+        }
+        if (!StringUtils.isEmpty(cartTime)) {
+            wrapper.eq("cart_time", cartTime);
+        }
+        if (!StringUtils.isEmpty(leiChong)) {
+            wrapper.eq("lei_chong", leiChong);
+        }
+        if (!StringUtils.isEmpty(leiXiao)) {
+            wrapper.eq("lei_xiao", leiXiao);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(remark1)) {
+            wrapper.eq("remark1", remark1);
+        }
+        if (!StringUtils.isEmpty(remark2)) {
+            wrapper.eq("remark2", remark2);
+        }
+        if (!StringUtils.isEmpty(remark3)) {
+            wrapper.eq("remark3", remark3);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        List<MemberManagement> list = memberManagementMapper.selectList(wrapper);
+        ExcelUtil<MemberManagement> util = new ExcelUtil<MemberManagement>(MemberManagement.class);
+        return util.exportExcel(list, "操作日志");
+    }
+}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/huiyuan/impl/MoneyHisServiceImpl.java

@@ -0,0 +1,164 @@
+package com.iotechn.unimall.admin.api.huiyuan.impl;
+
+import java.util.List;
+
+import com.iotechn.unimall.admin.api.huiyuan.IMoneyHisService;
+import com.iotechn.unimall.data.domain.MoneyHis;
+import com.iotechn.unimall.data.mapper.MoneyHisMapper;
+import org.apache.ibatis.session.RowBounds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.util.ExcelUtil;
+import com.iotechn.unimall.data.model.Page;
+
+import java.util.Date;
+
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 充值消费记录Service业务层处理
+ *
+ * @author jlb
+ * @date 2023-02-10
+ */
+@Service
+public class MoneyHisServiceImpl implements IMoneyHisService {
+    @Autowired
+    private MoneyHisMapper moneyHisMapper;
+
+    @Override
+    public Boolean add(MoneyHis moneyHis, Long adminId) throws ServiceException {
+        Date now = new Date();
+        moneyHis.setGmtCreate(now);
+        moneyHis.setGmtUpdate(now);
+        moneyHis.setAdminId(adminId);
+        return moneyHisMapper.insert(moneyHis) > 0;
+    }
+
+    @Override
+    public Page<MoneyHis> list(Long xiaofeiId, Long companyId, String serviceObject, Double money, String status, String remark1, String remark2, String remark3, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<MoneyHis> wrapper = new EntityWrapper<MoneyHis>();
+        if (!StringUtils.isEmpty(xiaofeiId)) {
+            wrapper.eq("xiaofei_id", xiaofeiId);
+        }
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(serviceObject)) {
+            wrapper.eq("service_object", serviceObject);
+        }
+        if (!StringUtils.isEmpty(money)) {
+            wrapper.eq("money", money);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(remark1)) {
+            wrapper.eq("remark1", remark1);
+        }
+        if (!StringUtils.isEmpty(remark2)) {
+            wrapper.eq("remark2", remark2);
+        }
+        if (!StringUtils.isEmpty(remark3)) {
+            wrapper.eq("remark3", remark3);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<MoneyHis> list = moneyHisMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = moneyHisMapper.selectCount(wrapper);
+        return new Page<MoneyHis>(list, page, limit, count);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            MoneyHis tmp = moneyHisMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                moneyHisMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean update(MoneyHis moneyHis, Long adminId) throws ServiceException {
+        Date now = new Date();
+        moneyHis.setGmtUpdate(now);
+        moneyHis.setAdminId(adminId);
+        return moneyHisMapper.updateById(moneyHis) > 0;
+    }
+
+    @Override
+    public MoneyHis get(Long id) throws ServiceException {
+        return moneyHisMapper.selectById(id);
+    }
+
+    @Override
+    public String export(Long xiaofeiId, Long companyId, String serviceObject, Double money, String status, String remark1, String remark2, String remark3, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<MoneyHis> wrapper = new EntityWrapper<MoneyHis>();
+        if (!StringUtils.isEmpty(xiaofeiId)) {
+            wrapper.eq("xiaofei_id", xiaofeiId);
+        }
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(serviceObject)) {
+            wrapper.eq("service_object", serviceObject);
+        }
+        if (!StringUtils.isEmpty(money)) {
+            wrapper.eq("money", money);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(remark1)) {
+            wrapper.eq("remark1", remark1);
+        }
+        if (!StringUtils.isEmpty(remark2)) {
+            wrapper.eq("remark2", remark2);
+        }
+        if (!StringUtils.isEmpty(remark3)) {
+            wrapper.eq("remark3", remark3);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        List<MoneyHis> list = moneyHisMapper.selectList(wrapper);
+        ExcelUtil<MoneyHis> util = new ExcelUtil<MoneyHis>(MoneyHis.class);
+        return util.exportExcel(list, "操作日志");
+    }
+}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/huiyuan/impl/SalesSlipServiceImpl.java

@@ -0,0 +1,182 @@
+package com.iotechn.unimall.admin.api.huiyuan.impl;
+
+import java.util.List;
+
+import com.iotechn.unimall.admin.api.huiyuan.ISalesSlipService;
+import com.iotechn.unimall.data.domain.SalesSlip;
+import com.iotechn.unimall.data.mapper.SalesSlipMapper;
+import org.apache.ibatis.session.RowBounds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.util.ExcelUtil;
+import com.iotechn.unimall.data.model.Page;
+
+import java.util.Date;
+
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 销售单Service业务层处理
+ *
+ * @author jlb
+ * @date 2023-02-08
+ */
+@Service
+public class SalesSlipServiceImpl implements ISalesSlipService {
+    @Autowired
+    private SalesSlipMapper salesSlipMapper;
+
+    @Override
+    public Boolean add(SalesSlip salesSlip, Long adminId) throws ServiceException {
+        Date now = new Date();
+        salesSlip.setGmtCreate(now);
+        salesSlip.setGmtUpdate(now);
+        salesSlip.setAdminId(adminId);
+        return salesSlipMapper.insert(salesSlip) > 0;
+    }
+
+    @Override
+    public Page<SalesSlip> list(Long companyId, String serviceObject, String serviceType, String color, String attribute, String serviceItems, Double money, String status, String remark1, String remark2, String remark3, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<SalesSlip> wrapper = new EntityWrapper<SalesSlip>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(serviceObject)) {
+            wrapper.eq("service_object", serviceObject);
+        }
+        if (!StringUtils.isEmpty(serviceType)) {
+            wrapper.eq("service_type", serviceType);
+        }
+        if (!StringUtils.isEmpty(color)) {
+            wrapper.eq("color", color);
+        }
+        if (!StringUtils.isEmpty(attribute)) {
+            wrapper.eq("attribute", attribute);
+        }
+        if (!StringUtils.isEmpty(serviceItems)) {
+            wrapper.eq("service_items", serviceItems);
+        }
+        if (!StringUtils.isEmpty(money)) {
+            wrapper.eq("money", money);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(remark1)) {
+            wrapper.eq("remark1", remark1);
+        }
+        if (!StringUtils.isEmpty(remark2)) {
+            wrapper.eq("remark2", remark2);
+        }
+        if (!StringUtils.isEmpty(remark3)) {
+            wrapper.eq("remark3", remark3);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<SalesSlip> list = salesSlipMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = salesSlipMapper.selectCount(wrapper);
+        return new Page<SalesSlip>(list, page, limit, count);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            SalesSlip tmp = salesSlipMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                salesSlipMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean update(SalesSlip salesSlip, Long adminId) throws ServiceException {
+        Date now = new Date();
+        salesSlip.setGmtUpdate(now);
+        salesSlip.setAdminId(adminId);
+        return salesSlipMapper.updateById(salesSlip) > 0;
+    }
+
+    @Override
+    public SalesSlip get(Long id) throws ServiceException {
+        return salesSlipMapper.selectById(id);
+    }
+
+    @Override
+    public String export(Long companyId, String serviceObject, String serviceType, String color, String attribute, String serviceItems, Double money, String status, String remark1, String remark2, String remark3, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<SalesSlip> wrapper = new EntityWrapper<SalesSlip>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(serviceObject)) {
+            wrapper.eq("service_object", serviceObject);
+        }
+        if (!StringUtils.isEmpty(serviceType)) {
+            wrapper.eq("service_type", serviceType);
+        }
+        if (!StringUtils.isEmpty(color)) {
+            wrapper.eq("color", color);
+        }
+        if (!StringUtils.isEmpty(attribute)) {
+            wrapper.eq("attribute", attribute);
+        }
+        if (!StringUtils.isEmpty(serviceItems)) {
+            wrapper.eq("service_items", serviceItems);
+        }
+        if (!StringUtils.isEmpty(money)) {
+            wrapper.eq("money", money);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(remark1)) {
+            wrapper.eq("remark1", remark1);
+        }
+        if (!StringUtils.isEmpty(remark2)) {
+            wrapper.eq("remark2", remark2);
+        }
+        if (!StringUtils.isEmpty(remark3)) {
+            wrapper.eq("remark3", remark3);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        List<SalesSlip> list = salesSlipMapper.selectList(wrapper);
+        ExcelUtil<SalesSlip> util = new ExcelUtil<SalesSlip>(SalesSlip.class);
+        return util.exportExcel(list, "操作日志");
+    }
+}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/huiyuan/impl/ServiceMangerServiceImpl.java

@@ -0,0 +1,152 @@
+package com.iotechn.unimall.admin.api.huiyuan.impl;
+
+import java.util.List;
+
+import com.iotechn.unimall.admin.api.huiyuan.IServiceMangerService;
+import com.iotechn.unimall.data.domain.ServiceManger;
+import com.iotechn.unimall.data.mapper.ServiceMangerMapper;
+import org.apache.ibatis.session.RowBounds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.util.ExcelUtil;
+import com.iotechn.unimall.data.model.Page;
+
+import java.util.Date;
+
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 服务管理Service业务层处理
+ *
+ * @author jlb
+ * @date 2023-02-08
+ */
+@Service
+public class ServiceMangerServiceImpl implements IServiceMangerService {
+    @Autowired
+    private ServiceMangerMapper serviceMangerMapper;
+
+    @Override
+    public Boolean add(ServiceManger serviceManger, Long adminId) throws ServiceException {
+        Date now = new Date();
+        serviceManger.setGmtCreate(now);
+        serviceManger.setGmtUpdate(now);
+        serviceManger.setAdminId(adminId);
+        return serviceMangerMapper.insert(serviceManger) > 0;
+    }
+
+    @Override
+    public Page<ServiceManger> list(Long companyId, String route, Double unitPrice, String remark1, String remark2, String remark3, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<ServiceManger> wrapper = new EntityWrapper<ServiceManger>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(route)) {
+            wrapper.eq("route", route);
+        }
+        if (!StringUtils.isEmpty(unitPrice)) {
+            wrapper.eq("unit_price", unitPrice);
+        }
+        if (!StringUtils.isEmpty(remark1)) {
+            wrapper.eq("remark1", remark1);
+        }
+        if (!StringUtils.isEmpty(remark2)) {
+            wrapper.eq("remark2", remark2);
+        }
+        if (!StringUtils.isEmpty(remark3)) {
+            wrapper.eq("remark3", remark3);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        wrapper.eq("delete_flag", 0);
+        List<ServiceManger> list = serviceMangerMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = serviceMangerMapper.selectCount(wrapper);
+        return new Page<ServiceManger>(list, page, limit, count);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            ServiceManger tmp = serviceMangerMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                serviceMangerMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean update(ServiceManger serviceManger, Long adminId) throws ServiceException {
+        Date now = new Date();
+        serviceManger.setGmtUpdate(now);
+        serviceManger.setAdminId(adminId);
+        return serviceMangerMapper.updateById(serviceManger) > 0;
+    }
+
+    @Override
+    public ServiceManger get(Long id) throws ServiceException {
+        return serviceMangerMapper.selectById(id);
+    }
+
+    @Override
+    public String export(Long companyId, String route, Double unitPrice, String remark1, String remark2, String remark3, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<ServiceManger> wrapper = new EntityWrapper<ServiceManger>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(route)) {
+            wrapper.eq("route", route);
+        }
+        if (!StringUtils.isEmpty(unitPrice)) {
+            wrapper.eq("unit_price", unitPrice);
+        }
+        if (!StringUtils.isEmpty(remark1)) {
+            wrapper.eq("remark1", remark1);
+        }
+        if (!StringUtils.isEmpty(remark2)) {
+            wrapper.eq("remark2", remark2);
+        }
+        if (!StringUtils.isEmpty(remark3)) {
+            wrapper.eq("remark3", remark3);
+        }
+        if (!StringUtils.isEmpty(deleteFlag)) {
+            wrapper.eq("delete_flag", deleteFlag);
+        }
+        if (!StringUtils.isEmpty(gmtCreate)) {
+            wrapper.eq("gmt_create", gmtCreate);
+        }
+        if (!StringUtils.isEmpty(gmtUpdate)) {
+            wrapper.eq("gmt_update", gmtUpdate);
+        }
+        if (!StringUtils.isEmpty(userId)) {
+            wrapper.eq("user_id", userId);
+        }
+        if (!StringUtils.isEmpty(adminId)) {
+            wrapper.eq("admin_id", adminId);
+        }
+        List<ServiceManger> list = serviceMangerMapper.selectList(wrapper);
+        ExcelUtil<ServiceManger> util = new ExcelUtil<ServiceManger>(ServiceManger.class);
+        return util.exportExcel(list, "操作日志");
+    }
+}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/IMarketAdvertisementInfoService.java

@@ -1,66 +0,0 @@
-package com.iotechn.unimall.admin.api.market;
-
-
-import com.iotechn.unimall.data.domain.market.MarketAdvertisementInfo;
-import com.iotechn.unimall.core.annotation.HttpMethod;
-import com.iotechn.unimall.core.annotation.HttpOpenApi;
-import com.iotechn.unimall.core.annotation.HttpParam;
-import com.iotechn.unimall.core.annotation.HttpParamType;
-import com.iotechn.unimall.core.annotation.param.NotNull;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.Date;
-
-/**
- * 广告信息Service接口
- *
- * @author jlb
- * @date 2022-08-01
- */
-@HttpOpenApi(group = "admin.market.marketAdvertisementInfo", description = "广告信息")
-public interface IMarketAdvertisementInfoService {
-    @HttpMethod(description = "新增", permission = "admin:market:marketAdvertisementInfo:add", permissionParentName = "宠物管理", permissionName = "广告信息管理")
-    public Boolean add(@NotNull @HttpParam(name = "marketAdvertisementInfo", type = HttpParamType.COMMON, description = "广告信息") MarketAdvertisementInfo marketAdvertisementInfo,
-                       @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "列表", permission = "admin:market:marketAdvertisementInfo:list", permissionParentName = "宠物管理", permissionName = "广告信息管理")
-    public Page<MarketAdvertisementInfo> list(
-            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-            @HttpParam(name = "advertisementName", type = HttpParamType.COMMON, description = "广告名称") String advertisementName,
-            @HttpParam(name = "url", type = HttpParamType.COMMON, description = "图片") String url,
-            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
-            throws ServiceException;
-
-    @HttpMethod(description = "删除", permission = "admin:market:marketAdvertisementInfo:delete", permissionParentName = "宠物管理", permissionName = "广告信息管理")
-    public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") String id) throws ServiceException;
-
-    @HttpMethod(description = "修改", permission = "admin:market:marketAdvertisementInfo:update", permissionParentName = "宠物管理", permissionName = "广告信息管理")
-    public Boolean update(@NotNull @HttpParam(name = "marketAdvertisementInfo", type = HttpParamType.COMMON, description = "广告信息") MarketAdvertisementInfo marketAdvertisementInfo,
-                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "查询", permission = "admin:market:marketAdvertisementInfo:get", permissionParentName = "宠物管理", permissionName = "广告信息管理")
-    public MarketAdvertisementInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
-
-    @HttpMethod(description = "导出excl表", permission = "admin:market:marketAdvertisementInfo:export", permissionParentName = "宠物管理", permissionName = "广告信息管理")
-    public String export(
-            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-            @HttpParam(name = "advertisementName", type = HttpParamType.COMMON, description = "广告名称") String advertisementName,
-            @HttpParam(name = "url", type = HttpParamType.COMMON, description = "图片") String url,
-            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit) throws ServiceException;
-
-}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/IMarketOrderDetailService.java

@@ -1,70 +0,0 @@
-package com.iotechn.unimall.admin.api.market;
-
-
-import com.iotechn.unimall.core.annotation.HttpMethod;
-import com.iotechn.unimall.core.annotation.HttpOpenApi;
-import com.iotechn.unimall.core.annotation.HttpParam;
-import com.iotechn.unimall.core.annotation.HttpParamType;
-import com.iotechn.unimall.core.annotation.param.NotNull;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.domain.market.MarketOrderDetail;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.Date;
-
-/**
- * 订单详情Service接口
- *
- * @author jlb
- * @date 2022-08-01
- */
-@HttpOpenApi(group = "admin.unimall.marketOrderDetail", description = "订单详情")
-public interface IMarketOrderDetailService {
-    @HttpMethod(description = "新增", permission = "admin:unimall:marketOrderDetail:add", permissionParentName = "宠物管理", permissionName = "订单详情管理")
-    public Boolean add(@NotNull @HttpParam(name = "marketOrderDetail", type = HttpParamType.COMMON, description = "订单详情") MarketOrderDetail marketOrderDetail,
-                       @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "列表", permission = "admin:unimall:marketOrderDetail:list", permissionParentName = "宠物管理", permissionName = "订单详情管理")
-    public Page<MarketOrderDetail> list(
-            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-            @HttpParam(name = "orderId", type = HttpParamType.COMMON, description = "订单id") String orderId,
-            @HttpParam(name = "name", type = HttpParamType.COMMON, description = "商品名称") String name,
-            @HttpParam(name = "price", type = HttpParamType.COMMON, description = "单价") Double price,
-            @HttpParam(name = "num", type = HttpParamType.COMMON, description = "数量") Long num,
-            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
-            throws ServiceException;
-
-    @HttpMethod(description = "删除", permission = "admin:unimall:marketOrderDetail:delete", permissionParentName = "宠物管理", permissionName = "订单详情管理")
-    public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") String id) throws ServiceException;
-
-    @HttpMethod(description = "修改", permission = "admin:unimall:marketOrderDetail:update", permissionParentName = "宠物管理", permissionName = "订单详情管理")
-    public Boolean update(@NotNull @HttpParam(name = "marketOrderDetail", type = HttpParamType.COMMON, description = "订单详情") MarketOrderDetail marketOrderDetail,
-                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "查询", permission = "admin:unimall:marketOrderDetail:get", permissionParentName = "宠物管理", permissionName = "订单详情管理")
-    public MarketOrderDetail get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
-
-    @HttpMethod(description = "导出excl表", permission = "admin:unimall:marketOrderDetail:export", permissionParentName = "宠物管理", permissionName = "订单详情管理")
-    public String export(
-            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-            @HttpParam(name = "orderId", type = HttpParamType.COMMON, description = "订单id") String orderId,
-            @HttpParam(name = "name", type = HttpParamType.COMMON, description = "商品名称") String name,
-            @HttpParam(name = "price", type = HttpParamType.COMMON, description = "单价") Double price,
-            @HttpParam(name = "num", type = HttpParamType.COMMON, description = "数量") Long num,
-            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit) throws ServiceException;
-
-}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/IMarketOrderInfoService.java

@@ -1,68 +0,0 @@
-package com.iotechn.unimall.admin.api.market;
-
-
-import com.iotechn.unimall.core.annotation.HttpMethod;
-import com.iotechn.unimall.core.annotation.HttpOpenApi;
-import com.iotechn.unimall.core.annotation.HttpParam;
-import com.iotechn.unimall.core.annotation.HttpParamType;
-import com.iotechn.unimall.core.annotation.param.NotNull;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.domain.market.MarketOrderInfo;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.Date;
-
-/**
- * 订单信息Service接口
- *
- * @author jlb
- * @date 2022-08-01
- */
-@HttpOpenApi(group = "admin.unimall.marketOrderInfo", description = "订单信息")
-public interface IMarketOrderInfoService {
-    @HttpMethod(description = "新增", permission = "admin:unimall:marketOrderInfo:add", permissionParentName = "宠物管理", permissionName = "订单信息管理")
-    public Boolean add(@NotNull @HttpParam(name = "marketOrderInfo", type = HttpParamType.COMMON, description = "订单信息") MarketOrderInfo marketOrderInfo,
-                       @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "列表", permission = "admin:unimall:marketOrderInfo:list", permissionParentName = "宠物管理", permissionName = "订单信息管理")
-    public Page<MarketOrderInfo> list(
-            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-            @HttpParam(name = "orderNo", type = HttpParamType.COMMON, description = "订单编号") String orderNo,
-            @HttpParam(name = "customer", type = HttpParamType.COMMON, description = "客户") String customer,
-            @HttpParam(name = "pets", type = HttpParamType.COMMON, description = "收货地址") String pets,
-            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
-            throws ServiceException;
-
-    @HttpMethod(description = "删除", permission = "admin:unimall:marketOrderInfo:delete", permissionParentName = "宠物管理", permissionName = "订单信息管理")
-    public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") String id) throws ServiceException;
-
-    @HttpMethod(description = "修改", permission = "admin:unimall:marketOrderInfo:update", permissionParentName = "宠物管理", permissionName = "订单信息管理")
-    public Boolean update(@NotNull @HttpParam(name = "marketOrderInfo", type = HttpParamType.COMMON, description = "订单信息") MarketOrderInfo marketOrderInfo,
-                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "查询", permission = "admin:unimall:marketOrderInfo:get", permissionParentName = "宠物管理", permissionName = "订单信息管理")
-    public MarketOrderInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
-
-    @HttpMethod(description = "导出excl表", permission = "admin:unimall:marketOrderInfo:export", permissionParentName = "宠物管理", permissionName = "订单信息管理")
-    public String export(
-            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-            @HttpParam(name = "orderNo", type = HttpParamType.COMMON, description = "订单编号") String orderNo,
-            @HttpParam(name = "customer", type = HttpParamType.COMMON, description = "客户") String customer,
-            @HttpParam(name = "pets", type = HttpParamType.COMMON, description = "收货地址") String pets,
-            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit) throws ServiceException;
-
-}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/IMarketProdectInfoService.java

@@ -1,74 +0,0 @@
-package com.iotechn.unimall.admin.api.market;
-
-
-import com.iotechn.unimall.core.annotation.HttpMethod;
-import com.iotechn.unimall.core.annotation.HttpOpenApi;
-import com.iotechn.unimall.core.annotation.HttpParam;
-import com.iotechn.unimall.core.annotation.HttpParamType;
-import com.iotechn.unimall.core.annotation.param.NotNull;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.domain.market.MarketProdectInfo;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.Date;
-
-/**
- * 商品信息Service接口
- *
- * @author jlb
- * @date 2022-08-01
- */
-@HttpOpenApi(group = "admin.unimall.marketProdectInfo", description = "商品信息")
-public interface IMarketProdectInfoService {
-    @HttpMethod(description = "新增", permission = "admin:unimall:marketProdectInfo:add", permissionParentName = "宠物管理", permissionName = "商品信息管理")
-    public Boolean add(@NotNull @HttpParam(name = "marketProdectInfo", type = HttpParamType.COMMON, description = "商品信息") MarketProdectInfo marketProdectInfo,
-                       @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "列表", permission = "admin:unimall:marketProdectInfo:list", permissionParentName = "宠物管理", permissionName = "商品信息管理")
-    public Page<MarketProdectInfo> list(
-            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-            @HttpParam(name = "prodectName", type = HttpParamType.COMMON, description = "商品名称") String prodectName,
-            @HttpParam(name = "classificationKey", type = HttpParamType.COMMON, description = "商品分类key") String classificationKey,
-            @HttpParam(name = "classification", type = HttpParamType.COMMON, description = "商品分类") String classification,
-            @HttpParam(name = "url", type = HttpParamType.COMMON, description = "封面") String url,
-            @HttpParam(name = "productDetails", type = HttpParamType.COMMON, description = "商品详情") String productDetails,
-            @HttpParam(name = "commodity price", type = HttpParamType.COMMON, description = "商品售价") Double commodityPrice,
-            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
-            throws ServiceException;
-
-    @HttpMethod(description = "删除", permission = "admin:unimall:marketProdectInfo:delete", permissionParentName = "宠物管理", permissionName = "商品信息管理")
-    public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") String id) throws ServiceException;
-
-    @HttpMethod(description = "修改", permission = "admin:unimall:marketProdectInfo:update", permissionParentName = "宠物管理", permissionName = "商品信息管理")
-    public Boolean update(@NotNull @HttpParam(name = "marketProdectInfo", type = HttpParamType.COMMON, description = "商品信息") MarketProdectInfo marketProdectInfo,
-                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "查询", permission = "admin:unimall:marketProdectInfo:get", permissionParentName = "宠物管理", permissionName = "商品信息管理")
-    public MarketProdectInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
-
-    @HttpMethod(description = "导出excl表", permission = "admin:unimall:marketProdectInfo:export", permissionParentName = "宠物管理", permissionName = "商品信息管理")
-    public String export(
-            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-            @HttpParam(name = "prodectName", type = HttpParamType.COMMON, description = "商品名称") String prodectName,
-            @HttpParam(name = "classificationKey", type = HttpParamType.COMMON, description = "商品分类key") String classificationKey,
-            @HttpParam(name = "classification", type = HttpParamType.COMMON, description = "商品分类") String classification,
-            @HttpParam(name = "url", type = HttpParamType.COMMON, description = "封面") String url,
-            @HttpParam(name = "productDetails", type = HttpParamType.COMMON, description = "商品详情") String productDetails,
-            @HttpParam(name = "commodity price", type = HttpParamType.COMMON, description = "商品售价") Double commodityPrice,
-            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit) throws ServiceException;
-
-}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/IMarketReceivingAddressService.java

@@ -1,71 +0,0 @@
-package com.iotechn.unimall.admin.api.market;
-
-
-import com.iotechn.unimall.core.annotation.HttpMethod;
-import com.iotechn.unimall.core.annotation.HttpOpenApi;
-import com.iotechn.unimall.core.annotation.HttpParam;
-import com.iotechn.unimall.core.annotation.HttpParamType;
-import com.iotechn.unimall.core.annotation.param.NotNull;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.domain.market.MarketReceivingAddress;
-import com.iotechn.unimall.data.model.Page;
-import java.util.Date;
-
-/**
- * 收货地址Service接口
- * 
- * @author jlb
- * @date 2022-08-01
- */
-@HttpOpenApi(group = "admin.unimall.marketReceivingAddress", description = "收货地址")
-public interface IMarketReceivingAddressService{
-	@HttpMethod(description = "新增", permission = "admin:unimall:marketReceivingAddress:add", permissionParentName = "宠物管理", permissionName = "收货地址管理")
-	public Boolean add(@NotNull @HttpParam(name = "marketReceivingAddress", type = HttpParamType.COMMON, description = "收货地址") MarketReceivingAddress marketReceivingAddress,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
-
-	@HttpMethod(description = "列表", permission = "admin:unimall:marketReceivingAddress:list",permissionParentName = "宠物管理", permissionName = "收货地址管理")
-	public Page<MarketReceivingAddress> list(
-								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-							@HttpParam(name = "cusId", type = HttpParamType.COMMON, description = "客户id") String cusId,
-							@HttpParam(name = "consigneeName", type = HttpParamType.COMMON, description = "收货人姓名") String consigneeName,
-							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "手机号") String phone,
-							@HttpParam(name = "location", type = HttpParamType.COMMON, description = "所在地区") String location,
-							@HttpParam(name = "address", type = HttpParamType.COMMON, description = "详细地址") String address,
-							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Integer deleteFlag,
-							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-					@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
-		throws ServiceException;
-
-	@HttpMethod(description = "删除", permission = "admin:unimall:marketReceivingAddress:delete",permissionParentName = "宠物管理", permissionName = "收货地址管理")
-	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
-
-	@HttpMethod(description = "修改", permission = "admin:unimall:marketReceivingAddress:update",permissionParentName = "宠物管理", permissionName = "收货地址管理")
-	public Boolean update(@NotNull @HttpParam(name = "marketReceivingAddress", type = HttpParamType.COMMON, description = "收货地址") MarketReceivingAddress marketReceivingAddress,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
-
-	@HttpMethod(description = "查询", permission = "admin:unimall:marketReceivingAddress:get",permissionParentName = "宠物管理", permissionName = "收货地址管理")
-	public MarketReceivingAddress get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
-	
-	@HttpMethod(description = "导出excl表", permission = "admin:unimall:marketReceivingAddress:export",permissionParentName = "宠物管理", permissionName = "收货地址管理")
-	public String export(
-								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-							@HttpParam(name = "cusId", type = HttpParamType.COMMON, description = "客户id") String cusId,
-							@HttpParam(name = "consigneeName", type = HttpParamType.COMMON, description = "收货人姓名") String consigneeName,
-							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "手机号") String phone,
-							@HttpParam(name = "location", type = HttpParamType.COMMON, description = "所在地区") String location,
-							@HttpParam(name = "address", type = HttpParamType.COMMON, description = "详细地址") String address,
-							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Integer deleteFlag,
-							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
-	
-}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/IMarketShopInfoService.java

@@ -1,70 +0,0 @@
-package com.iotechn.unimall.admin.api.market;
-
-
-import com.iotechn.unimall.core.annotation.HttpMethod;
-import com.iotechn.unimall.core.annotation.HttpOpenApi;
-import com.iotechn.unimall.core.annotation.HttpParam;
-import com.iotechn.unimall.core.annotation.HttpParamType;
-import com.iotechn.unimall.core.annotation.param.NotNull;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.domain.market.MarketShopInfo;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.Date;
-
-/**
- * 商店信息Service接口
- *
- * @author jlb
- * @date 2022-08-01
- */
-@HttpOpenApi(group = "admin.unimall.marketShopInfo", description = "商店信息")
-public interface IMarketShopInfoService {
-    @HttpMethod(description = "新增", permission = "admin:unimall:marketShopInfo:add", permissionParentName = "宠物管理", permissionName = "商店信息管理")
-    public Boolean add(@NotNull @HttpParam(name = "marketShopInfo", type = HttpParamType.COMMON, description = "商店信息") MarketShopInfo marketShopInfo,
-                       @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "列表", permission = "admin:unimall:marketShopInfo:list", permissionParentName = "宠物管理", permissionName = "商店信息管理")
-    public Page<MarketShopInfo> list(
-            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-            @HttpParam(name = "name", type = HttpParamType.COMMON, description = "名称") String name,
-            @HttpParam(name = "postion", type = HttpParamType.COMMON, description = "位置") String postion,
-            @HttpParam(name = "url", type = HttpParamType.COMMON, description = "封面") String url,
-            @HttpParam(name = "phone", type = HttpParamType.COMMON, description = "手机") String phone,
-            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
-            throws ServiceException;
-
-    @HttpMethod(description = "删除", permission = "admin:unimall:marketShopInfo:delete", permissionParentName = "宠物管理", permissionName = "商店信息管理")
-    public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") String id) throws ServiceException;
-
-    @HttpMethod(description = "修改", permission = "admin:unimall:marketShopInfo:update", permissionParentName = "宠物管理", permissionName = "商店信息管理")
-    public Boolean update(@NotNull @HttpParam(name = "marketShopInfo", type = HttpParamType.COMMON, description = "商店信息") MarketShopInfo marketShopInfo,
-                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
-
-    @HttpMethod(description = "查询", permission = "admin:unimall:marketShopInfo:get", permissionParentName = "宠物管理", permissionName = "商店信息管理")
-    public MarketShopInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
-
-    @HttpMethod(description = "导出excl表", permission = "admin:unimall:marketShopInfo:export", permissionParentName = "宠物管理", permissionName = "商店信息管理")
-    public String export(
-            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-            @HttpParam(name = "name", type = HttpParamType.COMMON, description = "名称") String name,
-            @HttpParam(name = "postion", type = HttpParamType.COMMON, description = "位置") String postion,
-            @HttpParam(name = "url", type = HttpParamType.COMMON, description = "封面") String url,
-            @HttpParam(name = "phone", type = HttpParamType.COMMON, description = "手机") String phone,
-            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-            @HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Integer deleteFlag,
-            @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-            @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-            @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit) throws ServiceException;
-
-}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/ISunMemberInfoService.java

@@ -1,75 +0,0 @@
-package com.iotechn.unimall.admin.api.market;
-
-
-import com.iotechn.unimall.core.annotation.HttpMethod;
-import com.iotechn.unimall.core.annotation.HttpOpenApi;
-import com.iotechn.unimall.core.annotation.HttpParam;
-import com.iotechn.unimall.core.annotation.HttpParamType;
-import com.iotechn.unimall.core.annotation.param.NotNull;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.domain.SunMemberInfo;
-import com.iotechn.unimall.data.model.Page;
-import java.util.Date;
-
-/**
- * 会员信息Service接口
- * 
- * @author jlb
- * @date 2022-10-31
- */
-@HttpOpenApi(group = "admin.unimall.sunMemberInfo", description = "会员信息")
-public interface ISunMemberInfoService{
-	@HttpMethod(description = "新增", permission = "admin:unimall:sunMemberInfo:add", permissionParentName = "宠物管理", permissionName = "会员信息管理")
-	public Boolean add(@NotNull @HttpParam(name = "sunMemberInfo", type = HttpParamType.COMMON, description = "会员信息") SunMemberInfo sunMemberInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
-
-	@HttpMethod(description = "列表", permission = "admin:unimall:sunMemberInfo:list",permissionParentName = "宠物管理", permissionName = "会员信息管理")
-	public Page<SunMemberInfo> list(
-								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-							@HttpParam(name = "name", type = HttpParamType.COMMON, description = "姓名") String name,
-							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "手机号") String phone,
-							@HttpParam(name = "sex", type = HttpParamType.COMMON, description = "性别") Long sex,
-							@HttpParam(name = "stars", type = HttpParamType.COMMON, description = "服务类型") String stars,
-							@HttpParam(name = "starsProject", type = HttpParamType.COMMON, description = "服务项目") String starsProject,
-							@HttpParam(name = "cancellations", type = HttpParamType.COMMON, description = "剩余服务次数") Long cancellations,
-							@HttpParam(name = "balance", type = HttpParamType.COMMON, description = "余额") Double balance,
-							@HttpParam(name = "remarks", type = HttpParamType.COMMON, description = "备注1") String remarks,
-										@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Long deleteFlag,
-							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-					@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
-		throws ServiceException;
-
-	@HttpMethod(description = "删除", permission = "admin:unimall:sunMemberInfo:delete",permissionParentName = "宠物管理", permissionName = "会员信息管理")
-	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
-
-	@HttpMethod(description = "修改", permission = "admin:unimall:sunMemberInfo:update",permissionParentName = "宠物管理", permissionName = "会员信息管理")
-	public Boolean update(@NotNull @HttpParam(name = "sunMemberInfo", type = HttpParamType.COMMON, description = "会员信息") SunMemberInfo sunMemberInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
-
-	@HttpMethod(description = "查询", permission = "admin:unimall:sunMemberInfo:get",permissionParentName = "宠物管理", permissionName = "会员信息管理")
-	public SunMemberInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
-	
-	@HttpMethod(description = "导出excl表", permission = "admin:unimall:sunMemberInfo:export",permissionParentName = "宠物管理", permissionName = "会员信息管理")
-	public String export(
-								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-							@HttpParam(name = "name", type = HttpParamType.COMMON, description = "姓名") String name,
-							@HttpParam(name = "phone", type = HttpParamType.COMMON, description = "手机号") String phone,
-							@HttpParam(name = "sex", type = HttpParamType.COMMON, description = "性别") Long sex,
-							@HttpParam(name = "stars", type = HttpParamType.COMMON, description = "服务类型") String stars,
-							@HttpParam(name = "starsProject", type = HttpParamType.COMMON, description = "服务项目") String starsProject,
-							@HttpParam(name = "cancellations", type = HttpParamType.COMMON, description = "剩余服务次数") Long cancellations,
-							@HttpParam(name = "balance", type = HttpParamType.COMMON, description = "余额") Double balance,
-							@HttpParam(name = "remarks", type = HttpParamType.COMMON, description = "备注1") String remarks,
-										@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "0：否（默认） 1：是") Long deleteFlag,
-							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
-							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
-							@HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-							@HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
-	
-}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/impl/MarketAdvertisementInfoServiceImpl.java

@@ -1,140 +0,0 @@
-package com.iotechn.unimall.admin.api.market.impl;
-
-import java.util.List;
-
-import org.apache.ibatis.session.RowBounds;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.market.MarketAdvertisementInfoMapper;
-import com.iotechn.unimall.data.domain.market.MarketAdvertisementInfo;
-import com.iotechn.unimall.admin.api.market.IMarketAdvertisementInfoService;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.Date;
-
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 广告信息Service业务层处理
- *
- * @author jlb
- * @date 2022-08-01
- */
-@Service
-public class MarketAdvertisementInfoServiceImpl implements IMarketAdvertisementInfoService {
-    @Autowired
-    private MarketAdvertisementInfoMapper marketAdvertisementInfoMapper;
-
-    @Override
-    public Boolean add(MarketAdvertisementInfo marketAdvertisementInfo, Long adminId) throws ServiceException {
-        Date now = new Date();
-        marketAdvertisementInfo.setGmtCreate(now);
-        marketAdvertisementInfo.setGmtUpdate(now);
-        marketAdvertisementInfo.setAdminId(adminId);
-        return marketAdvertisementInfoMapper.insert(marketAdvertisementInfo) > 0;
-    }
-
-    @Override
-    public Page<MarketAdvertisementInfo> list(Long companyId, String advertisementName, String url, String status, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<MarketAdvertisementInfo> wrapper = new EntityWrapper<MarketAdvertisementInfo>();
-        if (!StringUtils.isEmpty(companyId)) {
-            wrapper.eq("company_id", companyId);
-        }
-        if (!StringUtils.isEmpty(advertisementName)) {
-            wrapper.eq("advertisement_name", advertisementName);
-        }
-        if (!StringUtils.isEmpty(url)) {
-            wrapper.eq("url", url);
-        }
-        if (!StringUtils.isEmpty(status)) {
-            wrapper.eq("status", status);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        wrapper.eq("delete_flag", 0);
-        List<MarketAdvertisementInfo> list = marketAdvertisementInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-        Integer count = marketAdvertisementInfoMapper.selectCount(wrapper);
-        return new Page<MarketAdvertisementInfo>(list, page, limit, count);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean delete(String id) {
-        String[] ids = String.valueOf(id).split(",");
-        for (String tt : ids) {
-            MarketAdvertisementInfo tmp = marketAdvertisementInfoMapper.selectById(Long.parseLong(tt));
-            if (tmp != null) {
-                tmp.setDeleteFlag(1);
-                marketAdvertisementInfoMapper.updateById(tmp);
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Boolean update(MarketAdvertisementInfo marketAdvertisementInfo, Long adminId) throws ServiceException {
-        Date now = new Date();
-        marketAdvertisementInfo.setGmtUpdate(now);
-        marketAdvertisementInfo.setAdminId(adminId);
-        return marketAdvertisementInfoMapper.updateById(marketAdvertisementInfo) > 0;
-    }
-
-    @Override
-    public MarketAdvertisementInfo get(Long id) throws ServiceException {
-        return marketAdvertisementInfoMapper.selectById(id);
-    }
-
-    @Override
-    public String export(Long companyId, String advertisementName, String url, String status, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<MarketAdvertisementInfo> wrapper = new EntityWrapper<MarketAdvertisementInfo>();
-        if (!StringUtils.isEmpty(companyId)) {
-            wrapper.eq("company_id", companyId);
-        }
-        if (!StringUtils.isEmpty(advertisementName)) {
-            wrapper.eq("advertisement_name", advertisementName);
-        }
-        if (!StringUtils.isEmpty(url)) {
-            wrapper.eq("url", url);
-        }
-        if (!StringUtils.isEmpty(status)) {
-            wrapper.eq("status", status);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        List<MarketAdvertisementInfo> list = marketAdvertisementInfoMapper.selectList(wrapper);
-        ExcelUtil<MarketAdvertisementInfo> util = new ExcelUtil<MarketAdvertisementInfo>(MarketAdvertisementInfo.class);
-        return util.exportExcel(list, "操作日志");
-    }
-}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/impl/MarketOrderDetailServiceImpl.java

@@ -1,149 +0,0 @@
-package com.iotechn.unimall.admin.api.market.impl;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.iotechn.unimall.admin.api.market.IMarketOrderDetailService;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.domain.market.MarketOrderDetail;
-import com.iotechn.unimall.data.mapper.market.MarketOrderDetailMapper;
-import com.iotechn.unimall.data.model.Page;
-import com.iotechn.unimall.data.util.ExcelUtil;
-import org.apache.ibatis.session.RowBounds;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 订单详情Service业务层处理
- *
- * @author jlb
- * @date 2022-08-01
- */
-@Service
-public class MarketOrderDetailServiceImpl implements IMarketOrderDetailService {
-    @Autowired
-    private MarketOrderDetailMapper marketOrderDetailMapper;
-
-    @Override
-    public Boolean add(MarketOrderDetail marketOrderDetail, Long adminId) throws ServiceException {
-        Date now = new Date();
-        marketOrderDetail.setGmtCreate(now);
-        marketOrderDetail.setGmtUpdate(now);
-        marketOrderDetail.setAdminId(adminId);
-        return marketOrderDetailMapper.insert(marketOrderDetail) > 0;
-    }
-
-    @Override
-    public Page<MarketOrderDetail> list(Long companyId, String orderId, String name, Double price, Long num, String status, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<MarketOrderDetail> wrapper = new EntityWrapper<MarketOrderDetail>();
-        if (!StringUtils.isEmpty(companyId)) {
-            wrapper.eq("company_id", companyId);
-        }
-        if (!StringUtils.isEmpty(orderId)) {
-            wrapper.eq("order_id", orderId);
-        }
-        if (!StringUtils.isEmpty(name)) {
-            wrapper.eq("name", name);
-        }
-        if (!StringUtils.isEmpty(price)) {
-            wrapper.eq("price", price);
-        }
-        if (!StringUtils.isEmpty(num)) {
-            wrapper.eq("num", num);
-        }
-        if (!StringUtils.isEmpty(status)) {
-            wrapper.eq("status", status);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        wrapper.eq("delete_flag", 0);
-        List<MarketOrderDetail> list = marketOrderDetailMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-        Integer count = marketOrderDetailMapper.selectCount(wrapper);
-        return new Page<MarketOrderDetail>(list, page, limit, count);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean delete(String id) {
-        String[] ids = String.valueOf(id).split(",");
-        for (String tt : ids) {
-            MarketOrderDetail tmp = marketOrderDetailMapper.selectById(Long.parseLong(tt));
-            if (tmp != null) {
-                tmp.setDeleteFlag(1);
-                marketOrderDetailMapper.updateById(tmp);
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Boolean update(MarketOrderDetail marketOrderDetail, Long adminId) throws ServiceException {
-        Date now = new Date();
-        marketOrderDetail.setGmtUpdate(now);
-        marketOrderDetail.setAdminId(adminId);
-        return marketOrderDetailMapper.updateById(marketOrderDetail) > 0;
-    }
-
-    @Override
-    public MarketOrderDetail get(Long id) throws ServiceException {
-        return marketOrderDetailMapper.selectById(id);
-    }
-
-    @Override
-    public String export(Long companyId, String orderId, String name, Double price, Long num, String status, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<MarketOrderDetail> wrapper = new EntityWrapper<MarketOrderDetail>();
-        if (!StringUtils.isEmpty(companyId)) {
-            wrapper.eq("company_id", companyId);
-        }
-        if (!StringUtils.isEmpty(orderId)) {
-            wrapper.eq("order_id", orderId);
-        }
-        if (!StringUtils.isEmpty(name)) {
-            wrapper.eq("name", name);
-        }
-        if (!StringUtils.isEmpty(price)) {
-            wrapper.eq("price", price);
-        }
-        if (!StringUtils.isEmpty(num)) {
-            wrapper.eq("num", num);
-        }
-        if (!StringUtils.isEmpty(status)) {
-            wrapper.eq("status", status);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        List<MarketOrderDetail> list = marketOrderDetailMapper.selectList(wrapper);
-        ExcelUtil<MarketOrderDetail> util = new ExcelUtil<MarketOrderDetail>(MarketOrderDetail.class);
-        return util.exportExcel(list, "操作日志");
-    }
-}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/impl/MarketOrderInfoServiceImpl.java

@@ -1,146 +0,0 @@
-package com.iotechn.unimall.admin.api.market.impl;
-
-import java.util.List;
-
-import com.iotechn.unimall.admin.api.market.IMarketOrderInfoService;
-import com.iotechn.unimall.data.domain.market.MarketOrderInfo;
-import com.iotechn.unimall.data.mapper.market.MarketOrderInfoMapper;
-import org.apache.ibatis.session.RowBounds;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.Date;
-
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 订单信息Service业务层处理
- *
- * @author jlb
- * @date 2022-08-01
- */
-@Service
-public class MarketOrderInfoServiceImpl implements IMarketOrderInfoService {
-    @Autowired
-    private MarketOrderInfoMapper marketOrderInfoMapper;
-
-    @Override
-    public Boolean add(MarketOrderInfo marketOrderInfo, Long adminId) throws ServiceException {
-        Date now = new Date();
-        marketOrderInfo.setGmtCreate(now);
-        marketOrderInfo.setGmtUpdate(now);
-        marketOrderInfo.setAdminId(adminId);
-        return marketOrderInfoMapper.insert(marketOrderInfo) > 0;
-    }
-
-    @Override
-    public Page<MarketOrderInfo> list(Long companyId, String orderNo, String customer, String pets, String status, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<MarketOrderInfo> wrapper = new EntityWrapper<MarketOrderInfo>();
-        if (!StringUtils.isEmpty(companyId)) {
-            wrapper.eq("company_id", companyId);
-        }
-        if (!StringUtils.isEmpty(orderNo)) {
-            wrapper.eq("order_no", orderNo);
-        }
-        if (!StringUtils.isEmpty(customer)) {
-            wrapper.eq("customer", customer);
-        }
-        if (!StringUtils.isEmpty(pets)) {
-            wrapper.eq("pets", pets);
-        }
-        if (!StringUtils.isEmpty(status)) {
-            wrapper.eq("status", status);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        wrapper.eq("delete_flag", 0);
-        List<MarketOrderInfo> list = marketOrderInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-        Integer count = marketOrderInfoMapper.selectCount(wrapper);
-        return new Page<MarketOrderInfo>(list, page, limit, count);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean delete(String id) {
-        String[] ids = String.valueOf(id).split(",");
-        for (String tt : ids) {
-            MarketOrderInfo tmp = marketOrderInfoMapper.selectById(Long.parseLong(tt));
-            if (tmp != null) {
-                tmp.setDeleteFlag(1);
-                marketOrderInfoMapper.updateById(tmp);
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Boolean update(MarketOrderInfo marketOrderInfo, Long adminId) throws ServiceException {
-        Date now = new Date();
-        marketOrderInfo.setGmtUpdate(now);
-        marketOrderInfo.setAdminId(adminId);
-        return marketOrderInfoMapper.updateById(marketOrderInfo) > 0;
-    }
-
-    @Override
-    public MarketOrderInfo get(Long id) throws ServiceException {
-        return marketOrderInfoMapper.selectById(id);
-    }
-
-    @Override
-    public String export(Long companyId, String orderNo, String customer, String pets, String status, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<MarketOrderInfo> wrapper = new EntityWrapper<MarketOrderInfo>();
-        if (!StringUtils.isEmpty(companyId)) {
-            wrapper.eq("company_id", companyId);
-        }
-        if (!StringUtils.isEmpty(orderNo)) {
-            wrapper.eq("order_no", orderNo);
-        }
-        if (!StringUtils.isEmpty(customer)) {
-            wrapper.eq("customer", customer);
-        }
-        if (!StringUtils.isEmpty(pets)) {
-            wrapper.eq("pets", pets);
-        }
-        if (!StringUtils.isEmpty(status)) {
-            wrapper.eq("status", status);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        List<MarketOrderInfo> list = marketOrderInfoMapper.selectList(wrapper);
-        ExcelUtil<MarketOrderInfo> util = new ExcelUtil<MarketOrderInfo>(MarketOrderInfo.class);
-        return util.exportExcel(list, "操作日志");
-    }
-}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/impl/MarketProdectInfoServiceImpl.java

@@ -1,164 +0,0 @@
-package com.iotechn.unimall.admin.api.market.impl;
-
-import java.util.List;
-
-import com.iotechn.unimall.admin.api.market.IMarketProdectInfoService;
-import com.iotechn.unimall.data.domain.market.MarketProdectInfo;
-import com.iotechn.unimall.data.mapper.market.MarketProdectInfoMapper;
-import org.apache.ibatis.session.RowBounds;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.Date;
-
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 商品信息Service业务层处理
- *
- * @author jlb
- * @date 2022-08-01
- */
-@Service
-public class MarketProdectInfoServiceImpl implements IMarketProdectInfoService {
-    @Autowired
-    private MarketProdectInfoMapper marketProdectInfoMapper;
-
-    @Override
-    public Boolean add(MarketProdectInfo marketProdectInfo, Long adminId) throws ServiceException {
-        Date now = new Date();
-        marketProdectInfo.setGmtCreate(now);
-        marketProdectInfo.setGmtUpdate(now);
-        marketProdectInfo.setAdminId(adminId);
-        return marketProdectInfoMapper.insert(marketProdectInfo) > 0;
-    }
-
-    @Override
-    public Page<MarketProdectInfo> list(Long companyId, String prodectName, String classificationKey, String classification, String url, String productDetails, Double commodityPrice, String status, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<MarketProdectInfo> wrapper = new EntityWrapper<MarketProdectInfo>();
-        if (!StringUtils.isEmpty(companyId)) {
-            wrapper.eq("company_id", companyId);
-        }
-        if (!StringUtils.isEmpty(prodectName)) {
-            wrapper.eq("prodect_name", prodectName);
-        }
-        if (!StringUtils.isEmpty(classificationKey)) {
-            wrapper.eq("classification_key", classificationKey);
-        }
-        if (!StringUtils.isEmpty(classification)) {
-            wrapper.eq("classification", classification);
-        }
-        if (!StringUtils.isEmpty(url)) {
-            wrapper.eq("url", url);
-        }
-        if (!StringUtils.isEmpty(productDetails)) {
-            wrapper.eq("product_details", productDetails);
-        }
-        if (!StringUtils.isEmpty(commodityPrice)) {
-            wrapper.eq("commodity price", commodityPrice);
-        }
-        if (!StringUtils.isEmpty(status)) {
-            wrapper.eq("status", status);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        wrapper.eq("delete_flag", 0);
-        List<MarketProdectInfo> list = marketProdectInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-        Integer count = marketProdectInfoMapper.selectCount(wrapper);
-        return new Page<MarketProdectInfo>(list, page, limit, count);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean delete(String id) {
-        String[] ids = String.valueOf(id).split(",");
-        for (String tt : ids) {
-            MarketProdectInfo tmp = marketProdectInfoMapper.selectById(Long.parseLong(tt));
-            if (tmp != null) {
-                tmp.setDeleteFlag(1);
-                marketProdectInfoMapper.updateById(tmp);
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Boolean update(MarketProdectInfo marketProdectInfo, Long adminId) throws ServiceException {
-        Date now = new Date();
-        marketProdectInfo.setGmtUpdate(now);
-        marketProdectInfo.setAdminId(adminId);
-        return marketProdectInfoMapper.updateById(marketProdectInfo) > 0;
-    }
-
-    @Override
-    public MarketProdectInfo get(Long id) throws ServiceException {
-        return marketProdectInfoMapper.selectById(id);
-    }
-
-    @Override
-    public String export(Long companyId, String prodectName, String classificationKey, String classification, String url, String productDetails, Double commodityPrice, String status, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<MarketProdectInfo> wrapper = new EntityWrapper<MarketProdectInfo>();
-        if (!StringUtils.isEmpty(companyId)) {
-            wrapper.eq("company_id", companyId);
-        }
-        if (!StringUtils.isEmpty(prodectName)) {
-            wrapper.eq("prodect_name", prodectName);
-        }
-        if (!StringUtils.isEmpty(classificationKey)) {
-            wrapper.eq("classification_key", classificationKey);
-        }
-        if (!StringUtils.isEmpty(classification)) {
-            wrapper.eq("classification", classification);
-        }
-        if (!StringUtils.isEmpty(url)) {
-            wrapper.eq("url", url);
-        }
-        if (!StringUtils.isEmpty(productDetails)) {
-            wrapper.eq("product_details", productDetails);
-        }
-        if (!StringUtils.isEmpty(commodityPrice)) {
-            wrapper.eq("commodity price", commodityPrice);
-        }
-        if (!StringUtils.isEmpty(status)) {
-            wrapper.eq("status", status);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        List<MarketProdectInfo> list = marketProdectInfoMapper.selectList(wrapper);
-        ExcelUtil<MarketProdectInfo> util = new ExcelUtil<MarketProdectInfo>(MarketProdectInfo.class);
-        return util.exportExcel(list, "操作日志");
-    }
-}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/impl/MarketReceivingAddressServiceImpl.java

@@ -1,158 +0,0 @@
-package com.iotechn.unimall.admin.api.market.impl;
-
-import java.util.List;
-
-import com.iotechn.unimall.admin.api.market.IMarketReceivingAddressService;
-import com.iotechn.unimall.data.domain.market.MarketReceivingAddress;
-import com.iotechn.unimall.data.mapper.market.MarketReceivingAddressMapper;
-import org.apache.ibatis.session.RowBounds;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.Date;
-
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 收货地址Service业务层处理
- *
- * @author jlb
- * @date 2022-08-01
- */
-@Service
-public class MarketReceivingAddressServiceImpl implements IMarketReceivingAddressService {
-    @Autowired
-    private MarketReceivingAddressMapper marketReceivingAddressMapper;
-
-    @Override
-    public Boolean add(MarketReceivingAddress marketReceivingAddress, Long adminId) throws ServiceException {
-        Date now = new Date();
-        marketReceivingAddress.setGmtCreate(now);
-        marketReceivingAddress.setGmtUpdate(now);
-        marketReceivingAddress.setAdminId(adminId);
-        return marketReceivingAddressMapper.insert(marketReceivingAddress) > 0;
-    }
-
-    @Override
-    public Page<MarketReceivingAddress> list(Long companyId, String cusId, String consigneeName, String phone, String location, String address, String status, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<MarketReceivingAddress> wrapper = new EntityWrapper<MarketReceivingAddress>();
-        if (!StringUtils.isEmpty(companyId)) {
-            wrapper.eq("company_id", companyId);
-        }
-        if (!StringUtils.isEmpty(cusId)) {
-            wrapper.eq("cus_id", cusId);
-        }
-        if (!StringUtils.isEmpty(consigneeName)) {
-            wrapper.eq("consignee_name", consigneeName);
-        }
-        if (!StringUtils.isEmpty(phone)) {
-            wrapper.eq("phone", phone);
-        }
-        if (!StringUtils.isEmpty(location)) {
-            wrapper.eq("location", location);
-        }
-        if (!StringUtils.isEmpty(address)) {
-            wrapper.eq("address", address);
-        }
-        if (!StringUtils.isEmpty(status)) {
-            wrapper.eq("status", status);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        wrapper.eq("delete_flag", 0);
-        List<MarketReceivingAddress> list = marketReceivingAddressMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-        Integer count = marketReceivingAddressMapper.selectCount(wrapper);
-        return new Page<MarketReceivingAddress>(list, page, limit, count);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean delete(String id) {
-        String[] ids = String.valueOf(id).split(",");
-        for (String tt : ids) {
-            MarketReceivingAddress tmp = marketReceivingAddressMapper.selectById(Long.parseLong(tt));
-            if (tmp != null) {
-                tmp.setDeleteFlag(1);
-                marketReceivingAddressMapper.updateById(tmp);
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Boolean update(MarketReceivingAddress marketReceivingAddress, Long adminId) throws ServiceException {
-        Date now = new Date();
-        marketReceivingAddress.setGmtUpdate(now);
-        marketReceivingAddress.setAdminId(adminId);
-        return marketReceivingAddressMapper.updateById(marketReceivingAddress) > 0;
-    }
-
-    @Override
-    public MarketReceivingAddress get(Long id) throws ServiceException {
-        return marketReceivingAddressMapper.selectById(id);
-    }
-
-    @Override
-    public String export(Long companyId, String cusId, String consigneeName, String phone, String location, String address, String status, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<MarketReceivingAddress> wrapper = new EntityWrapper<MarketReceivingAddress>();
-        if (!StringUtils.isEmpty(companyId)) {
-            wrapper.eq("company_id", companyId);
-        }
-        if (!StringUtils.isEmpty(cusId)) {
-            wrapper.eq("cus_id", cusId);
-        }
-        if (!StringUtils.isEmpty(consigneeName)) {
-            wrapper.eq("consignee_name", consigneeName);
-        }
-        if (!StringUtils.isEmpty(phone)) {
-            wrapper.eq("phone", phone);
-        }
-        if (!StringUtils.isEmpty(location)) {
-            wrapper.eq("location", location);
-        }
-        if (!StringUtils.isEmpty(address)) {
-            wrapper.eq("address", address);
-        }
-        if (!StringUtils.isEmpty(status)) {
-            wrapper.eq("status", status);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        List<MarketReceivingAddress> list = marketReceivingAddressMapper.selectList(wrapper);
-        ExcelUtil<MarketReceivingAddress> util = new ExcelUtil<MarketReceivingAddress>(MarketReceivingAddress.class);
-        return util.exportExcel(list, "操作日志");
-    }
-}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/impl/MarketShopInfoServiceImpl.java

@@ -1,152 +0,0 @@
-package com.iotechn.unimall.admin.api.market.impl;
-
-import java.util.List;
-
-import com.iotechn.unimall.admin.api.market.IMarketShopInfoService;
-import com.iotechn.unimall.data.domain.market.MarketShopInfo;
-import com.iotechn.unimall.data.mapper.market.MarketShopInfoMapper;
-import org.apache.ibatis.session.RowBounds;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.model.Page;
-
-import java.util.Date;
-
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 商店信息Service业务层处理
- *
- * @author jlb
- * @date 2022-08-01
- */
-@Service
-public class MarketShopInfoServiceImpl implements IMarketShopInfoService {
-    @Autowired
-    private MarketShopInfoMapper marketShopInfoMapper;
-
-    @Override
-    public Boolean add(MarketShopInfo marketShopInfo, Long adminId) throws ServiceException {
-        Date now = new Date();
-        marketShopInfo.setGmtCreate(now);
-        marketShopInfo.setGmtUpdate(now);
-        marketShopInfo.setAdminId(adminId);
-        return marketShopInfoMapper.insert(marketShopInfo) > 0;
-    }
-
-    @Override
-    public Page<MarketShopInfo> list(Long companyId, String name, String postion, String url, String phone, String status, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<MarketShopInfo> wrapper = new EntityWrapper<MarketShopInfo>();
-        if (!StringUtils.isEmpty(companyId)) {
-            wrapper.eq("company_id", companyId);
-        }
-        if (!StringUtils.isEmpty(name)) {
-            wrapper.eq("name", name);
-        }
-        if (!StringUtils.isEmpty(postion)) {
-            wrapper.eq("postion", postion);
-        }
-        if (!StringUtils.isEmpty(url)) {
-            wrapper.eq("url", url);
-        }
-        if (!StringUtils.isEmpty(phone)) {
-            wrapper.eq("phone", phone);
-        }
-        if (!StringUtils.isEmpty(status)) {
-            wrapper.eq("status", status);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        wrapper.eq("delete_flag", 0);
-        List<MarketShopInfo> list = marketShopInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-        Integer count = marketShopInfoMapper.selectCount(wrapper);
-        return new Page<MarketShopInfo>(list, page, limit, count);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean delete(String id) {
-        String[] ids = String.valueOf(id).split(",");
-        for (String tt : ids) {
-            MarketShopInfo tmp = marketShopInfoMapper.selectById(Long.parseLong(tt));
-            if (tmp != null) {
-                tmp.setDeleteFlag(1);
-                marketShopInfoMapper.updateById(tmp);
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Boolean update(MarketShopInfo marketShopInfo, Long adminId) throws ServiceException {
-        Date now = new Date();
-        marketShopInfo.setGmtUpdate(now);
-        marketShopInfo.setAdminId(adminId);
-        return marketShopInfoMapper.updateById(marketShopInfo) > 0;
-    }
-
-    @Override
-    public MarketShopInfo get(Long id) throws ServiceException {
-        return marketShopInfoMapper.selectById(id);
-    }
-
-    @Override
-    public String export(Long companyId, String name, String postion, String url, String phone, String status, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
-        Wrapper<MarketShopInfo> wrapper = new EntityWrapper<MarketShopInfo>();
-        if (!StringUtils.isEmpty(companyId)) {
-            wrapper.eq("company_id", companyId);
-        }
-        if (!StringUtils.isEmpty(name)) {
-            wrapper.eq("name", name);
-        }
-        if (!StringUtils.isEmpty(postion)) {
-            wrapper.eq("postion", postion);
-        }
-        if (!StringUtils.isEmpty(url)) {
-            wrapper.eq("url", url);
-        }
-        if (!StringUtils.isEmpty(phone)) {
-            wrapper.eq("phone", phone);
-        }
-        if (!StringUtils.isEmpty(status)) {
-            wrapper.eq("status", status);
-        }
-        if (!StringUtils.isEmpty(deleteFlag)) {
-            wrapper.eq("delete_flag", deleteFlag);
-        }
-        if (!StringUtils.isEmpty(gmtCreate)) {
-            wrapper.eq("gmt_create", gmtCreate);
-        }
-        if (!StringUtils.isEmpty(gmtUpdate)) {
-            wrapper.eq("gmt_update", gmtUpdate);
-        }
-        if (!StringUtils.isEmpty(userId)) {
-            wrapper.eq("user_id", userId);
-        }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
-        }
-        List<MarketShopInfo> list = marketShopInfoMapper.selectList(wrapper);
-        ExcelUtil<MarketShopInfo> util = new ExcelUtil<MarketShopInfo>(MarketShopInfo.class);
-        return util.exportExcel(list, "操作日志");
-    }
-}

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/market/impl/SunMemberInfoServiceImpl.java

@@ -1,168 +0,0 @@
-package com.iotechn.unimall.admin.api.market.impl;
-
-import java.util.List;
-
-import com.iotechn.unimall.admin.api.market.ISunMemberInfoService;
-import com.iotechn.unimall.data.domain.SunMemberInfo;
-import com.iotechn.unimall.data.mapper.SunMemberInfoMapper;
-import org.apache.ibatis.session.RowBounds;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.model.Page;
-import java.util.Date;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 会员信息Service业务层处理
- * 
- * @author jlb
- * @date 2022-10-31
- */
-@Service
-public class SunMemberInfoServiceImpl implements ISunMemberInfoService {
-	@Autowired
-	private SunMemberInfoMapper sunMemberInfoMapper;
-	
-	@Override
-	public Boolean add(SunMemberInfo sunMemberInfo, Long adminId) throws ServiceException {
-		Date now = new Date();
-		sunMemberInfo.setGmtCreate(now);
-		sunMemberInfo.setGmtUpdate(now);
-		sunMemberInfo.setAdminId(adminId);
-		return sunMemberInfoMapper.insert(sunMemberInfo)>0;
-	}
-
-	@Override
-	public Page<SunMemberInfo> list(Long companyId,String name,String phone,Long sex,String stars,String starsProject,Long cancellations,Double balance,String remarks,Long deleteFlag,Date gmtCreate,Date gmtUpdate,Long userId,Long adminId, Integer page, Integer limit)throws ServiceException {
-		Wrapper<SunMemberInfo> wrapper = new EntityWrapper<SunMemberInfo>();
-														if (!StringUtils.isEmpty(companyId)) {
-					wrapper.eq("company_id", companyId);
-				}
-												if (!StringUtils.isEmpty(name)) {
-					wrapper.eq("name", name);
-				}
-												if (!StringUtils.isEmpty(phone)) {
-					wrapper.eq("phone", phone);
-				}
-												if (!StringUtils.isEmpty(sex)) {
-					wrapper.eq("sex", sex);
-				}
-												if (!StringUtils.isEmpty(stars)) {
-					wrapper.eq("stars", stars);
-				}
-												if (!StringUtils.isEmpty(starsProject)) {
-					wrapper.eq("stars_project", starsProject);
-				}
-												if (!StringUtils.isEmpty(cancellations)) {
-					wrapper.eq("cancellations", cancellations);
-				}
-												if (!StringUtils.isEmpty(balance)) {
-					wrapper.eq("balance", balance);
-				}
-												if (!StringUtils.isEmpty(remarks)) {
-					wrapper.eq("remarks", remarks);
-				}
-																	if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(userId)) {
-					wrapper.eq("user_id", userId);
-				}
-												if (!StringUtils.isEmpty(adminId)) {
-					wrapper.eq("admin_id", adminId);
-				}
-							wrapper.eq("delete_flag", 0);
-		List<SunMemberInfo> list = sunMemberInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-		Integer count = sunMemberInfoMapper.selectCount(wrapper);
-		return new Page<SunMemberInfo>(list, page, limit, count);
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			SunMemberInfo tmp =  sunMemberInfoMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1);
-				sunMemberInfoMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
-
-	@Override
-	public Boolean update(SunMemberInfo sunMemberInfo,Long adminId) throws ServiceException {
-		Date now = new Date();
-		sunMemberInfo.setGmtUpdate(now);
-		sunMemberInfo.setAdminId(adminId);
-		return sunMemberInfoMapper.updateById(sunMemberInfo)>0;
-	}
-
-	@Override
-	public SunMemberInfo get(Long id) throws ServiceException {
-		return sunMemberInfoMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(Long companyId,String name,String phone,Long sex,String stars,String starsProject,Long cancellations,Double balance,String remarks,Long deleteFlag,Date gmtCreate,Date gmtUpdate,Long userId,Long adminId, Integer page, Integer limit)throws ServiceException {
-		Wrapper<SunMemberInfo> wrapper = new EntityWrapper<SunMemberInfo>();
-														if (!StringUtils.isEmpty(companyId)) {
-					wrapper.eq("company_id", companyId);
-				}
-												if (!StringUtils.isEmpty(name)) {
-					wrapper.eq("name", name);
-				}
-												if (!StringUtils.isEmpty(phone)) {
-					wrapper.eq("phone", phone);
-				}
-												if (!StringUtils.isEmpty(sex)) {
-					wrapper.eq("sex", sex);
-				}
-												if (!StringUtils.isEmpty(stars)) {
-					wrapper.eq("stars", stars);
-				}
-												if (!StringUtils.isEmpty(starsProject)) {
-					wrapper.eq("stars_project", starsProject);
-				}
-												if (!StringUtils.isEmpty(cancellations)) {
-					wrapper.eq("cancellations", cancellations);
-				}
-												if (!StringUtils.isEmpty(balance)) {
-					wrapper.eq("balance", balance);
-				}
-												if (!StringUtils.isEmpty(remarks)) {
-					wrapper.eq("remarks", remarks);
-				}
-																	if (!StringUtils.isEmpty(deleteFlag)) {
-					wrapper.eq("delete_flag", deleteFlag);
-				}
-												if (!StringUtils.isEmpty(gmtCreate)) {
-					wrapper.eq("gmt_create", gmtCreate);
-				}
-												if (!StringUtils.isEmpty(gmtUpdate)) {
-					wrapper.eq("gmt_update", gmtUpdate);
-				}
-												if (!StringUtils.isEmpty(userId)) {
-					wrapper.eq("user_id", userId);
-				}
-												if (!StringUtils.isEmpty(adminId)) {
-					wrapper.eq("admin_id", adminId);
-				}
-							List<SunMemberInfo> list = sunMemberInfoMapper.selectList(wrapper);
-		ExcelUtil<SunMemberInfo> util = new ExcelUtil<SunMemberInfo>(SunMemberInfo.class);
-		return util.exportExcel(list, "操作日志");
-	}
-}

unimall-data/src/main/java/com/iotechn/unimall/data/domain/MemberManagement.java

@@ -0,0 +1,151 @@
+package com.iotechn.unimall.data.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel.ColumnType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.iotechn.unimall.core.util.StringUtils;
+import java.util.Date;
+
+/**
+ * 会员管理对象 member_management
+ * 
+ * @author jlb
+ * @date 2023-02-08
+ */
+@Data
+@TableName("member_management")
+public class MemberManagement extends SuperDO{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    @TableId("id")
+    private Long id;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("company_id")
+    private Long companyId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    @TableField("user_name")
+    private String userName;
+
+    /** 手机号 */
+    @Excel(name = "手机号")
+    @TableField("phone")
+    private String phone;
+
+    /** 卡名称 */
+    @Excel(name = "卡名称")
+    @TableField("cart_name")
+    private String cartName;
+
+    /** 卡号 */
+    @Excel(name = "卡号")
+    @TableField("cart_no")
+    private String cartNo;
+
+    /** 卡到期时间 */
+    @Excel(name = "卡到期时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("cart_end_time")
+    private Date cartEndTime;
+
+    /** 金额（元） */
+    @Excel(name = "金额", readConverterExp = "元=")
+    @TableField("money")
+    private Double money;
+
+    /** 日期 */
+    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("cart_time")
+    private Date cartTime;
+
+    /** 累计充值 */
+    @Excel(name = "累计充值")
+    @TableField("lei_chong")
+    private Double leiChong;
+
+    /** 累计消费 */
+    @Excel(name = "累计消费")
+    @TableField("lei_xiao")
+    private Double leiXiao;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    @TableField("status")
+    private String status;
+
+    /** 备注1 */
+    @Excel(name = "备注1")
+    @TableField("remark1")
+    private String remark1;
+
+    /** 备注2 */
+    @Excel(name = "备注2")
+    @TableField("remark2")
+    private String remark2;
+
+    /** 备注3 */
+    @Excel(name = "备注3")
+    @TableField("remark3")
+    private String remark3;
+
+    /** 0：否（默认） 1：是 */
+    @Excel(name = "0：否", readConverterExp = "默=认")
+    @TableField("delete_flag")
+    private Long deleteFlag;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_update")
+    private Date gmtUpdate;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("user_id")
+    private Long userId;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("admin_id")
+    private Long adminId;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("companyId", getCompanyId())
+            .append("userName", getUserName())
+            .append("phone", getPhone())
+            .append("cartName", getCartName())
+            .append("cartNo", getCartNo())
+            .append("cartEndTime", getCartEndTime())
+            .append("money", getMoney())
+            .append("cartTime", getCartTime())
+            .append("leiChong", getLeiChong())
+            .append("leiXiao", getLeiXiao())
+            .append("status", getStatus())
+            .append("remark1", getRemark1())
+            .append("remark2", getRemark2())
+            .append("remark3", getRemark3())
+            .append("deleteFlag", getDeleteFlag())
+            .append("gmtCreate", getGmtCreate())
+            .append("gmtUpdate", getGmtUpdate())
+            .append("userId", getUserId())
+            .append("adminId", getAdminId())
+            .toString();
+    }
+}

unimall-data/src/main/java/com/iotechn/unimall/data/domain/MoneyHis.java

@@ -0,0 +1,115 @@
+package com.iotechn.unimall.data.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel.ColumnType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.iotechn.unimall.core.util.StringUtils;
+import java.util.Date;
+
+/**
+ * 充值消费记录对象 money_his
+ * 
+ * @author jlb
+ * @date 2023-02-10
+ */
+@Data
+@TableName("money_his")
+public class MoneyHis extends SuperDO{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    @TableId("id")
+    private Long id;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("xiaofei_id")
+    private Long xiaofeiId;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("company_id")
+    private Long companyId;
+
+    /** 充值1消费2 */
+    @Excel(name = "充值1消费2")
+    @TableField("service_object")
+    private String serviceObject;
+
+    /** 金额（元） */
+    @Excel(name = "金额", readConverterExp = "元=")
+    @TableField("money")
+    private Double money;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    @TableField("status")
+    private String status;
+
+    /** 备注1 */
+    @Excel(name = "备注1")
+    @TableField("remark1")
+    private String remark1;
+
+    /** 备注2 */
+    @Excel(name = "备注2")
+    @TableField("remark2")
+    private String remark2;
+
+    /** 备注3 */
+    @Excel(name = "备注3")
+    @TableField("remark3")
+    private String remark3;
+
+    /** 0：否（默认） 1：是 */
+    @Excel(name = "0：否", readConverterExp = "默=认")
+    @TableField("delete_flag")
+    private Long deleteFlag;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_update")
+    private Date gmtUpdate;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("user_id")
+    private Long userId;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("admin_id")
+    private Long adminId;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("xiaofeiId", getXiaofeiId())
+            .append("companyId", getCompanyId())
+            .append("serviceObject", getServiceObject())
+            .append("money", getMoney())
+            .append("status", getStatus())
+            .append("remark1", getRemark1())
+            .append("remark2", getRemark2())
+            .append("remark3", getRemark3())
+            .append("deleteFlag", getDeleteFlag())
+            .append("gmtCreate", getGmtCreate())
+            .append("gmtUpdate", getGmtUpdate())
+            .append("userId", getUserId())
+            .append("adminId", getAdminId())
+            .toString();
+    }
+}

unimall-data/src/main/java/com/iotechn/unimall/data/domain/SalesSlip.java

@@ -0,0 +1,133 @@
+package com.iotechn.unimall.data.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel.ColumnType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.iotechn.unimall.core.util.StringUtils;
+import java.util.Date;
+
+/**
+ * 销售单对象 sales_slip
+ * 
+ * @author jlb
+ * @date 2023-02-08
+ */
+@Data
+@TableName("sales_slip")
+public class SalesSlip extends SuperDO{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    @TableId("id")
+    private Long id;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("company_id")
+    private Long companyId;
+
+    /** 服务对象 */
+    @Excel(name = "服务对象")
+    @TableField("service_object")
+    private String serviceObject;
+
+    /** 服务分类 */
+    @Excel(name = "服务分类")
+    @TableField("service_type")
+    private String serviceType;
+
+    /** 颜色 */
+    @Excel(name = "颜色")
+    @TableField("color")
+    private String color;
+
+    /** 属性 */
+    @Excel(name = "属性")
+    @TableField("attribute")
+    private String attribute;
+
+    /** 服务项目 */
+    @Excel(name = "服务项目")
+    @TableField("service_items")
+    private String serviceItems;
+
+    /** 金额（元） */
+    @Excel(name = "金额", readConverterExp = "元=")
+    @TableField("money")
+    private Double money;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    @TableField("status")
+    private String status;
+
+    /** 备注1 */
+    @Excel(name = "备注1")
+    @TableField("remark1")
+    private String remark1;
+
+    /** 备注2 */
+    @Excel(name = "备注2")
+    @TableField("remark2")
+    private String remark2;
+
+    /** 备注3 */
+    @Excel(name = "备注3")
+    @TableField("remark3")
+    private String remark3;
+
+    /** 0：否（默认） 1：是 */
+    @Excel(name = "0：否", readConverterExp = "默=认")
+    @TableField("delete_flag")
+    private Long deleteFlag;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_update")
+    private Date gmtUpdate;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("user_id")
+    private Long userId;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("admin_id")
+    private Long adminId;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("companyId", getCompanyId())
+            .append("serviceObject", getServiceObject())
+            .append("serviceType", getServiceType())
+            .append("color", getColor())
+            .append("attribute", getAttribute())
+            .append("serviceItems", getServiceItems())
+            .append("money", getMoney())
+            .append("status", getStatus())
+            .append("remark1", getRemark1())
+            .append("remark2", getRemark2())
+            .append("remark3", getRemark3())
+            .append("deleteFlag", getDeleteFlag())
+            .append("gmtCreate", getGmtCreate())
+            .append("gmtUpdate", getGmtUpdate())
+            .append("userId", getUserId())
+            .append("adminId", getAdminId())
+            .toString();
+    }
+}

unimall-data/src/main/java/com/iotechn/unimall/data/domain/ServiceManger.java

@@ -0,0 +1,103 @@
+package com.iotechn.unimall.data.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel.ColumnType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.iotechn.unimall.core.util.StringUtils;
+import java.util.Date;
+
+/**
+ * 服务管理对象 service_manger
+ * 
+ * @author jlb
+ * @date 2023-02-08
+ */
+@Data
+@TableName("service_manger")
+public class ServiceManger extends SuperDO{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    @TableId("id")
+    private Long id;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("company_id")
+    private Long companyId;
+
+    /** 服务项目 */
+    @Excel(name = "服务项目")
+    @TableField("route")
+    private String route;
+
+    /** 价格 */
+    @Excel(name = "价格")
+    @TableField("unit_price")
+    private Double unitPrice;
+
+    /** 备注1 */
+    @Excel(name = "备注1")
+    @TableField("remark1")
+    private String remark1;
+
+    /** 备注2 */
+    @Excel(name = "备注2")
+    @TableField("remark2")
+    private String remark2;
+
+    /** 备注3 */
+    @Excel(name = "备注3")
+    @TableField("remark3")
+    private String remark3;
+
+    /** 0：否（默认） 1：是 */
+    @Excel(name = "0：否", readConverterExp = "默=认")
+    @TableField("delete_flag")
+    private Long deleteFlag;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_update")
+    private Date gmtUpdate;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("user_id")
+    private Long userId;
+
+    /**  */
+    @Excel(name = "")
+    @TableField("admin_id")
+    private Long adminId;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("companyId", getCompanyId())
+            .append("route", getRoute())
+            .append("unitPrice", getUnitPrice())
+            .append("remark1", getRemark1())
+            .append("remark2", getRemark2())
+            .append("remark3", getRemark3())
+            .append("deleteFlag", getDeleteFlag())
+            .append("gmtCreate", getGmtCreate())
+            .append("gmtUpdate", getGmtUpdate())
+            .append("userId", getUserId())
+            .append("adminId", getAdminId())
+            .toString();
+    }
+}

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/MemberManagementMapper.java

@@ -0,0 +1,14 @@
+package com.iotechn.unimall.data.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.iotechn.unimall.data.domain.MemberManagement;
+
+/**
+ * 会员管理Mapper接口
+ * 
+ * @author jlb
+ * @date 2023-02-08
+ */
+public interface MemberManagementMapper extends BaseMapper<MemberManagement>{
+
+}

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/MoneyHisMapper.java

@@ -0,0 +1,14 @@
+package com.iotechn.unimall.data.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.iotechn.unimall.data.domain.MoneyHis;
+
+/**
+ * 充值消费记录Mapper接口
+ * 
+ * @author jlb
+ * @date 2023-02-10
+ */
+public interface MoneyHisMapper extends BaseMapper<MoneyHis>{
+
+}

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/SalesSlipMapper.java

@@ -0,0 +1,14 @@
+package com.iotechn.unimall.data.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.iotechn.unimall.data.domain.SalesSlip;
+
+/**
+ * 销售单Mapper接口
+ * 
+ * @author jlb
+ * @date 2023-02-08
+ */
+public interface SalesSlipMapper extends BaseMapper<SalesSlip>{
+
+}

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/ServiceMangerMapper.java

@@ -0,0 +1,14 @@
+package com.iotechn.unimall.data.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.iotechn.unimall.data.domain.ServiceManger;
+
+/**
+ * 服务管理Mapper接口
+ * 
+ * @author jlb
+ * @date 2023-02-08
+ */
+public interface ServiceMangerMapper extends BaseMapper<ServiceManger>{
+
+}

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/MemberManagementMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iotechn.unimall.data.mapper.MemberManagementMapper">
+    
+
+
+</mapper>

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/SalesSlipMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iotechn.unimall.data.mapper.SalesSlipMapper">
+    
+
+
+</mapper>

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/ServiceMangerMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iotechn.unimall.data.mapper.ServiceMangerMapper">
+    
+
+
+</mapper>

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/tools/gen/GenTableColumnMapper.xml

@@ -3,59 +3,59 @@
 <mapper
 	namespace="com.iotechn.unimall.data.mapper.tools.gen.GenTableColumnMapper">
 
-<!--	<resultMap type="GenTableColumn" id="GenTableColumnResult">-->
-<!--		<id property="columnId" column="column_id" />-->
-<!--		<result property="tableId" column="table_id" />-->
-<!--		<result property="columnName" column="column_name" />-->
-<!--		<result property="columnComment" column="column_comment" />-->
-<!--		<result property="columnType" column="column_type" />-->
-<!--		<result property="javaType" column="java_type" />-->
-<!--		<result property="javaField" column="java_field" />-->
-<!--		<result property="isPk" column="is_pk" />-->
-<!--		<result property="isIncrement" column="is_increment" />-->
-<!--		<result property="isRequired" column="is_required" />-->
-<!--		<result property="isInsert" column="is_insert" />-->
-<!--		<result property="isEdit" column="is_edit" />-->
-<!--		<result property="isList" column="is_list" />-->
-<!--		<result property="isQuery" column="is_query" />-->
-<!--		<result property="queryType" column="query_type" />-->
-<!--		<result property="htmlType" column="html_type" />-->
-<!--		<result property="dictType" column="dict_type" />-->
-<!--		<result property="sort" column="sort" />-->
-<!--		<result property="createBy" column="create_by" />-->
-<!--		<result property="createTime" column="create_time" />-->
-<!--		<result property="updateBy" column="update_by" />-->
-<!--		<result property="updateTime" column="update_time" />-->
-<!--	</resultMap>-->
-<!--	<sql id="selectDictTypeVo">-->
-<!--		SELECT-->
-<!--		table_id AS tableId,-->
-<!--		`table_name` AS tableName,-->
-<!--		table_comment AS tableComment,-->
-<!--		class_name AS className,-->
-<!--		tpl_category AS tplCategory,-->
-<!--		package_name AS packageName,-->
-<!--		module_name AS moduleName,-->
-<!--		business_name AS businessName,-->
-<!--		function_name AS functionName,-->
-<!--		function_author AS functionAuthor,-->
-<!--		create_by AS createBy,-->
-<!--		create_time AS createTime,-->
-<!--		update_by AS updateBy,-->
-<!--		update_time AS updateTime,-->
-<!--		`options`-->
-<!--		FROM-->
-<!--		sys_gen_table-->
-<!--	</sql>-->
-<!--	<select id="selectDbTableColumnsByName" parameterType="String" resultType="com.iotechn.unimall.data.domain.tools.gen.GenTableColumn">-->
-<!--		select column_name as columnName, (case when (is_nullable = 'no' <![CDATA[ && ]]>-->
-<!--		column_key != 'PRI') then '1' else null end) as isRequired, (case-->
-<!--		when column_key = 'PRI' then '1' else '0' end) as isPk,-->
-<!--		ordinal_position as sort, column_comment as columnComment, (case when extra =-->
-<!--		'auto_increment' then '1' else '0' end) as isIncrement, column_type as columnType-->
-<!--		from information_schema.columns where table_schema = (select-->
-<!--		database()) and table_name = (#{tableName})-->
-<!--		order by ordinal_position-->
-<!--	</select>-->
+	<resultMap type="GenTableColumn" id="GenTableColumnResult">
+		<id property="columnId" column="column_id" />
+		<result property="tableId" column="table_id" />
+		<result property="columnName" column="column_name" />
+		<result property="columnComment" column="column_comment" />
+		<result property="columnType" column="column_type" />
+		<result property="javaType" column="java_type" />
+		<result property="javaField" column="java_field" />
+		<result property="isPk" column="is_pk" />
+		<result property="isIncrement" column="is_increment" />
+		<result property="isRequired" column="is_required" />
+		<result property="isInsert" column="is_insert" />
+		<result property="isEdit" column="is_edit" />
+		<result property="isList" column="is_list" />
+		<result property="isQuery" column="is_query" />
+		<result property="queryType" column="query_type" />
+		<result property="htmlType" column="html_type" />
+		<result property="dictType" column="dict_type" />
+		<result property="sort" column="sort" />
+		<result property="createBy" column="create_by" />
+		<result property="createTime" column="create_time" />
+		<result property="updateBy" column="update_by" />
+		<result property="updateTime" column="update_time" />
+	</resultMap>
+	<sql id="selectDictTypeVo">
+		SELECT
+		table_id AS tableId,
+		`table_name` AS tableName,
+		table_comment AS tableComment,
+		class_name AS className,
+		tpl_category AS tplCategory,
+		package_name AS packageName,
+		module_name AS moduleName,
+		business_name AS businessName,
+		function_name AS functionName,
+		function_author AS functionAuthor,
+		create_by AS createBy,
+		create_time AS createTime,
+		update_by AS updateBy,
+		update_time AS updateTime,
+		`options`
+		FROM
+		sys_gen_table
+	</sql>
+	<select id="selectDbTableColumnsByName" parameterType="String" resultType="com.iotechn.unimall.data.domain.tools.gen.GenTableColumn">
+		select column_name as columnName, (case when (is_nullable = 'no' <![CDATA[ && ]]>
+		column_key != 'PRI') then '1' else null end) as isRequired, (case
+		when column_key = 'PRI' then '1' else '0' end) as isPk,
+		ordinal_position as sort, column_comment as columnComment, (case when extra =
+		'auto_increment' then '1' else '0' end) as isIncrement, column_type as columnType
+		from information_schema.columns where table_schema = (select
+		database()) and table_name = (#{tableName})
+		order by ordinal_position
+	</select>
 
 </mapper>

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/tools/gen/GenTableMapper.xml

@@ -2,124 +2,124 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iotechn.unimall.data.mapper.tools.gen.GenTableMapper">
 
-<!--	<resultMap type="GenTable" id="GenTableResult">-->
-<!--	    <id     property="tableId"        column="table_id"        />-->
-<!--		<result property="tableName"      column="table_name"      />-->
-<!--		<result property="tableComment"   column="table_comment"   />-->
-<!--		<result property="className"      column="class_name"      />-->
-<!--		<result property="tplCategory"    column="tpl_category"    />-->
-<!--		<result property="packageName"    column="package_name"    />-->
-<!--		<result property="moduleName"     column="module_name"     />-->
-<!--		<result property="businessName"   column="business_name"   />-->
-<!--		<result property="functionName"   column="function_name"   />-->
-<!--		<result property="functionAuthor" column="function_author" />-->
-<!--		<result property="options"        column="options"         />-->
-<!--		<result property="createBy"       column="create_by"       />-->
-<!--		<result property="createTime"     column="create_time"     />-->
-<!--		<result property="updateBy"       column="update_by"       />-->
-<!--		<result property="updateTime"     column="update_time"     />-->
-<!--		<result property="remark"         column="remark"          />-->
-<!--		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />-->
-<!--	</resultMap>-->
+	<resultMap type="GenTable" id="GenTableResult">
+	    <id     property="tableId"        column="table_id"        />
+		<result property="tableName"      column="table_name"      />
+		<result property="tableComment"   column="table_comment"   />
+		<result property="className"      column="class_name"      />
+		<result property="tplCategory"    column="tpl_category"    />
+		<result property="packageName"    column="package_name"    />
+		<result property="moduleName"     column="module_name"     />
+		<result property="businessName"   column="business_name"   />
+		<result property="functionName"   column="function_name"   />
+		<result property="functionAuthor" column="function_author" />
+		<result property="options"        column="options"         />
+		<result property="createBy"       column="create_by"       />
+		<result property="createTime"     column="create_time"     />
+		<result property="updateBy"       column="update_by"       />
+		<result property="updateTime"     column="update_time"     />
+		<result property="remark"         column="remark"          />
+		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
+	</resultMap>
 
-<!--	<resultMap type="GenTableColumn" id="GenTableColumnResult">-->
-<!--        <id     property="columnId"       column="column_id"      />-->
-<!--        <result property="tableId"        column="table_id"       />-->
-<!--        <result property="columnName"     column="column_name"    />-->
-<!--        <result property="columnComment"  column="column_comment" />-->
-<!--        <result property="columnType"     column="column_type"    />-->
-<!--        <result property="javaType"       column="java_type"      />-->
-<!--        <result property="javaField"      column="java_field"     />-->
-<!--        <result property="isPk"           column="is_pk"          />-->
-<!--        <result property="isIncrement"    column="is_increment"   />-->
-<!--        <result property="isRequired"     column="is_required"    />-->
-<!--        <result property="isInsert"       column="is_insert"      />-->
-<!--        <result property="isEdit"         column="is_edit"        />-->
-<!--        <result property="isList"         column="is_list"        />-->
-<!--        <result property="isQuery"        column="is_query"       />-->
-<!--        <result property="queryType"      column="query_type"     />-->
-<!--        <result property="htmlType"       column="html_type"      />-->
-<!--        <result property="dictType"       column="dict_type"      />-->
-<!--        <result property="sort"           column="sort"           />-->
-<!--        <result property="createBy"       column="create_by"      />-->
-<!--        <result property="createTime"     column="create_time"    />-->
-<!--        <result property="updateBy"       column="update_by"      />-->
-<!--        <result property="updateTime"     column="update_time"    />-->
-<!--    </resultMap>-->
-<!--	<sql id="selectDictTypeVo">-->
-<!--		SELECT-->
-<!--			table_id AS tableId,-->
-<!--			`table_name` AS tableName,-->
-<!--			table_comment AS tableComment,-->
-<!--			class_name AS className,-->
-<!--			tpl_category AS tplCategory,-->
-<!--			package_name AS packageName,-->
-<!--			module_name AS moduleName,-->
-<!--			business_name AS businessName,-->
-<!--			function_name AS functionName,-->
-<!--			function_author AS functionAuthor,-->
-<!--			create_by AS createBy,-->
-<!--			create_time AS createTime,-->
-<!--			update_by AS updateBy,-->
-<!--			update_time AS updateTime,-->
-<!--			`options`-->
-<!--		FROM-->
-<!--			sys_gen_table-->
-<!--	</sql>-->
-<!--	<select id="selectDbTableListByNames"  resultType="com.iotechn.unimall.data.domain.tools.gen.GenTable">-->
-<!--		SELECT-->
-<!--        table_name as tableName,-->
-<!--        table_comment as tableComment,-->
-<!--        create_time as createTime,-->
-<!--        update_time as updateTime-->
-<!--		FROM-->
-<!--			information_schema.TABLES-->
-<!--		WHERE-->
-<!--			table_schema = ( SELECT DATABASE ( ) )-->
-<!--			AND table_name NOT LIKE 'qrtz_%'-->
-<!--			AND table_name NOT LIKE 'gen_%'-->
-<!--			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )-->
-<!--			AND table_name in-->
-<!--			<foreach  item="item" collection="array" index="index"  open="(" separator="," close=")">-->
-<!--			#{item}-->
-<!--			</foreach>-->
-<!--	</select>-->
-<!--	<select id="selectDbTableList" parameterType="GenTable" resultType="com.iotechn.unimall.data.domain.tools.gen.GenTable">-->
-<!--		SELECT-->
-<!--			table_name as tableName,-->
-<!--			table_comment as tableComment,-->
-<!--			create_time as createTime,-->
-<!--			update_time as updateTime-->
-<!--		FROM-->
-<!--			information_schema.TABLES-->
-<!--		WHERE-->
-<!--			table_schema = ( SELECT DATABASE ( ) )-->
-<!--			AND table_name NOT LIKE 'qrtz_%'-->
-<!--			AND table_name NOT LIKE 'gen_%'-->
-<!--			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )-->
-<!--		<if test="tableName != null and tableName != ''">-->
-<!--			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))-->
-<!--		</if>-->
-<!--		<if test="tableComment != null and tableComment != ''">-->
-<!--			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))-->
-<!--		</if>-->
-<!--	</select>-->
-<!--	<select id="selectDbTableCount" parameterType="GenTable" resultType="java.lang.Integer">-->
-<!--		SELECT-->
-<!--			COUNT(*)-->
-<!--		FROM-->
-<!--			information_schema.TABLES-->
-<!--		WHERE-->
-<!--			table_schema = ( SELECT DATABASE ( ) )-->
-<!--			AND table_name NOT LIKE 'qrtz_%'-->
-<!--			AND table_name NOT LIKE 'gen_%'-->
-<!--			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )-->
-<!--		<if test="tableName != null and tableName != ''">-->
-<!--			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))-->
-<!--		</if>-->
-<!--		<if test="tableComment != null and tableComment != ''">-->
-<!--			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))-->
-<!--		</if>-->
-<!--	</select>-->
+	<resultMap type="GenTableColumn" id="GenTableColumnResult">
+        <id     property="columnId"       column="column_id"      />
+        <result property="tableId"        column="table_id"       />
+        <result property="columnName"     column="column_name"    />
+        <result property="columnComment"  column="column_comment" />
+        <result property="columnType"     column="column_type"    />
+        <result property="javaType"       column="java_type"      />
+        <result property="javaField"      column="java_field"     />
+        <result property="isPk"           column="is_pk"          />
+        <result property="isIncrement"    column="is_increment"   />
+        <result property="isRequired"     column="is_required"    />
+        <result property="isInsert"       column="is_insert"      />
+        <result property="isEdit"         column="is_edit"        />
+        <result property="isList"         column="is_list"        />
+        <result property="isQuery"        column="is_query"       />
+        <result property="queryType"      column="query_type"     />
+        <result property="htmlType"       column="html_type"      />
+        <result property="dictType"       column="dict_type"      />
+        <result property="sort"           column="sort"           />
+        <result property="createBy"       column="create_by"      />
+        <result property="createTime"     column="create_time"    />
+        <result property="updateBy"       column="update_by"      />
+        <result property="updateTime"     column="update_time"    />
+    </resultMap>
+	<sql id="selectDictTypeVo">
+		SELECT
+			table_id AS tableId,
+			`table_name` AS tableName,
+			table_comment AS tableComment,
+			class_name AS className,
+			tpl_category AS tplCategory,
+			package_name AS packageName,
+			module_name AS moduleName,
+			business_name AS businessName,
+			function_name AS functionName,
+			function_author AS functionAuthor,
+			create_by AS createBy,
+			create_time AS createTime,
+			update_by AS updateBy,
+			update_time AS updateTime,
+			`options`
+		FROM
+			sys_gen_table
+	</sql>
+	<select id="selectDbTableListByNames"  resultType="com.iotechn.unimall.data.domain.tools.gen.GenTable">
+		SELECT
+        table_name as tableName,
+        table_comment as tableComment,
+        create_time as createTime,
+        update_time as updateTime
+		FROM
+			information_schema.TABLES
+		WHERE
+			table_schema = ( SELECT DATABASE ( ) )
+			AND table_name NOT LIKE 'qrtz_%'
+			AND table_name NOT LIKE 'gen_%'
+			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )
+			AND table_name in
+			<foreach  item="item" collection="array" index="index"  open="(" separator="," close=")">
+			#{item}
+			</foreach>
+	</select>
+	<select id="selectDbTableList" parameterType="GenTable" resultType="com.iotechn.unimall.data.domain.tools.gen.GenTable">
+		SELECT
+			table_name as tableName,
+			table_comment as tableComment,
+			create_time as createTime,
+			update_time as updateTime
+		FROM
+			information_schema.TABLES
+		WHERE
+			table_schema = ( SELECT DATABASE ( ) )
+			AND table_name NOT LIKE 'qrtz_%'
+			AND table_name NOT LIKE 'gen_%'
+			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )
+		<if test="tableName != null and tableName != ''">
+			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+		</if>
+		<if test="tableComment != null and tableComment != ''">
+			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+		</if>
+	</select>
+	<select id="selectDbTableCount" parameterType="GenTable" resultType="java.lang.Integer">
+		SELECT
+			COUNT(*)
+		FROM
+			information_schema.TABLES
+		WHERE
+			table_schema = ( SELECT DATABASE ( ) )
+			AND table_name NOT LIKE 'qrtz_%'
+			AND table_name NOT LIKE 'gen_%'
+			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )
+		<if test="tableName != null and tableName != ''">
+			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+		</if>
+		<if test="tableComment != null and tableComment != ''">
+			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+		</if>
+	</select>
 	
 </mapper>