From a10110e1f0171f6cbdc70b56fa345f9f807d7d7d Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 19 May 2021 14:11:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionBuyerController.java | 3 +- .../DistributionCashBuyerController.java | 2 +- .../DistributionGoodsBuyerController.java | 10 +- .../DistributionOrderBuyerController.java | 3 +- .../goods/CategoryBuyerController.java | 3 +- .../goods/GoodsBuyerController.java | 3 +- .../member/CouponBuyerController.java | 5 +- .../member/FootprintController.java | 17 +- .../member/MemberAddressBuyerController.java | 20 +- .../member/MemberCollectionController.java | 3 +- .../MemberEvaluationBuyerController.java | 3 +- .../member/MemberMessageBuyerController.java | 3 +- .../member/MemberReceiptController.java | 3 +- .../member/MemberSignBuyerController.java | 3 +- .../member/MemberWalletBuyerController.java | 6 +- .../MemberWithdrawApplyBuyerController.java | 2 +- .../member/PointsHistoryBuyerController.java | 2 +- .../member/RechargeBuyerController.java | 3 +- .../member/ServiceNoticeBuyerController.java | 2 +- .../other/ArticleBuyerController.java | 3 +- .../other/FeedbackBuyerController.java | 10 +- .../other/LogisticsBuyerController.java | 3 +- .../controller/other/PageBuyerController.java | 3 +- .../passport/MemberBuyerController.java | 4 +- .../connect/ConnectBuyerBindController.java | 3 +- .../connect/ConnectBuyerWebController.java | 2 +- .../connect/MiniProgramBuyerController.java | 2 +- .../controller/payment/CashierController.java | 2 +- .../promotion/PintuanBuyerController.java | 3 +- .../promotion/PointsGoodsBuyerController.java | 2 +- .../promotion/SeckillBuyerController.java | 2 +- .../purchase/PurchaseBuyerController.java | 11 +- .../purchase/PurchaseQuotedController.java | 2 +- .../store/StoreBuyerController.java | 22 +- .../trade/AfterSaleBuyerController.java | 2 +- .../lili/controller/trade/CartController.java | 30 +-- .../trade/OrderBuyerController.java | 8 +- .../trade/OrderComplaintBuyerController.java | 17 +- .../trade/ReceiptBuyerController.java | 2 +- .../trade/RechargeTradeBuyerController.java | 2 +- .../trade/WalletLogBuyerController.java | 2 +- .../controller/common/FileController.java | 4 +- .../controller/common/LogoController.java | 2 +- .../controller/common/RegionController.java | 2 +- .../common/SliderImageController.java | 2 +- .../lili/controller/common/SmsController.java | 2 +- .../controller/common/UploadController.java | 2 +- .../java/cn/lili/common/enums/ResultCode.java | 243 +++++++++-------- .../common/{utils => enums}/ResultUtil.java | 51 +++- .../GlobalControllerExceptionHandler.java | 11 +- .../cn/lili/generator/VueCodeGenerator.java | 244 ------------------ .../java/cn/lili/generator/bean/Field.java | 40 --- .../modules/connect/util/ConnectUtil.java | 2 +- .../DistributionCashServiceImpl.java | 7 +- .../lili/modules/goods/entity/dos/Goods.java | 2 +- .../modules/goods/entity/dos/GoodsSku.java | 2 +- .../goods/entity/dto/GoodsOperationDTO.java | 5 +- .../member/entity/dos/MemberAddress.java | 2 - .../member/serviceimpl/MemberServiceImpl.java | 16 +- .../MemberWithdrawApplyServiceImpl.java | 15 +- .../message/util/WechatMpCodeUtil.java | 4 +- .../order/cart/entity/vo/CartSkuVO.java | 4 + .../order/cart/render/TradeBuilder.java | 1 + .../cart/render/impl/SkuFreightRender.java | 30 ++- .../order/cart/service/CartServiceImpl.java | 24 +- .../modules/order/order/entity/dos/Order.java | 16 +- .../serviceimpl/AfterSaleServiceImpl.java | 6 +- .../order/serviceimpl/ReceiptServiceImpl.java | 7 +- .../ArticleCategoryServiceImpl.java | 15 +- .../kit/plugin/alipay/AliPayPlugin.java | 4 +- .../kit/plugin/wallet/WalletPlugin.java | 2 +- .../kit/plugin/wechat/WechatPlugin.java | 2 +- .../resources/templates/java/controller.btl | 2 +- .../DistributionCashManagerController.java | 2 +- .../DistributionGoodsManagerController.java | 5 +- .../DistributionManagerController.java | 8 +- .../DistributionOrderManagerController.java | 3 +- .../file/FileManagerController.java | 4 +- .../goods/BrandManagerController.java | 4 +- .../goods/CategoryBrandManagerController.java | 5 +- .../goods/CategoryManagerController.java | 6 +- ...tegoryParameterGroupManagerController.java | 4 +- ...ategorySpecificationManagerController.java | 5 +- .../goods/GoodsManagerController.java | 8 +- .../GoodsParameterManagerController.java | 3 +- .../goods/GoodsUnitManagerController.java | 6 +- .../goods/ParameterManagerController.java | 4 +- .../goods/SpecValuesManagerController.java | 2 +- .../goods/SpecificationManagerController.java | 4 +- .../ConnectConfigManagerController.java | 2 +- .../member/IpInfoManagerController.java | 2 +- .../MemberAddressManagerController.java | 10 +- .../MemberEvaluationManagerController.java | 16 +- .../member/MemberManagerController.java | 12 +- .../MemberNoticeLogManagerController.java | 12 +- .../MemberNoticeSenterManagerController.java | 12 +- .../MemberPointsHistoryManagerController.java | 3 +- .../member/MemberWalletManagerController.java | 2 +- .../MemberWithdrawApplyManagerController.java | 2 +- .../ArticleCategoryManagerController.java | 10 +- .../other/ArticleManagerController.java | 14 +- .../other/CustomWordsManagerController.java | 22 +- .../other/FeedbackManagerController.java | 3 +- .../other/MessageManagerController.java | 3 +- .../other/PageDataManagerController.java | 2 +- .../SensitiveWordsManagerController.java | 22 +- .../other/SpecialManagerController.java | 16 +- .../other/VerificationSourceController.java | 22 +- .../passport/AdminUserManagerController.java | 8 +- .../DepartmentManagerController.java | 19 +- .../DepartmentRoleManagerController.java | 14 +- .../permission/MenuManagerController.java | 5 +- .../permission/RoleManagerController.java | 5 +- .../permission/RoleMenuManagerController.java | 5 +- .../permission/UserRoleManagerController.java | 4 +- .../promotion/CouponManagerController.java | 16 +- .../FullDiscountManagerController.java | 3 +- .../promotion/PintuanManagerController.java | 2 +- .../PointsGoodsCategoryManagerController.java | 22 +- .../PointsGoodsManagerController.java | 22 +- .../promotion/PromotionManagerController.java | 3 +- .../promotion/SeckillManagerController.java | 24 +- .../purchase/PurchaseManagerController.java | 10 +- .../setting/AppVersionManagerController.java | 3 +- .../InstantDeliveryManagerController.java | 5 +- .../setting/LogManagerController.java | 7 +- .../setting/LogisticsManagerController.java | 5 +- .../MemberNoticeManagerController.java | 10 +- .../NoticeMessageManagerController.java | 17 +- .../setting/RegionManagerController.java | 18 +- .../ServiceNoticeManagerController.java | 18 +- .../setting/SettingManagerController.java | 12 +- .../setting/SettingXManagerController.java | 2 +- .../setting/SmsManagerController.java | 4 +- .../setting/SmsSignManagerController.java | 11 +- .../setting/SmsTemplateManagerController.java | 10 +- .../WechatMPMessageManagerController.java | 21 +- .../WechatMessageManageController.java | 20 +- .../GoodsStatisticsManagerController.java | 3 +- .../IndexStatisticsManagerController.java | 3 +- .../MemberStatisticsManagerController.java | 3 +- .../OrderStatisticsManagerController.java | 3 +- ...efundOrderStatisticsManagerController.java | 2 +- .../ViewStatisticsManagerController.java | 2 +- .../store/BillManagerController.java | 10 +- .../store/StoreManagerController.java | 18 +- .../store/StoreMessageManagerController.java | 2 +- .../trade/AfterSaleManagerController.java | 3 +- .../AfterSaleReasonManagerController.java | 5 +- .../OrderComplaintManagerController.java | 35 +-- .../trade/OrderLogManagerController.java | 3 +- .../trade/OrderManagerController.java | 5 +- .../trade/PaymentLogManagerController.java | 3 +- .../trade/ReceiptManagerController.java | 2 +- .../trade/RechargeManagerController.java | 3 +- .../trade/RefundLogManagerController.java | 3 +- .../trade/WalletLogManagerController.java | 3 +- .../test/promotion/PromotionPriceTest.java | 2 +- .../DistributionGoodsStoreController.java | 5 +- .../DistributionOrderStoreController.java | 3 +- ...CategoryParameterGroupStoreController.java | 12 +- .../CategorySpecificationStoreController.java | 5 +- .../goods/CategoryStoreController.java | 2 +- .../goods/DraftGoodsStoreController.java | 6 +- .../goods/GoodsGalleryController.java | 18 +- .../goods/GoodsLabelStoreController.java | 4 +- .../goods/GoodsStoreController.java | 32 +-- .../goods/GoodsUnitStoreController.java | 3 +- .../goods/SpecValuesStoreController.java | 2 +- .../goods/SpecificationStoreController.java | 12 +- .../member/StoreUserController.java | 2 +- .../other/ArticleStoreController.java | 2 +- .../passport/StorePassportController.java | 2 +- .../promotion/CouponStoreController.java | 16 +- .../FullDiscountStoreController.java | 3 +- .../promotion/PintuanStoreController.java | 2 +- .../promotion/SeckillStoreController.java | 7 +- .../FreightTemplateStoreController.java | 10 +- .../settings/LogStoreController.java | 3 +- .../settings/LogisticsStoreController.java | 6 +- .../settings/StoreAddressController.java | 6 +- .../settings/StoreMessageController.java | 3 +- .../settings/StorePageDataController.java | 3 +- .../settings/StoreSettingsController.java | 22 +- .../GoodsStatisticsStoreController.java | 3 +- .../IndexStatisticsStoreController.java | 3 +- .../OrderStatisticsStoreController.java | 3 +- .../RefundOrderStatisticsStoreController.java | 2 +- .../ViewStatisticsStoreController.java | 2 +- .../trade/AfterSaleStoreController.java | 3 +- .../controller/trade/BillStoreController.java | 10 +- .../MemberEvaluationStoreController.java | 10 +- .../trade/OrderComplaintStoreController.java | 29 +-- .../trade/OrderLogStoreController.java | 3 +- .../trade/OrderStoreController.java | 3 +- .../trade/ReceiptStoreController.java | 2 +- 196 files changed, 733 insertions(+), 1233 deletions(-) rename framework/src/main/java/cn/lili/common/{utils => enums}/ResultUtil.java (52%) delete mode 100644 framework/src/main/java/cn/lili/generator/VueCodeGenerator.java delete mode 100644 framework/src/main/java/cn/lili/generator/bean/Field.java diff --git a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java index 82cac667..d8dbe3e8 100644 --- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.distribution; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.distribution.entity.dos.Distribution; import cn.lili.modules.distribution.entity.dos.DistributionOrder; @@ -13,7 +13,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java index 3801d30b..e296c7de 100644 --- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.distribution; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.distribution.entity.dos.DistributionCash; diff --git a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java index 76338351..d48f9f67 100644 --- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java @@ -1,8 +1,6 @@ package cn.lili.controller.distribution; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.distribution.entity.dto.DistributionGoodsSearchParams; import cn.lili.modules.distribution.entity.vos.DistributionGoodsVO; @@ -54,9 +52,7 @@ public class DistributionGoodsBuyerController { @GetMapping(value = "/checked/{distributionGoodsId}") public ResultMessage> distributionCheckGoods( @NotNull(message = "分销商品不能为空") @PathVariable("distributionGoodsId") String distributionGoodsId) { - if (distributionSelectedGoodsService.add(distributionGoodsId)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + distributionSelectedGoodsService.add(distributionGoodsId); + return ResultUtil.success(); } } diff --git a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java index f313316a..16e691a0 100644 --- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.distribution; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.distribution.entity.dos.DistributionOrder; import cn.lili.modules.distribution.entity.vos.DistributionOrderSearchParams; @@ -9,7 +9,6 @@ import cn.lili.modules.distribution.service.DistributionService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java index e260756e..f36e14b8 100644 --- a/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java @@ -1,13 +1,12 @@ package cn.lili.controller.goods; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.vos.CategoryVO; import cn.lili.modules.goods.service.CategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java index 7bcf0eed..49541e7d 100644 --- a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.goods; import cn.hutool.core.text.CharSequenceUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.distribution.service.DistributionService; @@ -21,7 +21,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.web.bind.annotation.GetMapping; diff --git a/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java index a8fc69ac..307b3f04 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.member; import cn.lili.common.enums.ResultCode; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.MemberCoupon; @@ -15,7 +15,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -82,7 +81,7 @@ public class CouponBuyerController { public ResultMessage receiveCoupon(@NotNull(message = "优惠券ID不能为空") @PathVariable("couponId") String couponId) { memberCouponService.checkCouponLimit(couponId, UserContext.getCurrentUser().getId()); memberCouponService.receiveCoupon(couponId, UserContext.getCurrentUser().getId(), UserContext.getCurrentUser().getNickName()); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "通过id获取") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java index 8eeadbf0..30d41365 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java @@ -1,8 +1,6 @@ package cn.lili.controller.member; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.service.FootprintService; @@ -44,19 +42,16 @@ public class FootprintController { @ApiImplicitParam(name = "ids", value = "商品ID", required = true, allowMultiple = true, dataType = "String", paramType = "path") @DeleteMapping(value = "/delByIds/{ids}") public ResultMessage delAllByIds(@NotNull(message = "商品ID不能为空") @PathVariable("ids") List ids) { - if (footprintService.deleteByIds(ids)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + footprintService.deleteByIds(ids); + return ResultUtil.success(); + } @ApiOperation(value = "清空足迹") @DeleteMapping public ResultMessage deleteAll() { - if (footprintService.clean()) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + footprintService.clean(); + return ResultUtil.success(); } @ApiOperation(value = "获取当前会员足迹数量") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java index 4492bd16..aa7af08a 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java @@ -1,12 +1,9 @@ package cn.lili.controller.member; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.base.service.RegionService; import cn.lili.modules.member.entity.dos.MemberAddress; import cn.lili.modules.promotion.service.MemberAddressService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -36,9 +33,6 @@ public class MemberAddressBuyerController { @Autowired private MemberAddressService memberAddressService; - @Autowired - private RegionService regionService; - @ApiOperation(value = "获取会员收件地址分页列表") @GetMapping public ResultMessage> page(PageVO page) { @@ -63,6 +57,9 @@ public class MemberAddressBuyerController { public ResultMessage addShippingAddress(@Valid MemberAddress shippingAddress) { //添加会员地址 shippingAddress.setMemberId(UserContext.getCurrentUser().getId()); + if(shippingAddress.getIsDefault()==null){ + shippingAddress.setIsDefault(false); + } return ResultUtil.data(memberAddressService.saveMemberAddress(shippingAddress)); } @@ -71,6 +68,9 @@ public class MemberAddressBuyerController { public ResultMessage editShippingAddress(@Valid MemberAddress shippingAddress) { //修改会员地址 shippingAddress.setMemberId(UserContext.getCurrentUser().getId()); + if(shippingAddress.getIsDefault()==null){ + shippingAddress.setIsDefault(false); + } return ResultUtil.data(memberAddressService.updateMemberAddress(shippingAddress)); } @@ -78,10 +78,8 @@ public class MemberAddressBuyerController { @ApiImplicitParam(name = "id", value = "会员地址ID", dataType = "String", paramType = "path") @DeleteMapping(value = "/delById/{id}") public ResultMessage delShippingAddressById(@PathVariable String id) { - if (memberAddressService.removeMemberAddress(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + memberAddressService.removeMemberAddress(id); + return ResultUtil.success(); } } diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java index 74198f4c..7e6d102b 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java @@ -1,6 +1,6 @@ package cn.lili.controller.member; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.service.GoodsCollectionService; @@ -9,7 +9,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java index 771c0477..14c47cb9 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.member; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberEvaluation; import cn.lili.modules.member.entity.dto.EvaluationQueryParams; @@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java index 5aedb6c3..0460250c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.member; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.message.entity.enums.MessageStatusEnum; @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java index 5d7d3b9c..99b3c046 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java @@ -2,7 +2,7 @@ package cn.lili.controller.member; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.vo.MemberReceiptAddVO; @@ -11,7 +11,6 @@ import cn.lili.modules.member.service.MemberReceiptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java index 828ff49e..eb55af7f 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java @@ -1,12 +1,11 @@ package cn.lili.controller.member; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberSign; import cn.lili.modules.member.service.MemberSignService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java index a12ae53f..73716710 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java @@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.verification.enums.VerificationEnums; import cn.lili.common.verification.service.VerificationService; import cn.lili.common.vo.ResultMessage; @@ -18,7 +18,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.web.bind.annotation.*; @@ -108,8 +107,9 @@ public class MemberWalletBuyerController { } this.memberWalletService.setMemberWalletPassword(member, newPassword); return ResultUtil.data("修改成功"); + } else { + throw new ServiceException(ResultCode.WALLET_NOT_EXIT_ERROR); } - throw new ServiceException(ResultCode.ERROR); } diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java index 34554935..a78f8b8d 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.member; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberWithdrawApply; diff --git a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java index 687aad7e..93c5f551 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.member; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberPointsHistory; diff --git a/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java index 1d4d610b..f22f0879 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.member; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.trade.entity.dos.Recharge; @@ -10,7 +10,6 @@ import cn.lili.modules.order.trade.service.RechargeService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; diff --git a/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java index 1089e903..ecd72e4e 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.member; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.system.entity.dos.ServiceNotice; diff --git a/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java index 727021de..17d3c63a 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.other; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.page.entity.dos.Article; import cn.lili.modules.page.entity.dto.ArticleSearchParams; @@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java index 42e579d1..2f84439b 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java @@ -1,9 +1,7 @@ package cn.lili.controller.other; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.page.entity.dos.Feedback; import cn.lili.modules.page.service.FeedbackService; @@ -35,10 +33,8 @@ public class FeedbackBuyerController { @PostMapping() public ResultMessage save(Feedback feedback) { feedback.setUserName(UserContext.getCurrentUser().getNickName()); - if (feedbackService.save(feedback)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + feedbackService.save(feedback); + return ResultUtil.success(); } } diff --git a/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java index c527e50a..5c9e62d5 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java @@ -1,12 +1,11 @@ package cn.lili.controller.other; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.system.entity.dos.Logistics; import cn.lili.modules.system.service.LogisticsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java index 1d7326de..54726ff2 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.other; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.page.entity.dto.PageDataDTO; import cn.lili.modules.page.entity.enums.PageEnum; @@ -8,7 +8,6 @@ import cn.lili.modules.page.entity.vos.PageDataVO; import cn.lili.modules.page.service.PageDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java index 2c676ba1..ecb824d0 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.passport; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.sms.SmsUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.verification.enums.VerificationEnums; import cn.lili.common.verification.service.VerificationService; import cn.lili.common.vo.ResultMessage; @@ -112,7 +112,7 @@ public class MemberBuyerController { if (smsUtil.verifyCode(mobile, VerificationEnums.FIND_USER, uuid, code)) { //校验是否通过手机号可获取会员,存在则将会员信息存入缓存，有效时间3分钟 if (memberService.findByMobile(uuid, mobile)) { - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } throw new ServiceException(ResultCode.VERIFICATION_ERROR); diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java index 99cfb54a..c6b01fbe 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java @@ -1,14 +1,13 @@ package cn.lili.controller.passport.connect; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.connect.service.ConnectService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java index 60e2c70f..0f475c12 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java @@ -4,7 +4,7 @@ package cn.lili.controller.passport.connect; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.token.Token; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.connect.entity.dto.AuthCallback; import cn.lili.modules.connect.entity.dto.ConnectAuthUser; diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java index 0b996880..99e59561 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.passport.connect; import cn.lili.common.token.Token; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.connect.entity.dto.WechatMPLoginParams; import cn.lili.modules.connect.service.ConnectService; diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java index 14da717c..aad6f2d4 100644 --- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java +++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java @@ -1,7 +1,7 @@ package cn.lili.controller.payment; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.payment.kit.CashierSupport; import cn.lili.modules.payment.kit.dto.PayParam; diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java index c9a65d03..53e6ce6c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.promotion; import cn.hutool.core.date.DateUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO; @@ -15,7 +15,6 @@ import cn.lili.modules.promotion.service.PromotionGoodsService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java index 811c297f..3074053b 100644 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.promotion; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.PointsGoodsCategory; diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java index 7e9d47aa..45e2afcf 100644 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.promotion; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.vos.SeckillGoodsVO; import cn.lili.modules.promotion.entity.vos.SeckillTimelineVO; diff --git a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java index 5a2fb14b..a3974480 100644 --- a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java @@ -1,9 +1,7 @@ package cn.lili.controller.purchase; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.purchase.entity.dos.PurchaseOrder; import cn.lili.modules.purchase.entity.params.PurchaseOrderSearchParams; @@ -65,11 +63,8 @@ public class PurchaseBuyerController { @ApiImplicitParam(name = "id", value = "采购单ID", required = true, dataType = "Long", paramType = "path") @PutMapping("/{id}") public ResultMessage close(@NotNull @PathVariable String id) { - - if (purchaseOrderService.close(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + purchaseOrderService.close(id); + return ResultUtil.success(); } } diff --git a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java index b107faa9..e990e00d 100644 --- a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java +++ b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java @@ -1,6 +1,6 @@ package cn.lili.controller.purchase; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.purchase.entity.dos.PurchaseQuoted; import cn.lili.modules.purchase.entity.vos.PurchaseQuotedVO; diff --git a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java index 65719f01..32120938 100644 --- a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java @@ -1,9 +1,7 @@ package cn.lili.controller.store; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.statistics.aop.PageViewPoint; @@ -80,28 +78,22 @@ public class StoreBuyerController { @ApiOperation(value = "申请店铺第一步-填写企业信息") @PutMapping(value = "/apply/first") public ResultMessage applyFirstStep(StoreCompanyDTO storeCompanyDTO) { - if (storeService.applyFirstStep(storeCompanyDTO)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + storeService.applyFirstStep(storeCompanyDTO); + return ResultUtil.success(); } @ApiOperation(value = "申请店铺第二步-填写银行信息") @PutMapping(value = "/apply/second") public ResultMessage applyFirstStep(StoreBankDTO storeBankDTO) { - if (storeService.applySecondStep(storeBankDTO)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + storeService.applySecondStep(storeBankDTO); + return ResultUtil.success(); } @ApiOperation(value = "申请店铺第三步-填写其他信息") @PutMapping(value = "/apply/third") public ResultMessage applyFirstStep(StoreOtherInfoDTO storeOtherInfoDTO) { - if (storeService.applyThirdStep(storeOtherInfoDTO)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + storeService.applyThirdStep(storeOtherInfoDTO); + return ResultUtil.success(); } @ApiOperation(value = "获取当前登录会员的店铺信息-入驻店铺") diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java index f6f89f7d..12a18716 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.AfterSale; import cn.lili.modules.order.order.entity.dos.AfterSaleReason; diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java b/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java index 39ca0471..fce86afd 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java @@ -2,7 +2,7 @@ package cn.lili.controller.trade; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.enums.CartTypeEnum; @@ -13,7 +13,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; @@ -52,7 +51,7 @@ public class CartController { @NotNull(message = "购买数量不能为空") @Min(value = 1, message = "加入购物车数量必须大于0") Integer num, String cartType) { cartService.add(skuId, num, cartType); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @@ -86,7 +85,7 @@ public class CartController { public ResultMessage update(@NotNull(message = "产品id不能为空") @PathVariable(name = "skuId") String skuId, Integer num) { cartService.updateNum(skuId, num); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @@ -98,7 +97,7 @@ public class CartController { public ResultMessage updateChecked(@NotNull(message = "产品id不能为空") @PathVariable(name = "skuId") String skuId, boolean checked) { cartService.checked(skuId, checked); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @@ -106,7 +105,7 @@ public class CartController { @PostMapping(value = "/sku/checked", produces = MediaType.APPLICATION_JSON_VALUE) public ResultMessage updateAll(boolean checked) { cartService.checkedAll(checked); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @@ -119,7 +118,7 @@ public class CartController { @PostMapping(value = "/store/{storeId}", produces = MediaType.APPLICATION_JSON_VALUE) public ResultMessage updateStoreAll(@NotNull(message = "卖家id不能为空") @PathVariable(name = "storeId") String storeId, boolean checked) { cartService.checkedStore(storeId, checked); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @@ -127,7 +126,7 @@ public class CartController { @DeleteMapping() public ResultMessage clean() { cartService.clean(); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @@ -138,7 +137,7 @@ public class CartController { @DeleteMapping(value = "/sku/remove") public ResultMessage delete(String[] skuIds) { cartService.delete(skuIds); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @@ -169,7 +168,7 @@ public class CartController { String way) { try { cartService.shippingAddress(shippingAddressId, way); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } catch (ServiceException se) { log.error(ResultCode.SHIPPING_NOT_APPLY.message(), se); throw new ServiceException(ResultCode.SHIPPING_NOT_APPLY); @@ -193,7 +192,7 @@ public class CartController { String way) { try { cartService.shippingMethod(selleId, shippingMethod, way); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } catch (Exception e) { log.error(ResultCode.CART_ERROR.message(), e); throw new ServiceException(ResultCode.CART_ERROR); @@ -207,7 +206,7 @@ public class CartController { @GetMapping("/select/receipt") public ResultMessage selectReceipt(String way, ReceiptVO receiptVO) { this.cartService.shippingReceipt(receiptVO, way); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "选择优惠券") @@ -219,7 +218,7 @@ public class CartController { @GetMapping("/select/coupon") public ResultMessage selectCoupon(String way, @NotNull(message = "优惠券id不能为空") String memberCouponId, boolean used) { this.cartService.selectCoupon(memberCouponId, way, used); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @@ -229,11 +228,10 @@ public class CartController { try { // 读取选中的列表 return ResultUtil.data(this.cartService.createTrade(tradeParams)); + } catch (ServiceException e) { + throw e; } catch (Exception e) { log.error(ResultCode.ORDER_ERROR.message(), e); - if (e.getMessage().equals(ResultCode.SHIPPING_NOT_APPLY.message())) { - throw new ServiceException(ResultCode.SHIPPING_NOT_APPLY); - } throw new ServiceException(ResultCode.ORDER_ERROR); } } diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java index 3893b8ae..dbb2ac27 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java @@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dto.OrderSearchParams; @@ -73,7 +73,7 @@ public class OrderBuyerController { throw new ServiceException(ResultCode.ORDER_DELIVERED_ERROR); } orderService.complete(orderSn); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "取消订单") @@ -84,7 +84,7 @@ public class OrderBuyerController { @PostMapping(value = "/{orderSn}/cancel") public ResultMessage cancel(@ApiIgnore @PathVariable String orderSn, @RequestParam String reason) { orderService.cancel(orderSn, reason); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "删除订单") @@ -94,7 +94,7 @@ public class OrderBuyerController { @DeleteMapping(value = "/{orderSn}") public ResultMessage deleteOrder(@PathVariable String orderSn) { orderService.deleteOrder(orderSn); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "查询物流踪迹") diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java index 30e5cc3f..22a41231 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java @@ -1,10 +1,8 @@ package cn.lili.controller.trade; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.OrderComplaint; @@ -79,21 +77,16 @@ public class OrderComplaintBuyerController { public ResultMessage addCommunication(@RequestParam String complainId, @RequestParam String content) { AuthUser currentUser = UserContext.getCurrentUser(); OrderComplaintCommunicationVO communicationVO = new OrderComplaintCommunicationVO(complainId, content, CommunicationOwnerEnum.BUYER.name(), currentUser.getId(), currentUser.getNickName()); - if (orderComplaintCommunicationService.addCommunication(communicationVO)) { - return ResultUtil.data(communicationVO); - - } - throw new ServiceException(ResultCode.ERROR); + orderComplaintCommunicationService.addCommunication(communicationVO); + return ResultUtil.data(communicationVO); } @ApiOperation(value = "取消售后") @ApiImplicitParam(name = "id", value = "投诉单ID", required = true, paramType = "path") @PutMapping(value = "/status/{id}") public ResultMessage cancel(@PathVariable String id) { - if (orderComplaintService.cancel(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + orderComplaintService.cancel(id); + return ResultUtil.success(); } diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/ReceiptBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/ReceiptBuyerController.java index fddbfb6c..220e3520 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/ReceiptBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/ReceiptBuyerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.Receipt; diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java index ba06143c..9af8a36a 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.trade.entity.dos.Recharge; import cn.lili.modules.order.trade.service.RechargeService; diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java index 5e4aa674..3da33ba4 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.trade; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.trade.entity.dos.WalletLog; diff --git a/common-api/src/main/java/cn/lili/controller/common/FileController.java b/common-api/src/main/java/cn/lili/controller/common/FileController.java index 60db9db9..cc056c0d 100644 --- a/common-api/src/main/java/cn/lili/controller/common/FileController.java +++ b/common-api/src/main/java/cn/lili/controller/common/FileController.java @@ -6,7 +6,7 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; import cn.lili.common.security.enums.UserEnums; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; @@ -93,7 +93,7 @@ public class FileController { AuthUser authUser = UserContext.getAuthUser(cache, accessToken); fileService.batchDelete(ids, authUser); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/common-api/src/main/java/cn/lili/controller/common/LogoController.java b/common-api/src/main/java/cn/lili/controller/common/LogoController.java index da256cc0..b3825ddf 100644 --- a/common-api/src/main/java/cn/lili/controller/common/LogoController.java +++ b/common-api/src/main/java/cn/lili/controller/common/LogoController.java @@ -1,6 +1,6 @@ package cn.lili.controller.common; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.system.entity.enums.SettingEnum; import cn.lili.modules.system.service.SettingService; diff --git a/common-api/src/main/java/cn/lili/controller/common/RegionController.java b/common-api/src/main/java/cn/lili/controller/common/RegionController.java index 60a94d1e..99f571e9 100644 --- a/common-api/src/main/java/cn/lili/controller/common/RegionController.java +++ b/common-api/src/main/java/cn/lili/controller/common/RegionController.java @@ -1,6 +1,6 @@ package cn.lili.controller.common; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.base.service.RegionService; import cn.lili.modules.system.entity.dos.Region; diff --git a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java index 00a38ae5..745ae80d 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java +++ b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java @@ -2,7 +2,7 @@ package cn.lili.controller.common; import cn.lili.common.aop.limiter.annotation.LimitPoint; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.verification.enums.VerificationEnums; import cn.lili.common.verification.service.VerificationService; import cn.lili.common.vo.ResultMessage; diff --git a/common-api/src/main/java/cn/lili/controller/common/SmsController.java b/common-api/src/main/java/cn/lili/controller/common/SmsController.java index 96a486a6..e69664a4 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SmsController.java +++ b/common-api/src/main/java/cn/lili/controller/common/SmsController.java @@ -4,7 +4,7 @@ import cn.lili.common.aop.limiter.annotation.LimitPoint; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.sms.SmsUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.verification.enums.VerificationEnums; import cn.lili.common.verification.service.VerificationService; import cn.lili.common.vo.ResultMessage; diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index 6b871e77..83d868b4 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java @@ -9,7 +9,7 @@ import cn.lili.common.security.context.UserContext; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.utils.Base64DecodeMultipartFile; import cn.lili.common.utils.CommonUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.file.entity.File; diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java index 124c0056..f3f45311 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -3,6 +3,7 @@ package cn.lili.common.enums; /** * 返回状态码 * 第一位 1:商品；2:用户；3:交易,4:促销,5:店铺,6:页面,7:设置,8:其他 + * * @author Chopper * @date 2020/4/8 1:36 下午 */ @@ -16,89 +17,97 @@ public enum ResultCode { /** * 失败返回码 */ - ERROR(400,"失败"), + ERROR(400, "失败"), + /** * 失败返回码 */ - DEMO_SITE_EXCEPTION(400,"演示站点禁止使用"), + DEMO_SITE_EXCEPTION(4001, "演示站点禁止使用"), + /** + * 参数异常 + */ + PARAMS_ERROR(4002, "参数异常"), + /** * 系统异常 */ - WECHAT_CONNECT_NOT_EXIST(1001,"微信联合登录未配置"), + WECHAT_CONNECT_NOT_EXIST(1001, "微信联合登录未配置"), /** * 分类 */ - CATEGORY_NOT_EXIST(10001,"商品分类不存在"), - CATEGORY_NAME_IS_EXIST(10002,"该分类名称已存在"), - CATEGORY_PARENT_NOT_EXIST(10003,"该分类名称已存在"), - CATEGORY_BEYOND_THREE(10004,"最多为三级分类,添加失败"), - CATEGORY_HAS_CHILDREN(10005,"此类别下存在子类别不能删除"), - CATEGORY_HAS_GOODS(10006,"此类别下存在商品不能删除"), - CATEGORY_SAVE_ERROR(10007,"此类别下存在商品不能删除"), - CATEGORY_PARAMETER_SAVE_ERROR(10008,"分类绑定参数组添加失败"), - CATEGORY_PARAMETER_UPDATE_ERROR(10009,"分类绑定参数组添加失败"), + CATEGORY_NOT_EXIST(10001, "商品分类不存在"), + CATEGORY_NAME_IS_EXIST(10002, "该分类名称已存在"), + CATEGORY_PARENT_NOT_EXIST(10003, "该分类名称已存在"), + CATEGORY_BEYOND_THREE(10004, "最多为三级分类,添加失败"), + CATEGORY_HAS_CHILDREN(10005, "此类别下存在子类别不能删除"), + CATEGORY_HAS_GOODS(10006, "此类别下存在商品不能删除"), + CATEGORY_SAVE_ERROR(10007, "此类别下存在商品不能删除"), + CATEGORY_PARAMETER_SAVE_ERROR(10008, "分类绑定参数组添加失败"), + CATEGORY_PARAMETER_UPDATE_ERROR(10009, "分类绑定参数组添加失败"), /** * 商品 */ - GOODS_NOT_EXIST(11001,"商品已下架"), - GOODS_NAME_ERROR(11002,"商品名称不正确，名称应为2-50字符"), - GOODS_UNDER_ERROR(11003,"商品下架失败"), - GOODS_UPPER_ERROR(11004,"商品上架失败"), - GOODS_AUTH_ERROR(11005,"商品审核失败"), + GOODS_NOT_EXIST(11001, "商品已下架"), + GOODS_NAME_ERROR(11002, "商品名称不正确，名称应为2-50字符"), + GOODS_UNDER_ERROR(11003, "商品下架失败"), + GOODS_UPPER_ERROR(11004, "商品上架失败"), + GOODS_AUTH_ERROR(11005, "商品审核失败"), + POINT_GOODS_ERROR(11006, "积分商品业务异常，请稍后重试"), /** * 参数 */ - PARAMETER_SAVE_ERROR(12001,"参数添加失败"), - PARAMETER_UPDATE_ERROR(12002,"参数编辑失败"), + PARAMETER_SAVE_ERROR(12001, "参数添加失败"), + PARAMETER_UPDATE_ERROR(12002, "参数编辑失败"), /** * 规格 */ - SPEC_SAVE_ERROR(13001,"规格修改失败"), - SPEC_UPDATE_ERROR(13002,"规格修改失败"), - SPEC_DELETE_ERROR(13003,"此规格已绑定分类不允许删除"), + SPEC_SAVE_ERROR(13001, "规格修改失败"), + SPEC_UPDATE_ERROR(13002, "规格修改失败"), + SPEC_DELETE_ERROR(13003, "此规格已绑定分类不允许删除"), /** * 品牌 */ - BRAND_SAVE_ERROR(14001,"品牌添加失败"), - BRAND_UPDATE_ERROR(14002,"品牌修改失败"), - BRAND_DISABLE_ERROR(14003,"品牌禁用失败"), - BRAND_DELETE_ERROR(14004,"品牌删除失败"), + BRAND_SAVE_ERROR(14001, "品牌添加失败"), + BRAND_UPDATE_ERROR(14002, "品牌修改失败"), + BRAND_DISABLE_ERROR(14003, "品牌禁用失败"), + BRAND_DELETE_ERROR(14004, "品牌删除失败"), /** * 用户 */ - USER_EDIT_SUCCESS(20001,"用户修改成功"), + USER_EDIT_SUCCESS(20001, "用户修改成功"), USER_NOT_EXIST(20002, "用户不存在"), USER_NOT_LOGIN(20003, "用户未登录"), USER_AUTH_EXPIRED(20004, "认证过期"), - USER_AUTHORITY_ERROR(20005,"权限不足"), - USER_CONNECT_LOGIN_ERROR(20006,"未找到登录信息"), + USER_AUTHORITY_ERROR(20005, "权限不足"), + USER_CONNECT_LOGIN_ERROR(20006, "未找到登录信息"), USER_NAME_EXIST(20007, "该用户名已被注册"), USER_PHONE_EXIST(20008, "该手机号已被注册"), USER_PHONE_NOT_EXIST(20009, "手机号不存在"), USER_PASSWORD_ERROR(20010, "密码不正确"), - USER_NOT_PHONE(20011,"非当前用户的手机号"), - USER_CONNECT_ERROR(20012,"联合第三方登录，授权信息错误"), - USER_RECEIPT_REPEAT_ERROR(20013,"会员发票信息重复"), - USER_RECEIPT_NOT_EXIST(20014,"会员发票信息不存在"), - USER_EDIT_ERROR(20015,"用户修改失败"), + USER_NOT_PHONE(20011, "非当前用户的手机号"), + USER_CONNECT_ERROR(20012, "联合第三方登录，授权信息错误"), + USER_RECEIPT_REPEAT_ERROR(20013, "会员发票信息重复"), + USER_RECEIPT_NOT_EXIST(20014, "会员发票信息不存在"), + USER_EDIT_ERROR(20015, "用户修改失败"), USER_OLD_PASSWORD_ERROR(20016, "旧密码不正确"), - USER_COLLECTION_EXIST(2001,"无法重复收藏"), + USER_COLLECTION_EXIST(2001, "无法重复收藏"), + DELETE_EXIST(2001, "无法重复收藏"), /** * 权限 */ - PERMISSION_DEPARTMENT_ROLE_ERROR(21001,"角色已绑定部门，请逐个删除"), - PERMISSION_USER_ROLE_ERROR(21002,"角色已绑定管理员，请逐个删除"), - PERMISSION_MENU_ROLE_ERROR(21003,"菜单已绑定角色，请先删除或编辑角色"), - PERMISSION_DEPARTMENT_DELETE_ERROR(21004,"部门已经绑定管理员，请先删除或编辑管理员"), - PERMISSION_BEYOND_TEN(21005,"最多可以设置10个角色"), + PERMISSION_DEPARTMENT_ROLE_ERROR(21001, "角色已绑定部门，请逐个删除"), + PERMISSION_USER_ROLE_ERROR(21002, "角色已绑定管理员，请逐个删除"), + PERMISSION_MENU_ROLE_ERROR(21003, "菜单已绑定角色，请先删除或编辑角色"), + PERMISSION_DEPARTMENT_DELETE_ERROR(21004, "部门已经绑定管理员，请先删除或编辑管理员"), + PERMISSION_BEYOND_TEN(21005, "最多可以设置10个角色"), /** * 分销 @@ -127,156 +136,166 @@ public enum ResultCode { ORDER_LOGISTICS_ERROR(31005, "物流错误"), ORDER_DELIVER_ERROR(31006, "物流错误"), ORDER_NOT_USER(31007, "非当前会员的订单"), - ORDER_TAKE_ERROR(31008,"当前订单无法核销"), + ORDER_TAKE_ERROR(31008, "当前订单无法核销"), + MEMBER_ADDRESS_NOT_EXIST(31009, "订单无收货地址，请先配置收货地址"), /** * 支付 */ - PAY_SUCCESS(32001,"支付成功"), - PAY_INCONSISTENT_ERROR(32002,"付款金额和应付金额不一致"), - PAY_DOUBLE_ERROR(32003,"订单已支付，不能再次进行支付"), - PAY_CASHIER_ERROR(32004,"收银台信息获取错误"), - PAY_ERROR(32005,"支付业务异常，请稍后重试"), - PAY_BAN(32006,"当前订单不需要付款，请返回订单列表重新操作"), - PAY_PARTIAL_ERROR(32007,"该订单已部分支付，请前往订单中心进行支付"), - PAY_NOT_SUPPORT(32008,"支付暂不支持"), - PAY_CLIENT_TYPE_ERROR(32009,"错误的客户端"), - PAY_POINT_ENOUGH(32010,"积分不足，不能兑换"), - PAY_NOT_EXIST_ORDER(32011,"支付订单不存在"), + PAY_SUCCESS(32001, "支付成功"), + PAY_INCONSISTENT_ERROR(32002, "付款金额和应付金额不一致"), + PAY_DOUBLE_ERROR(32003, "订单已支付，不能再次进行支付"), + PAY_CASHIER_ERROR(32004, "收银台信息获取错误"), + PAY_ERROR(32005, "支付业务异常，请稍后重试"), + PAY_BAN(32006, "当前订单不需要付款，请返回订单列表重新操作"), + PAY_PARTIAL_ERROR(32007, "该订单已部分支付，请前往订单中心进行支付"), + PAY_NOT_SUPPORT(32008, "支付暂不支持"), + PAY_CLIENT_TYPE_ERROR(32009, "错误的客户端"), + PAY_POINT_ENOUGH(32010, "积分不足，不能兑换"), + PAY_NOT_EXIST_ORDER(32011, "支付订单不存在"), /** * 售后 */ - AFTER_SALES_NOT_PAY_ERROR(33001,"当前订单未支付，不能申请售后"), - AFTER_SALES_CANCEL_ERROR(33002,"当前售后单无法取消"), - AFTER_SALES_BAN(33003,"订单状态不允许申请售后，请联系平台或商家"), - AFTER_SALES_DOUBLE_ERROR(33004,"售后已审核，无法重复操作"), - AFTER_SALES_LOGISTICS_ERROR(33005,"物流公司错误，请重新选择"), + AFTER_SALES_NOT_PAY_ERROR(33001, "当前订单未支付，不能申请售后"), + AFTER_SALES_CANCEL_ERROR(33002, "当前售后单无法取消"), + AFTER_SALES_BAN(33003, "订单状态不允许申请售后，请联系平台或商家"), + AFTER_SALES_DOUBLE_ERROR(33004, "售后已审核，无法重复操作"), + AFTER_SALES_LOGISTICS_ERROR(33005, "物流公司错误，请重新选择"), + AFTER_STATUS_ERROR(33006, "售后状态错误，请刷新页面"), /** * 投诉 */ - COMPLAINT_ORDER_ITEM_EMPTY_ERROR(33100,"订单不存在"), - COMPLAINT_SKU_EMPTY_ERROR(33101,"商品已下架，如需投诉请联系平台客服"), - COMPLAINT_ERROR(33102,"投诉异常，请稍后重试"), + COMPLAINT_ORDER_ITEM_EMPTY_ERROR(33100, "订单不存在"), + COMPLAINT_SKU_EMPTY_ERROR(33101, "商品已下架，如需投诉请联系平台客服"), + COMPLAINT_ERROR(33102, "投诉异常，请稍后重试"), /** * 余额 */ - WALLET_INSUFFICIENT(34001,"余额不足以支付订单，请充值!"), - WALLET_WITHDRAWAL_INSUFFICIENT(34002,"可提现金额不足！"), - WALLET_ERROR_INSUFFICIENT(34003,"零钱提现失败！"), - WALLET_REMARK_ERROR(34004,"请填写审核备注！"), + WALLET_NOT_EXIT_ERROR(34000, "钱包不存在，请联系管理员"), + WALLET_INSUFFICIENT(34001, "余额不足以支付订单，请充值!"), + WALLET_WITHDRAWAL_INSUFFICIENT(34002, "可提现金额不足！"), + WALLET_ERROR_INSUFFICIENT(34003, "零钱提现失败！"), + WALLET_REMARK_ERROR(34004, "请填写审核备注！"), + WALLET_APPLY_ERROR(34005, "提现申请异常！"), /** * 评价 */ - EVALUATION_DOUBLE_ERROR(35001,"无法重复提交评价"), + EVALUATION_DOUBLE_ERROR(35001, "无法重复提交评价"), /** * 签到 */ - MEMBER_SIGN_REPEAT(40001,"请勿重复签到"), + MEMBER_SIGN_REPEAT(40001, "请勿重复签到"), /** * 优惠券 */ - COUPON_EDIT_STATUS_SUCCESS(41001,"修改状态成功！"), - COUPON_CANCELLATION_SUCCESS(41002,"会员优惠券作废成功"), - COUPON_EXPIRED(41003,"优惠券已使用/已过期，不能使用"), - COUPON_EDIT_STATUS_ERROR(41004,"优惠券修改状态失败！"), + COUPON_EDIT_STATUS_SUCCESS(41001, "修改状态成功！"), + COUPON_CANCELLATION_SUCCESS(41002, "会员优惠券作废成功"), + COUPON_EXPIRED(41003, "优惠券已使用/已过期，不能使用"), + COUPON_EDIT_STATUS_ERROR(41004, "优惠券修改状态失败！"), /** * 拼团 */ - PINTUAN_MANUAL_OPEN_SUCCESS(42001,"手动开启拼团活动成功"), - PINTUAN_MANUAL_CLOSE_SUCCESS(42002,"手动关闭拼团活动成功"), - PINTUAN_ADD_SUCCESS(42003,"添加拼团活动成功"), - PINTUAN_EDIT_SUCCESS(42004,"修改拼团活动成功"), - PINTUAN_DELETE_SUCCESS(42005,"删除拼团活动成功"), - PINTUAN_MANUAL_OPEN_ERROR(42006,"手动开启拼团活动失败"), - PINTUAN_MANUAL_CLOSE_ERROR(42007,"手动关闭拼团活动失败"), - PINTUAN_ADD_ERROR(42008,"添加拼团活动失败"), - PINTUAN_EDIT_ERROR(42009,"修改拼团活动失败"), - PINTUAN_DELETE_ERROR(42010,"删除拼团活动失败"), + PINTUAN_MANUAL_OPEN_SUCCESS(42001, "手动开启拼团活动成功"), + PINTUAN_MANUAL_CLOSE_SUCCESS(42002, "手动关闭拼团活动成功"), + PINTUAN_ADD_SUCCESS(42003, "添加拼团活动成功"), + PINTUAN_EDIT_SUCCESS(42004, "修改拼团活动成功"), + PINTUAN_DELETE_SUCCESS(42005, "删除拼团活动成功"), + PINTUAN_MANUAL_OPEN_ERROR(42006, "手动开启拼团活动失败"), + PINTUAN_MANUAL_CLOSE_ERROR(42007, "手动关闭拼团活动失败"), + PINTUAN_ADD_ERROR(42008, "添加拼团活动失败"), + PINTUAN_EDIT_ERROR(42009, "修改拼团活动失败"), + PINTUAN_DELETE_ERROR(42010, "删除拼团活动失败"), /** * 满额活动 */ - FULL_DISCOUNT_EDIT_SUCCESS(43001,"修改满优惠活动成功"), - FULL_DISCOUNT_EDIT_DELETE(43002,"删除满优惠活动成功"), + FULL_DISCOUNT_EDIT_SUCCESS(43001, "修改满优惠活动成功"), + FULL_DISCOUNT_EDIT_DELETE(43002, "删除满优惠活动成功"), /** * 店铺 */ - STORE_NOT_EXIST(50001,"此店铺不存在"), - STORE_NAME_EXIST_ERROR(50002,"店铺名称已存在!"), - STORE_APPLY_DOUBLE_ERROR(50003,"已有店铺，无需重复申请!"), + STORE_NOT_EXIST(50001, "此店铺不存在"), + STORE_NAME_EXIST_ERROR(50002, "店铺名称已存在!"), + STORE_APPLY_DOUBLE_ERROR(50003, "已有店铺，无需重复申请!"), /** * 结算单 */ - BILL_CHECK_ERROR(51001,"只有已出账结算单可以核对"), - BILL_COMPLETE_ERROR(51002,"只有已审核结算单可以支付"), + BILL_CHECK_ERROR(51001, "只有已出账结算单可以核对"), + BILL_COMPLETE_ERROR(51002, "只有已审核结算单可以支付"), /** * 文章 */ - ARTICLE_CATEGORY_NAME_EXIST(60001,"文章分类名称已存在"), - ARTICLE_CATEGORY_PARENT_NOT_EXIST(60002,"文章分类父分类不存在"), - ARTICLE_CATEGORY_BEYOND_TWO(60003,"最多为二级分类,操作失败"), - ARTICLE_CATEGORY_DELETE_ERROR(60004,"该文章分类下存在子分类，不能删除"), - ARTICLE_CATEGORY_HAS_ARTICLE(60005,"该文章分类下存在文章，不能删除"), - ARTICLE_CATEGORY_NO_DELETION(60007,"默认文章分类不能进行删除"), - ARTICLE_NO_DELETION(60008,"默认文章不能进行删除"), - + ARTICLE_CATEGORY_NAME_EXIST(60001, "文章分类名称已存在"), + ARTICLE_CATEGORY_PARENT_NOT_EXIST(60002, "文章分类父分类不存在"), + ARTICLE_CATEGORY_BEYOND_TWO(60003, "最多为二级分类,操作失败"), + ARTICLE_CATEGORY_DELETE_ERROR(60004, "该文章分类下存在子分类，不能删除"), + ARTICLE_CATEGORY_HAS_ARTICLE(60005, "该文章分类下存在文章，不能删除"), + ARTICLE_CATEGORY_NO_DELETION(60007, "默认文章分类不能进行删除"), + ARTICLE_NO_DELETION(60008, "默认文章不能进行删除"), /** * 页面 */ - PAGE_NOT_EXIST(61001,"页面不存在"), - PAGE_OPEN_DELETE_ERROR(61002,"当前页面为开启状态，无法删除"), - PAGE_DELETE_ERROR(61003,"当前页面为唯一页面，无法删除"), - PAGE_RELEASE_ERROR(61004,"页面已发布，无需重复提交"), + PAGE_NOT_EXIST(61001, "页面不存在"), + PAGE_OPEN_DELETE_ERROR(61002, "当前页面为开启状态，无法删除"), + PAGE_DELETE_ERROR(61003, "当前页面为唯一页面，无法删除"), + PAGE_RELEASE_ERROR(61004, "页面已发布，无需重复提交"), /** * 设置 */ - SETTING_NOT_TO_SET(70001,"该参数不需要设置"), + SETTING_NOT_TO_SET(70001, "该参数不需要设置"), /** * 短信 */ - SMS_SIGN_EXIST_ERROR(80001,"短信签名已存在"), + SMS_SIGN_EXIST_ERROR(80001, "短信签名已存在"), /** * 站内信 */ - NOTICE_NOT_EXIST(80101,"当前消息模板不存在"), + NOTICE_NOT_EXIST(80101, "当前消息模板不存在"), + NOTICE_ERROR(80102, "修改站内信异常，请稍后重试"), /** * OSS */ - OSS_NOT_EXIST(80201,"OSS未配置"), - OSS_EXCEPTION(80202,"文件上传失败，请稍后重试"), + OSS_NOT_EXIST(80201, "OSS未配置"), + OSS_EXCEPTION(80202, "文件上传失败，请稍后重试"), /** * 验证码 */ - VERIFICATION_SEND_SUCCESS(80301,"短信验证码,发送成功"), - VERIFICATION_ERROR(80302,"验证失败"), - VERIFICATION_SMS_ERROR(80303,"短信验证码错误，请重新校验"), - VERIFICATION_SMS_EXPIRED_ERROR(80304,"验证码已失效，请重新校验"), + VERIFICATION_SEND_SUCCESS(80301, "短信验证码,发送成功"), + VERIFICATION_ERROR(80302, "验证失败"), + VERIFICATION_SMS_ERROR(80303, "短信验证码错误，请重新校验"), + VERIFICATION_SMS_EXPIRED_ERROR(80304, "验证码已失效，请重新校验"), /** * 配置错误 */ - ALIPAY_NOT_SETTING(80401,"支付宝支付未配置"), - ALIPAY_EXCEPTION(80402,"支付宝支付错误，请稍后重试"), - ALIPAY_PARAMS_EXCEPTION(80403,"支付宝参数异常"), - WECHAT_PAY_NOT_SETTING(80402,"微信支付未配置"), + ALIPAY_NOT_SETTING(80401, "支付宝支付未配置"), + ALIPAY_EXCEPTION(80402, "支付宝支付错误，请稍后重试"), + ALIPAY_PARAMS_EXCEPTION(80403, "支付宝参数异常"), + /** + * 微信相关异常 + */ + WECHAT_CONNECT_NOT_SETTING(80500, "微信联合登陆信息未配置"), + WECHAT_PAYMENT_NOT_SETTING(80501, "微信支付信息未配置"), + WECHAT_QRCODE_ERROR(80502, "微信二维码生成异常"), + WECHAT_MP_MESSAGE_ERROR(80503, "微信小程序小消息订阅异常"), ; diff --git a/framework/src/main/java/cn/lili/common/utils/ResultUtil.java b/framework/src/main/java/cn/lili/common/enums/ResultUtil.java similarity index 52% rename from framework/src/main/java/cn/lili/common/utils/ResultUtil.java rename to framework/src/main/java/cn/lili/common/enums/ResultUtil.java index b9aeda7a..ecf2bd09 100644 --- a/framework/src/main/java/cn/lili/common/utils/ResultUtil.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultUtil.java @@ -1,7 +1,6 @@ -package cn.lili.common.utils; +package cn.lili.common.enums; -import cn.lili.common.enums.ResultCode; import cn.lili.common.vo.ResultMessage; /** @@ -62,9 +61,57 @@ public class ResultUtil { /** * 返回成功 + * * @param resultCode 返回状态码 */ public static ResultMessage success(ResultCode resultCode) { return new ResultUtil().setSuccessMsg(resultCode); } + + /** + * 返回成功 + */ + public static ResultMessage success() { + return new ResultUtil().setSuccessMsg(ResultCode.SUCCESS); + } + /** + * 返回失败 + * @param resultCode 返回状态码 + */ + public static ResultMessage error(ResultCode resultCode) { + return new ResultUtil().setErrorMsg(resultCode); + } + /** + * 返回失败 + * @param code 状态码 + * @param msg 返回消息 + */ + public static ResultMessage error(Integer code, String msg) { + return new ResultUtil().setErrorMsg(code, msg); + } + + /** + * 服务器异常 追加状态码 + * + * @param resultCode 返回码 + */ + public ResultMessage setErrorMsg(ResultCode resultCode) { + this.resultMessage.setSuccess(false); + this.resultMessage.setMessage(resultCode.message()); + this.resultMessage.setCode(resultCode.code()); + return this.resultMessage; + } + + /** + * 服务器异常 追加状态码 + * @param code 状态码 + * @param msg 返回消息 + */ + public ResultMessage setErrorMsg(Integer code, String msg) { + this.resultMessage.setSuccess(false); + this.resultMessage.setMessage(msg); + this.resultMessage.setCode(code); + return this.resultMessage; + } + } diff --git a/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java b/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java index 6e6e5e3f..abac16d0 100644 --- a/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java +++ b/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java @@ -1,6 +1,7 @@ package cn.lili.common.exception; import cn.lili.common.enums.ResultCode; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -45,7 +46,7 @@ public class GlobalControllerExceptionHandler { if (e instanceof ServiceException) { ResultCode resultCode = ((ServiceException) e).getResultCode(); if (resultCode != null) { - throw new ServiceException(resultCode); + return ResultUtil.error(resultCode.code(), resultCode.message()); } } @@ -54,7 +55,7 @@ public class GlobalControllerExceptionHandler { if (e != null && e.getMessage() != null && e.getMessage().length() < MAX_LENGTH) { errorMsg = e.getMessage(); } - throw new ServiceException(ResultCode.ERROR, errorMsg); + return ResultUtil.error(ResultCode.ERROR.code(), errorMsg); } @ExceptionHandler(RuntimeException.class) @@ -63,7 +64,7 @@ public class GlobalControllerExceptionHandler { log.error("全局异常[RuntimeException]:", e); - throw new ServiceException(ResultCode.ERROR, "服务器异常，请稍后重试"); + return ResultUtil.error(ResultCode.ERROR); } // /** @@ -100,9 +101,9 @@ public class GlobalControllerExceptionHandler { BindException exception = (BindException) e; List fieldErrors = exception.getBindingResult().getFieldErrors(); for (FieldError error : fieldErrors) { - throw new ServiceException(ResultCode.ERROR, error.getDefaultMessage()); + return ResultUtil.error(ResultCode.PARAMS_ERROR.code(), error.getDefaultMessage()); } - throw new ServiceException(ResultCode.ERROR); + return ResultUtil.error(ResultCode.PARAMS_ERROR); } } diff --git a/framework/src/main/java/cn/lili/generator/VueCodeGenerator.java b/framework/src/main/java/cn/lili/generator/VueCodeGenerator.java deleted file mode 100644 index ff60b44e..00000000 --- a/framework/src/main/java/cn/lili/generator/VueCodeGenerator.java +++ /dev/null @@ -1,244 +0,0 @@ -package cn.lili.generator; - -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; -import cn.lili.common.utils.StringUtils; -import cn.lili.common.vo.ResultMessage; -import cn.lili.generator.bean.Field; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.beetl.core.Configuration; -import org.beetl.core.GroupTemplate; -import org.beetl.core.Template; -import org.beetl.core.resource.ClasspathResourceLoader; -import org.elasticsearch.common.util.ArrayUtils; -import org.springframework.web.bind.annotation.*; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -/** - * @author lili - */ -@Slf4j -@RestController -@Api(tags = "Vue代码生成") -@RequestMapping(value = "/manager/generate") -public class VueCodeGenerator { - - @RequestMapping(value = "/table/{vueName}/{rowNum}", method = RequestMethod.POST) - @ApiOperation(value = "增删改表格生成") - public ResultMessage generateTable(@PathVariable String vueName, - @PathVariable Integer rowNum, - @RequestBody List fields) throws IOException { - String result = generate("table.btl", vueName, rowNum, fields); - return ResultUtil.data(result); - } - - @RequestMapping(value = "/tree/{vueName}/{rowNum}", method = RequestMethod.POST) - @ApiOperation(value = "树形结构生成") - public ResultMessage generateTree(@PathVariable String vueName, - @PathVariable Integer rowNum, - @RequestBody List fields) throws IOException { - - - String result = generate("tree.btl", vueName, rowNum, fields); - return ResultUtil.data(result); - } - - @RequestMapping(value = "/getEntityData/{path}", method = RequestMethod.GET) - @ApiOperation(value = "通过实体类生成Vue代码Json数据") - public ResultMessage getEntityData(@PathVariable String path) { - - String result = ""; - try { - result = generateClassData(path); - } catch (Exception e) { - throw new ServiceException(ResultCode.ERROR); - } - return ResultUtil.data(result); - } - - /** - * 生成代码 - * - * @param template 模版名称 - * @param vueName 表单名称 - * @param rowNum 树形表格所需参数，一行几列 - * @param fields - * @return - * @throws IOException - */ - public String generate(String template, String vueName, Integer rowNum, List fields) throws IOException { - - // 模板路径 - ClasspathResourceLoader resourceLoader = new ClasspathResourceLoader("/templates/vue/"); - Configuration cfg = Configuration.defaultConfiguration(); - GroupTemplate gt = new GroupTemplate(resourceLoader, cfg); - - Template tableTemplate = gt.getTemplate(template); - // 排序 - Collections.sort(fields, Comparator.comparing(Field::getSortOrder)); - // 绑定变量 - tableTemplate.binding("vueName", vueName); - tableTemplate.binding("fields", fields); - // 判断有无upload和日期范围搜索 - Boolean upload = false; - for (Field f : fields) { - if ("upload".equals(f.getType())) { - upload = true; - } - } - tableTemplate.binding("upload", upload); - if ("table.btl".equals(template)) { - // 判断有无upload和日期范围搜索 - Boolean daterangeSearch = false; - for (Field f : fields) { - if (f.getSearchable() && "daterange".equals(f.getSearchType())) { - daterangeSearch = true; - } - } - tableTemplate.binding("daterangeSearch", daterangeSearch); - // 统计搜索栏个数 判断是否隐藏搜索栏 - Boolean hideSearch = false; - List firstTwo = new ArrayList<>(); - List rest = new ArrayList<>(); - Integer count = 0; - for (Field f : fields) { - if (f.getSearchable()) { - count++; - if (count <= 2) { - firstTwo.add(f); - } else { - rest.add(f); - } - } - } - if (count >= 4) { - hideSearch = true; - tableTemplate.binding("firstTwo", firstTwo); - tableTemplate.binding("rest", rest); - } - tableTemplate.binding("searchSize", count); - tableTemplate.binding("hideSearch", hideSearch); - // 获取默认排序字段 - String defaultSort = "", defaultSortType = ""; - for (Field f : fields) { - if (f.getDefaultSort()) { - defaultSort = f.getField(); - defaultSortType = f.getDefaultSortType(); - break; - } - } - tableTemplate.binding("defaultSort", defaultSort); - tableTemplate.binding("defaultSortType", defaultSortType); - } - // 一行几列 - tableTemplate.binding("rowNum", rowNum); - if (rowNum == 1) { - tableTemplate.binding("modalWidth", 500); - tableTemplate.binding("width", "100%"); - tableTemplate.binding("editWidth", "100%"); - tableTemplate.binding("itemWidth", ""); - tableTemplate.binding("span", "9"); - } else if (rowNum == 2) { - tableTemplate.binding("modalWidth", 770); - tableTemplate.binding("width", "250px"); - tableTemplate.binding("editWidth", "250px"); - tableTemplate.binding("itemWidth", "350px"); - tableTemplate.binding("span", "17"); - } else if (rowNum == 3) { - tableTemplate.binding("modalWidth", 980); - tableTemplate.binding("width", "200px"); - tableTemplate.binding("editWidth", "200px"); - tableTemplate.binding("itemWidth", "300px"); - tableTemplate.binding("span", "17"); - } else if (rowNum == 4) { - tableTemplate.binding("modalWidth", 1130); - tableTemplate.binding("width", "160px"); - tableTemplate.binding("editWidth", "160px"); - tableTemplate.binding("itemWidth", "260px"); - tableTemplate.binding("span", "17"); - } else { - throw new ServiceException("rowNum仅支持数字1-4"); - } - // 生成代码 - String result = tableTemplate.render(); - return result; - } - - /** - * 生成代码数据 - * - * @param path - * @return - * @throws Exception - */ - public String generateClassData(String path) throws Exception { - - Class c = Class.forName(path); - Object obj = c.newInstance(); - java.lang.reflect.Field[] fields = ArrayUtils.concat(obj.getClass().getDeclaredFields(), obj.getClass().getSuperclass().getDeclaredFields(), java.lang.reflect.Field.class); - - //下标 - int index = 0; - - StringBuffer fieldsData = new StringBuffer(); - for (java.lang.reflect.Field field : fields) { - index++; - field.setAccessible(true); - // 字段名 - String fieldName = field.getName(); - String fieldType = field.getType().getName(); - // 序列化id，不参与表单 - if ("serialVersionUID".equals(fieldName)) { - continue; - } - - // 获得字段注解 - ApiModelProperty myFieldAnnotation = field.getAnnotation(ApiModelProperty.class); - //表单名称 - String formName = fieldName; - if (myFieldAnnotation != null) { - formName = myFieldAnnotation.value(); - } - formName = StringUtils.isEmpty(formName) ? fieldName : formName; - - //默认类型 - String type = "text"; - String searchType = "text"; - // 日期字段特殊处理,其他一律按 字符串界面处理 - if (fieldType == "java.lang.Date" || fieldType == "java.util.Date" || fieldType == "Date") { - type = "date"; - searchType = "daterange"; - } - //表单子属性 - String formItem = "{" + - "\"sortOrder\":" + index + "," + - "\"field\":\"" + fieldName + "\"," + - "\"name\":\"" + formName + "\"," + - "\"level\":\"2\"," + - "\"tableShow\":true," + - "\"editable\":true," + - "\"type\":\"" + type + "\"," + - "\"searchType\":\"" + searchType + "\"," + - "\"searchLevel\":\"2\"," + - "\"validate\":false," + - "\"searchable\":true," + - "\"sortable\":false," + - "\"defaultSort\":false," + - "\"defaultSortType\":\"desc\"},"; - fieldsData.append(formItem); - } - String start = "{\"data\":["; - String end = "]}"; - String json = start + fieldsData.substring(0, fieldsData.length()-1) + end; - return json; - } -} diff --git a/framework/src/main/java/cn/lili/generator/bean/Field.java b/framework/src/main/java/cn/lili/generator/bean/Field.java deleted file mode 100644 index 1815eeb6..00000000 --- a/framework/src/main/java/cn/lili/generator/bean/Field.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.lili.generator.bean; - -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @author lili - */ -@Data -public class Field { - - private String field; - - private String name; - - private String level; - - private Boolean tableShow; - - private BigDecimal sortOrder; - - private Boolean searchable; - - private Boolean editable; - - private String type; - - private Boolean validate; - - private String searchType; - - private String searchLevel; - - private Boolean sortable; - - private Boolean defaultSort; - - private String defaultSortType; -} diff --git a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java index 32a09fb6..f0234882 100644 --- a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java +++ b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java @@ -6,7 +6,7 @@ import cn.lili.common.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.token.Token; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.config.properties.ApiProperties; import cn.lili.config.properties.DomainProperties; diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java index 078e5a34..fa94e0ad 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java @@ -143,11 +143,8 @@ public class DistributionCashServiceImpl extends ServiceImpl impleme //添加会员 Member member = new Member(memberAddDTO.getUsername(), memberAddDTO.getPassword(), memberAddDTO.getMobile()); - if (this.save(member)) { - String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_REGISTER.name(); - rocketMQTemplate.asyncSend(destination, member, RocketmqSendCallbackBuilder.commonCallback()); - return member; - } - throw new ServiceException(ResultCode.ERROR); + this.save(member); + String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_REGISTER.name(); + rocketMQTemplate.asyncSend(destination, member, RocketmqSendCallbackBuilder.commonCallback()); + return member; } @Override @@ -342,10 +340,8 @@ public class MemberServiceImpl extends ServiceImpl impleme Member member = this.findByUsername(managerMemberEditDTO.getUsername()); //传递修改会员信息 BeanUtil.copyProperties(managerMemberEditDTO, member); - if (this.updateById(member)) { - return member; - } - throw new ServiceException(ResultCode.ERROR); + this.updateById(member); + return member; } @Override diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java index 29f3c827..1ef16e9d 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java @@ -34,8 +34,6 @@ import java.util.Date; @Transactional public class MemberWithdrawApplyServiceImpl extends ServiceImpl implements MemberWithdrawApplyService { //提现申请数据层 - @Autowired - private MemberWithdrawApplyMapper memberWithdrawApplyMapper; //会员余额 @Autowired private MemberWalletService memberWalletService; @@ -43,9 +41,10 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl collect = tradeDTO.getSkuList().parallelStream().filter(i -> Boolean.TRUE.equals(i.getChecked())).collect(Collectors.toList()); + //拼团类型订单预处理 if (checkedWay.equals(CartTypeEnum.PINTUAN)) { for (CartSkuVO cartSkuVO : collect) { cartSkuVO.setPintuanId(""); diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java index 77cb7bbb..0893e303 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java @@ -2,6 +2,7 @@ package cn.lili.modules.order.cart.render.impl; import cn.hutool.core.util.NumberUtil; import cn.lili.common.utils.CurrencyUtil; +import cn.lili.modules.member.entity.dos.MemberAddress; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.vo.CartSkuVO; import cn.lili.modules.order.cart.render.CartRenderStep; @@ -10,7 +11,6 @@ import cn.lili.modules.store.entity.dto.FreightTemplateChildDTO; import cn.lili.modules.store.entity.enums.FreightTemplateEnum; import cn.lili.modules.store.entity.vos.FreightTemplateVO; import cn.lili.modules.store.service.FreightTemplateService; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Service; @@ -33,17 +33,43 @@ public class SkuFreightRender implements CartRenderStep { @Override public void render(TradeDTO tradeDTO) { List cartSkuVOS = tradeDTO.getSkuList(); + //会员收货地址问题处理 + MemberAddress memberAddress = tradeDTO.getMemberAddress(); + if(memberAddress==null){ + return; + } + //循环渲染购物车商品运费价格 for (CartSkuVO cartSkuVO : cartSkuVOS) { String freightTemplateId = cartSkuVO.getGoodsSku().getFreightTemplateId(); + //如果商品设置卖家承担运费，则跳出计算 + if (cartSkuVO.getFreightPayer().equals("STORE")) { + continue; + } + //免运费则跳出运费计算 if (Boolean.TRUE.equals(cartSkuVO.getIsFreeFreight()) || freightTemplateId == null) { continue; } + //寻找对应对商品运费计算模版 FreightTemplateVO freightTemplate = freightTemplateService.getFreightTemplate(freightTemplateId); if (freightTemplate != null && freightTemplate.getFreightTemplateChildList() != null && !freightTemplate.getFreightTemplateChildList().isEmpty()) { - FreightTemplateChild freightTemplateChild = freightTemplate.getFreightTemplateChildList().get(0); + + FreightTemplateChild freightTemplateChild = null; + + //获取市级别id + String addressId = memberAddress.getConsigneeAddressIdPath().split(",")[1]; + //获取匹配的收货地址 + for (FreightTemplateChild templateChild : freightTemplate.getFreightTemplateChildList()) { + //如果当前模版包含，则返回 + if (templateChild.getAreaId().indexOf(addressId) > 0) { + freightTemplateChild = templateChild; + break; + } + } + FreightTemplateChildDTO freightTemplateChildDTO = new FreightTemplateChildDTO(freightTemplateChild); + freightTemplateChildDTO.setPricingMethod(freightTemplate.getPricingMethod()); //要计算的基数 数量/重量 diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java index 2940e6e8..5659b911 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java @@ -2,6 +2,7 @@ package cn.lili.modules.order.cart.service; import cn.hutool.core.text.CharSequenceUtil; import cn.lili.common.cache.Cache; +import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; @@ -100,7 +101,7 @@ public class CartServiceImpl implements CartService { int newNum = oldNum + num; this.checkSetGoodsQuantity(cartSkuVO, skuId, newNum); //计算购物车小计 - cartSkuVO.setSubTotal(CurrencyUtil.mul(cartSkuVO.getPurchasePrice(),cartSkuVO.getNum())); + cartSkuVO.setSubTotal(CurrencyUtil.mul(cartSkuVO.getPurchasePrice(), cartSkuVO.getNum())); } else { //先清理一下 如果商品无效的话 cartSkuVOS.remove(cartSkuVO); @@ -112,7 +113,7 @@ public class CartServiceImpl implements CartService { //再设置加入购物车的数量 this.checkSetGoodsQuantity(cartSkuVO, skuId, num); //计算购物车小计 - cartSkuVO.setSubTotal(CurrencyUtil.mul(cartSkuVO.getPurchasePrice(),cartSkuVO.getNum())); + cartSkuVO.setSubTotal(CurrencyUtil.mul(cartSkuVO.getPurchasePrice(), cartSkuVO.getNum())); cartSkuVOS.add(cartSkuVO); } @@ -132,13 +133,13 @@ public class CartServiceImpl implements CartService { //再设置加入购物车的数量 this.checkSetGoodsQuantity(cartSkuVO, skuId, num); //计算购物车小计 - cartSkuVO.setSubTotal(CurrencyUtil.mul(cartSkuVO.getPurchasePrice(),cartSkuVO.getNum())); + cartSkuVO.setSubTotal(CurrencyUtil.mul(cartSkuVO.getPurchasePrice(), cartSkuVO.getNum())); cartSkuVOS.add(cartSkuVO); } tradeDTO.setCartTypeEnum(cartTypeEnum); this.resetTradeDTO(tradeDTO); } catch (Exception e) { - log.error("购物车渲染异常",e); + log.error("购物车渲染异常", e); throw new ServiceException(errorMessage); } } @@ -160,10 +161,10 @@ public class CartServiceImpl implements CartService { } String originKey = this.getOriginKey(CartTypeEnum.CART); cache.put(originKey, tradeDTO); - }catch (ServiceException se){ + } catch (ServiceException se) { log.error("购物车渲染异常", se); } catch (Exception e) { - log.error("购物车渲染异常",e); + log.error("购物车渲染异常", e); throw new ServiceException(errorMessage); } } @@ -478,10 +479,13 @@ public class CartServiceImpl implements CartService { @Override public Trade createTrade(TradeParams tradeParams) { + //获取购物车 CartTypeEnum cartTypeEnum = getCartType(tradeParams.getWay()); TradeDTO tradeDTO = this.readDTO(cartTypeEnum); + //设置基础属性 tradeDTO.setClientType(tradeParams.getClient()); tradeDTO.setStoreRemark(tradeParams.getRemark()); + //过滤勾选商品 List collect = tradeDTO.getSkuList().parallelStream().filter(i -> Boolean.TRUE.equals(i.getChecked())).collect(Collectors.toList()); MemberAddress memberAddress = tradeDTO.getMemberAddress(); this.checkAddressScope(collect, memberAddress); @@ -499,17 +503,21 @@ public class CartServiceImpl implements CartService { */ @Override public void checkAddressScope(List skuList, MemberAddress memberAddress) { + //如果收货地址为空，则抛出异常 if (memberAddress == null) { - return; + throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST); } for (CartSkuVO cartSkuVO : skuList) { - if (Boolean.TRUE.equals(cartSkuVO.getIsFreeFreight())) { + //店铺支付运费则跳过 + if (cartSkuVO.getFreightPayer().equals("STORE")) { break; } String freightTemplateId = cartSkuVO.getGoodsSku().getFreightTemplateId(); FreightTemplateVO freightTemplate = freightTemplateService.getFreightTemplate(freightTemplateId); String[] addressId = memberAddress.getConsigneeAddressIdPath().split(","); + //收货地址判定 if (freightTemplate != null && freightTemplate.getFreightTemplateChildList() != null && !freightTemplate.getFreightTemplateChildList().isEmpty()) { + FreightTemplateChild freightTemplateChild = freightTemplate.getFreightTemplateChildList().get(0); // 检查当前配送地址的城市id是否存在与配送模版的城市id里面 if (!freightTemplateChild.getAreaId().contains(addressId[1])) { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java index e3dbb029..c0f2ac75 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java @@ -209,6 +209,7 @@ public class Order extends BaseEntity { BeanUtil.copyProperties(cartVO, this); this.setId(oldId); this.setOrderType(OrderTypeEnum.NORMAL.name()); + //促销信息填充 if (cartVO.getSkuList().get(0).getPromotions() != null) { Optional pintuanId = cartVO.getSkuList().get(0).getPromotions().stream().filter(i -> i.getPromotionType().equals(PromotionTypeEnum.PINTUAN.name())).map(PromotionGoods::getPromotionId).findFirst(); if (pintuanId.isPresent()) { @@ -222,14 +223,19 @@ public class Order extends BaseEntity { this.setOrderStatus(OrderStatusEnum.UNPAID.name()); this.setPayStatus(PayStatusEnum.UNPAID.name()); this.setDeliverStatus(DeliverStatusEnum.UNDELIVERED.name()); - this.setConsigneeAddressIdPath(tradeDTO.getMemberAddress().getConsigneeAddressIdPath()); - this.setConsigneeAddressPath(tradeDTO.getMemberAddress().getConsigneeAddressPath()); - this.setConsigneeDetail(tradeDTO.getMemberAddress().getDetail()); - this.setConsigneeMobile(tradeDTO.getMemberAddress().getMobile()); - this.setConsigneeName(tradeDTO.getMemberAddress().getName()); + //如果有收货地址，才记录收货地址 + if (tradeDTO.getMemberAddress() != null) { + this.setConsigneeAddressIdPath(tradeDTO.getMemberAddress().getConsigneeAddressIdPath()); + this.setConsigneeAddressPath(tradeDTO.getMemberAddress().getConsigneeAddressPath()); + this.setConsigneeDetail(tradeDTO.getMemberAddress().getDetail()); + this.setConsigneeMobile(tradeDTO.getMemberAddress().getMobile()); + this.setConsigneeName(tradeDTO.getMemberAddress().getName()); + } + //平台优惠券判定 if (tradeDTO.getPlatformCoupon() != null) { this.setUsePlatformMemberCouponId(tradeDTO.getPlatformCoupon().getMemberCoupon().getId()); } + //店铺优惠券判定 if (tradeDTO.getStoreCoupons() != null && !tradeDTO.getStoreCoupons().isEmpty()) { StringBuilder storeCouponIds = new StringBuilder(); for (String s : tradeDTO.getStoreCoupons().keySet()) { diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java index c8ad0c53..b553f686 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java @@ -201,7 +201,7 @@ public class AfterSaleServiceImpl extends ServiceImpl impl this.save(receipt); return receipt; } - throw new ServiceException(ResultCode.ERROR); + return null; } @Override @@ -76,6 +73,6 @@ public class ReceiptServiceImpl extends ServiceImpl impl this.saveOrUpdate(receipt); return receipt; } - throw new ServiceException(ResultCode.ERROR); + throw new ServiceException(ResultCode.USER_RECEIPT_NOT_EXIST); } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java index 4a056132..0101bf9a 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java @@ -15,7 +15,6 @@ import cn.lili.modules.page.service.ArticleCategoryService; import cn.lili.modules.page.service.ArticleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -60,12 +59,10 @@ public class ArticleCategoryServiceImpl extends ServiceImpl delAllByIds(@PathVariable List ids) { distributionGoodsService.removeByIds(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java index bd15bce4..ca760a07 100644 --- a/manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.distribution; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.distribution.entity.dos.Distribution; @@ -46,7 +46,7 @@ public class DistributionManagerController { }) public ResultMessage retreat(@PathVariable String id) { if (distributionService.retreat(id)) { - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } else { throw new ServiceException(ResultCode.DISTRIBUTION_RETREAT_ERROR); } @@ -60,7 +60,7 @@ public class DistributionManagerController { }) public ResultMessage resume(@PathVariable String id) { if (distributionService.resume(id)) { - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } else { throw new ServiceException(ResultCode.DISTRIBUTION_RETREAT_ERROR); } @@ -75,7 +75,7 @@ public class DistributionManagerController { }) public ResultMessage audit(@NotNull @PathVariable String id, @NotNull String status) { if (distributionService.audit(id, status)) { - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } else { throw new ServiceException(ResultCode.DISTRIBUTION_AUDIT_ERROR); } diff --git a/manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java index ea7455cd..54e4725e 100644 --- a/manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionOrderManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.distribution; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.distribution.entity.dos.DistributionOrder; import cn.lili.modules.distribution.entity.vos.DistributionOrderSearchParams; @@ -8,7 +8,6 @@ import cn.lili.modules.distribution.service.DistributionOrderService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java b/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java index feb0da84..e70781d6 100644 --- a/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.file; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; @@ -54,7 +54,7 @@ public class FileManagerController { @DeleteMapping(value = "/delete/{ids}") public ResultMessage delete(@PathVariable List ids) { fileService.batchDelete(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java index 0784c300..0a617a35 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.goods; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.Brand; import cn.lili.modules.goods.entity.dto.BrandPageDTO; @@ -88,7 +88,7 @@ public class BrandManagerController { @PutMapping(value = "/disable/{brandId}") public ResultMessage disable(@PathVariable String brandId, @RequestParam Boolean disable) { if (brandService.brandDisable(brandId, disable)) { - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } throw new ServiceException(ResultCode.BRAND_DISABLE_ERROR); } diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java index cc755433..4bef3c3c 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.goods; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.CategoryBrand; import cn.lili.modules.goods.entity.vos.CategoryBrandVO; @@ -11,7 +11,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -55,7 +54,7 @@ public class CategoryBrandManagerController { CategoryBrand categoryBrand = new CategoryBrand(categoryId, brandId); categoryBrandService.save(categoryBrand); } - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java index 7bb2e4e2..0ef47f8e 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.goods; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.Category; @@ -122,7 +122,7 @@ public class CategoryManagerController { throw new ServiceException(ResultCode.CATEGORY_HAS_GOODS); } categoryService.delete(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @PutMapping(value = "/disable/{id}") @@ -137,7 +137,7 @@ public class CategoryManagerController { throw new ServiceException(ResultCode.CATEGORY_NOT_EXIST); } categoryService.updateCategoryStatus(id, enableOperations); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } \ No newline at end of file diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java index 81e5ccb6..ca7b820e 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.goods; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.CategoryParameterGroup; import cn.lili.modules.goods.entity.dos.Parameters; @@ -76,7 +76,7 @@ public class CategoryParameterGroupManagerController { parametersService.remove(new QueryWrapper().eq("group_id", id)); //删除参数组 categoryParameterGroupService.removeById(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java index ece78da9..4dd65c6f 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.goods; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.CategorySpecification; import cn.lili.modules.goods.entity.vos.CategorySpecificationVO; @@ -13,7 +13,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -73,7 +72,7 @@ public class CategorySpecificationManagerController { CategorySpecification categoryBrand = new CategorySpecification(categoryId, specId); categorySpecificationService.save(categoryBrand); } - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java index 599b056f..9f4d53e5 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.goods; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.Goods; import cn.lili.modules.goods.entity.dos.GoodsSku; @@ -70,7 +70,7 @@ public class GoodsManagerController { public ResultMessage underGoods(@PathVariable String goodsId, @NotEmpty(message = "下架原因不能为空") @RequestParam String reason) { List goodsIds = Arrays.asList(goodsId.split(",")); if (Boolean.TRUE.equals(goodsService.updateGoodsMarketAble(goodsIds, GoodsStatusEnum.DOWN, reason))) { - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } throw new ServiceException(ResultCode.GOODS_UNDER_ERROR); } @@ -84,7 +84,7 @@ public class GoodsManagerController { public ResultMessage auth(@PathVariable List goodsIds, @RequestParam String isAuth) { //校验商品是否存在 if (goodsService.auditGoods(goodsIds, GoodsAuthEnum.valueOf(isAuth))) { - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } throw new ServiceException(ResultCode.GOODS_AUTH_ERROR); } @@ -97,7 +97,7 @@ public class GoodsManagerController { }) public ResultMessage unpGoods(@PathVariable List goodsId) { if (goodsService.updateGoodsMarketAble(goodsId, GoodsStatusEnum.UPPER, "")) { - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } throw new ServiceException(ResultCode.GOODS_UPPER_ERROR); } diff --git a/manager-api/src/main/java/cn/lili/controller/goods/GoodsParameterManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/GoodsParameterManagerController.java index 6aa198ab..eb9ec22a 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsParameterManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsParameterManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.goods; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.vos.GoodsParamsGroupVO; import cn.lili.modules.goods.service.GoodsParamsService; @@ -8,7 +8,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java index 600f1a5d..e52178b2 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java @@ -1,10 +1,9 @@ package cn.lili.controller.goods; -import cn.lili.common.enums.MessageCode; import cn.lili.common.enums.ResultCode; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.GoodsUnit; @@ -13,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -70,7 +68,7 @@ public class GoodsUnitManagerController { @DeleteMapping("/delete/{ids}") public ResultMessage delete(@NotNull @PathVariable List ids) { goodsUnitService.removeByIds(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } diff --git a/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java index fcdf70ac..2d746b23 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.goods; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.Parameters; import cn.lili.modules.goods.service.ParametersService; @@ -54,7 +54,7 @@ public class ParameterManagerController { @DeleteMapping(value = "/{id}") public ResultMessage delById(@PathVariable String id) { parametersService.removeById(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } diff --git a/manager-api/src/main/java/cn/lili/controller/goods/SpecValuesManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/SpecValuesManagerController.java index 1d42f85b..e679064a 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/SpecValuesManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/SpecValuesManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.goods; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.SpecValues; import cn.lili.modules.goods.service.SpecValuesService; diff --git a/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java index 41f74517..fdd1c2ca 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.goods; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.Specification; @@ -88,6 +88,6 @@ public class SpecificationManagerController { @ApiOperation(value = "批量删除") public ResultMessage delAllByIds(@PathVariable List ids) { specificationService.deleteSpecification(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java index f11dadd3..fbe2cfe9 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.member; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.connect.entity.ConnectConfig; import cn.lili.modules.connect.entity.vo.ConnectConfigForm; diff --git a/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java index 10a2e2ea..af20657b 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.member; import cn.lili.common.utils.IpHelper; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java index 34708998..2bda4814 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java @@ -1,8 +1,6 @@ package cn.lili.controller.member; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberAddress; @@ -39,10 +37,8 @@ public class MemberAddressManagerController { @ApiImplicitParam(name = "id", value = "会员地址ID", dataType = "String", paramType = "path") @DeleteMapping(value = "/delById/{id}") public ResultMessage delShippingAddressById(@PathVariable String id) { - if (memberAddressService.removeMemberAddress(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + memberAddressService.removeMemberAddress(id); + return ResultUtil.success(); } @ApiOperation(value = "修改会员收件地址") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java index f46bc3b2..44824455 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java @@ -1,8 +1,6 @@ package cn.lili.controller.member; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dto.EvaluationQueryParams; @@ -54,20 +52,16 @@ public class MemberEvaluationManagerController { }) @GetMapping(value = "/updateStatus/{id}") public ResultMessage updateStatus(@PathVariable String id, @NotNull String status) { - if (memberEvaluationService.updateStatus(id, status)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + memberEvaluationService.updateStatus(id, status); + return ResultUtil.success(); } @ApiOperation(value = "删除评论") @ApiImplicitParam(name = "id", value = "评价ID", required = true, dataType = "String", paramType = "path") @PutMapping(value = "/delete/{id}") public ResultMessage> delete(@PathVariable String id) { - if (memberEvaluationService.delete(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + memberEvaluationService.delete(id); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java index bb7eab3e..7210e03a 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java @@ -1,8 +1,6 @@ package cn.lili.controller.member; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.Member; @@ -65,14 +63,12 @@ public class MemberManagerController { @ApiOperation(value = "修改会员状态,开启关闭会员") @ApiImplicitParams({ @ApiImplicitParam(name = "memberIds", value = "会员ID", required = true, dataType = "String", allowMultiple = true, paramType = "query"), - @ApiImplicitParam(name = "disabled", required = true, dataType = "boolean", paramType = "query") + @ApiImplicitParam(name = "disabled", required = true, dataType = "boolean", paramType = "query") }) @PutMapping("/updateMemberStatus") public ResultMessage updateMemberStatus(@RequestParam List memberIds, @RequestParam Boolean disabled) { - if (memberService.updateMemberStatus(memberIds, disabled)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + memberService.updateMemberStatus(memberIds, disabled); + return ResultUtil.success(); } diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java index f9a70039..a0f9ab49 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java @@ -1,9 +1,7 @@ package cn.lili.controller.member; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberNoticeLog; @@ -53,16 +51,14 @@ public class MemberNoticeLogManagerController { @ApiOperation(value = "编辑或更新数据") @PostMapping(value = "/insertOrUpdate") public ResultMessage saveOrUpdate(MemberNoticeLog memberNoticeLog) { - if (memberNoticeLogService.saveOrUpdate(memberNoticeLog)) { - return ResultUtil.data(memberNoticeLog); - } - throw new ServiceException(ResultCode.ERROR); + memberNoticeLogService.saveOrUpdate(memberNoticeLog); + return ResultUtil.data(memberNoticeLog); } @ApiOperation(value = "批量删除") @DeleteMapping(value = "/delByIds/{ids}") public ResultMessage delAllByIds(@PathVariable List ids) { memberNoticeLogService.removeByIds(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java index 07b46984..139120c4 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java @@ -1,9 +1,7 @@ package cn.lili.controller.member; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; @@ -58,16 +56,14 @@ public class MemberNoticeSenterManagerController { @PostMapping(value = "/insertOrUpdate") public ResultMessage saveOrUpdate(MemberNoticeSenter memberNoticeSenter) { - if (memberNoticeSenterService.customSave(memberNoticeSenter)) { - return ResultUtil.data(memberNoticeSenter); - } - throw new ServiceException(ResultCode.ERROR); + memberNoticeSenterService.customSave(memberNoticeSenter); + return ResultUtil.data(memberNoticeSenter); } @ApiOperation(value = "批量删除") @DeleteMapping(value = "/delByIds/{ids}") public ResultMessage delAllByIds(@PathVariable List ids) { memberNoticeSenterService.removeByIds(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java index 531d6ccb..a5e64e5b 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.member; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberPointsHistory; @@ -13,7 +13,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java index 5c6bec6c..d63da28e 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.member; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.vo.MemberWalletVO; import cn.lili.modules.member.service.MemberWalletService; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java index ae05c2a9..eff087ba 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.member; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberWithdrawApply; diff --git a/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java index 1f879e81..fbd0c39a 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java @@ -1,8 +1,6 @@ package cn.lili.controller.other; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.page.entity.dos.ArticleCategory; import cn.lili.modules.page.entity.vos.ArticleCategoryVO; @@ -73,9 +71,7 @@ public class ArticleCategoryManagerController { @ApiImplicitParam(name = "id", value = "文章分类ID", required = true, dataType = "String", paramType = "path") @DeleteMapping("/{id}") public ResultMessage deleteById(@PathVariable String id) { - if (articleCategoryService.deleteById(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + articleCategoryService.deleteById(id); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java index cdd15920..e91ec47f 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java @@ -1,8 +1,6 @@ package cn.lili.controller.other; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.page.entity.dos.Article; import cn.lili.modules.page.entity.dto.ArticleSearchParams; @@ -76,11 +74,9 @@ public class ArticleManagerController { @ApiImplicitParam(name = "status", value = "操作状态", required = true, paramType = "query") }) @PutMapping("update/status/{id}") - public ResultMessage
updateStatus(@PathVariable("id") String id,boolean status) { - if(articleService.updateArticleStatus(id,status)){ - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + public ResultMessage
updateStatus(@PathVariable("id") String id, boolean status) { + articleService.updateArticleStatus(id, status); + return ResultUtil.success(); } @@ -89,7 +85,7 @@ public class ArticleManagerController { @DeleteMapping(value = "/delByIds/{id}") public ResultMessage delAllByIds(@PathVariable String id) { articleService.customRemove(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } diff --git a/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java index b9f30e79..61af5e6e 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java @@ -1,8 +1,6 @@ package cn.lili.controller.other; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.search.entity.dos.CustomWords; @@ -38,29 +36,23 @@ public class CustomWordsManagerController { @ApiOperation(value = "添加自定义分词") @PostMapping public ResultMessage addCustomWords(@Valid CustomWordsVO customWords) { - if (customWordsService.addCustomWords(customWords)) { - return ResultUtil.data(customWords); - } - throw new ServiceException(ResultCode.ERROR); + customWordsService.addCustomWords(customWords); + return ResultUtil.data(customWords); } @ApiOperation(value = "修改自定义分词") @PutMapping public ResultMessage updateCustomWords(@Valid CustomWordsVO customWords) { - if (customWordsService.updateCustomWords(customWords)) { - return ResultUtil.data(customWords); - } - throw new ServiceException(ResultCode.ERROR); + customWordsService.updateCustomWords(customWords); + return ResultUtil.data(customWords); } @ApiOperation(value = "删除自定义分词") @ApiImplicitParam(name = "id", value = "文章ID", required = true, dataType = "String", paramType = "path") @DeleteMapping("/{id}") public ResultMessage deleteCustomWords(@NotNull @PathVariable String id) { - if (customWordsService.deleteCustomWords(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + customWordsService.deleteCustomWords(id); + return ResultUtil.success(); } @ApiOperation(value = "分页获取自定义分词") diff --git a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java index 9491c673..26ea97ae 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.other; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.page.entity.dos.Feedback; @@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java index a3ec9ec3..4deea20a 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.other; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.message.entity.dos.Message; @@ -11,7 +11,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java index 58e79a7b..47d80fee 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.other; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.page.entity.dos.PageData; diff --git a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java index 56269ae0..315d47ec 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java @@ -1,9 +1,7 @@ package cn.lili.controller.other; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.system.entity.dos.SensitiveWords; @@ -49,11 +47,9 @@ public class SensitiveWordsManagerController { @ApiOperation(value = "添加敏感词") @PostMapping public ResultMessage add(@Valid SensitiveWords sensitiveWords) { - if (sensitiveWordsService.save(sensitiveWords)) { - SensitiveWordsFilter.put(sensitiveWords.getSensitiveWord()); - return ResultUtil.data(sensitiveWords); - } - throw new ServiceException(ResultCode.ERROR); + sensitiveWordsService.save(sensitiveWords); + SensitiveWordsFilter.put(sensitiveWords.getSensitiveWord()); + return ResultUtil.data(sensitiveWords); } @ApiOperation(value = "修改敏感词") @@ -61,11 +57,9 @@ public class SensitiveWordsManagerController { @PutMapping("/{id}") public ResultMessage edit(@PathVariable String id, SensitiveWords sensitiveWords) { sensitiveWords.setId(id); - if (sensitiveWordsService.updateById(sensitiveWords)) { - SensitiveWordsFilter.put(sensitiveWords.getSensitiveWord()); - return ResultUtil.data(sensitiveWords); - } - throw new ServiceException(ResultCode.ERROR); + sensitiveWordsService.updateById(sensitiveWords); + SensitiveWordsFilter.put(sensitiveWords.getSensitiveWord()); + return ResultUtil.data(sensitiveWords); } @ApiOperation(value = "批量删除") @@ -77,7 +71,7 @@ public class SensitiveWordsManagerController { SensitiveWordsFilter.remove(name); sensitiveWordsService.removeById(id); } - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java index 1e2c308d..e5d34b39 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java @@ -1,9 +1,7 @@ package cn.lili.controller.other; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.page.entity.dos.Special; @@ -43,20 +41,16 @@ public class SpecialManagerController { @PutMapping("/updateSpecial") public ResultMessage updateSpecial(@PathVariable String id, @Valid Special special) { special.setId(id); - if (specialService.updateById(special)) { - return ResultUtil.data(special); - } - throw new ServiceException(ResultCode.ERROR); + specialService.updateById(special); + return ResultUtil.data(special); } @ApiOperation(value = "删除专题活动") @ApiImplicitParam(name = "id", value = "专题ID", required = true, dataType = "String", paramType = "path") @DeleteMapping("/{id}") public ResultMessage deleteSpecial(@PathVariable String id) { - if(specialService.removeSpecial(id)){ - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + specialService.removeSpecial(id); + return ResultUtil.success(); } @ApiOperation(value = "分页获取专题活动") diff --git a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java index fb43b501..5dcbe2e3 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java @@ -1,9 +1,7 @@ package cn.lili.controller.other; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; @@ -55,22 +53,18 @@ public class VerificationSourceController { @ApiOperation(value = "新增验证码资源维护") public ResultMessage save(VerificationSource verificationSource) { - if (verificationSourceService.save(verificationSource)) { - verificationSourceService.initCache(); - return ResultUtil.data(verificationSource); - } - throw new ServiceException(ResultCode.ERROR); + verificationSourceService.save(verificationSource); + verificationSourceService.initCache(); + return ResultUtil.data(verificationSource); } @PutMapping("/{id}") @ApiOperation(value = "更新验证码资源维护") public ResultMessage update(@PathVariable String id, VerificationSource verificationSource) { verificationSource.setId(id); - if (verificationSourceService.updateById(verificationSource)) { - verificationSourceService.initCache(); - return ResultUtil.data(verificationSource); - } - throw new ServiceException(ResultCode.ERROR); + verificationSourceService.updateById(verificationSource); + verificationSourceService.initCache(); + return ResultUtil.data(verificationSource); } @DeleteMapping(value = "/{ids}") @@ -79,6 +73,6 @@ public class VerificationSourceController { verificationSourceService.removeByIds(ids); verificationSourceService.initCache(); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java index 67578afd..8586089a 100644 --- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java @@ -6,7 +6,7 @@ import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; import cn.lili.common.token.Token; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; @@ -150,7 +150,7 @@ public class AdminUserManagerController { } catch (Exception e) { e.printStackTrace(); } - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @PutMapping(value = "/enable/{userId}") @@ -162,14 +162,14 @@ public class AdminUserManagerController { } user.setStatus(status); adminUserService.updateById(user); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @DeleteMapping(value = "/{ids}") @ApiOperation(value = "批量通过ids删除") public ResultMessage delAllByIds(@PathVariable List ids) { adminUserService.deleteCompletely(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java index f76b27ab..73724178 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java @@ -1,9 +1,7 @@ package cn.lili.controller.permission; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; import cn.lili.modules.permission.entity.dos.Department; @@ -48,25 +46,22 @@ public class DepartmentManagerController { @PostMapping @ApiOperation(value = "新增部门") public ResultMessage save(Department department) { - if (departmentService.save(department)) { - return ResultUtil.data(department); - } - throw new ServiceException(ResultCode.ERROR); + departmentService.save(department); + return ResultUtil.data(department); } @PutMapping("/{id}") @ApiOperation(value = "更新部门") public ResultMessage update(@PathVariable String id, Department department) { - if (departmentService.updateById(department)) { - return ResultUtil.data(department); - } - throw new ServiceException(ResultCode.ERROR); + departmentService.updateById(department); + departmentService.updateById(department); + return ResultUtil.data(department); } @DeleteMapping(value = "/{ids}") @ApiOperation(value = "删除部门") public ResultMessage delAllByIds(@PathVariable List ids) { departmentService.deleteByIds(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java index a610ee35..20d8b068 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java @@ -1,8 +1,6 @@ package cn.lili.controller.permission; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.permission.entity.dos.DepartmentRole; import cn.lili.modules.permission.service.DepartmentRoleService; @@ -36,13 +34,9 @@ public class DepartmentRoleManagerController { @PutMapping("/{departmentId}") @ApiOperation(value = "更新部门角色") public ResultMessage update(@PathVariable String departmentId, @RequestBody List departmentRole) { - try { - departmentRoleService.updateByDepartmentId(departmentId, departmentRole); - } catch (Exception e) { - e.printStackTrace(); - throw new ServiceException(ResultCode.ERROR); - } - return ResultUtil.success(ResultCode.SUCCESS); + + departmentRoleService.updateByDepartmentId(departmentId, departmentRole); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java index 8ad7c9d1..0745a60c 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.permission; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.permission.entity.dos.Menu; import cn.lili.modules.permission.entity.dto.MenuSearchParams; @@ -10,7 +10,6 @@ import cn.lili.modules.permission.service.MenuService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -60,7 +59,7 @@ public class MenuManagerController { @DeleteMapping(value = "/{ids}") public ResultMessage delByIds(@PathVariable List ids) { menuService.deleteIds(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "获取所有菜单") diff --git a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java index b3669fb1..07edd0d9 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.permission; import cn.lili.common.enums.ResultCode; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.permission.entity.dos.Role; @@ -10,7 +10,6 @@ import cn.lili.modules.permission.service.RoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -56,7 +55,7 @@ public class RoleManagerController { @ApiOperation(value = "批量删除") public ResultMessage delByIds(@PathVariable List ids) { roleService.deleteRoles(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } diff --git a/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java index c2c5ba59..58633dc7 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java @@ -1,13 +1,12 @@ package cn.lili.controller.permission; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.permission.entity.dos.RoleMenu; import cn.lili.modules.permission.service.RoleMenuService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,7 +36,7 @@ public class RoleMenuManagerController { @ApiOperation(value = "保存角色菜单") public ResultMessage save(@PathVariable String roleId, @RequestBody List roleMenus) { roleMenuService.updateRoleMenu(roleId, roleMenus); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java index c1f23cbc..1cad5d54 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.permission; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.permission.entity.dos.UserRole; import cn.lili.modules.permission.service.UserRoleService; @@ -37,7 +37,7 @@ public class UserRoleManagerController { @ApiOperation(value = "更新角色菜单") public ResultMessage update(@PathVariable String userId, List userRole) { userRoleService.updateUserRole(userId, userRole); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java index 21c3c989..9c8cbd31 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java @@ -5,7 +5,7 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.Coupon; @@ -60,10 +60,8 @@ public class CouponManagerController { @PostMapping(consumes = "application/json", produces = "application/json") public ResultMessage addCoupon(@RequestBody CouponVO couponVO) { this.setStoreInfo(couponVO); - if (couponService.add(couponVO) != null) { - return ResultUtil.data(couponVO); - } - throw new ServiceException(ResultCode.ERROR); + couponService.add(couponVO); + return ResultUtil.data(couponVO); } @ApiOperation(value = "修改优惠券") @@ -71,10 +69,8 @@ public class CouponManagerController { public ResultMessage updateCoupon(@RequestBody CouponVO couponVO) { Coupon coupon = couponService.getById(couponVO.getId()); couponVO.setPromotionStatus(PromotionStatusEnum.NEW.name()); - if (couponService.updateCoupon(couponVO) != null) { - return ResultUtil.data(coupon); - } - throw new ServiceException(ResultCode.ERROR); + couponService.updateCoupon(couponVO); + return ResultUtil.data(coupon); } @ApiOperation(value = "修改优惠券状态") @@ -93,7 +89,7 @@ public class CouponManagerController { for (String id : ids) { couponService.deleteCoupon(id); } - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "会员优惠券作废") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java index ef8c0a42..8036f8e0 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.promotion; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams; @@ -9,7 +9,6 @@ import cn.lili.modules.order.cart.entity.vo.FullDiscountVO; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java index a0cf9b25..1f177fe0 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.promotion; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.Pintuan; diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java index 81af36f3..d5429c81 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java @@ -1,8 +1,6 @@ package cn.lili.controller.promotion; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.PointsGoodsCategory; @@ -30,28 +28,22 @@ public class PointsGoodsCategoryManagerController { @PostMapping @ApiOperation(value = "添加积分商品分类") public ResultMessage add(PointsGoodsCategoryVO pointsGoodsCategory) { - if (pointsGoodsCategoryService.addCategory(pointsGoodsCategory)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + pointsGoodsCategoryService.addCategory(pointsGoodsCategory); + return ResultUtil.success(); } @PutMapping @ApiOperation(value = "修改积分商品分类") public ResultMessage update(PointsGoodsCategoryVO pointsGoodsCategory) { - if (pointsGoodsCategoryService.updateCategory(pointsGoodsCategory)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + pointsGoodsCategoryService.updateCategory(pointsGoodsCategory); + return ResultUtil.success(); } @DeleteMapping("/{id}") @ApiOperation(value = "删除积分商品分类") public ResultMessage delete(@PathVariable String id) { - if (pointsGoodsCategoryService.deleteCategory(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + pointsGoodsCategoryService.deleteCategory(id); + return ResultUtil.success(); } @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java index d4a09e9f..a69a9a05 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java @@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.vos.PointsGoodsSearchParams; @@ -43,10 +43,8 @@ public class PointsGoodsManagerController { i.setStoreId(currentUser.getId()); collect.add(i); } - if (pointsGoodsService.addPointsGoods(collect)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + pointsGoodsService.addPointsGoods(collect); + return ResultUtil.success(); } @PutMapping(consumes = "application/json", produces = "application/json") @@ -55,28 +53,26 @@ public class PointsGoodsManagerController { AuthUser currentUser = UserContext.getCurrentUser(); pointsGoods.setStoreId(currentUser.getId()); pointsGoods.setStoreName("platform"); - if (pointsGoodsService.updatePointsGoods(pointsGoods)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + pointsGoodsService.updatePointsGoods(pointsGoods); + return ResultUtil.success(); } @PutMapping("/{ids}") @ApiOperation(value = "修改积分商品状态") public ResultMessage updatePointsGoodsStatus(@PathVariable String ids, String promotionStatus) { if (pointsGoodsService.updatePointsGoodsPromotionStatus(Arrays.asList(ids.split(",")), promotionStatus)) { - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } - throw new ServiceException(ResultCode.ERROR); + throw new ServiceException(ResultCode.POINT_GOODS_ERROR); } @DeleteMapping("/{ids}") @ApiOperation(value = "删除积分商品") public ResultMessage delete(@PathVariable String ids) { if (pointsGoodsService.deletePointsGoods(Arrays.asList(ids.split(",")))) { - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } - throw new ServiceException(ResultCode.ERROR); + throw new ServiceException(ResultCode.POINT_GOODS_ERROR); } @GetMapping diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java index e57ff029..901e33dd 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.promotion; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO; @@ -9,7 +9,6 @@ import cn.lili.modules.promotion.service.PromotionGoodsService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java index 681799a9..6fc60377 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java @@ -1,10 +1,8 @@ package cn.lili.controller.promotion; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.Seckill; @@ -42,10 +40,8 @@ public class SeckillManagerController { seckillVO.setStoreId(currentUser.getId()); seckillVO.setStoreName(currentUser.getUsername()); seckillVO.setSeckillApplyStatus(SeckillApplyStatusEnum.NOT_APPLY.name()); - if (seckillService.saveSeckill(seckillVO)) { - return ResultUtil.data(seckillVO); - } - throw new ServiceException(ResultCode.ERROR); + seckillService.saveSeckill(seckillVO); + return ResultUtil.data(seckillVO); } @PutMapping @@ -54,10 +50,8 @@ public class SeckillManagerController { AuthUser currentUser = UserContext.getCurrentUser(); seckillVO.setStoreId(currentUser.getId()); seckillVO.setStoreName(currentUser.getUsername()); - if (seckillService.modifySeckill(seckillVO)) { - return ResultUtil.data(seckillVO); - } - throw new ServiceException(ResultCode.ERROR); + seckillService.modifySeckill(seckillVO); + return ResultUtil.data(seckillVO); } @GetMapping(value = "/{id}") @@ -79,21 +73,21 @@ public class SeckillManagerController { @ApiOperation(value = "删除一个限时抢购") public ResultMessage deleteSeckill(@PathVariable String id) { seckillService.deleteSeckill(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @PutMapping("/close/{id}") @ApiOperation(value = "关闭一个限时抢购") public ResultMessage closeSeckill(@PathVariable String id) { seckillService.closeSeckill(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @PutMapping("/open/{id}") @ApiOperation(value = "一个限时抢购") public ResultMessage openSeckill(@PathVariable String id) { seckillService.openSeckill(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @GetMapping("/apply") @@ -107,7 +101,7 @@ public class SeckillManagerController { @ApiOperation(value = "审核多个限时抢购申请") public ResultMessage auditSeckillApply(@PathVariable String[] ids, String seckillId, String applyStatus, String failReason) { seckillApplyService.auditBatchApply(ids, seckillId, applyStatus, failReason); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java b/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java index bbbed309..258cea23 100644 --- a/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java @@ -1,8 +1,6 @@ package cn.lili.controller.purchase; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.purchase.entity.dos.PurchaseOrder; import cn.lili.modules.purchase.entity.dos.PurchaseQuoted; @@ -62,10 +60,8 @@ public class PurchaseManagerController { @PutMapping("/{id}") public ResultMessage close(@NotNull @PathVariable String id) { - if (purchaseOrderService.close(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + purchaseOrderService.close(id); + return ResultUtil.success(); } @ApiOperation(value = "报价列表") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java index 9abb5578..fd98337c 100755 --- a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.setting; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; @@ -13,7 +13,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java index 8ac44efd..6fc50543 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultCode; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.system.entity.dos.InstantDelivery; @@ -15,7 +15,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -72,7 +71,7 @@ public class InstantDeliveryManagerController { @ApiImplicitParam(name = "bean", value = "bean", required = true, dataType = "String", paramType = "path") public ResultMessage open(@PathVariable String bean) { this.instantDeliveryService.openInstantDelivery(bean); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } diff --git a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java index 9a73f418..e4a41e56 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java @@ -1,14 +1,13 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; import cn.lili.modules.permission.service.SystemLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -52,13 +51,13 @@ public class LogManagerController { @DeleteMapping(value = "/{ids}") public ResultMessage delByIds(@PathVariable List ids) { systemLogService.deleteLog(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @DeleteMapping @ApiOperation(value = "全部删除") public ResultMessage delAll() { systemLogService.flushAll(); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java index 6139f9b0..c836ebae 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultCode; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.system.entity.dos.Logistics; @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -64,6 +63,6 @@ public class LogisticsManagerController { @DeleteMapping(value = "/delete/{id}") public ResultMessage delAllByIds(@PathVariable String id) { logisticsService.removeById(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java index 7f0e520d..9816d7a1 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultCode; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberNotice; @@ -53,7 +53,7 @@ public class MemberNoticeManagerController { updateWrapper.in("id", ids); updateWrapper.set("is_read", true); memberNoticeService.update(updateWrapper); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "阅读全部") @@ -63,14 +63,14 @@ public class MemberNoticeManagerController { updateWrapper.in("member_id", UserContext.getCurrentUser().getId()); updateWrapper.set("is_read", true); memberNoticeService.update(updateWrapper); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "批量删除") @DeleteMapping(value = "/{ids}") public ResultMessage delAllByIds(@PathVariable List ids) { memberNoticeService.removeByIds(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "删除所有") @@ -79,7 +79,7 @@ public class MemberNoticeManagerController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("member_id", UserContext.getCurrentUser().getId()); memberNoticeService.remove(queryWrapper); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java index d8b21cc7..8eeac205 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java @@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.SwitchEnum; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.BeanUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.message.entity.dos.NoticeMessage; @@ -95,11 +95,8 @@ public class NoticeMessageManagerController { if (noticeMessage != null) { noticeMessage.setNoticeContent(noticeContent); noticeMessage.setNoticeTitle(noticeTitle); - boolean result = noticeMessageService.updateById(noticeMessage); - if (result) { - return ResultUtil.data(noticeMessage); - } - throw new ServiceException(ResultCode.ERROR); + noticeMessageService.updateById(noticeMessage); + ResultUtil.data(noticeMessage); } throw new ResourceNotFoundException(ResultCode.NOTICE_NOT_EXIST.message()); } @@ -120,12 +117,10 @@ public class NoticeMessageManagerController { if (b) { //赋值执行修改操作 messageTemplate.setNoticeStatus(status); - boolean result = noticeMessageService.updateById(messageTemplate); - if (result) { - return ResultUtil.data(messageTemplate); - } + noticeMessageService.updateById(messageTemplate); + return ResultUtil.data(messageTemplate); } - throw new ServiceException(ResultCode.ERROR); + throw new ServiceException(ResultCode.NOTICE_ERROR); } throw new ResourceNotFoundException(ResultCode.NOTICE_NOT_EXIST.message()); } diff --git a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java index 23e0912c..436de03a 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java @@ -1,8 +1,6 @@ package cn.lili.controller.setting; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.base.service.RegionService; import cn.lili.modules.system.entity.dos.Region; @@ -56,20 +54,16 @@ public class RegionManagerController { @ApiOperation(value = "更新地区") public ResultMessage update(@PathVariable String id, @Valid Region region) { region.setId(id); - if (regionService.updateById(region)) { - return ResultUtil.data(region); - } - throw new ServiceException(ResultCode.ERROR); + regionService.updateById(region); + return ResultUtil.data(region); } @PostMapping @ApiOperation(value = "增加地区") public ResultMessage save(@Valid Region region) { - if (regionService.save(region)) { - return ResultUtil.data(region); - } - throw new ServiceException(ResultCode.ERROR); + regionService.save(region); + return ResultUtil.data(region); } @DeleteMapping(value = "{ids}") @@ -77,6 +71,6 @@ public class RegionManagerController { @ApiOperation(value = "批量通过id删除") public ResultMessage delAllByIds(@PathVariable List ids) { regionService.removeByIds(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java index 792090d6..491c3002 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java @@ -1,9 +1,7 @@ package cn.lili.controller.setting; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; @@ -52,25 +50,21 @@ public class ServiceNoticeManagerController { public ResultMessage save(ServiceNotice serviceNotice) { //标记平台消息 serviceNotice.setStoreId("-1"); - if (serviceNoticeService.saveOrUpdate(serviceNotice)) { - return ResultUtil.data(serviceNotice); - } - throw new ServiceException(ResultCode.ERROR); + serviceNoticeService.saveOrUpdate(serviceNotice); + return ResultUtil.data(serviceNotice); } @ApiOperation(value = "更新服务订阅消息") @PostMapping("/{id}") public ResultMessage update(@PathVariable String id, ServiceNotice serviceNotice) { - if (serviceNoticeService.saveOrUpdate(serviceNotice)) { - return ResultUtil.data(serviceNotice); - } - throw new ServiceException(ResultCode.ERROR); + serviceNoticeService.saveOrUpdate(serviceNotice); + return ResultUtil.data(serviceNotice); } @ApiOperation(value = "删除服务订阅消息") @DeleteMapping(value = "/{ids}") public ResultMessage delAllByIds(@PathVariable List ids) { serviceNoticeService.removeByIds(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java index ff48f433..c60b586c 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.setting; import cn.hutool.json.JSONUtil; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.base.aspect.DemoSite; import cn.lili.modules.system.entity.dos.Setting; @@ -60,7 +60,7 @@ public class SettingManagerController { setting.setSettingValue(configValue); settingService.saveUpdate(setting); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } /** @@ -95,12 +95,7 @@ public class SettingManagerController { "PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT" ) public ResultMessage settingGet(@PathVariable String key) { - try { - return createSetting(key); - } catch (Exception e) { - e.printStackTrace(); - throw new ServiceException(ResultCode.ERROR); - } + return createSetting(key); } /** @@ -114,7 +109,6 @@ public class SettingManagerController { */ private ResultMessage createSetting(String key) { SettingEnum settingEnum = SettingEnum.valueOf(key); - Setting setting = settingService.get(key); switch (settingEnum) { case BASE_SETTING: diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java index 1dfe06a4..8a336f2d 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.setting; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportForm; import io.swagger.annotations.Api; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java index 07967b61..5f72622e 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultCode; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.message.entity.dos.SmsReach; @@ -33,7 +33,7 @@ public class SmsManagerController { @PostMapping public ResultMessage sendBatchSms(SmsReach smsReach, @RequestParam(value = "mobile") List mobile) { smsReachService.addSmsReach(smsReach,mobile); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "查询短信任务分页") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java index ea81f601..c9e0a858 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.message.entity.dos.SmsSign; @@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,7 +33,7 @@ public class SmsSignManagerController { @PostMapping public ResultMessage save(@Valid SmsSign smsSign) { smsSignService.addSmsSign(smsSign); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "删除短信签名") @@ -42,7 +41,7 @@ public class SmsSignManagerController { @ApiImplicitParam(name = "id", value = "短信签名id", required = true, dataType = "String", allowMultiple = true, paramType = "path") public ResultMessage delete(@PathVariable String id) { smsSignService.deleteSmsSign(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @@ -57,14 +56,14 @@ public class SmsSignManagerController { @PutMapping("/querySmsSign") public ResultMessage querySmsSign() { smsSignService.querySmsSign(); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "修改短信签名") @PutMapping("/modifySmsSign") public ResultMessage modifySmsSign(@Valid SmsSign smsSign) { smsSignService.modifySmsSign(smsSign); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "查询短信签名分页") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java index 442c838a..44a99f9f 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.message.entity.dos.SmsTemplate; @@ -32,7 +32,7 @@ public class SmsTemplateManagerController { @PostMapping public ResultMessage save(@Valid SmsTemplate smsTemplate) { smsTemplateService.addSmsTemplate(smsTemplate); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "删除短信模板") @@ -40,21 +40,21 @@ public class SmsTemplateManagerController { @DeleteMapping("/{id}") public ResultMessage delete(@PathVariable("id") String id) { smsTemplateService.deleteSmsTemplate(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "查询短信模板状态") @PutMapping("/querySmsSign") public ResultMessage querySmsSign() { smsTemplateService.querySmsTemplate(); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "修改短信模板") @PutMapping("/modifySmsTemplate") public ResultMessage modifySmsTemplate(@Valid SmsTemplate smsTemplate) { smsTemplateService.modifySmsTemplate(smsTemplate); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "查询短信模板分页") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java index e70aa0c2..fe783888 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMPMessageManagerController.java @@ -1,9 +1,7 @@ package cn.lili.controller.setting; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; @@ -34,8 +32,9 @@ public class WechatMPMessageManagerController { @ApiOperation(value = "初始化微信小程序消息订阅") public ResultMessage init() { wechatMPMessageService.init(); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } + @GetMapping(value = "/{id}") @ApiOperation(value = "查看微信小程序消息订阅详情") public ResultMessage get(@PathVariable String id) { @@ -57,19 +56,15 @@ public class WechatMPMessageManagerController { @ApiOperation(value = "新增微信小程序消息订阅") public ResultMessage save(WechatMPMessage wechatMPMessage) { - if (wechatMPMessageService.save(wechatMPMessage)) { - return new ResultUtil().setData(wechatMPMessage); - } - throw new ServiceException(ResultCode.ERROR); + wechatMPMessageService.save(wechatMPMessage); + return new ResultUtil().setData(wechatMPMessage); } @PutMapping("/{id}") @ApiOperation(value = "更新微信小程序消息订阅") public ResultMessage update(@PathVariable String id, WechatMPMessage wechatMPMessage) { - if (wechatMPMessageService.updateById(wechatMPMessage)) { - return new ResultUtil().setData(wechatMPMessage); - } - throw new ServiceException(ResultCode.ERROR); + wechatMPMessageService.updateById(wechatMPMessage); + return new ResultUtil().setData(wechatMPMessage); } @DeleteMapping(value = "/{ids}") @@ -77,6 +72,6 @@ public class WechatMPMessageManagerController { public ResultMessage delAllByIds(@PathVariable List ids) { wechatMPMessageService.removeByIds(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java index 09d1f0ff..1460e90f 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java @@ -1,9 +1,7 @@ package cn.lili.controller.setting; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.message.entity.dos.WechatMessage; @@ -35,7 +33,7 @@ public class WechatMessageManageController { @ApiOperation(value = "初始化微信消息") public ResultMessage init() { wechatMessageService.init(); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @GetMapping(value = "/{id}") @@ -57,25 +55,21 @@ public class WechatMessageManageController { @ApiOperation(value = "新增微信消息") public ResultMessage save(WechatMessage wechatMessage) { - if (wechatMessageService.save(wechatMessage)) { - return ResultUtil.data(wechatMessage); - } - throw new ServiceException(ResultCode.ERROR); + wechatMessageService.save(wechatMessage); + return ResultUtil.data(wechatMessage); } @PutMapping("/{id}") @ApiOperation(value = "更新微信消息") public ResultMessage update(@PathVariable String id, WechatMessage wechatMessage) { - if (wechatMessageService.updateById(wechatMessage)) { - return ResultUtil.data(wechatMessage); - } - throw new ServiceException(ResultCode.ERROR); + wechatMessageService.updateById(wechatMessage); + return ResultUtil.data(wechatMessage); } @DeleteMapping(value = "/{ids}") @ApiOperation(value = "删除微信消息") public ResultMessage delAllByIds(@PathVariable List ids) { wechatMessageService.removeByIds(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java index 9c46710b..f8a76dfb 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.statistics; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; import cn.lili.modules.statistics.model.vo.CategoryStatisticsDataVO; @@ -8,7 +8,6 @@ import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO; import cn.lili.modules.statistics.service.GoodsStatisticsDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java index 888e9426..97f8ff7c 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.statistics; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO; import cn.lili.modules.statistics.model.vo.IndexNoticeVO; @@ -9,7 +9,6 @@ import cn.lili.modules.statistics.model.vo.StoreStatisticsDataVO; import cn.lili.modules.statistics.service.IndexStatisticsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java index 2b70a512..9c364405 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java @@ -1,13 +1,12 @@ package cn.lili.controller.statistics; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.statistics.model.dos.MemberStatisticsData; import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; import cn.lili.modules.statistics.service.MemberStatisticsDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java index cd81f48f..4aa5dff7 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.statistics; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.AfterSale; @@ -14,7 +14,6 @@ import cn.lili.modules.statistics.service.OrderStatisticsDataService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java index 01907451..ec77d92f 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.statistics; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java index a01eaf6a..df3406ff 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.statistics; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.vo.MemberDistributionVO; import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; diff --git a/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java index de49d6a5..f82068ea 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java @@ -1,8 +1,6 @@ package cn.lili.controller.store; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.StoreFlow; @@ -60,10 +58,8 @@ public class BillManagerController { @ApiImplicitParam(name = "id", value = "结算单ID", required = true, paramType = "path") @PutMapping(value = "/pay/{id}") public ResultMessage pay(@PathVariable String id) { - if (billService.complete(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + billService.complete(id); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java index 89580d9b..e5079b27 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java @@ -1,8 +1,6 @@ package cn.lili.controller.store; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.vos.CategoryVO; @@ -89,27 +87,23 @@ public class StoreManagerController { @PutMapping(value = "/audit/{id}/{passed}") public ResultMessage audit(@PathVariable String id, @PathVariable Integer passed) { storeService.audit(id, passed); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "关闭店铺") @ApiImplicitParam(name = "id", value = "店铺id", required = true, dataType = "String", paramType = "path") @PutMapping(value = "/disable/{id}") public ResultMessage disable(@PathVariable String id) { - if (storeService.disable(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + storeService.disable(id); + return ResultUtil.success(); } @ApiOperation(value = "开启店铺") @ApiImplicitParam(name = "id", value = "店铺id", required = true, dataType = "String", paramType = "path") @PutMapping(value = "/enable/{id}") public ResultMessage enable(@PathVariable String id) { - if (storeService.enable(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + storeService.enable(id); + return ResultUtil.success(); } @ApiOperation(value = "查询一级分类列表") diff --git a/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java index c4588473..0494e403 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.store; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.message.entity.dos.StoreMessage; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java index 9f33615e..dfc83989 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.AfterSale; import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams; @@ -12,7 +12,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java index 94cd2c3f..c4afdb76 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.trade; import cn.lili.common.enums.ResultCode; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.AfterSaleReason; @@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -70,6 +69,6 @@ public class AfterSaleReasonManagerController { @DeleteMapping(value = "/delByIds/{id}") public ResultMessage delAllByIds(@PathVariable String id) { afterSaleReasonService.removeById(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java index ba76071f..fbb2c68c 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java @@ -1,10 +1,8 @@ package cn.lili.controller.trade; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.OrderComplaint; @@ -63,10 +61,9 @@ public class OrderComplaintManagerController { @ApiOperation(value = "更新数据") @PutMapping public ResultMessage update(OrderComplaintVO orderComplainVO) { - if (orderComplaintService.updateOrderComplain(orderComplainVO)) { - return ResultUtil.data(orderComplainVO); - } - throw new ServiceException(ResultCode.ERROR); + orderComplaintService.updateOrderComplain(orderComplainVO); + return ResultUtil.data(orderComplainVO); + } @ApiOperation(value = "添加交易投诉对话") @@ -75,22 +72,18 @@ public class OrderComplaintManagerController { @ApiImplicitParam(name = "content", value = "内容", required = true, paramType = "query") }) @PostMapping("/communication") - public ResultMessage addCommunication(@RequestParam String complainId,@RequestParam String content) { + public ResultMessage addCommunication(@RequestParam String complainId, @RequestParam String content) { AuthUser currentUser = UserContext.getCurrentUser(); OrderComplaintCommunicationVO communicationVO = new OrderComplaintCommunicationVO(complainId, content, CommunicationOwnerEnum.PLATFORM.name(), currentUser.getId(), currentUser.getUsername()); - if (orderComplaintCommunicationService.addCommunication(communicationVO)) { - return ResultUtil.data(communicationVO); - } - throw new ServiceException(ResultCode.ERROR); + orderComplaintCommunicationService.addCommunication(communicationVO); + return ResultUtil.data(communicationVO); } @ApiOperation(value = "修改状态") @PutMapping(value = "/status") public ResultMessage updateStatus(OrderComplaintOperationParams orderComplainVO) { - if (orderComplaintService.updateOrderComplainByStatus(orderComplainVO) != null) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + orderComplaintService.updateOrderComplainByStatus(orderComplainVO); + return ResultUtil.success(); } @@ -100,17 +93,15 @@ public class OrderComplaintManagerController { @ApiImplicitParam(name = "arbitrationResult", value = "仲裁结果", required = true, paramType = "query") }) @PutMapping(value = "/complete/{id}") - public ResultMessage complete(@PathVariable String id,String arbitrationResult) { + public ResultMessage complete(@PathVariable String id, String arbitrationResult) { //新建对象 - OrderComplaintOperationParams orderComplaintOperationParams =new OrderComplaintOperationParams(); + OrderComplaintOperationParams orderComplaintOperationParams = new OrderComplaintOperationParams(); orderComplaintOperationParams.setComplainId(id); orderComplaintOperationParams.setArbitrationResult(arbitrationResult); orderComplaintOperationParams.setComplainStatus(OrderComplaintStatusEnum.COMPLETE.name()); //修改状态 - if (orderComplaintService.updateOrderComplainByStatus(orderComplaintOperationParams) != null) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + orderComplaintService.updateOrderComplainByStatus(orderComplaintOperationParams); + return ResultUtil.success(); } } diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java index 40e8e15f..1ce34363 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.trade; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; @@ -10,7 +10,6 @@ import cn.lili.modules.order.trade.service.OrderLogService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java index e53ffedf..0b93d2c3 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.trade; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dto.MemberAddressDTO; import cn.lili.modules.order.order.entity.dos.Order; @@ -15,7 +15,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -62,7 +61,7 @@ public class OrderManagerController { @PostMapping(value = "/{orderSn}/pay") public ResultMessage payOrder(@PathVariable String orderSn) { orderPriceService.adminPayOrder(orderSn); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "修改收货人信息") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java index cefcffb2..7c16c31b 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.trade; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; @@ -11,7 +11,6 @@ import cn.lili.modules.payment.service.PaymentService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java index ea9ceb9e..d5b5d859 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dto.OrderReceiptDTO; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java index 0287be30..bd3cd0fb 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.trade.entity.dos.Recharge; @@ -9,7 +9,6 @@ import cn.lili.modules.order.trade.service.RechargeService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java index 2ea7fee6..37aff972 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java @@ -1,7 +1,7 @@ package cn.lili.controller.trade; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; @@ -10,7 +10,6 @@ import cn.lili.modules.payment.service.RefundLogService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; diff --git a/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java index 67bff876..2818bdde 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java @@ -1,6 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.trade.entity.dos.WalletLog; @@ -9,7 +9,6 @@ import cn.lili.modules.order.trade.service.WalletLogService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; diff --git a/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java b/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java index 3e8ffaeb..6e593668 100644 --- a/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java +++ b/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java @@ -1,7 +1,7 @@ package cn.lili.test.promotion; import cn.hutool.json.JSONUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dto.BasePromotion; diff --git a/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java index 4fa6d230..391ed393 100644 --- a/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java @@ -1,7 +1,7 @@ package cn.lili.controller.distribution; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.distribution.entity.dos.DistributionGoods; import cn.lili.modules.distribution.entity.dos.DistributionSelectedGoods; @@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -66,7 +65,7 @@ public class DistributionGoodsStoreController { distributionSelectedGoodsService.remove(new QueryWrapper().eq("distribution_goods_id", id)); //清除分销商品 distributionGoodsService.removeById(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java index a724d616..f9de49dd 100644 --- a/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java @@ -1,7 +1,7 @@ package cn.lili.controller.distribution; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.distribution.entity.dos.DistributionOrder; import cn.lili.modules.distribution.entity.vos.DistributionOrderSearchParams; @@ -9,7 +9,6 @@ import cn.lili.modules.distribution.service.DistributionOrderService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java index f847a175..9b1d761e 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java @@ -1,8 +1,6 @@ package cn.lili.controller.goods; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.CategoryParameterGroup; import cn.lili.modules.goods.entity.dos.Parameters; @@ -46,10 +44,8 @@ public class CategoryParameterGroupStoreController { @PostMapping(value = "/save") public ResultMessage saveOrUpdate(CategoryParameterGroup categoryParameterGroup) { - if (categoryParameterGroupService.save(categoryParameterGroup)) { - return ResultUtil.data(categoryParameterGroup); - } - throw new ServiceException(ResultCode.ERROR); + categoryParameterGroupService.save(categoryParameterGroup); + return ResultUtil.data(categoryParameterGroup); } @ApiOperation(value = "通过id删除参数组") @@ -59,7 +55,7 @@ public class CategoryParameterGroupStoreController { parametersService.remove(new QueryWrapper().eq("group_id", id)); //删除参数组 categoryParameterGroupService.removeById(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java index b9fb8ac1..142971d6 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java @@ -1,7 +1,7 @@ package cn.lili.controller.goods; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.CategorySpecification; import cn.lili.modules.goods.entity.vos.CategorySpecificationVO; @@ -13,7 +13,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -66,7 +65,7 @@ public class CategorySpecificationStoreController { CategorySpecification categoryBrand = new CategorySpecification(categoryId, specId); categorySpecificationService.save(categoryBrand); } - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java index ce969a6e..b2530cb1 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java @@ -1,7 +1,7 @@ package cn.lili.controller.goods; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.vos.CategoryBrandVO; import cn.lili.modules.goods.entity.vos.CategoryVO; diff --git a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java index 9eb1592d..2b2e04b4 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java @@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.DraftGoods; import cn.lili.modules.goods.entity.dto.DraftGoodsDTO; @@ -59,7 +59,7 @@ public class DraftGoodsStoreController { throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR); } draftGoodsService.saveGoodsDraft(draftGoodsVO); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "删除草稿商品") @@ -70,7 +70,7 @@ public class DraftGoodsStoreController { throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR); } draftGoodsService.deleteGoodsDraft(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java index 88efe900..a5b8e52c 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java @@ -1,9 +1,7 @@ package cn.lili.controller.goods; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; @@ -59,20 +57,16 @@ public class GoodsGalleryController { @PostMapping(value = "/save") public ResultMessage save(GoodsGallery goodsGallery) { - if (goodsGalleryService.save(goodsGallery)) { - return ResultUtil.data(goodsGallery); - } - throw new ServiceException(ResultCode.ERROR); + goodsGalleryService.save(goodsGallery); + return ResultUtil.data(goodsGallery); } @ApiOperation(value = "修改商品相册") @PostMapping(value = "/update") public ResultMessage update(GoodsGallery goodsGallery) { - if (goodsGalleryService.updateById(goodsGallery)) { - return ResultUtil.data(goodsGallery); - } - throw new ServiceException(ResultCode.ERROR); + goodsGalleryService.updateById(goodsGallery); + return ResultUtil.data(goodsGallery); } @ApiOperation(value = "批量删除") @@ -80,6 +74,6 @@ public class GoodsGalleryController { public ResultMessage delAllByIds(@PathVariable List ids) { goodsGalleryService.removeByIds(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java index 044d85a7..9830dbfa 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java @@ -2,7 +2,7 @@ package cn.lili.controller.goods; import cn.lili.common.enums.ResultCode; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.store.entity.dos.StoreGoodsLabel; import cn.lili.modules.store.entity.vos.StoreGoodsLabelVO; @@ -63,6 +63,6 @@ public class GoodsLabelStoreController { @DeleteMapping("/{id}") public ResultMessage delete(@PathVariable String id) { storeGoodsLabelService.removeStoreGoodsLabel(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java index 263d554c..b59a1e02 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java @@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.Goods; import cn.lili.modules.goods.entity.dos.GoodsSku; @@ -100,14 +100,14 @@ public class GoodsStoreController { public ResultMessage save(@RequestBody GoodsOperationDTO goodsOperationDTO) { goodsService.addGoods(goodsOperationDTO); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "修改商品") @PutMapping(value = "/update/{goodsId}", consumes = "application/json", produces = "application/json") public ResultMessage update(@RequestBody GoodsOperationDTO goodsOperationDTO, @PathVariable String goodsId) { goodsService.editGoods(goodsOperationDTO, goodsId); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "下架商品", notes = "下架商品时使用") @@ -115,30 +115,24 @@ public class GoodsStoreController { @PutMapping(value = "/under") public ResultMessage underGoods(@RequestParam List goodsId) { - if (goodsService.updateGoodsMarketAble(goodsId, GoodsStatusEnum.DOWN, "商家下架")) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + goodsService.updateGoodsMarketAble(goodsId, GoodsStatusEnum.DOWN, "商家下架"); + return ResultUtil.success(); } @ApiOperation(value = "上架商品", notes = "上架商品时使用") @PutMapping(value = "/up") @ApiImplicitParam(name = "goodsId", value = "商品ID", required = true, paramType = "query", allowMultiple = true) public ResultMessage unpGoods(@RequestParam List goodsId) { - if (goodsService.updateGoodsMarketAble(goodsId, GoodsStatusEnum.UPPER, "")) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + goodsService.updateGoodsMarketAble(goodsId, GoodsStatusEnum.UPPER, ""); + return ResultUtil.success(); } @ApiOperation(value = "删除商品") @PutMapping(value = "/delete") @ApiImplicitParam(name = "goodsId", value = "商品ID", required = true, paramType = "query", allowMultiple = true) public ResultMessage deleteGoods(@RequestParam List goodsId) { - if (goodsService.deleteGoods(goodsId)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + goodsService.deleteGoods(goodsId); + return ResultUtil.success(); } @ApiOperation(value = "设置商品运费模板") @@ -149,10 +143,8 @@ public class GoodsStoreController { @ApiImplicitParam(name = "templateId", value = "运费模板ID", required = true, paramType = "query") }) public ResultMessage freight(@RequestParam List goodsId, @RequestParam String freightPayer, @RequestParam String templateId) { - if (goodsService.freight(goodsId, freightPayer, templateId)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + goodsService.freight(goodsId, freightPayer, templateId); + return ResultUtil.success(); } @ApiOperation(value = "根据goodsId分页获取商品规格列表") @@ -166,7 +158,7 @@ public class GoodsStoreController { @PutMapping(value = "/update/stocks", consumes = "application/json") public ResultMessage updateStocks(@RequestBody List updateStockList) { goodsSkuService.updateStocks(updateStockList); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java index a208d753..f6e00d27 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java @@ -2,7 +2,7 @@ package cn.lili.controller.goods; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.GoodsUnit; @@ -10,7 +10,6 @@ import cn.lili.modules.goods.service.GoodsUnitService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; diff --git a/seller-api/src/main/java/cn/lili/controller/goods/SpecValuesStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/SpecValuesStoreController.java index 85b1f977..75a30849 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/SpecValuesStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/SpecValuesStoreController.java @@ -1,7 +1,7 @@ package cn.lili.controller.goods; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.SpecValues; diff --git a/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java index 2cb6e1ee..e15d1a7d 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java @@ -1,10 +1,8 @@ package cn.lili.controller.goods; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.Specification; @@ -49,10 +47,8 @@ public class SpecificationStoreController { if (parameters.getStoreId() == null) { parameters.setStoreId(UserContext.getCurrentUser().getId()); } - if (specificationService.addSpecification(parameters) != null) { - return ResultUtil.data(parameters); - } - throw new ServiceException(ResultCode.ERROR); + specificationService.addSpecification(parameters); + return ResultUtil.data(parameters); } @DeleteMapping(value = "/{ids}") @@ -60,6 +56,6 @@ public class SpecificationStoreController { @ApiOperation(value = "批量删除") public ResultMessage delAllByIds(@PathVariable List ids) { specificationService.deleteSpecification(ids); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java b/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java index d0440c4b..0846a3ad 100644 --- a/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java +++ b/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java @@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; diff --git a/seller-api/src/main/java/cn/lili/controller/other/ArticleStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/ArticleStoreController.java index 3acd0f0c..c73eda9e 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/ArticleStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/ArticleStoreController.java @@ -1,6 +1,6 @@ package cn.lili.controller.other; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.page.entity.dos.Article; import cn.lili.modules.page.entity.dto.ArticleSearchParams; diff --git a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java index 05b9c096..52474ff5 100644 --- a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java +++ b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java @@ -1,7 +1,7 @@ package cn.lili.controller.passport; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java index e14c9dc8..8ab6aa5d 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java @@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.Coupon; @@ -62,10 +62,8 @@ public class CouponStoreController { AuthUser currentUser = UserContext.getCurrentUser(); couponVO.setStoreId(currentUser.getStoreId()); couponVO.setStoreName(currentUser.getStoreName()); - if (couponService.add(couponVO) != null) { - return ResultUtil.data(couponVO); - } - throw new ServiceException(ResultCode.ERROR); + couponService.add(couponVO); + return ResultUtil.data(couponVO); } @PutMapping(consumes = "application/json", produces = "application/json") @@ -80,11 +78,7 @@ public class CouponStoreController { throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR); } CouponVO coupon = couponService.updateCoupon(couponVO); - if (coupon != null) { - - return ResultUtil.data(coupon); - } - throw new ServiceException(ResultCode.ERROR); + return ResultUtil.data(coupon); } @DeleteMapping(value = "/{ids}") @@ -98,7 +92,7 @@ public class CouponStoreController { for (String id : ids) { couponService.deleteCoupon(id); } - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @ApiOperation(value = "修改优惠券状态") diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java index e3af4044..fafdb403 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java @@ -3,7 +3,7 @@ package cn.lili.controller.promotion; import cn.lili.common.enums.ResultCode; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.FullDiscount; @@ -14,7 +14,6 @@ import cn.lili.modules.order.cart.entity.vo.FullDiscountVO; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java index f4096cda..205867e2 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java @@ -4,7 +4,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO; diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java index 7ce0a9c5..83c0a3b9 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java @@ -2,7 +2,7 @@ package cn.lili.controller.promotion; import cn.lili.common.enums.ResultCode; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.Seckill; @@ -15,7 +15,6 @@ import cn.lili.modules.promotion.service.SeckillService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -70,7 +69,7 @@ public class SeckillStoreController { public ResultMessage addSeckillApply(@PathVariable String seckillId, @RequestBody List applyVos) { String storeId = UserContext.getCurrentUser().getStoreId(); seckillApplyService.addSeckillApply(seckillId, storeId, applyVos); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } @DeleteMapping("/apply/{seckillId}/{ids}") @@ -78,7 +77,7 @@ public class SeckillStoreController { public ResultMessage deleteSeckillApply(@PathVariable("seckillId") String seckillId, @PathVariable("ids") String ids) { String[] idsSplit = ids.split(","); seckillApplyService.removeSeckillApplyByIds(seckillId, Arrays.asList(idsSplit)); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } diff --git a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java index 1b76ab17..c0a2ef1f 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java @@ -1,9 +1,7 @@ package cn.lili.controller.settings; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.store.entity.vos.FreightTemplateVO; import cn.lili.modules.store.service.FreightTemplateService; @@ -58,9 +56,7 @@ public class FreightTemplateStoreController { @ApiImplicitParam(name = "id", value = "商家模板ID", required = true, paramType = "path") @DeleteMapping("/{id}") public ResultMessage edit(@PathVariable String id) { - if (freightTemplateService.removeFreightTemplate(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + freightTemplateService.removeFreightTemplate(id); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java index 1f024b9f..c83f1c3b 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java @@ -1,14 +1,13 @@ package cn.lili.controller.settings; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; import cn.lili.modules.permission.service.SystemLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; diff --git a/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java index 799cea3c..26b6d955 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java @@ -1,9 +1,8 @@ package cn.lili.controller.settings; -import cn.lili.common.enums.MessageCode; import cn.lili.common.enums.ResultCode; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.store.entity.dos.StoreLogistics; import cn.lili.modules.system.entity.vo.StoreLogisticsVO; @@ -11,7 +10,6 @@ import cn.lili.modules.system.service.StoreLogisticsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -59,7 +57,7 @@ public class LogisticsStoreController { @DeleteMapping(value = "/{id}") public ResultMessage cancel(@PathVariable String id) { storeLogisticsService.removeById(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java index f53e58d6..94793f54 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java @@ -1,10 +1,9 @@ package cn.lili.controller.settings; -import cn.lili.common.enums.MessageCode; import cn.lili.common.enums.ResultCode; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.store.entity.dos.StoreAddress; @@ -13,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -72,7 +70,7 @@ public class StoreAddressController { @DeleteMapping(value = "/{id}") public ResultMessage delByIds(@PathVariable String id) { storeAddressService.removeStoreAddress(id); - return ResultUtil.success(ResultCode.SUCCESS); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java index b3e6b060..e755aa74 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java @@ -2,7 +2,7 @@ package cn.lili.controller.settings; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.message.entity.dos.StoreMessage; @@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java b/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java index 341f784e..f8758ad0 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java @@ -1,7 +1,7 @@ package cn.lili.controller.settings; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.page.entity.dos.PageData; @@ -14,7 +14,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java index 15c6015f..6a3b001b 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java @@ -1,9 +1,7 @@ package cn.lili.controller.settings; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.store.entity.dos.StoreDetail; import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO; @@ -55,10 +53,8 @@ public class StoreSettingsController { @PutMapping public ResultMessage edit(@Valid StoreSettingDTO storeSettingDTO) { //修改商家设置 - if (storeDetailService.editStoreSetting(storeSettingDTO)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + storeDetailService.editStoreSetting(storeSettingDTO); + return ResultUtil.success(); } @ApiOperation(value = "修改店铺库存预警数量") @@ -66,10 +62,8 @@ public class StoreSettingsController { @PutMapping("/updateStockWarning") public ResultMessage updateStockWarning(Integer stockWarning) { //修改商家设置 - if (storeDetailService.updateStockWarning(stockWarning)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + storeDetailService.updateStockWarning(stockWarning); + return ResultUtil.success(); } @ApiOperation(value = "获取商家退货收件地址") @@ -83,9 +77,7 @@ public class StoreSettingsController { @PutMapping("/storeAfterSaleAddress") public ResultMessage editStoreAfterSaleAddress(@Valid StoreAfterSaleAddressDTO storeAfterSaleAddressDTO) { //修改商家退货收件地址 - if (storeDetailService.editStoreAfterSaleAddressDTO(storeAfterSaleAddressDTO)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + storeDetailService.editStoreAfterSaleAddressDTO(storeAfterSaleAddressDTO); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java index ad8803a6..7cae959f 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java @@ -1,14 +1,13 @@ package cn.lili.controller.statistics; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO; import cn.lili.modules.statistics.service.GoodsStatisticsDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java index f823cc49..6146ebda 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java @@ -1,7 +1,7 @@ package cn.lili.controller.statistics; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam; import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO; @@ -10,7 +10,6 @@ import cn.lili.modules.statistics.service.GoodsStatisticsDataService; import cn.lili.modules.statistics.service.IndexStatisticsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java index eb512db9..3de478a3 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java @@ -1,7 +1,7 @@ package cn.lili.controller.statistics; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.AfterSale; @@ -15,7 +15,6 @@ import cn.lili.modules.statistics.service.OrderStatisticsDataService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java index 9b412728..f0146d49 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java @@ -1,7 +1,7 @@ package cn.lili.controller.statistics; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java index 41bc723b..d4f97455 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java @@ -1,7 +1,7 @@ package cn.lili.controller.statistics; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.statistics.model.dto.StatisticsQueryParam; import cn.lili.modules.statistics.model.vo.PlatformViewVO; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java index 0a62fdc5..57792ffa 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java @@ -1,6 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.AfterSale; import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams; @@ -12,7 +12,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java index 85b354ee..f967539c 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java @@ -1,8 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.StoreFlow; @@ -68,9 +66,7 @@ public class BillStoreController { @ApiImplicitParam(name = "id", value = "结算单ID", required = true, paramType = "path", dataType = "String") @PutMapping(value = "/check/{id}") public ResultMessage examine(@PathVariable String id) { - if (billService.check(id)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + billService.check(id); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java index 55e6c945..937a9a8b 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java @@ -1,8 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dto.StoreEvaluationQueryParams; import cn.lili.modules.member.entity.vo.MemberEvaluationListVO; @@ -52,9 +50,7 @@ public class MemberEvaluationStoreController { }) @PutMapping(value = "/reply/{id}") public ResultMessage reply(@PathVariable String id, @RequestParam String reply, @RequestParam String replyImage) { - if (memberEvaluationService.reply(id, reply, replyImage)) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + memberEvaluationService.reply(id, reply, replyImage); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java index 3c63a4ba..77e46b75 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java @@ -1,10 +1,8 @@ package cn.lili.controller.trade; -import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.OrderComplaint; @@ -66,40 +64,31 @@ public class OrderComplaintStoreController { public ResultMessage addCommunication(@RequestParam String complainId, @RequestParam String content) { AuthUser currentUser = UserContext.getCurrentUser(); OrderComplaintCommunicationVO communicationVO = new OrderComplaintCommunicationVO(complainId, content, CommunicationOwnerEnum.STORE.name(), currentUser.getStoreId(), currentUser.getUsername()); - if (orderComplaintCommunicationService.addCommunication(communicationVO)) { - return ResultUtil.data(communicationVO); - } - throw new ServiceException(ResultCode.ERROR); + orderComplaintCommunicationService.addCommunication(communicationVO); + return ResultUtil.success(); } @ApiOperation(value = "修改申诉信息") @PutMapping public ResultMessage update(OrderComplaintVO orderComplainVO) { orderComplainVO.setStoreId(UserContext.getCurrentUser().getId()); - if (orderComplaintService.updateOrderComplain(orderComplainVO)) { - return ResultUtil.data(orderComplainVO); - } - throw new ServiceException(ResultCode.ERROR); + orderComplaintService.updateOrderComplain(orderComplainVO); + return ResultUtil.data(orderComplainVO); } @ApiOperation(value = "申诉") @PutMapping("/appeal") public ResultMessage appeal(StoreAppealVO storeAppealVO) { - //申诉接口 - if (orderComplaintService.appeal(storeAppealVO)) { - return ResultUtil.data(orderComplaintService.getOrderComplainById(storeAppealVO.getOrderComplaintId())); - } - throw new ServiceException(ResultCode.ERROR); + orderComplaintService.appeal(storeAppealVO); + return ResultUtil.data(orderComplaintService.getOrderComplainById(storeAppealVO.getOrderComplaintId())); } @ApiOperation(value = "修改状态") @PutMapping(value = "/status") public ResultMessage updateStatus(OrderComplaintOperationParams orderComplainVO) { - if (orderComplaintService.updateOrderComplainByStatus(orderComplainVO) != null) { - return ResultUtil.success(ResultCode.SUCCESS); - } - throw new ServiceException(ResultCode.ERROR); + orderComplaintService.updateOrderComplainByStatus(orderComplainVO); + return ResultUtil.success(); } } diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java index 7822bff1..274c0eed 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java @@ -1,13 +1,12 @@ package cn.lili.controller.trade; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.trade.entity.dos.OrderLog; import cn.lili.modules.order.trade.service.OrderLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java index de4127a9..4ca89760 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java @@ -1,6 +1,6 @@ package cn.lili.controller.trade; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dto.MemberAddressDTO; import cn.lili.modules.order.order.entity.dto.OrderSearchParams; @@ -13,7 +13,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java index 2ca3ae5d..a25d7d6f 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java @@ -1,7 +1,7 @@ package cn.lili.controller.trade; import cn.lili.common.security.context.UserContext; -import cn.lili.common.utils.ResultUtil; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.Receipt; From 3a6ce0b22cba95e51673cdd16d102888288ab679 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 19 May 2021 14:47:17 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E5=95=86=E5=93=81=E8=AE=BE=E7=BD=AE=E4=B8=BA=E7=AB=8B=E5=8D=B3?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=EF=BC=8C=E5=88=99=E5=B0=86=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=9A=84=E4=B8=8A=E6=9E=B6=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=B7=B2=E4=B8=8A=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java index eaa70349..a23defa1 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java @@ -337,8 +337,6 @@ public class GoodsServiceImpl extends ServiceImpl implements GoodsSetting goodsSetting = JSONUtil.toBean(setting.getSettingValue(), GoodsSetting.class); //是否需要审核 goods.setIsAuth(Boolean.TRUE.equals(goodsSetting.getGoodsCheck()) ? GoodsAuthEnum.TOBEAUDITED.name() : GoodsAuthEnum.PASS.name()); - //自动下架 - goods.setMarketEnable(Boolean.TRUE.equals(goodsSetting.getGoodsCheck()) ? GoodsStatusEnum.DOWN.name() : GoodsStatusEnum.UPPER.name()); } /** From edfd75d31bf318e34cdd2bf58bf954cadd688126 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 19 May 2021 16:35:14 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=95=86=E5=93=81es=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/GoodsSkuServiceImpl.java | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java index 3ec76b83..6d63599b 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java @@ -110,6 +110,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl i if (Boolean.TRUE.equals(regeneratorSkuFlag)) { List goodsListByGoodsId = getGoodsListByGoodsId(goods.getId()); List oldSkuIds = new ArrayList<>(); + //删除旧索引 for (GoodsSkuVO goodsSkuVO : goodsListByGoodsId) { oldSkuIds.add(goodsSkuVO.getId()); goodsIndexService.deleteIndexById(goodsSkuVO.getId()); @@ -133,11 +134,13 @@ public class GoodsSkuServiceImpl extends ServiceImpl i //设置商品规格信息 skuInfo(sku, goods, map, null); newSkuList.add(sku); + //如果商品状态值不对，则es索引移除 + if (goods.getIsAuth().equals(GoodsAuthEnum.PASS.name()) && goods.getMarketEnable().equals(GoodsStatusEnum.UPPER.name())) { + goodsIndexService.deleteIndexById(sku.getId()); + } } this.updateBatchById(newSkuList); } - - this.updateStock(newSkuList); generateEsCheck(goods); } @@ -428,18 +431,30 @@ public class GoodsSkuServiceImpl extends ServiceImpl i if (goods.getIsAuth().equals(GoodsAuthEnum.PASS.name()) && goods.getMarketEnable().equals(GoodsStatusEnum.UPPER.name())) { List goodsSkuList = this.list(new LambdaQueryWrapper().eq(GoodsSku::getGoodsId, goods.getId())); for (GoodsSku goodsSku : goodsSkuList) { - EsGoodsIndex byId = goodsIndexService.findById(goodsSku.getId()); + EsGoodsIndex esGoodsOld = goodsIndexService.findById(goodsSku.getId()); EsGoodsIndex goodsIndex = new EsGoodsIndex(goodsSku); - if (goodsSku.getQuantity() > 0 && byId == null) { + //如果商品库存不为0，并且es中有数据 + if (goodsSku.getQuantity() > 0 && esGoodsOld == null) { goodsIndexService.addIndex(goodsIndex); - } else if (goodsSku.getQuantity() > 0 && byId != null) { + } else if (goodsSku.getQuantity() > 0 && esGoodsOld != null) { goodsIndexService.updateIndex(goodsIndex); - } else if (goodsSku.getQuantity() <= 0 && byId != null) { + } else if (goodsSku.getQuantity() <= 0 && esGoodsOld != null) { goodsIndexService.deleteIndexById(goodsSku.getId()); } + //删除sku缓存 cache.remove(GoodsSkuService.getCacheKeys(goodsSku.getId())); } } + //如果商品状态值不支持es搜索，那么将商品信息做下架处理 + else { + List goodsSkuList = this.list(new LambdaQueryWrapper().eq(GoodsSku::getGoodsId, goods.getId())); + for (GoodsSku goodsSku : goodsSkuList) { + EsGoodsIndex esGoodsOld = goodsIndexService.findById(goodsSku.getId()); + if (esGoodsOld != null) { + goodsIndexService.deleteIndexById(goodsSku.getId()); + } + } + } } /** @@ -601,7 +616,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl i sku.setThumbnail(thumbnail); //规格信息 - sku.setId(Convert.toStr(map.get("id"),"").toString()); + sku.setId(Convert.toStr(map.get("id"), "").toString()); sku.setSn(Convert.toStr(map.get("sn"))); sku.setWeight(Convert.toDouble(map.get("weight"), 0D)); sku.setPrice(Convert.toDouble(map.get("price"), 0D)); From 5ab2865f0d4b542606ccb871a83576071a7e21e9 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 19 May 2021 16:35:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E7=89=A9?= =?UTF-8?q?=E6=B5=81=E8=A7=84=E5=88=99=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/common/enums/ResultCode.java | 2 +- .../order/cart/entity/dto/TradeDTO.java | 4 ++++ .../order/cart/render/TradeBuilder.java | 1 + .../cart/render/impl/SkuFreightRender.java | 14 ++++++++++++-- .../order/cart/service/CartServiceImpl.java | 19 +++++++++++++------ 5 files changed, 31 insertions(+), 9 deletions(-) diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java index f3f45311..0abac758 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -124,7 +124,7 @@ public enum ResultCode { * 购物车 */ CART_ERROR(30001, "读取结算页的购物车异常"), - + GOODS_NOT_SUPPORT(30002, "以下商品不支持当前收货地址："), SHIPPING_NOT_APPLY(30005, "当前选择地址暂不支持配送！"), /** * 订单 diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java index fb9ae4e9..2781aacd 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java @@ -53,6 +53,10 @@ public class TradeDTO implements Serializable { @ApiModelProperty(value = "是否需要发票") private Boolean needReceipt; + + @ApiModelProperty(value = "不支持配送方式") + private List notSupportFreight; + /** * 购物车类型 */ diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java b/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java index 7ce7a955..4373206c 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java @@ -81,6 +81,7 @@ public class TradeBuilder { */ public TradeDTO buildTrade(CartTypeEnum checkedWay) { TradeDTO tradeDTO = cartService.readDTO(checkedWay); + tradeDTO.setNotSupportFreight(null); List collect = tradeDTO.getSkuList().parallelStream().filter(i -> Boolean.TRUE.equals(i.getChecked())).collect(Collectors.toList()); //拼团类型订单预处理 if (checkedWay.equals(CartTypeEnum.PINTUAN)) { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java index 0893e303..0ef0a395 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java @@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -35,10 +36,11 @@ public class SkuFreightRender implements CartRenderStep { List cartSkuVOS = tradeDTO.getSkuList(); //会员收货地址问题处理 MemberAddress memberAddress = tradeDTO.getMemberAddress(); - if(memberAddress==null){ + if (memberAddress == null) { return; } //循环渲染购物车商品运费价格 + forSku: for (CartSkuVO cartSkuVO : cartSkuVOS) { String freightTemplateId = cartSkuVO.getGoodsSku().getFreightTemplateId(); //如果商品设置卖家承担运费，则跳出计算 @@ -62,12 +64,20 @@ public class SkuFreightRender implements CartRenderStep { //获取匹配的收货地址 for (FreightTemplateChild templateChild : freightTemplate.getFreightTemplateChildList()) { //如果当前模版包含，则返回 - if (templateChild.getAreaId().indexOf(addressId) > 0) { + if (templateChild.getAreaId().contains(addressId)) { freightTemplateChild = templateChild; break; } } + if (freightTemplateChild == null) { + if (tradeDTO.getNotSupportFreight() == null) { + tradeDTO.setNotSupportFreight(new ArrayList<>()); + } + tradeDTO.getNotSupportFreight().add(cartSkuVO); + continue forSku; + } + FreightTemplateChildDTO freightTemplateChildDTO = new FreightTemplateChildDTO(freightTemplateChild); freightTemplateChildDTO.setPricingMethod(freightTemplate.getPricingMethod()); diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java index 5659b911..7d05f2e6 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java @@ -388,7 +388,6 @@ public class CartServiceImpl implements CartService { TradeDTO tradeDTO = this.readDTO(cartTypeEnum); MemberAddress memberAddress = memberAddressService.getById(shippingAddressId); - this.checkAddressScope(tradeDTO.getSkuList(), memberAddress); tradeDTO.setMemberAddress(memberAddress); this.resetTradeDTO(tradeDTO); } @@ -487,9 +486,11 @@ public class CartServiceImpl implements CartService { tradeDTO.setStoreRemark(tradeParams.getRemark()); //过滤勾选商品 List collect = tradeDTO.getSkuList().parallelStream().filter(i -> Boolean.TRUE.equals(i.getChecked())).collect(Collectors.toList()); + //校验收获地址 MemberAddress memberAddress = tradeDTO.getMemberAddress(); this.checkAddressScope(collect, memberAddress); this.resetTradeDTO(tradeDTO); + //构建交易 Trade trade = tradeBuilder.createTrade(cartTypeEnum, tradeParams.getParentOrderSn()); this.cleanChecked(tradeDTO); return trade; @@ -514,15 +515,21 @@ public class CartServiceImpl implements CartService { } String freightTemplateId = cartSkuVO.getGoodsSku().getFreightTemplateId(); FreightTemplateVO freightTemplate = freightTemplateService.getFreightTemplate(freightTemplateId); - String[] addressId = memberAddress.getConsigneeAddressIdPath().split(","); //收货地址判定 + forTemplates: if (freightTemplate != null && freightTemplate.getFreightTemplateChildList() != null && !freightTemplate.getFreightTemplateChildList().isEmpty()) { - FreightTemplateChild freightTemplateChild = freightTemplate.getFreightTemplateChildList().get(0); - // 检查当前配送地址的城市id是否存在与配送模版的城市id里面 - if (!freightTemplateChild.getAreaId().contains(addressId[1])) { - throw new ServiceException("当前选择地址暂不支持配送！"); + //获取市级别id + String addressId = memberAddress.getConsigneeAddressIdPath().split(",")[1]; + //获取匹配的收货地址 + for (FreightTemplateChild templateChild : freightTemplate.getFreightTemplateChildList()) { + //如果当前模版包含，则返回 + if (templateChild.getAreaId().contains(addressId)) { + break forTemplates; + } } + throw new ServiceException(ResultCode.GOODS_NOT_SUPPORT, cartSkuVO.getGoodsSku().getGoodsName()); + } } } From 64c095f20e568ebbc4c62189d4c8eb3fc2ec7972 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Wed, 19 May 2021 19:11:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionBuyerController.java | 3 +- .../DistributionCashBuyerController.java | 2 +- .../DistributionGoodsBuyerController.java | 2 +- .../DistributionOrderBuyerController.java | 3 +- .../distribution/entity/dos/Distribution.java | 3 + .../mapper/DistributionMapper.java | 5 +- .../service/DistributionOrderService.java | 1 + .../service/DistributionService.java | 7 ++- .../DistributionOrderServiceImpl.java | 57 +++++++++++++++++-- .../serviceimpl/DistributionServiceImpl.java | 13 +++-- .../DistributionCashManagerController.java | 2 +- .../DistributionGoodsManagerController.java | 3 +- .../DistributionManagerController.java | 2 +- .../DistributionOrderManagerController.java | 3 +- .../DistributionGoodsStoreController.java | 3 +- .../DistributionOrderStoreController.java | 3 +- 16 files changed, 82 insertions(+), 30 deletions(-) rename buyer-api/src/main/java/cn/lili/controller/{ => other}/distribution/DistributionBuyerController.java (97%) rename buyer-api/src/main/java/cn/lili/controller/{ => other}/distribution/DistributionCashBuyerController.java (97%) rename buyer-api/src/main/java/cn/lili/controller/{ => other}/distribution/DistributionGoodsBuyerController.java (98%) rename buyer-api/src/main/java/cn/lili/controller/{ => other}/distribution/DistributionOrderBuyerController.java (95%) rename manager-api/src/main/java/cn/lili/controller/{ => other}/distribution/DistributionCashManagerController.java (97%) rename manager-api/src/main/java/cn/lili/controller/{ => other}/distribution/DistributionGoodsManagerController.java (95%) rename manager-api/src/main/java/cn/lili/controller/{ => other}/distribution/DistributionManagerController.java (98%) rename manager-api/src/main/java/cn/lili/controller/{ => other}/distribution/DistributionOrderManagerController.java (95%) rename seller-api/src/main/java/cn/lili/controller/{ => other}/distribution/DistributionGoodsStoreController.java (97%) rename seller-api/src/main/java/cn/lili/controller/{ => other}/distribution/DistributionOrderStoreController.java (95%) diff --git a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java similarity index 97% rename from buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java index 82cac667..4cc17ed8 100644 --- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.distribution; +package cn.lili.controller.other.distribution; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.ResultUtil; @@ -13,7 +13,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java similarity index 97% rename from buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java index 3801d30b..4333b430 100644 --- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.distribution; +package cn.lili.controller.other.distribution; import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; diff --git a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java similarity index 98% rename from buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java index 76338351..ac671a4d 100644 --- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.distribution; +package cn.lili.controller.other.distribution; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; diff --git a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java similarity index 95% rename from buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java rename to buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java index f313316a..5e7599ef 100644 --- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionOrderBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java @@ -1,4 +1,4 @@ -package cn.lili.controller.distribution; +package cn.lili.controller.other.distribution; import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.ResultMessage; @@ -9,7 +9,6 @@ import cn.lili.modules.distribution.service.DistributionService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java index a5a24a3d..ce31ee33 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java @@ -33,6 +33,7 @@ public class Distribution extends BaseEntity { this.memberName = memberName; this.name = name; this.idNumber = idNumber; + distributionOrderCount=0; this.distributionStatus = DistributionStatusEnum.APPLY.name(); } @@ -57,6 +58,8 @@ public class Distribution extends BaseEntity { @ApiModelProperty(value = "冻结金额") private Double commissionFrozen = 0D; + @ApiModelProperty(value = "分销订单数") + private Integer distributionOrderCount; /** * @see DistributionStatusEnum diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java index 91617051..4a43c512 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java +++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java @@ -14,5 +14,8 @@ import org.apache.ibatis.annotations.Update; public interface DistributionMapper extends BaseMapper { @Update("UPDATE li_distribution set can_rebate = can_rebate+#{canRebate} WHERE id = #{distributionId}") - void updateCanRebate(Double canRebate,String distributionId); + void subCanRebate(Double canRebate,String distributionId); + + @Update("UPDATE li_distribution set can_rebate = (can_rebate+#{canRebate}) AND rebate_total=(rebate_total+#{canRebate}) AND distribution_order_count=(distribution_order_count+1) WHERE id = #{distributionId}") + void addCanRebate(Double canRebate,String distributionId); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java index 894773a6..100bc191 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java +++ b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java @@ -28,6 +28,7 @@ public interface DistributionOrderService extends IService { * @param orderSn 订单编号 */ void payOrder(String orderSn); + void test(String orderSn); /** * 取消订单 diff --git a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionService.java b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionService.java index a43c1b77..536617ae 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionService.java +++ b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionService.java @@ -80,6 +80,11 @@ public interface DistributionService extends IService { * @param canRebate 修改金额 * @param distributionId 分销员ID */ - void updateCanRebate(Double canRebate,String distributionId); + void subCanRebate(Double canRebate,String distributionId); + /** + * 添加分销金额 + * @param rebate + */ + void addRebate(Double rebate,String distributionId); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java index e60aedac..21c2ba1e 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java @@ -24,7 +24,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -69,15 +68,17 @@ public class DistributionOrderServiceImpl extends ServiceImpl storeFlowList = storeFlowService.list(new LambdaQueryWrapper() .eq(StoreFlow::getOrderSn, orderSn) .isNotNull(StoreFlow::getDistributionRebate)); + Double rebate=0.0; + //循环店铺流水记录判断是否包含分销商品 + //包含分销商品则进行记录分销订单、计算分销总额 for (StoreFlow storeFlow : storeFlowList) { + rebate=CurrencyUtil.add(rebate,storeFlow.getDistributionRebate()); DistributionOrder distributionOrder = new DistributionOrder(storeFlow); distributionOrder.setDistributionId(order.getDistributionId()); - //分销员信息 Distribution distribution = distributionService.getById(order.getDistributionId()); distributionOrder.setDistributionName(distribution.getMemberName()); @@ -86,12 +87,56 @@ public class DistributionOrderServiceImpl extends ServiceImpl storeFlowList = storeFlowService.list(new LambdaQueryWrapper() + .eq(StoreFlow::getOrderSn, orderSn) + .isNotNull(StoreFlow::getDistributionRebate)); + Double rebate=0.0; + //循环店铺流水记录判断是否包含分销商品 + //包含分销商品则进行记录分销订单、计算分销总额 + for (StoreFlow storeFlow : storeFlowList) { + rebate=CurrencyUtil.add(rebate,storeFlow.getDistributionRebate()); + DistributionOrder distributionOrder = new DistributionOrder(storeFlow); + distributionOrder.setDistributionId(order.getDistributionId()); + //分销员信息 + Distribution distribution = distributionService.getById(order.getDistributionId()); + distributionOrder.setDistributionName(distribution.getMemberName()); + + //设置结算天数(解冻日期) + Setting setting = settingService.get(SettingEnum.DISTRIBUTION_SETTING.name()); + DistributionSetting distributionSetting = JSONUtil.toBean(setting.getSettingValue(), DistributionSetting.class); + DateTime dateTime = new DateTime(); + //默认提现周期一天 + dateTime.offsetNew(DateField.DAY_OF_MONTH,1); + //dateTime.offsetNew(DateField.DAY_OF_MONTH,distributionSetting.getCashDay()); + distributionOrder.setSettleCycle(dateTime); + this.save(distributionOrder); + } + //如果包含分销商品则记录会员的分销总额 + if(rebate!=0.0){ + distributionService.addRebate(rebate,order.getDistributionId()); + } + } + } @Override @@ -126,7 +171,7 @@ public class DistributionOrderServiceImpl extends ServiceImpl