code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Bulbasaur

Browse Source
This commit is contained in:
lifenlong
2021-05-18 17:35:48 +08:00
parent 0c3a1928ff 3925422b3e
commit 0173ba814e
87 changed files with 616 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
View File

@@ -1,6 +1,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.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.CategoryParameterGroup;
@@ -12,7 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -49,7 +49,7 @@ public class CategoryParameterGroupStoreController {
if (categoryParameterGroupService.save(categoryParameterGroup)) {
return ResultUtil.data(categoryParameterGroup);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@ApiOperation(value = "通过id删除参数组")

8
seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java
View File

@@ -1,6 +1,7 @@
package cn.lili.controller.goods;
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;
@@ -13,7 +14,6 @@ import cn.lili.modules.goods.service.DraftGoodsService;
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.*;
@@ -44,7 +44,7 @@ public class DraftGoodsStoreController {
public ResultMessage<DraftGoodsVO> getDraftGoods(@PathVariable String id) {
DraftGoodsVO draftGoods = draftGoodsService.getDraftGoods(id);
if (!UserContext.getCurrentUser().getStoreId().equals(draftGoods.getStoreId())) {
return ResultUtil.error(ResultCode.USER_AUTHORITY_ERROR);
throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
}
return ResultUtil.data(draftGoods);
}
@@ -56,7 +56,7 @@ public class DraftGoodsStoreController {
AuthUser currentUser = UserContext.getCurrentUser();
draftGoodsVO.setStoreId(currentUser.getStoreId());
} else if (draftGoodsVO.getStoreId() != null && !UserContext.getCurrentUser().getStoreId().equals(draftGoodsVO.getStoreId())) {
return ResultUtil.error(ResultCode.USER_AUTHORITY_ERROR);
throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
}
draftGoodsService.saveGoodsDraft(draftGoodsVO);
return ResultUtil.success(ResultCode.SUCCESS);
@@ -67,7 +67,7 @@ public class DraftGoodsStoreController {
public ResultMessage<String> deleteDraftGoods(@PathVariable String id) {
DraftGoods draftGoods = draftGoodsService.getById(id);
if (!draftGoods.getStoreId().equals(UserContext.getCurrentUser().getStoreId())) {
return ResultUtil.error(ResultCode.USER_AUTHORITY_ERROR);
throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
}
draftGoodsService.deleteGoodsDraft(id);
return ResultUtil.success(ResultCode.SUCCESS);

5
seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java
View File

@@ -1,6 +1,7 @@
package cn.lili.controller.goods;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
@@ -61,7 +62,7 @@ public class GoodsGalleryController {
if (goodsGalleryService.save(goodsGallery)) {
return ResultUtil.data(goodsGallery);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@ApiOperation(value = "修改商品相册")
@@ -71,7 +72,7 @@ public class GoodsGalleryController {
if (goodsGalleryService.updateById(goodsGallery)) {
return ResultUtil.data(goodsGallery);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@ApiOperation(value = "批量删除")

12
seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
View File

@@ -1,6 +1,7 @@
package cn.lili.controller.goods;
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;
@@ -22,7 +23,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.*;
@@ -92,7 +92,7 @@ public class GoodsStoreController {
if (tokenUser.getStoreId().equals(goods.getStoreId())) {
return ResultUtil.data(goods);
}
return ResultUtil.error(ResultCode.USER_AUTHORITY_ERROR);
throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
}
@ApiOperation(value = "新增商品")
@@ -118,7 +118,7 @@ public class GoodsStoreController {
if (goodsService.updateGoodsMarketAble(goodsId, GoodsStatusEnum.DOWN, "商家下架")) {
return ResultUtil.success(ResultCode.SUCCESS);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@ApiOperation(value = "上架商品", notes = "上架商品时使用")
@@ -128,7 +128,7 @@ public class GoodsStoreController {
if (goodsService.updateGoodsMarketAble(goodsId, GoodsStatusEnum.UPPER, "")) {
return ResultUtil.success(ResultCode.SUCCESS);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@ApiOperation(value = "删除商品")
@@ -138,7 +138,7 @@ public class GoodsStoreController {
if (goodsService.deleteGoods(goodsId)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@ApiOperation(value = "设置商品运费模板")
@@ -152,7 +152,7 @@ public class GoodsStoreController {
if (goodsService.freight(goodsId, freightPayer, templateId)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@ApiOperation(value = "根据goodsId分页获取商品规格列表")

4
seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java
View File

@@ -2,6 +2,7 @@ package cn.lili.controller.goods;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
@@ -14,7 +15,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.*;
@@ -52,7 +52,7 @@ public class SpecificationStoreController {
if (specificationService.addSpecification(parameters) != null) {
return ResultUtil.data(parameters);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@DeleteMapping(value = "/{ids}")

3
seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java
View File

@@ -1,6 +1,7 @@
package cn.lili.controller.member;
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;
@@ -38,7 +39,7 @@ public class StoreUserController {
member.setPassword(null);
return ResultUtil.data(member);
}
return ResultUtil.error(ResultCode.USER_NOT_LOGIN);
throw new ServiceException(ResultCode.USER_NOT_LOGIN);
}

8
seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java
View File

@@ -51,7 +51,7 @@ public class CouponStoreController {
AuthUser currentUser = UserContext.getCurrentUser();
Coupon coupon = couponService.getCouponDetailFromMongo(couponId);
if (coupon == null || !coupon.getStoreId().equals(currentUser.getStoreId())) {
return ResultUtil.error(ResultCode.USER_AUTHORITY_ERROR);
throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
}
return ResultUtil.data(coupon);
}
@@ -65,7 +65,7 @@ public class CouponStoreController {
if (couponService.add(couponVO) != null) {
return ResultUtil.data(couponVO);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@PutMapping(consumes = "application/json", produces = "application/json")
@@ -84,7 +84,7 @@ public class CouponStoreController {
return ResultUtil.data(coupon);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@DeleteMapping(value = "/{ids}")
@@ -108,6 +108,6 @@ public class CouponStoreController {
if (couponService.updateCouponStatus(Arrays.asList(split), PromotionStatusEnum.valueOf(promotionStatus))) {
return ResultUtil.success(ResultCode.COUPON_EDIT_STATUS_SUCCESS);
}
return ResultUtil.error(ResultCode.COUPON_EDIT_STATUS_ERROR);
throw new ServiceException(ResultCode.COUPON_EDIT_STATUS_ERROR);
}
}

11
seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java
View File

@@ -1,6 +1,7 @@
package cn.lili.controller.promotion;
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;
@@ -72,7 +73,7 @@ public class PintuanStoreController {
if (pintuanService.addPintuan(pintuan)) {
return ResultUtil.success(ResultCode.PINTUAN_ADD_SUCCESS);
}
return ResultUtil.error(ResultCode.PINTUAN_ADD_ERROR);
throw new ServiceException(ResultCode.PINTUAN_ADD_ERROR);
}
@PutMapping(consumes = "application/json", produces = "application/json")
@@ -84,7 +85,7 @@ public class PintuanStoreController {
if (pintuanService.modifyPintuan(pintuan)) {
return ResultUtil.success(ResultCode.PINTUAN_EDIT_SUCCESS);
}
return ResultUtil.error(ResultCode.PINTUAN_EDIT_ERROR);
throw new ServiceException(ResultCode.PINTUAN_EDIT_ERROR);
}
@PutMapping("/open/{pintuanId}")
@@ -93,7 +94,7 @@ public class PintuanStoreController {
if (pintuanService.openPintuan(pintuanId, new Date(startTime), new Date(endTime))) {
return ResultUtil.success(ResultCode.PINTUAN_MANUAL_OPEN_SUCCESS);
}
return ResultUtil.error(ResultCode.PINTUAN_MANUAL_OPEN_ERROR);
throw new ServiceException(ResultCode.PINTUAN_MANUAL_OPEN_ERROR);
}
@@ -103,7 +104,7 @@ public class PintuanStoreController {
if (pintuanService.closePintuan(pintuanId)) {
return ResultUtil.success(ResultCode.PINTUAN_MANUAL_CLOSE_SUCCESS);
}
return ResultUtil.error(ResultCode.PINTUAN_MANUAL_CLOSE_ERROR);
throw new ServiceException(ResultCode.PINTUAN_MANUAL_CLOSE_ERROR);
}
@DeleteMapping("/{pintuanId}")
@@ -112,7 +113,7 @@ public class PintuanStoreController {
if (pintuanService.deletePintuan(pintuanId)) {
return ResultUtil.success(ResultCode.PINTUAN_DELETE_SUCCESS);
}
return ResultUtil.error(ResultCode.PINTUAN_DELETE_ERROR);
throw new ServiceException(ResultCode.PINTUAN_DELETE_ERROR);
}
}

4
seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java
View File

@@ -1,6 +1,7 @@
package cn.lili.controller.settings;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.ResultMessage;
@@ -9,7 +10,6 @@ import cn.lili.modules.store.service.FreightTemplateService;
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.*;
@@ -61,6 +61,6 @@ public class FreightTemplateStoreController {
if (freightTemplateService.removeFreightTemplate(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
}

7
seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java
View File

@@ -2,6 +2,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.vo.ResultMessage;
import cn.lili.modules.store.entity.dos.StoreDetail;
@@ -57,7 +58,7 @@ public class StoreSettingsController {
if (storeDetailService.editStoreSetting(storeSettingDTO)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@ApiOperation(value = "修改店铺库存预警数量")
@@ -68,7 +69,7 @@ public class StoreSettingsController {
if (storeDetailService.updateStockWarning(stockWarning)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@ApiOperation(value = "获取商家退货收件地址")
@@ -85,6 +86,6 @@ public class StoreSettingsController {
if (storeDetailService.editStoreAfterSaleAddressDTO(storeAfterSaleAddressDTO)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
}

4
seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java
View File

@@ -1,6 +1,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.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@@ -14,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.*;
@@ -71,6 +71,6 @@ public class BillStoreController {
if (billService.check(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
}

4
seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java
View File

@@ -1,6 +1,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.vo.ResultMessage;
import cn.lili.modules.member.entity.dto.StoreEvaluationQueryParams;
@@ -12,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.*;
@@ -55,6 +55,6 @@ public class MemberEvaluationStoreController {
if (memberEvaluationService.reply(id, reply, replyImage)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
}

10
seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java
View File

@@ -1,6 +1,7 @@
package cn.lili.controller.trade;
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;
@@ -16,7 +17,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.*;
@@ -69,7 +69,7 @@ public class OrderComplaintStoreController {
if (orderComplaintCommunicationService.addCommunication(communicationVO)) {
return ResultUtil.data(communicationVO);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@ApiOperation(value = "修改申诉信息")
@@ -79,7 +79,7 @@ public class OrderComplaintStoreController {
if (orderComplaintService.updateOrderComplain(orderComplainVO)) {
return ResultUtil.data(orderComplainVO);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@@ -90,7 +90,7 @@ public class OrderComplaintStoreController {
if (orderComplaintService.appeal(storeAppealVO)) {
return ResultUtil.data(orderComplaintService.getOrderComplainById(storeAppealVO.getOrderComplaintId()));
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
@ApiOperation(value = "修改状态")
@@ -99,7 +99,7 @@ public class OrderComplaintStoreController {
if (orderComplaintService.updateOrderComplainByStatus(orderComplainVO) != null) {
return ResultUtil.success(ResultCode.SUCCESS);
}
return ResultUtil.error(ResultCode.ERROR);
throw new ServiceException(ResultCode.ERROR);
}
}