Merge branch 'master' of http://git.zthymaoyi.com/gongdc/gubi

# Conflicts:
#	unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/gubi/IGubiTransactionService.java

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/gubi/IGubiPriceHisService.java

@@ -9,59 +9,60 @@ 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-11-15
  */
 @HttpOpenApi(group = "admin.gubi.gubiPriceHis", description = "价格历史")
-public interface IGubiPriceHisService{
-	@HttpMethod(description = "新增")
-	public Boolean add(@NotNull @HttpParam(name = "gubiPriceHis", type = HttpParamType.COMMON, description = "价格历史") GubiPriceHis gubiPriceHis,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+public interface IGubiPriceHisService {
+    @HttpMethod(description = "新增")
+    public Boolean add(@NotNull @HttpParam(name = "gubiPriceHis", type = HttpParamType.COMMON, description = "价格历史") GubiPriceHis gubiPriceHis,
+                       @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
+
+    @HttpMethod(description = "列表")
+    public Page<GubiPriceHis> list(
+            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+            @HttpParam(name = "orderId", type = HttpParamType.COMMON, description = "分值id") String orderId,
+            @HttpParam(name = "collection", type = HttpParamType.COMMON, description = "时间") Date collection,
+            @HttpParam(name = "price", type = HttpParamType.COMMON, description = "价钱") Double price,
+            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+            @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:gubi:gubiPriceHis:delete", permissionParentName = "宠物管理", permissionName = "价格历史管理")
+    public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") String id) throws ServiceException;
 
-	@HttpMethod(description = "列表")
-	public Page<GubiPriceHis> list(
-								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-							@HttpParam(name = "orderId", type = HttpParamType.COMMON, description = "分值id") String orderId,
-							@HttpParam(name = "collection", type = HttpParamType.COMMON, description = "时间") Date collection,
-							@HttpParam(name = "price", type = HttpParamType.COMMON, description = "价钱") Double price,
-							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-							@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:gubi:gubiPriceHis:update", permissionParentName = "宠物管理", permissionName = "价格历史管理")
+    public Boolean update(@NotNull @HttpParam(name = "gubiPriceHis", type = HttpParamType.COMMON, description = "价格历史") GubiPriceHis gubiPriceHis,
+                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
 
-	@HttpMethod(description = "删除", permission = "admin:gubi:gubiPriceHis:delete",permissionParentName = "宠物管理", permissionName = "价格历史管理")
-	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+    @HttpMethod(description = "查询", permission = "admin:gubi:gubiPriceHis:get", permissionParentName = "宠物管理", permissionName = "价格历史管理")
+    public GubiPriceHis get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
 
-	@HttpMethod(description = "修改", permission = "admin:gubi:gubiPriceHis:update",permissionParentName = "宠物管理", permissionName = "价格历史管理")
-	public Boolean update(@NotNull @HttpParam(name = "gubiPriceHis", type = HttpParamType.COMMON, description = "价格历史") GubiPriceHis gubiPriceHis,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+    @HttpMethod(description = "导出excl表", permission = "admin:gubi:gubiPriceHis: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 = "collection", type = HttpParamType.COMMON, description = "时间") Date collection,
+            @HttpParam(name = "price", type = HttpParamType.COMMON, description = "价钱") Double price,
+            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+            @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:gubi:gubiPriceHis:get",permissionParentName = "宠物管理", permissionName = "价格历史管理")
-	public GubiPriceHis get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
-	
-	@HttpMethod(description = "导出excl表", permission = "admin:gubi:gubiPriceHis: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 = "collection", type = HttpParamType.COMMON, description = "时间") Date collection,
-							@HttpParam(name = "price", type = HttpParamType.COMMON, description = "价钱") Double price,
-							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-							@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/gubi/IGubiTypeInfoService.java

@@ -9,61 +9,62 @@ 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;
 import java.util.List;
 
 /**
  * 一级分类Service接口
- * 
+ *
  * @author jlb
  * @date 2022-11-15
  */
 @HttpOpenApi(group = "admin.gubi.gubiTypeInfo", description = "一级分类")
-public interface IGubiTypeInfoService{
-	@HttpMethod(description = "新增")
-	public Boolean add(@NotNull @HttpParam(name = "gubiTypeInfo", type = HttpParamType.COMMON, description = "一级分类") GubiTypeInfo gubiTypeInfo,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+public interface IGubiTypeInfoService {
+    @HttpMethod(description = "新增")
+    public Boolean add(@NotNull @HttpParam(name = "gubiTypeInfo", type = HttpParamType.COMMON, description = "一级分类") GubiTypeInfo gubiTypeInfo,
+                       @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
+
+    @HttpMethod(description = "列表")
+    public Page<GubiTypeInfo> list(
+            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+            @HttpParam(name = "typeName", type = HttpParamType.COMMON, description = "分类") String typeName,
+            @HttpParam(name = "postion", type = HttpParamType.COMMON, description = "排序") Long postion,
+            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+            @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 = "列表")
+    public List<GubiTypeInfo> listInfo() throws ServiceException;
 
-	@HttpMethod(description = "列表")
-	public Page<GubiTypeInfo> list(
-								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-							@HttpParam(name = "typeName", type = HttpParamType.COMMON, description = "分类") String typeName,
-							@HttpParam(name = "postion", type = HttpParamType.COMMON, description = "排序") Long postion,
-							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-							@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:gubi:gubiTypeInfo:delete", permissionParentName = "宠物管理", permissionName = "一级分类管理")
+    public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") String id) throws ServiceException;
 
-	@HttpMethod(description = "列表")
-	public List<GubiTypeInfo> listInfo() throws ServiceException;
+    @HttpMethod(description = "修改", permission = "admin:gubi:gubiTypeInfo:update", permissionParentName = "宠物管理", permissionName = "一级分类管理")
+    public Boolean update(@NotNull @HttpParam(name = "gubiTypeInfo", type = HttpParamType.COMMON, description = "一级分类") GubiTypeInfo gubiTypeInfo,
+                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
 
-	@HttpMethod(description = "删除", permission = "admin:gubi:gubiTypeInfo:delete",permissionParentName = "宠物管理", permissionName = "一级分类管理")
-	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+    @HttpMethod(description = "查询", permission = "admin:gubi:gubiTypeInfo:get", permissionParentName = "宠物管理", permissionName = "一级分类管理")
+    public GubiTypeInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
 
-	@HttpMethod(description = "修改", permission = "admin:gubi:gubiTypeInfo:update",permissionParentName = "宠物管理", permissionName = "一级分类管理")
-	public Boolean update(@NotNull @HttpParam(name = "gubiTypeInfo", type = HttpParamType.COMMON, description = "一级分类") GubiTypeInfo gubiTypeInfo,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+    @HttpMethod(description = "导出excl表", permission = "admin:gubi:gubiTypeInfo:export", permissionParentName = "宠物管理", permissionName = "一级分类管理")
+    public String export(
+            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+            @HttpParam(name = "typeName", type = HttpParamType.COMMON, description = "分类") String typeName,
+            @HttpParam(name = "postion", type = HttpParamType.COMMON, description = "排序") Long postion,
+            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+            @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:gubi:gubiTypeInfo:get",permissionParentName = "宠物管理", permissionName = "一级分类管理")
-	public GubiTypeInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
-	
-	@HttpMethod(description = "导出excl表", permission = "admin:gubi:gubiTypeInfo:export",permissionParentName = "宠物管理", permissionName = "一级分类管理")
-	public String export(
-								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-							@HttpParam(name = "typeName", type = HttpParamType.COMMON, description = "分类") String typeName,
-							@HttpParam(name = "postion", type = HttpParamType.COMMON, description = "排序") Long postion,
-							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-							@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/gubi/IGubiTypeSecondService.java

@@ -9,61 +9,62 @@ 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-11-15
  */
 @HttpOpenApi(group = "admin.gubi.gubiTypeSecond", description = "二级分类")
-public interface IGubiTypeSecondService{
-	@HttpMethod(description = "新增", permission = "admin:gubi:gubiTypeSecond:add", permissionParentName = "宠物管理", permissionName = "二级分类管理")
-	public Boolean add(@NotNull @HttpParam(name = "gubiTypeSecond", type = HttpParamType.COMMON, description = "二级分类") GubiTypeSecond gubiTypeSecond,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+public interface IGubiTypeSecondService {
+    @HttpMethod(description = "新增", permission = "admin:gubi:gubiTypeSecond:add", permissionParentName = "宠物管理", permissionName = "二级分类管理")
+    public Boolean add(@NotNull @HttpParam(name = "gubiTypeSecond", type = HttpParamType.COMMON, description = "二级分类") GubiTypeSecond gubiTypeSecond,
+                       @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
+
+    @HttpMethod(description = "列表", permission = "admin:gubi:gubiTypeSecond:list", permissionParentName = "宠物管理", permissionName = "二级分类管理")
+    public Page<GubiTypeSecond> list(
+            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+            @HttpParam(name = "typeId", type = HttpParamType.COMMON, description = "分类id") String typeId,
+            @HttpParam(name = "secondName", type = HttpParamType.COMMON, description = "二级分类型") String secondName,
+            @HttpParam(name = "postion", type = HttpParamType.COMMON, description = "排序") Long postion,
+            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+            @HttpParam(name = "urlPath", type = HttpParamType.COMMON, description = "附件") String urlPath,
+            @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:gubi:gubiTypeSecond:delete", permissionParentName = "宠物管理", permissionName = "二级分类管理")
+    public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") String id) throws ServiceException;
 
-	@HttpMethod(description = "列表", permission = "admin:gubi:gubiTypeSecond:list",permissionParentName = "宠物管理", permissionName = "二级分类管理")
-	public Page<GubiTypeSecond> list(
-								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-							@HttpParam(name = "typeId", type = HttpParamType.COMMON, description = "分类id") String typeId,
-							@HttpParam(name = "secondName", type = HttpParamType.COMMON, description = "二级分类型") String secondName,
-							@HttpParam(name = "postion", type = HttpParamType.COMMON, description = "排序") Long postion,
-							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-							@HttpParam(name = "urlPath", type = HttpParamType.COMMON, description = "附件") String urlPath,
-							@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:gubi:gubiTypeSecond:update", permissionParentName = "宠物管理", permissionName = "二级分类管理")
+    public Boolean update(@NotNull @HttpParam(name = "gubiTypeSecond", type = HttpParamType.COMMON, description = "二级分类") GubiTypeSecond gubiTypeSecond,
+                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
 
-	@HttpMethod(description = "删除", permission = "admin:gubi:gubiTypeSecond:delete",permissionParentName = "宠物管理", permissionName = "二级分类管理")
-	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+    @HttpMethod(description = "查询", permission = "admin:gubi:gubiTypeSecond:get", permissionParentName = "宠物管理", permissionName = "二级分类管理")
+    public GubiTypeSecond get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
 
-	@HttpMethod(description = "修改", permission = "admin:gubi:gubiTypeSecond:update",permissionParentName = "宠物管理", permissionName = "二级分类管理")
-	public Boolean update(@NotNull @HttpParam(name = "gubiTypeSecond", type = HttpParamType.COMMON, description = "二级分类") GubiTypeSecond gubiTypeSecond,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+    @HttpMethod(description = "导出excl表", permission = "admin:gubi:gubiTypeSecond:export", permissionParentName = "宠物管理", permissionName = "二级分类管理")
+    public String export(
+            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+            @HttpParam(name = "typeId", type = HttpParamType.COMMON, description = "分类id") String typeId,
+            @HttpParam(name = "secondName", type = HttpParamType.COMMON, description = "二级分类型") String secondName,
+            @HttpParam(name = "postion", type = HttpParamType.COMMON, description = "排序") Long postion,
+            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+            @HttpParam(name = "urlPath", type = HttpParamType.COMMON, description = "附件") String urlPath,
+            @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:gubi:gubiTypeSecond:get",permissionParentName = "宠物管理", permissionName = "二级分类管理")
-	public GubiTypeSecond get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
-	
-	@HttpMethod(description = "导出excl表", permission = "admin:gubi:gubiTypeSecond:export",permissionParentName = "宠物管理", permissionName = "二级分类管理")
-	public String export(
-								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-							@HttpParam(name = "typeId", type = HttpParamType.COMMON, description = "分类id") String typeId,
-							@HttpParam(name = "secondName", type = HttpParamType.COMMON, description = "二级分类型") String secondName,
-							@HttpParam(name = "postion", type = HttpParamType.COMMON, description = "排序") Long postion,
-							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-							@HttpParam(name = "urlPath", type = HttpParamType.COMMON, description = "附件") String urlPath,
-							@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/gubi/IGubiTypeThreeService.java

@@ -9,81 +9,82 @@ import com.iotechn.unimall.core.annotation.param.NotNull;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.domain.gubi.GubiTypeThree;
 import com.iotechn.unimall.data.model.Page;
+
 import java.util.Date;
 
 /**
  * 分值信息Service接口
- * 
+ *
  * @author jlb
  * @date 2022-11-15
  */
 @HttpOpenApi(group = "admin.gubi.gubiTypeThree", description = "分值信息")
-public interface IGubiTypeThreeService{
-	@HttpMethod(description = "新增", permission = "admin:gubi:gubiTypeThree:add", permissionParentName = "宠物管理", permissionName = "分值信息管理")
-	public Boolean add(@NotNull @HttpParam(name = "gubiTypeThree", type = HttpParamType.COMMON, description = "分值信息") GubiTypeThree gubiTypeThree,
-						   @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+public interface IGubiTypeThreeService {
+    @HttpMethod(description = "新增", permission = "admin:gubi:gubiTypeThree:add", permissionParentName = "宠物管理", permissionName = "分值信息管理")
+    public Boolean add(@NotNull @HttpParam(name = "gubiTypeThree", type = HttpParamType.COMMON, description = "分值信息") GubiTypeThree gubiTypeThree,
+                       @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
+
+    @HttpMethod(description = "列表", permission = "admin:gubi:gubiTypeThree:list", permissionParentName = "宠物管理", permissionName = "分值信息管理")
+    public Page<GubiTypeThree> list(
+            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+            @HttpParam(name = "typeId", type = HttpParamType.COMMON, description = "分类id") String typeId,
+            @HttpParam(name = "secondId", type = HttpParamType.COMMON, description = "二级分类id") String secondId,
+            @HttpParam(name = "product", type = HttpParamType.COMMON, description = "品名") String product,
+            @HttpParam(name = "number", type = HttpParamType.COMMON, description = "官网编号") String number,
+            @HttpParam(name = "year", type = HttpParamType.COMMON, description = "年份") String year,
+            @HttpParam(name = "face", type = HttpParamType.COMMON, description = "面值") String face,
+            @HttpParam(name = "edition", type = HttpParamType.COMMON, description = "版别") String edition,
+            @HttpParam(name = "region", type = HttpParamType.COMMON, description = "地区") String region,
+            @HttpParam(name = "grade", type = HttpParamType.COMMON, description = "分值等级") String grade,
+            @HttpParam(name = "highScores", type = HttpParamType.COMMON, description = "高分数量") String highScores,
+            @HttpParam(name = "collection", type = HttpParamType.COMMON, description = "收集时间") Date collection,
+            @HttpParam(name = "introduction", type = HttpParamType.COMMON, description = "详细介绍") String introduction,
+            @HttpParam(name = "postion", type = HttpParamType.COMMON, description = "排序") Long postion,
+            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+            @HttpParam(name = "urlPath", type = HttpParamType.COMMON, description = "附件") String urlPath,
+            @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:gubi:gubiTypeThree:delete", permissionParentName = "宠物管理", permissionName = "分值信息管理")
+    public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") String id) throws ServiceException;
 
-	@HttpMethod(description = "列表", permission = "admin:gubi:gubiTypeThree:list",permissionParentName = "宠物管理", permissionName = "分值信息管理")
-	public Page<GubiTypeThree> list(
-								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-							@HttpParam(name = "typeId", type = HttpParamType.COMMON, description = "分类id") String typeId,
-							@HttpParam(name = "secondId", type = HttpParamType.COMMON, description = "二级分类id") String secondId,
-							@HttpParam(name = "product", type = HttpParamType.COMMON, description = "品名") String product,
-							@HttpParam(name = "number", type = HttpParamType.COMMON, description = "官网编号") String number,
-							@HttpParam(name = "year", type = HttpParamType.COMMON, description = "年份") String year,
-							@HttpParam(name = "face", type = HttpParamType.COMMON, description = "面值") String face,
-							@HttpParam(name = "edition", type = HttpParamType.COMMON, description = "版别") String edition,
-							@HttpParam(name = "region", type = HttpParamType.COMMON, description = "地区") String region,
-							@HttpParam(name = "grade", type = HttpParamType.COMMON, description = "分值等级") String grade,
-							@HttpParam(name = "highScores", type = HttpParamType.COMMON, description = "高分数量") String highScores,
-							@HttpParam(name = "collection", type = HttpParamType.COMMON, description = "收集时间") Date collection,
-							@HttpParam(name = "introduction", type = HttpParamType.COMMON, description = "详细介绍") String introduction,
-							@HttpParam(name = "postion", type = HttpParamType.COMMON, description = "排序") Long postion,
-							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-							@HttpParam(name = "urlPath", type = HttpParamType.COMMON, description = "附件") String urlPath,
-							@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:gubi:gubiTypeThree:update", permissionParentName = "宠物管理", permissionName = "分值信息管理")
+    public Boolean update(@NotNull @HttpParam(name = "gubiTypeThree", type = HttpParamType.COMMON, description = "分值信息") GubiTypeThree gubiTypeThree,
+                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
 
-	@HttpMethod(description = "删除", permission = "admin:gubi:gubiTypeThree:delete",permissionParentName = "宠物管理", permissionName = "分值信息管理")
-	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+    @HttpMethod(description = "查询", permission = "admin:gubi:gubiTypeThree:get", permissionParentName = "宠物管理", permissionName = "分值信息管理")
+    public GubiTypeThree get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
 
-	@HttpMethod(description = "修改", permission = "admin:gubi:gubiTypeThree:update",permissionParentName = "宠物管理", permissionName = "分值信息管理")
-	public Boolean update(@NotNull @HttpParam(name = "gubiTypeThree", type = HttpParamType.COMMON, description = "分值信息") GubiTypeThree gubiTypeThree,
-						  @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId)throws ServiceException;
+    @HttpMethod(description = "导出excl表", permission = "admin:gubi:gubiTypeThree:export", permissionParentName = "宠物管理", permissionName = "分值信息管理")
+    public String export(
+            @HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
+            @HttpParam(name = "typeId", type = HttpParamType.COMMON, description = "分类id") String typeId,
+            @HttpParam(name = "secondId", type = HttpParamType.COMMON, description = "二级分类id") String secondId,
+            @HttpParam(name = "product", type = HttpParamType.COMMON, description = "品名") String product,
+            @HttpParam(name = "number", type = HttpParamType.COMMON, description = "官网编号") String number,
+            @HttpParam(name = "year", type = HttpParamType.COMMON, description = "年份") String year,
+            @HttpParam(name = "face", type = HttpParamType.COMMON, description = "面值") String face,
+            @HttpParam(name = "edition", type = HttpParamType.COMMON, description = "版别") String edition,
+            @HttpParam(name = "region", type = HttpParamType.COMMON, description = "地区") String region,
+            @HttpParam(name = "grade", type = HttpParamType.COMMON, description = "分值等级") String grade,
+            @HttpParam(name = "highScores", type = HttpParamType.COMMON, description = "高分数量") String highScores,
+            @HttpParam(name = "collection", type = HttpParamType.COMMON, description = "收集时间") Date collection,
+            @HttpParam(name = "introduction", type = HttpParamType.COMMON, description = "详细介绍") String introduction,
+            @HttpParam(name = "postion", type = HttpParamType.COMMON, description = "排序") Long postion,
+            @HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
+            @HttpParam(name = "urlPath", type = HttpParamType.COMMON, description = "附件") String urlPath,
+            @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:gubi:gubiTypeThree:get",permissionParentName = "宠物管理", permissionName = "分值信息管理")
-	public GubiTypeThree get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
-	
-	@HttpMethod(description = "导出excl表", permission = "admin:gubi:gubiTypeThree:export",permissionParentName = "宠物管理", permissionName = "分值信息管理")
-	public String export(
-								@HttpParam(name = "companyId", type = HttpParamType.COMMON, description = "") Long companyId,
-							@HttpParam(name = "typeId", type = HttpParamType.COMMON, description = "分类id") String typeId,
-							@HttpParam(name = "secondId", type = HttpParamType.COMMON, description = "二级分类id") String secondId,
-							@HttpParam(name = "product", type = HttpParamType.COMMON, description = "品名") String product,
-							@HttpParam(name = "number", type = HttpParamType.COMMON, description = "官网编号") String number,
-							@HttpParam(name = "year", type = HttpParamType.COMMON, description = "年份") String year,
-							@HttpParam(name = "face", type = HttpParamType.COMMON, description = "面值") String face,
-							@HttpParam(name = "edition", type = HttpParamType.COMMON, description = "版别") String edition,
-							@HttpParam(name = "region", type = HttpParamType.COMMON, description = "地区") String region,
-							@HttpParam(name = "grade", type = HttpParamType.COMMON, description = "分值等级") String grade,
-							@HttpParam(name = "highScores", type = HttpParamType.COMMON, description = "高分数量") String highScores,
-							@HttpParam(name = "collection", type = HttpParamType.COMMON, description = "收集时间") Date collection,
-							@HttpParam(name = "introduction", type = HttpParamType.COMMON, description = "详细介绍") String introduction,
-							@HttpParam(name = "postion", type = HttpParamType.COMMON, description = "排序") Long postion,
-							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态") String status,
-							@HttpParam(name = "urlPath", type = HttpParamType.COMMON, description = "附件") String urlPath,
-							@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/gubi/impl/GubiPriceHisServiceImpl.java

@@ -15,130 +15,132 @@ import com.iotechn.unimall.data.mapper.gubi.GubiPriceHisMapper;
 import com.iotechn.unimall.data.domain.gubi.GubiPriceHis;
 import com.iotechn.unimall.admin.api.gubi.IGubiPriceHisService;
 import com.iotechn.unimall.data.model.Page;
+
 import java.util.Date;
+
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 价格历史Service业务层处理
- * 
+ *
  * @author jlb
  * @date 2022-11-15
  */
 @Service
-public class GubiPriceHisServiceImpl implements IGubiPriceHisService{
-	@Autowired
-	private GubiPriceHisMapper gubiPriceHisMapper;
-	
-	@Override
-	public Boolean add(GubiPriceHis gubiPriceHis,Long adminId) throws ServiceException {
-		Date now = new Date();
-		gubiPriceHis.setGmtCreate(now);
-		gubiPriceHis.setGmtUpdate(now);
-		gubiPriceHis.setAdminId(adminId);
-		return gubiPriceHisMapper.insert(gubiPriceHis)>0;
-	}
+public class GubiPriceHisServiceImpl implements IGubiPriceHisService {
+    @Autowired
+    private GubiPriceHisMapper gubiPriceHisMapper;
+
+    @Override
+    public Boolean add(GubiPriceHis gubiPriceHis, Long adminId) throws ServiceException {
+        Date now = new Date();
+        gubiPriceHis.setGmtCreate(now);
+        gubiPriceHis.setGmtUpdate(now);
+        gubiPriceHis.setAdminId(adminId);
+        return gubiPriceHisMapper.insert(gubiPriceHis) > 0;
+    }
+
+    @Override
+    public Page<GubiPriceHis> list(Long companyId, String orderId, Date collection, Double price, String status, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<GubiPriceHis> wrapper = new EntityWrapper<GubiPriceHis>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(orderId)) {
+            wrapper.eq("order_id", orderId);
+        }
+        if (!StringUtils.isEmpty(collection)) {
+            wrapper.eq("collection", collection);
+        }
+        if (!StringUtils.isEmpty(price)) {
+            wrapper.eq("price", price);
+        }
+        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<GubiPriceHis> list = gubiPriceHisMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = gubiPriceHisMapper.selectCount(wrapper);
+        return new Page<GubiPriceHis>(list, page, limit, count);
+    }
 
-	@Override
-	public Page<GubiPriceHis> list(Long companyId,String orderId,Date collection,Double price,String status,Long deleteFlag,Date gmtCreate,Date gmtUpdate,Long userId,Long adminId, Integer page, Integer limit)throws ServiceException {
-		Wrapper<GubiPriceHis> wrapper = new EntityWrapper<GubiPriceHis>();
-														if (!StringUtils.isEmpty(companyId)) {
-					wrapper.eq("company_id", companyId);
-				}
-												if (!StringUtils.isEmpty(orderId)) {
-					wrapper.eq("order_id", orderId);
-				}
-												if (!StringUtils.isEmpty(collection)) {
-					wrapper.eq("collection", collection);
-				}
-												if (!StringUtils.isEmpty(price)) {
-					wrapper.eq("price", price);
-				}
-												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<GubiPriceHis> list = gubiPriceHisMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-		Integer count = gubiPriceHisMapper.selectCount(wrapper);
-		return new Page<GubiPriceHis>(list, page, limit, count);
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            GubiPriceHis tmp = gubiPriceHisMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                gubiPriceHisMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			GubiPriceHis tmp =  gubiPriceHisMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1l);
-				gubiPriceHisMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
+    @Override
+    public Boolean update(GubiPriceHis gubiPriceHis, Long adminId) throws ServiceException {
+        Date now = new Date();
+        gubiPriceHis.setGmtUpdate(now);
+        gubiPriceHis.setAdminId(adminId);
+        return gubiPriceHisMapper.updateById(gubiPriceHis) > 0;
+    }
 
-	@Override
-	public Boolean update(GubiPriceHis gubiPriceHis,Long adminId) throws ServiceException {
-		Date now = new Date();
-		gubiPriceHis.setGmtUpdate(now);
-		gubiPriceHis.setAdminId(adminId);
-		return gubiPriceHisMapper.updateById(gubiPriceHis)>0;
-	}
+    @Override
+    public GubiPriceHis get(Long id) throws ServiceException {
+        return gubiPriceHisMapper.selectById(id);
+    }
 
-	@Override
-	public GubiPriceHis get(Long id) throws ServiceException {
-		return gubiPriceHisMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(Long companyId,String orderId,Date collection,Double price,String status,Long deleteFlag,Date gmtCreate,Date gmtUpdate,Long userId,Long adminId, Integer page, Integer limit)throws ServiceException {
-		Wrapper<GubiPriceHis> wrapper = new EntityWrapper<GubiPriceHis>();
-														if (!StringUtils.isEmpty(companyId)) {
-					wrapper.eq("company_id", companyId);
-				}
-												if (!StringUtils.isEmpty(orderId)) {
-					wrapper.eq("order_id", orderId);
-				}
-												if (!StringUtils.isEmpty(collection)) {
-					wrapper.eq("collection", collection);
-				}
-												if (!StringUtils.isEmpty(price)) {
-					wrapper.eq("price", price);
-				}
-												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<GubiPriceHis> list = gubiPriceHisMapper.selectList(wrapper);
-		ExcelUtil<GubiPriceHis> util = new ExcelUtil<GubiPriceHis>(GubiPriceHis.class);
-		return util.exportExcel(list, "操作日志");
-	}
+    @Override
+    public String export(Long companyId, String orderId, Date collection, Double price, String status, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<GubiPriceHis> wrapper = new EntityWrapper<GubiPriceHis>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(orderId)) {
+            wrapper.eq("order_id", orderId);
+        }
+        if (!StringUtils.isEmpty(collection)) {
+            wrapper.eq("collection", collection);
+        }
+        if (!StringUtils.isEmpty(price)) {
+            wrapper.eq("price", price);
+        }
+        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<GubiPriceHis> list = gubiPriceHisMapper.selectList(wrapper);
+        ExcelUtil<GubiPriceHis> util = new ExcelUtil<GubiPriceHis>(GubiPriceHis.class);
+        return util.exportExcel(list, "操作日志");
+    }
 }

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/gubi/impl/GubiTransactionServiceImpl.java

@@ -15,148 +15,150 @@ import com.iotechn.unimall.data.mapper.gubi.GubiTransactionMapper;
 import com.iotechn.unimall.data.domain.gubi.GubiTransaction;
 import com.iotechn.unimall.admin.api.gubi.IGubiTransactionService;
 import com.iotechn.unimall.data.model.Page;
+
 import java.util.Date;
+
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 交易记录Service业务层处理
- * 
+ *
  * @author jlb
  * @date 2022-11-15
  */
 @Service
-public class GubiTransactionServiceImpl implements IGubiTransactionService{
-	@Autowired
-	private GubiTransactionMapper gubiTransactionMapper;
-	
-	@Override
-	public Boolean add(GubiTransaction gubiTransaction,Long adminId) throws ServiceException {
-		Date now = new Date();
-		gubiTransaction.setGmtCreate(now);
-		gubiTransaction.setGmtUpdate(now);
-		gubiTransaction.setAdminId(adminId);
-		return gubiTransactionMapper.insert(gubiTransaction)>0;
-	}
+public class GubiTransactionServiceImpl implements IGubiTransactionService {
+    @Autowired
+    private GubiTransactionMapper gubiTransactionMapper;
+
+    @Override
+    public Boolean add(GubiTransaction gubiTransaction, Long adminId) throws ServiceException {
+        Date now = new Date();
+        gubiTransaction.setGmtCreate(now);
+        gubiTransaction.setGmtUpdate(now);
+        gubiTransaction.setAdminId(adminId);
+        return gubiTransactionMapper.insert(gubiTransaction) > 0;
+    }
+
+    @Override
+    public Page<GubiTransaction> list(Long companyId, String orderId, String number, String grade, Date collection, Double price, String status, String urlPath, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<GubiTransaction> wrapper = new EntityWrapper<GubiTransaction>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(orderId)) {
+            wrapper.eq("order_id", orderId);
+        }
+        if (!StringUtils.isEmpty(number)) {
+            wrapper.eq("number", number);
+        }
+        if (!StringUtils.isEmpty(grade)) {
+            wrapper.eq("grade", grade);
+        }
+        if (!StringUtils.isEmpty(collection)) {
+            wrapper.eq("collection", collection);
+        }
+        if (!StringUtils.isEmpty(price)) {
+            wrapper.eq("price", price);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(urlPath)) {
+            wrapper.eq("url_path", urlPath);
+        }
+        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<GubiTransaction> list = gubiTransactionMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = gubiTransactionMapper.selectCount(wrapper);
+        return new Page<GubiTransaction>(list, page, limit, count);
+    }
 
-	@Override
-	public Page<GubiTransaction> list(Long companyId,String orderId,String number,String grade,Date collection,Double price,String status,String urlPath,Long deleteFlag,Date gmtCreate,Date gmtUpdate,Long userId,Long adminId, Integer page, Integer limit)throws ServiceException {
-		Wrapper<GubiTransaction> wrapper = new EntityWrapper<GubiTransaction>();
-														if (!StringUtils.isEmpty(companyId)) {
-					wrapper.eq("company_id", companyId);
-				}
-												if (!StringUtils.isEmpty(orderId)) {
-					wrapper.eq("order_id", orderId);
-				}
-												if (!StringUtils.isEmpty(number)) {
-					wrapper.eq("number", number);
-				}
-												if (!StringUtils.isEmpty(grade)) {
-					wrapper.eq("grade", grade);
-				}
-												if (!StringUtils.isEmpty(collection)) {
-					wrapper.eq("collection", collection);
-				}
-												if (!StringUtils.isEmpty(price)) {
-					wrapper.eq("price", price);
-				}
-												if (!StringUtils.isEmpty(status)) {
-					wrapper.eq("status", status);
-				}
-												if (!StringUtils.isEmpty(urlPath)) {
-					wrapper.eq("url_path", urlPath);
-				}
-												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<GubiTransaction> list = gubiTransactionMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-		Integer count = gubiTransactionMapper.selectCount(wrapper);
-		return new Page<GubiTransaction>(list, page, limit, count);
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            GubiTransaction tmp = gubiTransactionMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                gubiTransactionMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			GubiTransaction tmp =  gubiTransactionMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1l);
-				gubiTransactionMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
+    @Override
+    public Boolean update(GubiTransaction gubiTransaction, Long adminId) throws ServiceException {
+        Date now = new Date();
+        gubiTransaction.setGmtUpdate(now);
+        gubiTransaction.setAdminId(adminId);
+        return gubiTransactionMapper.updateById(gubiTransaction) > 0;
+    }
 
-	@Override
-	public Boolean update(GubiTransaction gubiTransaction,Long adminId) throws ServiceException {
-		Date now = new Date();
-		gubiTransaction.setGmtUpdate(now);
-		gubiTransaction.setAdminId(adminId);
-		return gubiTransactionMapper.updateById(gubiTransaction)>0;
-	}
+    @Override
+    public GubiTransaction get(Long id) throws ServiceException {
+        return gubiTransactionMapper.selectById(id);
+    }
 
-	@Override
-	public GubiTransaction get(Long id) throws ServiceException {
-		return gubiTransactionMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(Long companyId,String orderId,String number,String grade,Date collection,Double price,String status,String urlPath,Long deleteFlag,Date gmtCreate,Date gmtUpdate,Long userId,Long adminId, Integer page, Integer limit)throws ServiceException {
-		Wrapper<GubiTransaction> wrapper = new EntityWrapper<GubiTransaction>();
-														if (!StringUtils.isEmpty(companyId)) {
-					wrapper.eq("company_id", companyId);
-				}
-												if (!StringUtils.isEmpty(orderId)) {
-					wrapper.eq("order_id", orderId);
-				}
-												if (!StringUtils.isEmpty(number)) {
-					wrapper.eq("number", number);
-				}
-												if (!StringUtils.isEmpty(grade)) {
-					wrapper.eq("grade", grade);
-				}
-												if (!StringUtils.isEmpty(collection)) {
-					wrapper.eq("collection", collection);
-				}
-												if (!StringUtils.isEmpty(price)) {
-					wrapper.eq("price", price);
-				}
-												if (!StringUtils.isEmpty(status)) {
-					wrapper.eq("status", status);
-				}
-												if (!StringUtils.isEmpty(urlPath)) {
-					wrapper.eq("url_path", urlPath);
-				}
-												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<GubiTransaction> list = gubiTransactionMapper.selectList(wrapper);
-		ExcelUtil<GubiTransaction> util = new ExcelUtil<GubiTransaction>(GubiTransaction.class);
-		return util.exportExcel(list, "操作日志");
-	}
+    @Override
+    public String export(Long companyId, String orderId, String number, String grade, Date collection, Double price, String status, String urlPath, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<GubiTransaction> wrapper = new EntityWrapper<GubiTransaction>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(orderId)) {
+            wrapper.eq("order_id", orderId);
+        }
+        if (!StringUtils.isEmpty(number)) {
+            wrapper.eq("number", number);
+        }
+        if (!StringUtils.isEmpty(grade)) {
+            wrapper.eq("grade", grade);
+        }
+        if (!StringUtils.isEmpty(collection)) {
+            wrapper.eq("collection", collection);
+        }
+        if (!StringUtils.isEmpty(price)) {
+            wrapper.eq("price", price);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(urlPath)) {
+            wrapper.eq("url_path", urlPath);
+        }
+        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<GubiTransaction> list = gubiTransactionMapper.selectList(wrapper);
+        ExcelUtil<GubiTransaction> util = new ExcelUtil<GubiTransaction>(GubiTransaction.class);
+        return util.exportExcel(list, "操作日志");
+    }
 }

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/gubi/impl/GubiTypeInfoServiceImpl.java

@@ -95,8 +95,8 @@ public class GubiTypeInfoServiceImpl implements IGubiTypeInfoService {
                         .eq("type_id", list.get(i).getId())
                         .eq("delete_flag", "0")
                         .orderBy("postion"));
-                if(!CollectionUtils.isEmpty(gubiTypeSeconds)){
-                    for(int k=0;k<gubiTypeSeconds.size();k++){
+                if (!CollectionUtils.isEmpty(gubiTypeSeconds)) {
+                    for (int k = 0; k < gubiTypeSeconds.size(); k++) {
                         List<GubiTypeThree> gubiTypeThrees = gubiTypeThreeMapper.selectList(new EntityWrapper<GubiTypeThree>()
                                 .eq("second_id", gubiTypeSeconds.get(k).getId())
                                 .eq("delete_flag", "0")

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/gubi/impl/GubiTypeSecondServiceImpl.java

@@ -15,136 +15,138 @@ import com.iotechn.unimall.data.mapper.gubi.GubiTypeSecondMapper;
 import com.iotechn.unimall.data.domain.gubi.GubiTypeSecond;
 import com.iotechn.unimall.admin.api.gubi.IGubiTypeSecondService;
 import com.iotechn.unimall.data.model.Page;
+
 import java.util.Date;
+
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 二级分类Service业务层处理
- * 
+ *
  * @author jlb
  * @date 2022-11-15
  */
 @Service
-public class GubiTypeSecondServiceImpl implements IGubiTypeSecondService{
-	@Autowired
-	private GubiTypeSecondMapper gubiTypeSecondMapper;
-	
-	@Override
-	public Boolean add(GubiTypeSecond gubiTypeSecond,Long adminId) throws ServiceException {
-		Date now = new Date();
-		gubiTypeSecond.setGmtCreate(now);
-		gubiTypeSecond.setGmtUpdate(now);
-		gubiTypeSecond.setAdminId(adminId);
-		return gubiTypeSecondMapper.insert(gubiTypeSecond)>0;
-	}
+public class GubiTypeSecondServiceImpl implements IGubiTypeSecondService {
+    @Autowired
+    private GubiTypeSecondMapper gubiTypeSecondMapper;
+
+    @Override
+    public Boolean add(GubiTypeSecond gubiTypeSecond, Long adminId) throws ServiceException {
+        Date now = new Date();
+        gubiTypeSecond.setGmtCreate(now);
+        gubiTypeSecond.setGmtUpdate(now);
+        gubiTypeSecond.setAdminId(adminId);
+        return gubiTypeSecondMapper.insert(gubiTypeSecond) > 0;
+    }
+
+    @Override
+    public Page<GubiTypeSecond> list(Long companyId, String typeId, String secondName, Long postion, String status, String urlPath, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<GubiTypeSecond> wrapper = new EntityWrapper<GubiTypeSecond>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(typeId)) {
+            wrapper.eq("type_id", typeId);
+        }
+        if (!StringUtils.isEmpty(secondName)) {
+            wrapper.eq("second_name", secondName);
+        }
+        if (!StringUtils.isEmpty(postion)) {
+            wrapper.eq("postion", postion);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(urlPath)) {
+            wrapper.eq("url_path", urlPath);
+        }
+        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<GubiTypeSecond> list = gubiTypeSecondMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        Integer count = gubiTypeSecondMapper.selectCount(wrapper);
+        return new Page<GubiTypeSecond>(list, page, limit, count);
+    }
 
-	@Override
-	public Page<GubiTypeSecond> list(Long companyId,String typeId,String secondName,Long postion,String status,String urlPath,Long deleteFlag,Date gmtCreate,Date gmtUpdate,Long userId,Long adminId, Integer page, Integer limit)throws ServiceException {
-		Wrapper<GubiTypeSecond> wrapper = new EntityWrapper<GubiTypeSecond>();
-														if (!StringUtils.isEmpty(companyId)) {
-					wrapper.eq("company_id", companyId);
-				}
-												if (!StringUtils.isEmpty(typeId)) {
-					wrapper.eq("type_id", typeId);
-				}
-												if (!StringUtils.isEmpty(secondName)) {
-					wrapper.eq("second_name", secondName);
-				}
-												if (!StringUtils.isEmpty(postion)) {
-					wrapper.eq("postion", postion);
-				}
-												if (!StringUtils.isEmpty(status)) {
-					wrapper.eq("status", status);
-				}
-												if (!StringUtils.isEmpty(urlPath)) {
-					wrapper.eq("url_path", urlPath);
-				}
-												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<GubiTypeSecond> list = gubiTypeSecondMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
-		Integer count = gubiTypeSecondMapper.selectCount(wrapper);
-		return new Page<GubiTypeSecond>(list, page, limit, count);
-	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(String id) {
+        String[] ids = String.valueOf(id).split(",");
+        for (String tt : ids) {
+            GubiTypeSecond tmp = gubiTypeSecondMapper.selectById(Long.parseLong(tt));
+            if (tmp != null) {
+                tmp.setDeleteFlag(1l);
+                gubiTypeSecondMapper.updateById(tmp);
+            }
+        }
+        return true;
+    }
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public Boolean delete(String id) {
-		String[] ids = String.valueOf(id).split(",");
-		for (String tt:ids) {
-			GubiTypeSecond tmp =  gubiTypeSecondMapper.selectById(Long.parseLong(tt));
-			if(tmp != null){
-				tmp.setDeleteFlag(1l);
-				gubiTypeSecondMapper.updateById(tmp);
-			}
-		}
-		return true;
-	}
+    @Override
+    public Boolean update(GubiTypeSecond gubiTypeSecond, Long adminId) throws ServiceException {
+        Date now = new Date();
+        gubiTypeSecond.setGmtUpdate(now);
+        gubiTypeSecond.setAdminId(adminId);
+        return gubiTypeSecondMapper.updateById(gubiTypeSecond) > 0;
+    }
 
-	@Override
-	public Boolean update(GubiTypeSecond gubiTypeSecond,Long adminId) throws ServiceException {
-		Date now = new Date();
-		gubiTypeSecond.setGmtUpdate(now);
-		gubiTypeSecond.setAdminId(adminId);
-		return gubiTypeSecondMapper.updateById(gubiTypeSecond)>0;
-	}
+    @Override
+    public GubiTypeSecond get(Long id) throws ServiceException {
+        return gubiTypeSecondMapper.selectById(id);
+    }
 
-	@Override
-	public GubiTypeSecond get(Long id) throws ServiceException {
-		return gubiTypeSecondMapper.selectById(id);
-	}
-	
-	@Override
-	public String export(Long companyId,String typeId,String secondName,Long postion,String status,String urlPath,Long deleteFlag,Date gmtCreate,Date gmtUpdate,Long userId,Long adminId, Integer page, Integer limit)throws ServiceException {
-		Wrapper<GubiTypeSecond> wrapper = new EntityWrapper<GubiTypeSecond>();
-														if (!StringUtils.isEmpty(companyId)) {
-					wrapper.eq("company_id", companyId);
-				}
-												if (!StringUtils.isEmpty(typeId)) {
-					wrapper.eq("type_id", typeId);
-				}
-												if (!StringUtils.isEmpty(secondName)) {
-					wrapper.eq("second_name", secondName);
-				}
-												if (!StringUtils.isEmpty(postion)) {
-					wrapper.eq("postion", postion);
-				}
-												if (!StringUtils.isEmpty(status)) {
-					wrapper.eq("status", status);
-				}
-												if (!StringUtils.isEmpty(urlPath)) {
-					wrapper.eq("url_path", urlPath);
-				}
-												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<GubiTypeSecond> list = gubiTypeSecondMapper.selectList(wrapper);
-		ExcelUtil<GubiTypeSecond> util = new ExcelUtil<GubiTypeSecond>(GubiTypeSecond.class);
-		return util.exportExcel(list, "操作日志");
-	}
+    @Override
+    public String export(Long companyId, String typeId, String secondName, Long postion, String status, String urlPath, Long deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+        Wrapper<GubiTypeSecond> wrapper = new EntityWrapper<GubiTypeSecond>();
+        if (!StringUtils.isEmpty(companyId)) {
+            wrapper.eq("company_id", companyId);
+        }
+        if (!StringUtils.isEmpty(typeId)) {
+            wrapper.eq("type_id", typeId);
+        }
+        if (!StringUtils.isEmpty(secondName)) {
+            wrapper.eq("second_name", secondName);
+        }
+        if (!StringUtils.isEmpty(postion)) {
+            wrapper.eq("postion", postion);
+        }
+        if (!StringUtils.isEmpty(status)) {
+            wrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(urlPath)) {
+            wrapper.eq("url_path", urlPath);
+        }
+        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<GubiTypeSecond> list = gubiTypeSecondMapper.selectList(wrapper);
+        ExcelUtil<GubiTypeSecond> util = new ExcelUtil<GubiTypeSecond>(GubiTypeSecond.class);
+        return util.exportExcel(list, "操作日志");
+    }
 }

unimall-data/src/main/java/com/iotechn/unimall/data/domain/gubi/GubiTransaction.java

@@ -11,11 +11,12 @@ 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;
 
 /**
  * 交易记录对象 gubi_transaction
- * 
+ *
  * @author jlb
  * @date 2022-11-15
  */
@@ -24,71 +25,99 @@ import java.util.Date;
 public class GubiTransaction extends SuperDO {
     private static final long serialVersionUID = 1L;
 
-    /**  */
+    /**
+     *
+     */
     @TableId("id")
     private Long id;
 
-    /**  */
+    /**
+     *
+     */
     @Excel(name = "")
     @TableField("company_id")
     private Long companyId;
 
-    /** 分值id */
+    /**
+     * 分值id
+     */
     @Excel(name = "分值id")
     @TableField("order_id")
     private String orderId;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
     @Excel(name = "编号")
     @TableField("number")
     private String number;
 
-    /** 分值等级 */
+    /**
+     * 分值等级
+     */
     @Excel(name = "分值等级")
     @TableField("grade")
     private String grade;
 
-    /** 时间 */
+    /**
+     * 时间
+     */
     @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
     @TableField("collection")
     private Date collection;
 
-    /** 价钱 */
+    /**
+     * 价钱
+     */
     @Excel(name = "价钱")
     @TableField("price")
     private Double price;
 
-    /** 状态 */
+    /**
+     * 状态
+     */
     @Excel(name = "状态")
     @TableField("status")
     private String status;
 
-    /** 附件 */
+    /**
+     * 附件
+     */
     @Excel(name = "附件")
     @TableField("url_path")
     private String urlPath;
 
-    /** 0：否（默认） 1：是 */
+    /**
+     * 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;
@@ -96,21 +125,21 @@ public class GubiTransaction extends SuperDO {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("companyId", getCompanyId())
-            .append("orderId", getOrderId())
-            .append("number", getNumber())
-            .append("grade", getGrade())
-            .append("collection", getCollection())
-            .append("price", getPrice())
-            .append("status", getStatus())
-            .append("urlPath", getUrlPath())
-            .append("deleteFlag", getDeleteFlag())
-            .append("gmtCreate", getGmtCreate())
-            .append("gmtUpdate", getGmtUpdate())
-            .append("userId", getUserId())
-            .append("adminId", getAdminId())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("companyId", getCompanyId())
+                .append("orderId", getOrderId())
+                .append("number", getNumber())
+                .append("grade", getGrade())
+                .append("collection", getCollection())
+                .append("price", getPrice())
+                .append("status", getStatus())
+                .append("urlPath", getUrlPath())
+                .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/gubi/GubiTypeInfo.java

@@ -11,12 +11,13 @@ 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;
 import java.util.List;
 
 /**
  * 一级分类对象 gubi_type_info
- * 
+ *
  * @author jlb
  * @date 2022-11-15
  */
@@ -25,72 +26,94 @@ import java.util.List;
 public class GubiTypeInfo extends SuperDO {
     private static final long serialVersionUID = 1L;
 
-    /**  */
+    /**
+     *
+     */
     @TableId("id")
     private Long id;
 
-    /**  */
+    /**
+     *
+     */
     @Excel(name = "")
     @TableField("company_id")
     private Long companyId;
 
-    /** 分类 */
+    /**
+     * 分类
+     */
     @Excel(name = "分类")
     @TableField("type_name")
     private String typeName;
 
-    /** 排序 */
+    /**
+     * 排序
+     */
     @Excel(name = "排序")
     @TableField("postion")
     private Long postion;
 
-    /** 状态 */
+    /**
+     * 状态
+     */
     @Excel(name = "状态")
     @TableField("status")
     private String status;
 
-    /** 0：否（默认） 1：是 */
+    /**
+     * 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;
 
-    /**  */
+    /**
+     *
+     */
     @TableField(exist = false)
     private List<GubiTypeSecond> children;
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("companyId", getCompanyId())
-            .append("typeName", getTypeName())
-            .append("postion", getPostion())
-            .append("status", getStatus())
-            .append("deleteFlag", getDeleteFlag())
-            .append("gmtCreate", getGmtCreate())
-            .append("gmtUpdate", getGmtUpdate())
-            .append("userId", getUserId())
-            .append("adminId", getAdminId())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("companyId", getCompanyId())
+                .append("typeName", getTypeName())
+                .append("postion", getPostion())
+                .append("status", getStatus())
+                .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/gubi/GubiTypeSecond.java

@@ -11,12 +11,13 @@ 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;
 import java.util.List;
 
 /**
  * 二级分类对象 gubi_type_second
- * 
+ *
  * @author jlb
  * @date 2022-11-15
  */
@@ -25,85 +26,111 @@ import java.util.List;
 public class GubiTypeSecond extends SuperDO {
     private static final long serialVersionUID = 1L;
 
-    /**  */
+    /**
+     *
+     */
     @TableId("id")
     private Long id;
 
-    /**  */
+    /**
+     *
+     */
     @Excel(name = "")
     @TableField("company_id")
     private Long companyId;
 
-    /** 分类id */
+    /**
+     * 分类id
+     */
     @Excel(name = "分类id")
     @TableField("type_id")
     private String typeId;
 
-    /** 二级分类型 */
+    /**
+     * 二级分类型
+     */
     @Excel(name = "二级分类型")
     @TableField("second_name")
     private String secondName;
 
-    /** 排序 */
+    /**
+     * 排序
+     */
     @Excel(name = "排序")
     @TableField("postion")
     private Long postion;
 
-    /** 状态 */
+    /**
+     * 状态
+     */
     @Excel(name = "状态")
     @TableField("status")
     private String status;
 
-    /** 附件 */
+    /**
+     * 附件
+     */
     @Excel(name = "附件")
     @TableField("url_path")
     private String urlPath;
 
-    /** 0：否（默认） 1：是 */
+    /**
+     * 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;
 
-    /**  */
+    /**
+     *
+     */
     @TableField(exist = false)
     private List<GubiTypeThree> children;
 
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("companyId", getCompanyId())
-            .append("typeId", getTypeId())
-            .append("secondName", getSecondName())
-            .append("postion", getPostion())
-            .append("status", getStatus())
-            .append("urlPath", getUrlPath())
-            .append("deleteFlag", getDeleteFlag())
-            .append("gmtCreate", getGmtCreate())
-            .append("gmtUpdate", getGmtUpdate())
-            .append("userId", getUserId())
-            .append("adminId", getAdminId())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("companyId", getCompanyId())
+                .append("typeId", getTypeId())
+                .append("secondName", getSecondName())
+                .append("postion", getPostion())
+                .append("status", getStatus())
+                .append("urlPath", getUrlPath())
+                .append("deleteFlag", getDeleteFlag())
+                .append("gmtCreate", getGmtCreate())
+                .append("gmtUpdate", getGmtUpdate())
+                .append("userId", getUserId())
+                .append("adminId", getAdminId())
+                .toString();
     }
 }