From 5ec1f3915e91628e2ecec1686ffae8ce246e0e58 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Thu, 28 Aug 2025 22:16:07 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=8E=BB=E6=8E=89=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=87=8F=E8=BD=BB?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BD=93=E9=87=8F=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/AdvertStoreFileController.java | 4 - .../controller/xkt/FeedbackController.java | 1 - .../xkt/PictureSearchHotController.java | 17 --- .../xkt/PictureSearchResultController.java | 91 ------------- .../xkt/StoreCertificateController.java | 2 +- ...toreCustomerProductDiscountController.java | 1 - .../controller/xkt/StoreOrderController.java | 4 - .../StoreProductBarcodeMatchController.java | 1 - .../StoreProductBarcodeRecordController.java | 1 - .../xkt/StoreProductColorController.java | 1 - .../xkt/StoreProductColorPriceController.java | 3 - .../xkt/StoreProductStockController.java | 6 +- .../xkt/StoreProductStorageController.java | 7 - .../StoreProductStorageDetailController.java | 3 +- .../xkt/StoreRoleAccountController.java | 30 +++-- .../controller/xkt/StoreRoleController.java | 30 +++-- .../xkt/StoreRoleMenuController.java | 36 ++++-- .../controller/xkt/StoreSaleController.java | 3 +- .../controller/xkt/UserAccountController.java | 91 ------------- .../xkt/UserBillingStatementController.java | 91 ------------- .../xkt/UserFavoritesController.java | 1 - .../xkt/UserNoticeSettingController.java | 21 --- .../vo/express/ExpressShippingLabelVO.java | 2 - .../vo/store/StoreIndexSaleRevenueResVO.java | 2 - .../storeHomepage/StoreHomeDecorationVO.java | 1 - .../xkt/vo/storeProd/PicPackInfoVO.java | 2 - .../userFavorite/UserFavStatusCountResVO.java | 1 - .../vo/userSubscriptions/UserSubscPageVO.java | 1 - sql/ry_20240629.sql | 41 ------ .../ruoyi/xkt/domain/PictureSearchHot.java | 69 ---------- .../ruoyi/xkt/domain/PictureSearchResult.java | 78 ----------- .../com/ruoyi/xkt/domain/UserAccount.java | 78 ----------- .../xkt/domain/UserBillingStatement.java | 106 --------------- .../ruoyi/xkt/domain/UserNoticeSetting.java | 45 ------- .../xkt/mapper/PictureSearchHotMapper.java | 14 -- .../xkt/mapper/PictureSearchResultMapper.java | 62 --------- .../ruoyi/xkt/mapper/UserAccountMapper.java | 62 --------- .../mapper/UserBillingStatementMapper.java | 62 --------- .../xkt/mapper/UserNoticeSettingMapper.java | 16 --- .../xkt/service/IPictureSearchHotService.java | 12 -- .../service/IPictureSearchResultService.java | 61 --------- .../xkt/service/IPictureSearchService.java | 1 - .../com/ruoyi/xkt/service/IStoreService.java | 1 + .../xkt/service/IUserAccountService.java | 61 --------- .../service/IUserBillingStatementService.java | 61 --------- .../service/IUserNoticeSettingService.java | 11 -- .../service/IUserSubscriptionsService.java | 9 +- .../impl/AdminAdvertRoundServiceImpl.java | 2 +- .../xkt/service/impl/ExpressServiceImpl.java | 4 +- .../service/impl/FinanceBillServiceImpl.java | 14 +- .../xkt/service/impl/NoticeServiceImpl.java | 6 +- .../impl/PictureSearchHotServiceImpl.java | 15 --- .../impl/PictureSearchResultServiceImpl.java | 97 -------------- ...oreCustomerProductDiscountServiceImpl.java | 1 + .../service/impl/StoreMemberServiceImpl.java | 2 +- .../service/impl/StoreOrderServiceImpl.java | 30 ++--- .../impl/StoreProductFileServiceImpl.java | 7 - .../service/impl/StoreProductServiceImpl.java | 1 - .../impl/StoreProductStockServiceImpl.java | 41 +++--- ...roductStorageDemandDeducteServiceImpl.java | 12 +- .../impl/StoreProductStorageServiceImpl.java | 4 +- .../impl/SysProductCategoryServiceImpl.java | 1 + .../service/impl/UserAccountServiceImpl.java | 95 -------------- .../impl/UserBillingStatementServiceImpl.java | 94 -------------- .../impl/UserFavoritesServiceImpl.java | 2 +- .../impl/UserNoticeSettingServiceImpl.java | 21 --- .../service/impl/WebsitePCServiceImpl.java | 11 +- .../mapper/PictureSearchHotMapper.xml | 8 -- .../mapper/PictureSearchResultMapper.xml | 101 --------------- .../resources/mapper/UserAccountMapper.xml | 101 --------------- .../mapper/UserBillingStatementMapper.xml | 121 ------------------ .../mapper/UserNoticeSettingMapper.xml | 7 - 72 files changed, 133 insertions(+), 1969 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchHotController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchResultController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAccountController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserBillingStatementController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeSettingController.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchHot.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchResult.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/UserAccount.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/UserBillingStatement.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/UserNoticeSetting.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchHotMapper.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchResultMapper.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/UserAccountMapper.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/UserBillingStatementMapper.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/UserNoticeSettingMapper.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/IPictureSearchHotService.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/IPictureSearchResultService.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/IUserAccountService.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/IUserBillingStatementService.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/IUserNoticeSettingService.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/impl/PictureSearchHotServiceImpl.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/impl/PictureSearchResultServiceImpl.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAccountServiceImpl.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/impl/UserBillingStatementServiceImpl.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/service/impl/UserNoticeSettingServiceImpl.java delete mode 100644 xkt/src/main/resources/mapper/PictureSearchHotMapper.xml delete mode 100644 xkt/src/main/resources/mapper/PictureSearchResultMapper.xml delete mode 100644 xkt/src/main/resources/mapper/UserAccountMapper.xml delete mode 100644 xkt/src/main/resources/mapper/UserBillingStatementMapper.xml delete mode 100644 xkt/src/main/resources/mapper/UserNoticeSettingMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertStoreFileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertStoreFileController.java index 2916e2d7a..f68c431d9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertStoreFileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertStoreFileController.java @@ -4,13 +4,9 @@ import cn.hutool.core.bean.BeanUtil; import com.ruoyi.common.core.controller.XktBaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.Page; -import com.ruoyi.web.controller.xkt.vo.advert.AdvertPageVO; import com.ruoyi.web.controller.xkt.vo.advertStoreFile.AdvertStoreFilePageVO; -import com.ruoyi.xkt.dto.advert.AdvertPageDTO; -import com.ruoyi.xkt.dto.advert.AdvertResDTO; import com.ruoyi.xkt.dto.advertStoreFile.AdvertStoreFilePageDTO; import com.ruoyi.xkt.dto.advertStoreFile.AdvertStoreFileResDTO; -import com.ruoyi.xkt.service.IAdvertService; import com.ruoyi.xkt.service.IAdvertStoreFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/FeedbackController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/FeedbackController.java index d06886966..ebda34969 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/FeedbackController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/FeedbackController.java @@ -9,7 +9,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.web.controller.xkt.vo.feedback.FeedbackPageVO; import com.ruoyi.web.controller.xkt.vo.feedback.FeedbackResVO; import com.ruoyi.web.controller.xkt.vo.feedback.FeedbackVO; -import com.ruoyi.web.controller.xkt.vo.notice.NoticeResVO; import com.ruoyi.xkt.dto.feedback.FeedbackDTO; import com.ruoyi.xkt.dto.feedback.FeedbackPageDTO; import com.ruoyi.xkt.dto.feedback.FeedbackResDTO; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchHotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchHotController.java deleted file mode 100644 index fa2cf805f..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchHotController.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.ruoyi.web.controller.xkt; - -import com.ruoyi.common.core.controller.XktBaseController; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 图搜热款Controller - * - * @author ruoyi - * @date 2025-03-26 - */ -@RestController -@RequestMapping("/rest/v1/search-hots") -public class PictureSearchHotController extends XktBaseController { - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchResultController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchResultController.java deleted file mode 100644 index 6cc76eb24..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/PictureSearchResultController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.ruoyi.web.controller.xkt; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.XktBaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.xkt.domain.PictureSearchResult; -import com.ruoyi.xkt.service.IPictureSearchResultService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 以图搜款结果Controller - * - * @author ruoyi - * @date 2025-03-26 - */ -@RestController -@RequestMapping("/rest/v1/search-results") -public class PictureSearchResultController extends XktBaseController { - @Autowired - private IPictureSearchResultService pictureSearchResultService; - - /** - * 查询以图搜款结果列表 - */ - // @PreAuthorize("@ss.hasPermi('system:result:list')") - @GetMapping("/list") - public TableDataInfo list(PictureSearchResult pictureSearchResult) { - startPage(); - List list = pictureSearchResultService.selectPictureSearchResultList(pictureSearchResult); - return getDataTable(list); - } - - /** - * 导出以图搜款结果列表 - */ - // @PreAuthorize("@ss.hasPermi('system:result:export')") - @Log(title = "以图搜款结果", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, PictureSearchResult pictureSearchResult) { - List list = pictureSearchResultService.selectPictureSearchResultList(pictureSearchResult); - ExcelUtil util = new ExcelUtil(PictureSearchResult.class); - util.exportExcel(response, list, "以图搜款结果数据"); - } - - /** - * 获取以图搜款结果详细信息 - */ - // @PreAuthorize("@ss.hasPermi('system:result:query')") - @GetMapping(value = "/{picSearchResId}") - public R getInfo(@PathVariable("picSearchResId") Long picSearchResId) { - return success(pictureSearchResultService.selectPictureSearchResultByPicSearchResId(picSearchResId)); - } - - /** - * 新增以图搜款结果 - */ - // @PreAuthorize("@ss.hasPermi('system:result:add')") - @Log(title = "以图搜款结果", businessType = BusinessType.INSERT) - @PostMapping - public R add(@RequestBody PictureSearchResult pictureSearchResult) { - return success(pictureSearchResultService.insertPictureSearchResult(pictureSearchResult)); - } - - /** - * 修改以图搜款结果 - */ - // @PreAuthorize("@ss.hasPermi('system:result:edit')") - @Log(title = "以图搜款结果", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@RequestBody PictureSearchResult pictureSearchResult) { - return success(pictureSearchResultService.updatePictureSearchResult(pictureSearchResult)); - } - - /** - * 删除以图搜款结果 - */ - // @PreAuthorize("@ss.hasPermi('system:result:remove')") - @Log(title = "以图搜款结果", businessType = BusinessType.DELETE) - @DeleteMapping("/{picSearchResIds}") - public R remove(@PathVariable Long[] picSearchResIds) { - return success(pictureSearchResultService.deletePictureSearchResultByPicSearchResIds(picSearchResIds)); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCertificateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCertificateController.java index df119e2e7..4ee8b31bc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCertificateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCertificateController.java @@ -10,8 +10,8 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.web.controller.xkt.vo.storeCertificate.StoreCertResVO; import com.ruoyi.web.controller.xkt.vo.storeCertificate.StoreCertCreateVO; +import com.ruoyi.web.controller.xkt.vo.storeCertificate.StoreCertResVO; import com.ruoyi.web.controller.xkt.vo.storeCertificate.StoreCertStepResVO; import com.ruoyi.web.controller.xkt.vo.storeCertificate.StoreCertUpdateVO; import com.ruoyi.xkt.dto.storeCertificate.StoreCertDTO; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerProductDiscountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerProductDiscountController.java index 7fdd4eb3f..fc58e78c8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerProductDiscountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerProductDiscountController.java @@ -7,7 +7,6 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.Page; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.web.controller.xkt.vo.storeCusProdDiscount.*; -import com.ruoyi.web.controller.xkt.vo.storeProd.StoreProdSkuResVO; import com.ruoyi.xkt.dto.storeCusProdDiscount.*; import com.ruoyi.xkt.service.IStoreCustomerProductDiscountService; import io.swagger.annotations.Api; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java index e2123f5d8..fcd012978 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java @@ -27,15 +27,11 @@ import com.ruoyi.web.controller.xkt.vo.express.ExpressWaybillNosVO; import com.ruoyi.web.controller.xkt.vo.order.*; import com.ruoyi.xkt.domain.StoreOrder; import com.ruoyi.xkt.domain.StoreOrderDetail; -import com.ruoyi.xkt.dto.express.ExpressCancelReqDTO; -import com.ruoyi.xkt.dto.express.ExpressInterceptReqDTO; import com.ruoyi.xkt.dto.express.ExpressShippingLabelDTO; import com.ruoyi.xkt.dto.order.*; -import com.ruoyi.xkt.enums.EExpressStatus; import com.ruoyi.xkt.enums.EOrderStatus; import com.ruoyi.xkt.enums.EPayChannel; import com.ruoyi.xkt.enums.EPayPage; -import com.ruoyi.xkt.manager.ExpressManager; import com.ruoyi.xkt.manager.PaymentManager; import com.ruoyi.xkt.service.IExpressService; import com.ruoyi.xkt.service.IStoreOrderService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeMatchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeMatchController.java index 3fedcd67d..d286c4a4d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeMatchController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeMatchController.java @@ -12,7 +12,6 @@ import com.ruoyi.xkt.domain.StoreProductBarcodeMatch; import com.ruoyi.xkt.dto.storeProdBarcodeMatch.BarcodeMatchDTO; import com.ruoyi.xkt.service.IStoreProductBarcodeMatchService; import lombok.RequiredArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeRecordController.java index 1c33fa6b9..57adc036b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductBarcodeRecordController.java @@ -9,7 +9,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.xkt.domain.StoreProductBarcodeRecord; import com.ruoyi.xkt.service.IStoreProductBarcodeRecordService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java index 540a22d8b..576a66a9c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java @@ -8,7 +8,6 @@ import com.ruoyi.xkt.service.IStoreProductColorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorPriceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorPriceController.java index be137daab..d626c6aab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorPriceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorPriceController.java @@ -4,13 +4,10 @@ import cn.hutool.core.bean.BeanUtil; import com.ruoyi.common.core.controller.XktBaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.Page; -import com.ruoyi.web.controller.xkt.vo.storeProd.StoreProdPageVO; import com.ruoyi.web.controller.xkt.vo.storeProdColorPrice.StoreProdColorPricePageVO; import com.ruoyi.web.controller.xkt.vo.storeProdColorPrice.StoreProdColorPriceVO; import com.ruoyi.xkt.dto.storeProdColorPrice.StoreProdColorPricePageDTO; import com.ruoyi.xkt.dto.storeProdColorPrice.StoreProdColorPriceResDTO; -import com.ruoyi.xkt.dto.storeProduct.StoreProdPageDTO; -import com.ruoyi.xkt.dto.storeProduct.StoreProdPageResDTO; import com.ruoyi.xkt.service.IStoreProductColorPriceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java index 536cf9f2a..ac153a2f2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java @@ -9,9 +9,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.web.controller.xkt.vo.storeProdStock.*; -import com.ruoyi.web.controller.xkt.vo.storeProdStorage.StoreStorageExportVO; -import com.ruoyi.xkt.dto.storeProdStorage.StoreStorageDetailDownloadDTO; -import com.ruoyi.xkt.dto.storeProdStorage.StoreStorageExportDTO; import com.ruoyi.xkt.dto.storeProductStock.*; import com.ruoyi.xkt.service.IStoreProductStockService; import io.swagger.annotations.Api; @@ -107,11 +104,10 @@ public class StoreProductStockController extends XktBaseController { List downloadList = storeProdStockService.export(BeanUtil.toBean(exportVO, StoreProdStockExportDTO.class)); ExcelUtil util = new ExcelUtil<>(StoreProdStockDownloadDTO.class); // 设置下载excel名 - String encodedFileName = URLEncoder.encode("库存明细" + DateUtils.getDate(), "UTF-8").replaceAll("\\+", "%20"); + String encodedFileName = URLEncoder.encode("库存明细" + DateUtils.getDate(), "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename=" + encodedFileName + ".xlsx"); util.exportExcel(response, downloadList, "库存明细"); } - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageController.java index 8a3394e6e..a8036f5ac 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageController.java @@ -6,16 +6,12 @@ import com.ruoyi.common.core.controller.XktBaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.Page; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.web.controller.xkt.vo.storeProdStorage.StoreProdStoragePageVO; import com.ruoyi.web.controller.xkt.vo.storeProdStorage.StoreProdStorageResVO; import com.ruoyi.web.controller.xkt.vo.storeProdStorage.StoreProdStorageVO; -import com.ruoyi.web.controller.xkt.vo.storeSale.StoreSaleExportVO; import com.ruoyi.xkt.dto.storeProdStorage.StoreProdStorageDTO; import com.ruoyi.xkt.dto.storeProdStorage.StoreProdStoragePageDTO; import com.ruoyi.xkt.dto.storeProdStorage.StoreProdStoragePageResDTO; -import com.ruoyi.xkt.dto.storeSale.StoreSaleDownloadDTO; -import com.ruoyi.xkt.dto.storeSale.StoreSaleExportDTO; import com.ruoyi.xkt.service.IStoreProductStorageService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -24,9 +20,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.util.List; - /** * 档口商品入库Controller * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageDetailController.java index 94560ea37..9b1460021 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStorageDetailController.java @@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.List; -import java.util.UUID; /** * 档口商品入库明细Controller @@ -49,7 +48,7 @@ public class StoreProductStorageDetailController extends XktBaseController { List downloadList = storageDetailService.export(BeanUtil.toBean(exportVO, StoreStorageExportDTO.class)); ExcelUtil util = new ExcelUtil<>(StoreStorageDetailDownloadDTO.class); // 设置下载excel名 - String encodedFileName = URLEncoder.encode("入库记录" + DateUtils.getDate(), "UTF-8").replaceAll("\\+", "%20"); + String encodedFileName = URLEncoder.encode("入库记录" + DateUtils.getDate(), "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename=" + encodedFileName + ".xlsx"); util.exportExcel(response, downloadList, "入库记录"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleAccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleAccountController.java index 5dcd9e7b4..6e59208c4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleAccountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleAccountController.java @@ -27,6 +27,16 @@ import java.util.List; * * @author ruoyi * @date 2025-03-26 + *

+ * 新增档口子账号 + *

+ * 修改档口子账号 + *

+ * 获取档口子账号列表 + *

+ * 获取档口子账号详情 + *

+ * 停用/启用档口子账号 *//* @Api(tags = "档口子账号") @@ -39,8 +49,8 @@ public class StoreRoleAccountController extends XktBaseController { */ /** - * 新增档口子账号 - *//* + * 新增档口子账号 + *//* // @PreAuthorize("@ss.hasPermi('system:account:add')") @ApiOperation(value = "新增档口子账号", httpMethod = "POST", response = R.class) @@ -52,8 +62,8 @@ public class StoreRoleAccountController extends XktBaseController { */ /** - * 修改档口子账号 - *//* + * 修改档口子账号 + *//* // @PreAuthorize("@ss.hasPermi('system:account:edit')") @ApiOperation(value = "修改档口子账号", httpMethod = "PUT", response = R.class) @@ -65,8 +75,8 @@ public class StoreRoleAccountController extends XktBaseController { */ /** - * 获取档口子账号列表 - *//* + * 获取档口子账号列表 + *//* // @PreAuthorize("@ss.hasPermi('system:role:list')") @ApiOperation(value = "获取档口子账号列表", httpMethod = "POST", response = R.class) @@ -77,8 +87,8 @@ public class StoreRoleAccountController extends XktBaseController { */ /** - * 获取档口子账号详情 - *//* + * 获取档口子账号详情 + *//* // @PreAuthorize("@ss.hasPermi('system:account:query')") @ApiOperation(value = "获取档口子账号详情", httpMethod = "POST", response = R.class) @@ -89,8 +99,8 @@ public class StoreRoleAccountController extends XktBaseController { */ /** - * 停用/启用档口子账号 - *//* + * 停用/启用档口子账号 + *//* // @PreAuthorize("@ss.hasPermi('system:role:edit')") @ApiOperation(value = "停用/启用档口子账号", httpMethod = "PUT", response = R.class) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleController.java index 27b0c4be9..55ba29562 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleController.java @@ -29,6 +29,16 @@ import java.util.List; * * @author ruoyi * @date 2025-03-26 + *

+ * 新增档口子角色 + *

+ * 编辑档口子角色 + *

+ * 获取档口子角色详细信息 + *

+ * 获取档口子角色列表 + *

+ * 停用/启用档口子角色 *//* @Api(tags = "档口子角色") @@ -46,8 +56,8 @@ public class StoreRoleController extends XktBaseController { */ /** - * 新增档口子角色 - *//* + * 新增档口子角色 + *//* // @PreAuthorize("@ss.hasPermi('system:role:add')") @ApiOperation(value = "新增档口子角色", httpMethod = "POST", response = R.class) @@ -60,8 +70,8 @@ public class StoreRoleController extends XktBaseController { */ /** - * 编辑档口子角色 - *//* + * 编辑档口子角色 + *//* // @PreAuthorize("@ss.hasPermi('system:role:edit')") @ApiOperation(value = "编辑档口子角色", httpMethod = "PUT", response = R.class) @@ -73,8 +83,8 @@ public class StoreRoleController extends XktBaseController { */ /** - * 获取档口子角色详细信息 - *//* + * 获取档口子角色详细信息 + *//* // @PreAuthorize("@ss.hasPermi('system:role:query')") @ApiOperation(value = "获取档口子角色详细信息", httpMethod = "GET", response = R.class) @@ -91,8 +101,8 @@ public class StoreRoleController extends XktBaseController { */ /** - * 获取档口子角色列表 - *//* + * 获取档口子角色列表 + *//* // @PreAuthorize("@ss.hasPermi('system:role:list')") @ApiOperation(value = "查询档口销售出库列表", httpMethod = "POST", response = R.class) @@ -103,8 +113,8 @@ public class StoreRoleController extends XktBaseController { */ /** - * 停用/启用档口子角色 - *//* + * 停用/启用档口子角色 + *//* // @PreAuthorize("@ss.hasPermi('system:role:edit')") @ApiOperation(value = "停用/启用档口子角色", httpMethod = "PUT", response = R.class) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleMenuController.java index d98780613..b9337bc44 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleMenuController.java @@ -22,6 +22,18 @@ import java.util.List; * * @author ruoyi * @date 2025-03-26 + *

+ * 查询档口子角色菜单列表 + *

+ * 导出档口子角色菜单列表 + *

+ * 获取档口子角色菜单详细信息 + *

+ * 新增档口子角色菜单 + *

+ * 修改档口子角色菜单 + *

+ * 删除档口子角色菜单 *//* @RestController @@ -32,8 +44,8 @@ public class StoreRoleMenuController extends XktBaseController { */ /** - * 查询档口子角色菜单列表 - *//* + * 查询档口子角色菜单列表 + *//* // // @PreAuthorize("@ss.hasPermi('system:menu:list')") @GetMapping("/list") @@ -45,8 +57,8 @@ public class StoreRoleMenuController extends XktBaseController { */ /** - * 导出档口子角色菜单列表 - *//* + * 导出档口子角色菜单列表 + *//* // // @PreAuthorize("@ss.hasPermi('system:menu:export')") @Log(title = "档口子角色菜单", businessType = BusinessType.EXPORT) @@ -59,8 +71,8 @@ public class StoreRoleMenuController extends XktBaseController { */ /** - * 获取档口子角色菜单详细信息 - *//* + * 获取档口子角色菜单详细信息 + *//* // // @PreAuthorize("@ss.hasPermi('system:menu:query')") @GetMapping(value = "/{storeRoleMenuId}") @@ -70,8 +82,8 @@ public class StoreRoleMenuController extends XktBaseController { */ /** - * 新增档口子角色菜单 - *//* + * 新增档口子角色菜单 + *//* // // @PreAuthorize("@ss.hasPermi('system:menu:add')") @Log(title = "档口子角色菜单", businessType = BusinessType.INSERT) @@ -82,8 +94,8 @@ public class StoreRoleMenuController extends XktBaseController { */ /** - * 修改档口子角色菜单 - *//* + * 修改档口子角色菜单 + *//* // // @PreAuthorize("@ss.hasPermi('system:menu:edit')") @Log(title = "档口子角色菜单", businessType = BusinessType.UPDATE) @@ -94,8 +106,8 @@ public class StoreRoleMenuController extends XktBaseController { */ /** - * 删除档口子角色菜单 - *//* + * 删除档口子角色菜单 + *//* // // @PreAuthorize("@ss.hasPermi('system:menu:remove')") @Log(title = "档口子角色菜单", businessType = BusinessType.DELETE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleController.java index 1f9d4bdda..bae647aae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleController.java @@ -8,7 +8,6 @@ import com.ruoyi.common.core.page.Page; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.web.controller.xkt.vo.storeCustomer.StoreCusGeneralSaleVO; import com.ruoyi.web.controller.xkt.vo.storeSale.*; import com.ruoyi.xkt.dto.storeSale.*; @@ -116,7 +115,7 @@ public class StoreSaleController extends XktBaseController { List downloadList = storeSaleService.export(BeanUtil.toBean(exportVO, StoreSaleExportDTO.class)); ExcelUtil util = new ExcelUtil<>(StoreSaleDownloadDTO.class); // 设置下载excel名 - String encodedFileName = URLEncoder.encode("销售出库" + DateUtils.getDate(), "UTF-8").replaceAll("\\+", "%20"); + String encodedFileName = URLEncoder.encode("销售出库" + DateUtils.getDate(), "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename=" + encodedFileName + ".xlsx"); util.exportExcel(response, downloadList, "销售出库"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAccountController.java deleted file mode 100644 index c9921f232..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserAccountController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.ruoyi.web.controller.xkt; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.XktBaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.xkt.domain.UserAccount; -import com.ruoyi.xkt.service.IUserAccountService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 用户账户（支付宝、微信等）Controller - * - * @author ruoyi - * @date 2025-03-26 - */ -//@RestController -//@RequestMapping("/rest/v1/user-accs") -public class UserAccountController extends XktBaseController { - @Autowired - private IUserAccountService userAccountService; - - /** - * 查询用户账户（支付宝、微信等）列表 - */ - // @PreAuthorize("@ss.hasPermi('system:account:list')") - @GetMapping("/list") - public TableDataInfo list(UserAccount userAccount) { - startPage(); - List list = userAccountService.selectUserAccountList(userAccount); - return getDataTable(list); - } - - /** - * 导出用户账户（支付宝、微信等）列表 - */ - // @PreAuthorize("@ss.hasPermi('system:account:export')") - @Log(title = "用户账户（支付宝、微信等）", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, UserAccount userAccount) { - List list = userAccountService.selectUserAccountList(userAccount); - ExcelUtil util = new ExcelUtil(UserAccount.class); - util.exportExcel(response, list, "用户账户（支付宝、微信等）数据"); - } - - /** - * 获取用户账户（支付宝、微信等）详细信息 - */ - // @PreAuthorize("@ss.hasPermi('system:account:query')") - @GetMapping(value = "/{userAccId}") - public R getInfo(@PathVariable("userAccId") Long userAccId) { - return success(userAccountService.selectUserAccountByUserAccId(userAccId)); - } - - /** - * 新增用户账户（支付宝、微信等） - */ - // @PreAuthorize("@ss.hasPermi('system:account:add')") - @Log(title = "用户账户（支付宝、微信等）", businessType = BusinessType.INSERT) - @PostMapping - public R add(@RequestBody UserAccount userAccount) { - return success(userAccountService.insertUserAccount(userAccount)); - } - - /** - * 修改用户账户（支付宝、微信等） - */ - // @PreAuthorize("@ss.hasPermi('system:account:edit')") - @Log(title = "用户账户（支付宝、微信等）", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@RequestBody UserAccount userAccount) { - return success(userAccountService.updateUserAccount(userAccount)); - } - - /** - * 删除用户账户（支付宝、微信等） - */ - // @PreAuthorize("@ss.hasPermi('system:account:remove')") - @Log(title = "用户账户（支付宝、微信等）", businessType = BusinessType.DELETE) - @DeleteMapping("/{userAccIds}") - public R remove(@PathVariable Long[] userAccIds) { - return success(userAccountService.deleteUserAccountByUserAccIds(userAccIds)); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserBillingStatementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserBillingStatementController.java deleted file mode 100644 index 9d0c156a2..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserBillingStatementController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.ruoyi.web.controller.xkt; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.XktBaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.xkt.domain.UserBillingStatement; -import com.ruoyi.xkt.service.IUserBillingStatementService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 用户对账明细Controller - * - * @author ruoyi - * @date 2025-03-26 - */ -@RestController -@RequestMapping("/rest/v1/user-bill-stats") -public class UserBillingStatementController extends XktBaseController { - @Autowired - private IUserBillingStatementService userBillingStatementService; - - /** - * 查询用户对账明细列表 - */ - // @PreAuthorize("@ss.hasPermi('system:statement:list')") - @GetMapping("/list") - public TableDataInfo list(UserBillingStatement userBillingStatement) { - startPage(); - List list = userBillingStatementService.selectUserBillingStatementList(userBillingStatement); - return getDataTable(list); - } - - /** - * 导出用户对账明细列表 - */ - // @PreAuthorize("@ss.hasPermi('system:statement:export')") - @Log(title = "用户对账明细", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, UserBillingStatement userBillingStatement) { - List list = userBillingStatementService.selectUserBillingStatementList(userBillingStatement); - ExcelUtil util = new ExcelUtil(UserBillingStatement.class); - util.exportExcel(response, list, "用户对账明细数据"); - } - - /** - * 获取用户对账明细详细信息 - */ - // @PreAuthorize("@ss.hasPermi('system:statement:query')") - @GetMapping(value = "/{userBillStatId}") - public R getInfo(@PathVariable("userBillStatId") Long userBillStatId) { - return success(userBillingStatementService.selectUserBillingStatementByUserBillStatId(userBillStatId)); - } - - /** - * 新增用户对账明细 - */ - // @PreAuthorize("@ss.hasPermi('system:statement:add')") - @Log(title = "用户对账明细", businessType = BusinessType.INSERT) - @PostMapping - public R add(@RequestBody UserBillingStatement userBillingStatement) { - return success(userBillingStatementService.insertUserBillingStatement(userBillingStatement)); - } - - /** - * 修改用户对账明细 - */ - // @PreAuthorize("@ss.hasPermi('system:statement:edit')") - @Log(title = "用户对账明细", businessType = BusinessType.UPDATE) - @PutMapping - public R edit(@RequestBody UserBillingStatement userBillingStatement) { - return success(userBillingStatementService.updateUserBillingStatement(userBillingStatement)); - } - - /** - * 删除用户对账明细 - */ - // @PreAuthorize("@ss.hasPermi('system:statement:remove')") - @Log(title = "用户对账明细", businessType = BusinessType.DELETE) - @DeleteMapping("/{userBillStatIds}") - public R remove(@PathVariable Long[] userBillStatIds) { - return success(userBillingStatementService.deleteUserBillingStatementByUserBillStatIds(userBillStatIds)); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserFavoritesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserFavoritesController.java index 4698e27da..08843ef48 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserFavoritesController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserFavoritesController.java @@ -6,7 +6,6 @@ import com.ruoyi.common.core.controller.XktBaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.Page; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.web.controller.xkt.vo.storeProd.StoreProdStatusCountResVO; import com.ruoyi.web.controller.xkt.vo.userFavorite.*; import com.ruoyi.xkt.dto.userFavorite.*; import com.ruoyi.xkt.service.IUserFavoritesService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeSettingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeSettingController.java deleted file mode 100644 index 027b7fa99..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/UserNoticeSettingController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ruoyi.web.controller.xkt; - -import com.ruoyi.common.core.controller.XktBaseController; -import com.ruoyi.xkt.service.IUserNoticeSettingService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 用户通知接收设置Controller - * - * @author ruoyi - * @date 2025-03-26 - */ -@RestController -@RequestMapping("/rest/v1/user-notice-settings") -public class UserNoticeSettingController extends XktBaseController { - @Autowired - private IUserNoticeSettingService userNoticeSettingService; - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/ExpressShippingLabelVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/ExpressShippingLabelVO.java index 147f4bc8c..349af53d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/ExpressShippingLabelVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/ExpressShippingLabelVO.java @@ -4,9 +4,7 @@ import com.ruoyi.common.utils.desensitization.Desensitization; import com.ruoyi.common.utils.desensitization.SensitiveTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; import java.util.Date; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexSaleRevenueResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexSaleRevenueResVO.java index 6dbc4c483..91a9d04bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexSaleRevenueResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreIndexSaleRevenueResVO.java @@ -1,12 +1,10 @@ package com.ruoyi.web.controller.xkt.vo.store; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; -import java.util.Date; /** * @author liujiang diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeDecorationVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeDecorationVO.java index 4f246adc7..0174b9a85 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeDecorationVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeDecorationVO.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; -import java.math.BigDecimal; import java.util.List; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/PicPackInfoVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/PicPackInfoVO.java index 40041d8a0..521569d31 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/PicPackInfoVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/PicPackInfoVO.java @@ -2,9 +2,7 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; import java.math.BigDecimal; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavStatusCountResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavStatusCountResVO.java index 3e77b790b..fb9d7d98a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavStatusCountResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavStatusCountResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userFavorite; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscPageVO.java index de3d2c051..8fea6c161 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscPageVO.java @@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; /** diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index 680bd6e34..e13a0efcd 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -2267,47 +2267,6 @@ CREATE TABLE `picture_search` PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 73 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '以图搜款' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Table structure for picture_search_hot --- ---------------------------- -DROP TABLE IF EXISTS `picture_search_hot`; -CREATE TABLE `picture_search_hot` -( - `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '图搜热款ID', - `store_prod_file_id` bigint UNSIGNED NOT NULL COMMENT 'store_prod_file.id', - `file_id` bigint UNSIGNED NOT NULL COMMENT 'sys_file.id', - `store_id` bigint UNSIGNED NOT NULL COMMENT 'store.id', - `search_count` int UNSIGNED NULL DEFAULT NULL COMMENT '搜索次数（包括主动搜索和搜索结果）', - `version` bigint UNSIGNED NOT NULL COMMENT '版本号', - `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志（0代表存在 2代表删除）', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '图搜热款' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Table structure for picture_search_result --- ---------------------------- -DROP TABLE IF EXISTS `picture_search_result`; -CREATE TABLE `picture_search_result` -( - `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '文件搜索结果ID', - `pic_search_id` bigint UNSIGNED NOT NULL COMMENT '搜索的文件ID', - `file_id` bigint UNSIGNED NOT NULL COMMENT '搜索结果的文件ID', - `category_id` int UNSIGNED NULL DEFAULT NULL COMMENT '搜索结果分类ID', - `score` decimal(6, 4) UNSIGNED NULL DEFAULT NULL COMMENT '搜索结果评分', - `sort_expr_values` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '排序描述', - `version` bigint UNSIGNED NOT NULL COMMENT '版本号', - `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志（0代表存在 2代表删除）', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '以图搜款结果' ROW_FORMAT = DYNAMIC; - -- ---------------------------- -- Table structure for quick_function diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchHot.java b/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchHot.java deleted file mode 100644 index f725c5142..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchHot.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.ruoyi.xkt.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.XktBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 图搜热款对象 picture_search_hot - * - * @author ruoyi - * @date 2025-03-26 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class PictureSearchHot extends XktBaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 图搜热款ID - */ - @TableId - private Long id; - - /** - * store_prod_file.id - */ - @Excel(name = "store_prod_file.id") - private Long storeProdFileId; - - /** - * sys_file.id - */ - @Excel(name = "sys_file.id") - private Long fileId; - - /** - * store.id - */ - @Excel(name = "store.id") - private Long storeId; - - /** - * 搜索次数（包括主动搜索和搜索结果） - */ - @Excel(name = "搜索次数", readConverterExp = "包=括主动搜索和搜索结果") - private Integer searchCount; - - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("storeProdFileId", getStoreProdFileId()) - .append("fileId", getFileId()) - .append("storeId", getStoreId()) - .append("searchCount", getSearchCount()) - .append("version", getVersion()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchResult.java b/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchResult.java deleted file mode 100644 index 56a4eebdf..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/PictureSearchResult.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.ruoyi.xkt.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.XktBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import java.math.BigDecimal; - -/** - * 以图搜款结果对象 picture_search_result - * - * @author ruoyi - * @date 2025-03-26 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class PictureSearchResult extends XktBaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 文件搜索结果ID - */ - @TableId - private Long id; - - /** - * 搜索的文件ID - */ - @Excel(name = "搜索的文件ID") - private Long picSearchId; - - /** - * 搜索结果的文件ID - */ - @Excel(name = "搜索结果的文件ID") - private Long fileId; - - /** - * 搜索结果分类ID - */ - @Excel(name = "搜索结果分类ID") - private Integer categoryId; - - /** - * 搜索结果评分 - */ - @Excel(name = "搜索结果评分") - private BigDecimal score; - - /** - * 排序描述 - */ - @Excel(name = "排序描述") - private String sortExprValues; - - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("picSearchId", getPicSearchId()) - .append("fileId", getFileId()) - .append("categoryId", getCategoryId()) - .append("score", getScore()) - .append("sortExprValues", getSortExprValues()) - .append("version", getVersion()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserAccount.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserAccount.java deleted file mode 100644 index 3ba863794..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserAccount.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.ruoyi.xkt.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.XktBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import java.math.BigDecimal; - -/** - * 用户账户（支付宝、微信等）对象 user_account - * - * @author ruoyi - * @date 2025-03-26 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class UserAccount extends XktBaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 用户账户ID - */ - @TableId - private Long id; - - /** - * sys_user.id - */ - @Excel(name = "sys_user.id") - private Long userId; - - /** - * 用户类型（支付宝、微信等） - */ - @Excel(name = "用户类型", readConverterExp = "支=付宝、微信等") - private Long accountType; - - /** - * 账户电话 - */ - @Excel(name = "账户电话") - private String accountPhone; - - /** - * 账户名称 - */ - @Excel(name = "账户名称") - private String accountName; - - /** - * 账户余额 - */ - @Excel(name = "账户余额") - private BigDecimal balance; - - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("userId", getUserId()) - .append("accountType", getAccountType()) - .append("accountPhone", getAccountPhone()) - .append("accountName", getAccountName()) - .append("balance", getBalance()) - .append("version", getVersion()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserBillingStatement.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserBillingStatement.java deleted file mode 100644 index f5ec8a27a..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserBillingStatement.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.ruoyi.xkt.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.XktBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import java.math.BigDecimal; - -/** - * 用户对账明细对象 user_billing_statement - * - * @author ruoyi - * @date 2025-03-26 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class UserBillingStatement extends XktBaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 用户账户明细ID - */ - @TableId - private Long id; - - /** - * sys_user.id - */ - @Excel(name = "sys_user.id") - private Long userId; - - /** - * user_account.id - */ - @Excel(name = "user_account.id") - private Long userAccId; - - /** - * 账单code - */ - @Excel(name = "账单code") - private String code; - - /** - * 交易类型 - */ - @Excel(name = "交易类型") - private Long transType; - - /** - * 交易备注 - */ - @Excel(name = "交易备注") - private String transRemark; - - /** - * 支付方式 - */ - @Excel(name = "支付方式") - private Long payWay; - - /** - * 收入 - */ - @Excel(name = "收入") - private BigDecimal income; - - /** - * 支出 - */ - @Excel(name = "支出") - private BigDecimal expenses; - - /** - * 账户余额 - */ - @Excel(name = "账户余额") - private BigDecimal accBalance; - - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("userId", getUserId()) - .append("userAccId", getUserAccId()) - .append("code", getCode()) - .append("transType", getTransType()) - .append("transRemark", getTransRemark()) - .append("payWay", getPayWay()) - .append("income", getIncome()) - .append("expenses", getExpenses()) - .append("accBalance", getAccBalance()) - .append("version", getVersion()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/UserNoticeSetting.java b/xkt/src/main/java/com/ruoyi/xkt/domain/UserNoticeSetting.java deleted file mode 100644 index 3db7c4399..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/UserNoticeSetting.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.ruoyi.xkt.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.ruoyi.common.core.domain.XktBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 用户通知接收设置对象 user_notice_setting - * - * @author ruoyi - * @date 2025-03-26 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class UserNoticeSetting extends XktBaseEntity { - - private static final long serialVersionUID = 1L; - /** - * 用户设置是否接收通知ID - */ - @TableId - private Long id; - /** - * sys_user.id - */ - private Long userId; - /** - * 是否允许接收系统消息通知 0不接收 1接收 - */ - private Integer sysMsgNotice; - /** - * [电商卖家]是否允许接收代发订单消息通知 0不接收 1接收 - */ - private Integer orderNotice; - /** - * [电商卖家]是否允许接收关注档口消息通知 0不接收 1接收 - */ - private Integer focusNotice; - /** - * [电商卖家]是否允许接收收藏商品消息通知 0不接收 1接收 - */ - private Integer favoriteNotice; - -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchHotMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchHotMapper.java deleted file mode 100644 index 098fda8ee..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchHotMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.ruoyi.xkt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.xkt.domain.PictureSearchHot; - -/** - * 图搜热款Mapper接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface PictureSearchHotMapper extends BaseMapper { - -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchResultMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchResultMapper.java deleted file mode 100644 index 5fad3bfc6..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/PictureSearchResultMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.xkt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.xkt.domain.PictureSearchResult; - -import java.util.List; - -/** - * 以图搜款结果Mapper接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface PictureSearchResultMapper extends BaseMapper { - /** - * 查询以图搜款结果 - * - * @param id 以图搜款结果主键 - * @return 以图搜款结果 - */ - public PictureSearchResult selectPictureSearchResultByPicSearchResId(Long id); - - /** - * 查询以图搜款结果列表 - * - * @param pictureSearchResult 以图搜款结果 - * @return 以图搜款结果集合 - */ - public List selectPictureSearchResultList(PictureSearchResult pictureSearchResult); - - /** - * 新增以图搜款结果 - * - * @param pictureSearchResult 以图搜款结果 - * @return 结果 - */ - public int insertPictureSearchResult(PictureSearchResult pictureSearchResult); - - /** - * 修改以图搜款结果 - * - * @param pictureSearchResult 以图搜款结果 - * @return 结果 - */ - public int updatePictureSearchResult(PictureSearchResult pictureSearchResult); - - /** - * 删除以图搜款结果 - * - * @param id 以图搜款结果主键 - * @return 结果 - */ - public int deletePictureSearchResultByPicSearchResId(Long id); - - /** - * 批量删除以图搜款结果 - * - * @param picSearchResIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deletePictureSearchResultByPicSearchResIds(Long[] picSearchResIds); -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAccountMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAccountMapper.java deleted file mode 100644 index 3a6c61bdb..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserAccountMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.xkt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.xkt.domain.UserAccount; - -import java.util.List; - -/** - * 用户账户（支付宝、微信等）Mapper接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface UserAccountMapper extends BaseMapper { - /** - * 查询用户账户（支付宝、微信等） - * - * @param id 用户账户（支付宝、微信等）主键 - * @return 用户账户（支付宝、微信等） - */ - public UserAccount selectUserAccountByUserAccId(Long id); - - /** - * 查询用户账户（支付宝、微信等）列表 - * - * @param userAccount 用户账户（支付宝、微信等） - * @return 用户账户（支付宝、微信等）集合 - */ - public List selectUserAccountList(UserAccount userAccount); - - /** - * 新增用户账户（支付宝、微信等） - * - * @param userAccount 用户账户（支付宝、微信等） - * @return 结果 - */ - public int insertUserAccount(UserAccount userAccount); - - /** - * 修改用户账户（支付宝、微信等） - * - * @param userAccount 用户账户（支付宝、微信等） - * @return 结果 - */ - public int updateUserAccount(UserAccount userAccount); - - /** - * 删除用户账户（支付宝、微信等） - * - * @param id 用户账户（支付宝、微信等）主键 - * @return 结果 - */ - public int deleteUserAccountByUserAccId(Long id); - - /** - * 批量删除用户账户（支付宝、微信等） - * - * @param userAccIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteUserAccountByUserAccIds(Long[] userAccIds); -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserBillingStatementMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserBillingStatementMapper.java deleted file mode 100644 index e89390c5a..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserBillingStatementMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.xkt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.xkt.domain.UserBillingStatement; - -import java.util.List; - -/** - * 用户对账明细Mapper接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface UserBillingStatementMapper extends BaseMapper { - /** - * 查询用户对账明细 - * - * @param id 用户对账明细主键 - * @return 用户对账明细 - */ - public UserBillingStatement selectUserBillingStatementByUserBillStatId(Long id); - - /** - * 查询用户对账明细列表 - * - * @param userBillingStatement 用户对账明细 - * @return 用户对账明细集合 - */ - public List selectUserBillingStatementList(UserBillingStatement userBillingStatement); - - /** - * 新增用户对账明细 - * - * @param userBillingStatement 用户对账明细 - * @return 结果 - */ - public int insertUserBillingStatement(UserBillingStatement userBillingStatement); - - /** - * 修改用户对账明细 - * - * @param userBillingStatement 用户对账明细 - * @return 结果 - */ - public int updateUserBillingStatement(UserBillingStatement userBillingStatement); - - /** - * 删除用户对账明细 - * - * @param id 用户对账明细主键 - * @return 结果 - */ - public int deleteUserBillingStatementByUserBillStatId(Long id); - - /** - * 批量删除用户对账明细 - * - * @param userBillStatIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteUserBillingStatementByUserBillStatIds(Long[] userBillStatIds); -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserNoticeSettingMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserNoticeSettingMapper.java deleted file mode 100644 index 871aaafc1..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserNoticeSettingMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.xkt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.xkt.domain.UserNoticeSetting; - -import java.util.List; - -/** - * 用户通知接收设置Mapper接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface UserNoticeSettingMapper extends BaseMapper { - -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IPictureSearchHotService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IPictureSearchHotService.java deleted file mode 100644 index 7ca792d73..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IPictureSearchHotService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.ruoyi.xkt.service; - - -/** - * 图搜热款Service接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface IPictureSearchHotService { - -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IPictureSearchResultService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IPictureSearchResultService.java deleted file mode 100644 index 4e118772c..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IPictureSearchResultService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.xkt.service; - -import com.ruoyi.xkt.domain.PictureSearchResult; - -import java.util.List; - -/** - * 以图搜款结果Service接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface IPictureSearchResultService { - /** - * 查询以图搜款结果 - * - * @param picSearchResId 以图搜款结果主键 - * @return 以图搜款结果 - */ - public PictureSearchResult selectPictureSearchResultByPicSearchResId(Long picSearchResId); - - /** - * 查询以图搜款结果列表 - * - * @param pictureSearchResult 以图搜款结果 - * @return 以图搜款结果集合 - */ - public List selectPictureSearchResultList(PictureSearchResult pictureSearchResult); - - /** - * 新增以图搜款结果 - * - * @param pictureSearchResult 以图搜款结果 - * @return 结果 - */ - public int insertPictureSearchResult(PictureSearchResult pictureSearchResult); - - /** - * 修改以图搜款结果 - * - * @param pictureSearchResult 以图搜款结果 - * @return 结果 - */ - public int updatePictureSearchResult(PictureSearchResult pictureSearchResult); - - /** - * 批量删除以图搜款结果 - * - * @param picSearchResIds 需要删除的以图搜款结果主键集合 - * @return 结果 - */ - public int deletePictureSearchResultByPicSearchResIds(Long[] picSearchResIds); - - /** - * 删除以图搜款结果信息 - * - * @param picSearchResId 以图搜款结果主键 - * @return 结果 - */ - public int deletePictureSearchResultByPicSearchResId(Long picSearchResId); -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IPictureSearchService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IPictureSearchService.java index 4c341b9b3..38292ce4f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IPictureSearchService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IPictureSearchService.java @@ -1,7 +1,6 @@ package com.ruoyi.xkt.service; import com.ruoyi.xkt.dto.picture.SearchRequestDTO; -import com.ruoyi.xkt.dto.picture.TopProductMatchDTO; import com.ruoyi.xkt.dto.storeProduct.StoreProdViewDTO; import java.util.List; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java index 78a9dff39..acb99f96a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreService.java @@ -169,6 +169,7 @@ public interface IStoreService { /** * 获取今日商品销售额前5 + * * @param storeId 档口ID * @return StoreIndexTodaySaleResDTO */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IUserAccountService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IUserAccountService.java deleted file mode 100644 index c36d1e0d1..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IUserAccountService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.xkt.service; - -import com.ruoyi.xkt.domain.UserAccount; - -import java.util.List; - -/** - * 用户账户（支付宝、微信等）Service接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface IUserAccountService { - /** - * 查询用户账户（支付宝、微信等） - * - * @param userAccId 用户账户（支付宝、微信等）主键 - * @return 用户账户（支付宝、微信等） - */ - public UserAccount selectUserAccountByUserAccId(Long userAccId); - - /** - * 查询用户账户（支付宝、微信等）列表 - * - * @param userAccount 用户账户（支付宝、微信等） - * @return 用户账户（支付宝、微信等）集合 - */ - public List selectUserAccountList(UserAccount userAccount); - - /** - * 新增用户账户（支付宝、微信等） - * - * @param userAccount 用户账户（支付宝、微信等） - * @return 结果 - */ - public int insertUserAccount(UserAccount userAccount); - - /** - * 修改用户账户（支付宝、微信等） - * - * @param userAccount 用户账户（支付宝、微信等） - * @return 结果 - */ - public int updateUserAccount(UserAccount userAccount); - - /** - * 批量删除用户账户（支付宝、微信等） - * - * @param userAccIds 需要删除的用户账户（支付宝、微信等）主键集合 - * @return 结果 - */ - public int deleteUserAccountByUserAccIds(Long[] userAccIds); - - /** - * 删除用户账户（支付宝、微信等）信息 - * - * @param userAccId 用户账户（支付宝、微信等）主键 - * @return 结果 - */ - public int deleteUserAccountByUserAccId(Long userAccId); -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IUserBillingStatementService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IUserBillingStatementService.java deleted file mode 100644 index bdd8a6219..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IUserBillingStatementService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.xkt.service; - -import com.ruoyi.xkt.domain.UserBillingStatement; - -import java.util.List; - -/** - * 用户对账明细Service接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface IUserBillingStatementService { - /** - * 查询用户对账明细 - * - * @param userBillStatId 用户对账明细主键 - * @return 用户对账明细 - */ - public UserBillingStatement selectUserBillingStatementByUserBillStatId(Long userBillStatId); - - /** - * 查询用户对账明细列表 - * - * @param userBillingStatement 用户对账明细 - * @return 用户对账明细集合 - */ - public List selectUserBillingStatementList(UserBillingStatement userBillingStatement); - - /** - * 新增用户对账明细 - * - * @param userBillingStatement 用户对账明细 - * @return 结果 - */ - public int insertUserBillingStatement(UserBillingStatement userBillingStatement); - - /** - * 修改用户对账明细 - * - * @param userBillingStatement 用户对账明细 - * @return 结果 - */ - public int updateUserBillingStatement(UserBillingStatement userBillingStatement); - - /** - * 批量删除用户对账明细 - * - * @param userBillStatIds 需要删除的用户对账明细主键集合 - * @return 结果 - */ - public int deleteUserBillingStatementByUserBillStatIds(Long[] userBillStatIds); - - /** - * 删除用户对账明细信息 - * - * @param userBillStatId 用户对账明细主键 - * @return 结果 - */ - public int deleteUserBillingStatementByUserBillStatId(Long userBillStatId); -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IUserNoticeSettingService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IUserNoticeSettingService.java deleted file mode 100644 index 1086876c8..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IUserNoticeSettingService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.ruoyi.xkt.service; - -/** - * 用户通知接收设置Service接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -public interface IUserNoticeSettingService { - -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IUserSubscriptionsService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IUserSubscriptionsService.java index e71ddfa3c..b6efc4c34 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IUserSubscriptionsService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IUserSubscriptionsService.java @@ -1,15 +1,11 @@ package com.ruoyi.xkt.service; import com.ruoyi.common.core.page.Page; -import com.ruoyi.xkt.domain.UserSubscriptions; -import com.ruoyi.xkt.dto.userFavorite.UserFavoritePageDTO; import com.ruoyi.xkt.dto.userSubscriptions.UserSubscDTO; import com.ruoyi.xkt.dto.userSubscriptions.UserSubscDeleteDTO; import com.ruoyi.xkt.dto.userSubscriptions.UserSubscPageDTO; import com.ruoyi.xkt.dto.userSubscriptions.UserSubscPageResDTO; -import java.util.List; - /** * 用户关注档口Service接口 * @@ -20,6 +16,7 @@ public interface IUserSubscriptionsService { /** * 新增用户关注档口 + * * @param subscDTO 新增用户关注档口入参 * @return Integer */ @@ -27,6 +24,7 @@ public interface IUserSubscriptionsService { /** * 用户批量取消关注档口 + * * @param deleteDTO 取消关注档口入参 * @return Integer */ @@ -34,8 +32,9 @@ public interface IUserSubscriptionsService { /** * 用户关注档口列表 + * * @param pageDTO 查询入参 - * @return Page + * @return Page */ Page page(UserSubscPageDTO pageDTO); diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java index a3738671b..6f4762347 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java @@ -284,7 +284,7 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService { public AdminAdRoundStatusCountResDTO statusCount() { final Date now = java.sql.Date.valueOf(LocalDate.now().plusDays(1)); final Date sixMonthAgo = java.sql.Date.valueOf(LocalDate.now().minusMonths(6)); - return this.advertRoundMapper.statusCount(sixMonthAgo, now); + return this.advertRoundMapper.statusCount(sixMonthAgo, now); } /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java index e53293683..c81280287 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java @@ -114,8 +114,8 @@ public class ExpressServiceImpl implements IExpressService { Assert.notEmpty(cityCode); Assert.notEmpty(countyCode); Map map = expressFeeConfigMapper.selectList(Wrappers.lambdaQuery(ExpressFeeConfig.class) - .eq(ExpressFeeConfig::getExpressId, expressId) - .in(ExpressFeeConfig::getRegionCode, Arrays.asList(provinceCode, cityCode, countyCode))) + .eq(ExpressFeeConfig::getExpressId, expressId) + .in(ExpressFeeConfig::getRegionCode, Arrays.asList(provinceCode, cityCode, countyCode))) .stream() //过滤掉已被删除的配置 .filter(BeanValidators::exists) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/FinanceBillServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/FinanceBillServiceImpl.java index b963de7ac..27a774ce7 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/FinanceBillServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/FinanceBillServiceImpl.java @@ -213,17 +213,17 @@ public class FinanceBillServiceImpl implements IFinanceBillService { Map refundPaymentBillDetailMap; if (CollUtil.isNotEmpty(afterSaleBillUks)) { refundPaymentBillMap = financeBillMapper.selectList( - Wrappers.lambdaQuery(FinanceBill.class) - .in(FinanceBill::getBusinessUniqueKey, afterSaleBillUks) - .eq(FinanceBill::getBillType, EFinBillType.PAYMENT.getValue()) - .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)) + Wrappers.lambdaQuery(FinanceBill.class) + .in(FinanceBill::getBusinessUniqueKey, afterSaleBillUks) + .eq(FinanceBill::getBillType, EFinBillType.PAYMENT.getValue()) + .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)) .stream() .collect(Collectors.toMap(SimpleEntity::getId, Function.identity())); Assert.notEmpty(refundPaymentBillMap); refundPaymentBillDetailMap = financeBillDetailMapper.selectList( - Wrappers.lambdaQuery(FinanceBillDetail.class) - .in(FinanceBillDetail::getFinanceBillId, refundPaymentBillMap.keySet()) - .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)).stream() + Wrappers.lambdaQuery(FinanceBillDetail.class) + .in(FinanceBillDetail::getFinanceBillId, refundPaymentBillMap.keySet()) + .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)).stream() .collect(Collectors.toMap(FinanceBillDetail::getRelId, Function.identity())); } else { refundPaymentBillMap = MapUtil.empty(); diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/NoticeServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/NoticeServiceImpl.java index 416222dc8..ba08fe271 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/NoticeServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/NoticeServiceImpl.java @@ -15,7 +15,10 @@ import com.ruoyi.xkt.domain.Notice; import com.ruoyi.xkt.domain.UserNotice; import com.ruoyi.xkt.dto.notice.*; import com.ruoyi.xkt.enums.*; -import com.ruoyi.xkt.mapper.*; +import com.ruoyi.xkt.mapper.NoticeMapper; +import com.ruoyi.xkt.mapper.UserFavoritesMapper; +import com.ruoyi.xkt.mapper.UserNoticeMapper; +import com.ruoyi.xkt.mapper.UserSubscriptionsMapper; import com.ruoyi.xkt.service.INoticeService; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; @@ -42,7 +45,6 @@ public class NoticeServiceImpl implements INoticeService { final UserFavoritesMapper userFavMapper; final UserNoticeMapper userNoticeMapper; final SysUserMapper userMapper; - final UserNoticeSettingMapper userNoticeSetMapper; /** * 新增公告 diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/PictureSearchHotServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/PictureSearchHotServiceImpl.java deleted file mode 100644 index 0b97a9913..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/PictureSearchHotServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ruoyi.xkt.service.impl; - -import com.ruoyi.xkt.service.IPictureSearchHotService; -import org.springframework.stereotype.Service; - -/** - * 图搜热款Service业务层处理 - * - * @author ruoyi - * @date 2025-03-26 - */ -@Service -public class PictureSearchHotServiceImpl implements IPictureSearchHotService { - -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/PictureSearchResultServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/PictureSearchResultServiceImpl.java deleted file mode 100644 index ede39845d..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/PictureSearchResultServiceImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.ruoyi.xkt.service.impl; - -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.xkt.domain.PictureSearchResult; -import com.ruoyi.xkt.mapper.PictureSearchResultMapper; -import com.ruoyi.xkt.service.IPictureSearchResultService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 以图搜款结果Service业务层处理 - * - * @author ruoyi - * @date 2025-03-26 - */ -@Service -public class PictureSearchResultServiceImpl implements IPictureSearchResultService { - @Autowired - private PictureSearchResultMapper pictureSearchResultMapper; - - /** - * 查询以图搜款结果 - * - * @param picSearchResId 以图搜款结果主键 - * @return 以图搜款结果 - */ - @Override - @Transactional(readOnly = true) - public PictureSearchResult selectPictureSearchResultByPicSearchResId(Long picSearchResId) { - return pictureSearchResultMapper.selectPictureSearchResultByPicSearchResId(picSearchResId); - } - - /** - * 查询以图搜款结果列表 - * - * @param pictureSearchResult 以图搜款结果 - * @return 以图搜款结果 - */ - @Override - @Transactional(readOnly = true) - public List selectPictureSearchResultList(PictureSearchResult pictureSearchResult) { - return pictureSearchResultMapper.selectPictureSearchResultList(pictureSearchResult); - } - - /** - * 新增以图搜款结果 - * - * @param pictureSearchResult 以图搜款结果 - * @return 结果 - */ - @Override - @Transactional - public int insertPictureSearchResult(PictureSearchResult pictureSearchResult) { - pictureSearchResult.setCreateTime(DateUtils.getNowDate()); - return pictureSearchResultMapper.insertPictureSearchResult(pictureSearchResult); - } - - /** - * 修改以图搜款结果 - * - * @param pictureSearchResult 以图搜款结果 - * @return 结果 - */ - @Override - @Transactional - public int updatePictureSearchResult(PictureSearchResult pictureSearchResult) { - pictureSearchResult.setUpdateTime(DateUtils.getNowDate()); - return pictureSearchResultMapper.updatePictureSearchResult(pictureSearchResult); - } - - /** - * 批量删除以图搜款结果 - * - * @param picSearchResIds 需要删除的以图搜款结果主键 - * @return 结果 - */ - @Override - @Transactional - public int deletePictureSearchResultByPicSearchResIds(Long[] picSearchResIds) { - return pictureSearchResultMapper.deletePictureSearchResultByPicSearchResIds(picSearchResIds); - } - - /** - * 删除以图搜款结果信息 - * - * @param picSearchResId 以图搜款结果主键 - * @return 结果 - */ - @Override - @Transactional - public int deletePictureSearchResultByPicSearchResId(Long picSearchResId) { - return pictureSearchResultMapper.deletePictureSearchResultByPicSearchResId(picSearchResId); - } -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java index 6c19f4f6d..444e5405a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java @@ -211,6 +211,7 @@ public class StoreCustomerProductDiscountServiceImpl implements IStoreCustomerPr /** * 批量删除客户优惠 + * * @param deleteDTO 删除优惠入参 * @return */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreMemberServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreMemberServiceImpl.java index aae01f0de..aa7827587 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreMemberServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreMemberServiceImpl.java @@ -66,7 +66,7 @@ public class StoreMemberServiceImpl implements IStoreMemberService { int count = this.storeMemberMapper.insert(storeMember); // 将档口权重增加1 Store store = Optional.ofNullable(this.storeMapper.selectOne(new LambdaQueryWrapper() - .eq(Store::getId, createDTO.getStoreId()).eq(Store::getDelFlag, Constants.UNDELETED))) + .eq(Store::getId, createDTO.getStoreId()).eq(Store::getDelFlag, Constants.UNDELETED))) .orElseThrow(() -> new ServiceException("档口不存在!", HttpStatus.ERROR)); store.setStoreWeight(ObjectUtils.defaultIfNull(store.getStoreWeight(), 0) + 1); this.storeMapper.updateById(store); diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java index fbdce7f18..4a237052d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java @@ -403,7 +403,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService { List spIds = detailInfos.stream().map(StoreOrderDetailInfoDTO::getStoreProdId).distinct() .collect(Collectors.toList()); Map mainPicMap = storeProductFileMapper.selectMainPicByStoreProdIdList(spIds, - FileType.MAIN_PIC.getValue(), ORDER_NUM_1).stream() + FileType.MAIN_PIC.getValue(), ORDER_NUM_1).stream() .collect(Collectors.toMap(StoreProdMainPicDTO::getStoreProdId, StoreProdMainPicDTO::getFileUrl, (o, n) -> n)); for (StoreOrderDetailInfoDTO detailInfo : detailInfos) { @@ -447,8 +447,8 @@ public class StoreOrderServiceImpl implements IStoreOrderService { return ListUtil.empty(); } Map printTimeMap = expressShippingLabelMapper.selectList(Wrappers - .lambdaQuery(ExpressShippingLabel.class) - .in(ExpressShippingLabel::getExpressWaybillNo, expressWaybillNos)) + .lambdaQuery(ExpressShippingLabel.class) + .in(ExpressShippingLabel::getExpressWaybillNo, expressWaybillNos)) .stream() .collect(Collectors.toMap(ExpressShippingLabel::getExpressWaybillNo, ExpressShippingLabel::getLastPrintTime)); @@ -487,9 +487,9 @@ public class StoreOrderServiceImpl implements IStoreOrderService { //物流信息 Map expressNameMap = expressService.getAllExpressNameMap(); Map> expressWaybillGroupMap = storeOrderDetailMapper.selectList(Wrappers - .lambdaQuery(StoreOrderDetail.class) - .eq(StoreOrderDetail::getStoreOrderId, storeOrderId) - .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)) + .lambdaQuery(StoreOrderDetail.class) + .eq(StoreOrderDetail::getStoreOrderId, storeOrderId) + .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)) .stream() .filter(o -> StrUtil.isNotEmpty(o.getExpressWaybillNo())) .collect(Collectors.groupingBy(StoreOrderDetail::getExpressWaybillNo)); @@ -560,7 +560,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService { List spIds = orderDetailList.stream().map(StoreOrderDetailInfoDTO::getStoreProdId).distinct() .collect(Collectors.toList()); Map mainPicMap = storeProductFileMapper.selectMainPicByStoreProdIdList(spIds, - FileType.MAIN_PIC.getValue(), ORDER_NUM_1).stream() + FileType.MAIN_PIC.getValue(), ORDER_NUM_1).stream() .collect(Collectors.toMap(StoreProdMainPicDTO::getStoreProdId, StoreProdMainPicDTO::getFileUrl, (o, n) -> n)); Map> orderDetailGroup = orderDetailList @@ -1133,9 +1133,9 @@ public class StoreOrderServiceImpl implements IStoreOrderService { List afterSaleOrderIds = afterSaleOrderList.stream().map(SimpleEntity::getId) .collect(Collectors.toList()); Map> afterSaleOrderDetailGroupMap = storeOrderDetailMapper.selectList( - Wrappers.lambdaQuery(StoreOrderDetail.class) - .in(StoreOrderDetail::getStoreOrderId, afterSaleOrderIds) - .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)) + Wrappers.lambdaQuery(StoreOrderDetail.class) + .in(StoreOrderDetail::getStoreOrderId, afterSaleOrderIds) + .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)) .stream() .filter(o -> { if (!EOrderStatus.AFTER_SALE_COMPLETED.getValue().equals(o.getDetailStatus())) { @@ -1502,9 +1502,9 @@ public class StoreOrderServiceImpl implements IStoreOrderService { public void refundSuccess(Long storeOrderId, List storeOrderDetailIds, Long operatorId) { StoreOrder order = getAndBaseCheck(storeOrderId); Map orderDetailMap = storeOrderDetailMapper.selectList(Wrappers - .lambdaQuery(StoreOrderDetail.class) - .eq(StoreOrderDetail::getStoreOrderId, order.getId()) - .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)) + .lambdaQuery(StoreOrderDetail.class) + .eq(StoreOrderDetail::getStoreOrderId, order.getId()) + .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)) .stream() .collect(Collectors.toMap(SimpleEntity::getId, Function.identity())); for (Long storeOrderDetailId : storeOrderDetailIds) { @@ -1890,8 +1890,8 @@ public class StoreOrderServiceImpl implements IStoreOrderService { .collect(Collectors.toMap(StoreProductColorSize::getId, o -> o)); //下单商品档口颜色 Map scMap = storeColorMapper.selectByIds(spcsMap.values().stream() - .map(StoreProductColorSize::getStoreColorId) - .collect(Collectors.toSet())).stream() + .map(StoreProductColorSize::getStoreColorId) + .collect(Collectors.toSet())).stream() .collect(Collectors.toMap(StoreColor::getId, Function.identity())); //下单商品 List spIdList = spcsMap.values().stream() diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductFileServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductFileServiceImpl.java index e11251cf9..d2ada9654 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductFileServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductFileServiceImpl.java @@ -1,14 +1,7 @@ package com.ruoyi.xkt.service.impl; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.xkt.domain.StoreProductFile; -import com.ruoyi.xkt.mapper.StoreProductFileMapper; import com.ruoyi.xkt.service.IStoreProductFileService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; /** * 档口商品文件Service业务层处理 diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index 2ccdaf0ea..3f8c1054c 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -108,7 +108,6 @@ public class StoreProductServiceImpl implements IStoreProductService { final StoreHomepageMapper storeHomepageMapper; final RedisCache redisCache; final NoticeMapper noticeMapper; - final UserNoticeSettingMapper userNoticeSetMapper; final UserNoticeMapper userNoticeMapper; final UserSubscriptionsMapper userSubMapper; final OSSClientWrapper ossClient; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStockServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStockServiceImpl.java index 2631b77bf..c485d1499 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStockServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStockServiceImpl.java @@ -117,7 +117,7 @@ public class StoreProductStockServiceImpl implements IStoreProductStockService { /** * 根据档口ID 和 档口商品颜色ID 查询商品库存 * - * @param dto 入参 + * @param dto 入参 * @return StoreProdStockResDTO */ @Override @@ -490,7 +490,8 @@ public class StoreProductStockServiceImpl implements IStoreProductStockService { /** * 获取商品某尺寸的库存 - * @param size 尺寸 + * + * @param size 尺寸 * @param stock 库存 * @return 库存 */ @@ -502,41 +503,29 @@ public class StoreProductStockServiceImpl implements IStoreProductStockService { return stock.getSize30(); } else if (size == 31) { return stock.getSize31(); - } - else if (size == 32) { + } else if (size == 32) { return stock.getSize32(); - } - else if (size == 33) { + } else if (size == 33) { return stock.getSize33(); - } - else if (size == 34) { + } else if (size == 34) { return stock.getSize34(); - } - else if (size == 35) { + } else if (size == 35) { return stock.getSize35(); - } - else if (size == 36) { + } else if (size == 36) { return stock.getSize36(); - } - else if (size == 37) { + } else if (size == 37) { return stock.getSize37(); - } - else if (size == 38) { + } else if (size == 38) { return stock.getSize38(); - } - else if (size == 39) { + } else if (size == 39) { return stock.getSize39(); - } - else if (size == 40) { + } else if (size == 40) { return stock.getSize40(); - } - else if (size == 41) { + } else if (size == 41) { return stock.getSize41(); - } - else if (size == 42) { + } else if (size == 42) { return stock.getSize42(); - } - else if (size == 43) { + } else if (size == 43) { return stock.getSize43(); } return null; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageDemandDeducteServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageDemandDeducteServiceImpl.java index a1e84358c..9ac28e073 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageDemandDeducteServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageDemandDeducteServiceImpl.java @@ -43,7 +43,7 @@ public class StoreProductStorageDemandDeducteServiceImpl implements IStoreProduc /** * 入库单列表获取抵扣需求明细列表 * - * @param storeId 档口ID + * @param storeId 档口ID * @param storageCode 入库单号 * @return List */ @@ -56,8 +56,8 @@ public class StoreProductStorageDemandDeducteServiceImpl implements IStoreProduc } // 根据storageCode找到入库单 StoreProductStorage storage = Optional.ofNullable(this.prodStorageMapper.selectOne(new LambdaQueryWrapper() - .eq(StoreProductStorage::getCode, storageCode).eq(StoreProductStorage::getStoreId, storeId) - .eq(StoreProductStorage::getDelFlag, Constants.UNDELETED))) + .eq(StoreProductStorage::getCode, storageCode).eq(StoreProductStorage::getStoreId, storeId) + .eq(StoreProductStorage::getDelFlag, Constants.UNDELETED))) .orElseThrow(() -> new ServiceException("档口商品入库不存在!", HttpStatus.ERROR)); List storageDetailList = this.productStorageDetailMapper.selectList(new LambdaQueryWrapper() .eq(StoreProductStorageDetail::getStoreProdStorId, storage.getId()).eq(StoreProductStorageDetail::getDelFlag, Constants.UNDELETED)); @@ -78,13 +78,13 @@ public class StoreProductStorageDemandDeducteServiceImpl implements IStoreProduc // 抵扣的需求明细列表 再按照code进行分类 Map> demandSizeMap = demandDetailList.stream().collect(Collectors.groupingBy(StoreProductStorageDemandDeduct::getDemandCode)); // 生产需求单号列 - final List demandCodeList = new ArrayList(){{ + final List demandCodeList = new ArrayList() {{ add(""); // 生产需求单号列表 demandDetailList.stream().map(StoreProductStorageDemandDeduct::getDemandCode).distinct().sorted(Comparator.comparing(x -> x)).forEach(this::add); }}; // 初始化数量对比 列 - List compareNumStrList = new ArrayList(){{ + List compareNumStrList = new ArrayList() {{ add("入库数量"); // 根据生产需求单号数量 生成 对应的 抵扣数量 demandDetailList.stream().map(StoreProductStorageDemandDeduct::getDemandCode).distinct().forEach(x -> this.add("抵扣需求数量")); @@ -112,7 +112,6 @@ public class StoreProductStorageDemandDeducteServiceImpl implements IStoreProduc } - private List getSizeQuantityList(List demandCodeList, Map> demandSizeMap, Integer size) { // 每一个尺码的数量对比明细 return demandCodeList.stream().map(demandCode -> { @@ -124,5 +123,4 @@ public class StoreProductStorageDemandDeducteServiceImpl implements IStoreProduc } - } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageServiceImpl.java index 822641617..cf88bb6b9 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageServiceImpl.java @@ -145,7 +145,7 @@ public class StoreProductStorageServiceImpl implements IStoreProductStorageServi Map>> unDeductMap = this.getUnDeductMap(demandDetailList, detailList.stream() .map(StoreProductStorageDetail::getStoreProdColorId).collect(Collectors.toList())); long fifth = System.currentTimeMillis(); - System.err.println("查询需求耗时:" + (fifth - fourth)); + System.err.println("查询需求耗时:" + (fifth - fourth)); if (MapUtils.isEmpty(unDeductMap)) { return; } @@ -155,7 +155,7 @@ public class StoreProductStorageServiceImpl implements IStoreProductStorageServi System.err.println("库存转map耗时: " + (sixth - fifth)); // 按照入库的数量明细依次判断哪些需求订单明细还未抵扣完毕 Map>>> totalMatchMap = this.getTotalMatchMap(storageQuantityMap, unDeductMap); - long seventh = System.currentTimeMillis(); + long seventh = System.currentTimeMillis(); System.err.println("处理需求抵扣明细耗时:" + (seventh - sixth)); if (MapUtils.isEmpty(totalMatchMap)) { return; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/SysProductCategoryServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/SysProductCategoryServiceImpl.java index a127b7eb3..206a1d3f5 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/SysProductCategoryServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/SysProductCategoryServiceImpl.java @@ -271,6 +271,7 @@ public class SysProductCategoryServiceImpl implements ISysProductCategoryService /** * 商品管理列表获取所有商品二级分类及没有二级分类的一级分类 + * * @return List */ @Override diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAccountServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAccountServiceImpl.java deleted file mode 100644 index 64de7b520..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAccountServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.ruoyi.xkt.service.impl; - -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.xkt.domain.UserAccount; -import com.ruoyi.xkt.mapper.UserAccountMapper; -import com.ruoyi.xkt.service.IUserAccountService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 用户账户（支付宝、微信等）Service业务层处理 - * - * @author ruoyi - * @date 2025-03-26 - */ -@Service -public class UserAccountServiceImpl implements IUserAccountService { - @Autowired - private UserAccountMapper userAccountMapper; - - /** - * 查询用户账户（支付宝、微信等） - * - * @param userAccId 用户账户（支付宝、微信等）主键 - * @return 用户账户（支付宝、微信等） - */ - @Override - @Transactional(readOnly = true) - public UserAccount selectUserAccountByUserAccId(Long userAccId) { - return userAccountMapper.selectUserAccountByUserAccId(userAccId); - } - - /** - * 查询用户账户（支付宝、微信等）列表 - * - * @param userAccount 用户账户（支付宝、微信等） - * @return 用户账户（支付宝、微信等） - */ - @Override - @Transactional(readOnly = true) - public List selectUserAccountList(UserAccount userAccount) { - return userAccountMapper.selectUserAccountList(userAccount); - } - - /** - * 新增用户账户（支付宝、微信等） - * - * @param userAccount 用户账户（支付宝、微信等） - * @return 结果 - */ - @Override - @Transactional - public int insertUserAccount(UserAccount userAccount) { - userAccount.setCreateTime(DateUtils.getNowDate()); - return userAccountMapper.insertUserAccount(userAccount); - } - - /** - * 修改用户账户（支付宝、微信等） - * - * @param userAccount 用户账户（支付宝、微信等） - * @return 结果 - */ - @Override - @Transactional - public int updateUserAccount(UserAccount userAccount) { - userAccount.setUpdateTime(DateUtils.getNowDate()); - return userAccountMapper.updateUserAccount(userAccount); - } - - /** - * 批量删除用户账户（支付宝、微信等） - * - * @param userAccIds 需要删除的用户账户（支付宝、微信等）主键 - * @return 结果 - */ - @Override - public int deleteUserAccountByUserAccIds(Long[] userAccIds) { - return userAccountMapper.deleteUserAccountByUserAccIds(userAccIds); - } - - /** - * 删除用户账户（支付宝、微信等）信息 - * - * @param userAccId 用户账户（支付宝、微信等）主键 - * @return 结果 - */ - @Override - public int deleteUserAccountByUserAccId(Long userAccId) { - return userAccountMapper.deleteUserAccountByUserAccId(userAccId); - } -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserBillingStatementServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserBillingStatementServiceImpl.java deleted file mode 100644 index e0f01e15b..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserBillingStatementServiceImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.ruoyi.xkt.service.impl; - -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.xkt.domain.UserBillingStatement; -import com.ruoyi.xkt.mapper.UserBillingStatementMapper; -import com.ruoyi.xkt.service.IUserBillingStatementService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 用户对账明细Service业务层处理 - * - * @author ruoyi - * @date 2025-03-26 - */ -@Service -public class UserBillingStatementServiceImpl implements IUserBillingStatementService { - @Autowired - private UserBillingStatementMapper userBillingStatementMapper; - - /** - * 查询用户对账明细 - * - * @param userBillStatId 用户对账明细主键 - * @return 用户对账明细 - */ - @Override - @Transactional(readOnly = true) - public UserBillingStatement selectUserBillingStatementByUserBillStatId(Long userBillStatId) { - return userBillingStatementMapper.selectUserBillingStatementByUserBillStatId(userBillStatId); - } - - /** - * 查询用户对账明细列表 - * - * @param userBillingStatement 用户对账明细 - * @return 用户对账明细 - */ - @Override - public List selectUserBillingStatementList(UserBillingStatement userBillingStatement) { - return userBillingStatementMapper.selectUserBillingStatementList(userBillingStatement); - } - - /** - * 新增用户对账明细 - * - * @param userBillingStatement 用户对账明细 - * @return 结果 - */ - @Override - @Transactional - public int insertUserBillingStatement(UserBillingStatement userBillingStatement) { - userBillingStatement.setCreateTime(DateUtils.getNowDate()); - return userBillingStatementMapper.insertUserBillingStatement(userBillingStatement); - } - - /** - * 修改用户对账明细 - * - * @param userBillingStatement 用户对账明细 - * @return 结果 - */ - @Override - @Transactional - public int updateUserBillingStatement(UserBillingStatement userBillingStatement) { - userBillingStatement.setUpdateTime(DateUtils.getNowDate()); - return userBillingStatementMapper.updateUserBillingStatement(userBillingStatement); - } - - /** - * 批量删除用户对账明细 - * - * @param userBillStatIds 需要删除的用户对账明细主键 - * @return 结果 - */ - @Override - public int deleteUserBillingStatementByUserBillStatIds(Long[] userBillStatIds) { - return userBillingStatementMapper.deleteUserBillingStatementByUserBillStatIds(userBillStatIds); - } - - /** - * 删除用户对账明细信息 - * - * @param userBillStatId 用户对账明细主键 - * @return 结果 - */ - @Override - public int deleteUserBillingStatementByUserBillStatId(Long userBillStatId) { - return userBillingStatementMapper.deleteUserBillingStatementByUserBillStatId(userBillStatId); - } -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java index 720f83f3d..5a04f4c74 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java @@ -269,7 +269,7 @@ public class UserFavoritesServiceImpl implements IUserFavoritesService { } final Date now = java.sql.Date.valueOf(LocalDate.now().plusDays(1)); final Date sixMonthAgo = java.sql.Date.valueOf(LocalDate.now().minusMonths(6)); - return this.userFavMapper.getStatusNum(userId, sixMonthAgo, now); + return this.userFavMapper.getStatusNum(userId, sixMonthAgo, now); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserNoticeSettingServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserNoticeSettingServiceImpl.java deleted file mode 100644 index 7f5654afc..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserNoticeSettingServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ruoyi.xkt.service.impl; - -import com.ruoyi.xkt.mapper.UserNoticeSettingMapper; -import com.ruoyi.xkt.service.IUserNoticeSettingService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * 用户通知接收设置Service业务层处理 - * - * @author ruoyi - * @date 2025-03-26 - */ -@Service -public class UserNoticeSettingServiceImpl implements IUserNoticeSettingService { - - @Autowired - private UserNoticeSettingMapper userNoticeSettingMapper; - - -} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java index e4a42a39e..8b9883733 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java @@ -1761,15 +1761,14 @@ public class WebsitePCServiceImpl implements IWebsitePCService { } /** - * - * @param advertRoundList 广告列表 - * @param prodPriceAndMainPicMap 商品价格及主图map - * @param existProdIdList 已存在的商品ID列表 - * @param limitCount 返回的 数量 + * @param advertRoundList 广告列表 + * @param prodPriceAndMainPicMap 商品价格及主图map + * @param existProdIdList 已存在的商品ID列表 + * @param limitCount 返回的 数量 * @return */ private List fillPcSearchResultAdvertList(List advertRoundList, Map prodPriceAndMainPicMap, - Map storeMap, List existProdIdList, int limitCount) { + Map storeMap, List existProdIdList, int limitCount) { List tempList = new ArrayList<>(); advertRoundList.stream().collect(Collectors.groupingBy(AdvertRound::getStoreId)) .forEach((storeId, list) -> { diff --git a/xkt/src/main/resources/mapper/PictureSearchHotMapper.xml b/xkt/src/main/resources/mapper/PictureSearchHotMapper.xml deleted file mode 100644 index 256ef63a2..000000000 --- a/xkt/src/main/resources/mapper/PictureSearchHotMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/PictureSearchResultMapper.xml b/xkt/src/main/resources/mapper/PictureSearchResultMapper.xml deleted file mode 100644 index 0e582ebcc..000000000 --- a/xkt/src/main/resources/mapper/PictureSearchResultMapper.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - select id, pic_search_id, file_id, category_id, score, sort_expr_values, version, del_flag, create_by, create_time, update_by, update_time from picture_search_result - - - - - - - - insert into picture_search_result - - pic_search_id, - file_id, - category_id, - score, - sort_expr_values, - version, - del_flag, - create_by, - create_time, - update_by, - update_time, - - - #{picSearchId}, - #{fileId}, - #{categoryId}, - #{score}, - #{sortExprValues}, - #{version}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update picture_search_result - - pic_search_id = #{picSearchId}, - file_id = #{fileId}, - category_id = #{categoryId}, - score = #{score}, - sort_expr_values = #{sortExprValues}, - version = #{version}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from picture_search_result where id = #{id} - - - - delete from picture_search_result where id in - - #{id} - - - \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserAccountMapper.xml b/xkt/src/main/resources/mapper/UserAccountMapper.xml deleted file mode 100644 index ffdd86ff9..000000000 --- a/xkt/src/main/resources/mapper/UserAccountMapper.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - select id, user_id, account_type, account_phone, account_name, balance, version, del_flag, create_by, create_time, update_by, update_time from user_account - - - - - - - - insert into user_account - - user_id, - account_type, - account_phone, - account_name, - balance, - version, - del_flag, - create_by, - create_time, - update_by, - update_time, - - - #{userId}, - #{accountType}, - #{accountPhone}, - #{accountName}, - #{balance}, - #{version}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update user_account - - user_id = #{userId}, - account_type = #{accountType}, - account_phone = #{accountPhone}, - account_name = #{accountName}, - balance = #{balance}, - version = #{version}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from user_account where id = #{id} - - - - delete from user_account where id in - - #{id} - - - \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserBillingStatementMapper.xml b/xkt/src/main/resources/mapper/UserBillingStatementMapper.xml deleted file mode 100644 index 5a665a235..000000000 --- a/xkt/src/main/resources/mapper/UserBillingStatementMapper.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, user_acc_id, code, trans_type, trans_remark, pay_way, income, expenses, acc_balance, version, del_flag, create_by, create_time, update_by, update_time from user_billing_statement - - - - - - - - insert into user_billing_statement - - user_id, - user_acc_id, - code, - trans_type, - trans_remark, - pay_way, - income, - expenses, - acc_balance, - version, - del_flag, - create_by, - create_time, - update_by, - update_time, - - - #{userId}, - #{userAccId}, - #{code}, - #{transType}, - #{transRemark}, - #{payWay}, - #{income}, - #{expenses}, - #{accBalance}, - #{version}, - #{delFlag}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update user_billing_statement - - user_id = #{userId}, - user_acc_id = #{userAccId}, - code = #{code}, - trans_type = #{transType}, - trans_remark = #{transRemark}, - pay_way = #{payWay}, - income = #{income}, - expenses = #{expenses}, - acc_balance = #{accBalance}, - version = #{version}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from user_billing_statement where id = #{id} - - - - delete from user_billing_statement where id in - - #{id} - - - \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/UserNoticeSettingMapper.xml b/xkt/src/main/resources/mapper/UserNoticeSettingMapper.xml deleted file mode 100644 index d5d15e359..000000000 --- a/xkt/src/main/resources/mapper/UserNoticeSettingMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file