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

merge master

Browse Source
This commit is contained in:
lifenlong
2021-05-19 19:29:51 +08:00
parent 48f24b675b 120189ef99
commit 250fffab77
205 changed files with 899 additions and 1251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<CategoryParameterGroup> 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<Parameters>().eq("group_id", id));
//删除参数组
categoryParameterGroupService.removeById(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

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

@@ -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();
}
}

2
seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java
View File

@@ -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;

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

@@ -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();
}
}

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

@@ -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<GoodsGallery> 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<GoodsGallery> 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<Object> delAllByIds(@PathVariable List ids) {
goodsGalleryService.removeByIds(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

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

@@ -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<StoreGoodsLabel> delete(@PathVariable String id) {
storeGoodsLabelService.removeStoreGoodsLabel(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

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

@@ -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<GoodsOperationDTO> 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<GoodsOperationDTO> 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<Object> underGoods(@RequestParam List<String> 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<Object> unpGoods(@RequestParam List<String> 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<Object> deleteGoods(@RequestParam List<String> 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<Object> freight(@RequestParam List<String> 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<Object> updateStocks(@RequestBody List<GoodsSkuStockDTO> updateStockList) {
goodsSkuService.updateStocks(updateStockList);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

3
seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java
View File

@@ -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;

2
seller-api/src/main/java/cn/lili/controller/goods/SpecValuesStoreController.java
View File

@@ -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;

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

@@ -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<Object> delAllByIds(@PathVariable List<String> ids) {
specificationService.deleteSpecification(ids);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

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

@@ -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;

2
seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.other.article;
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;

7
seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java → seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.distribution;
package cn.lili.controller.other.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<DistributionSelectedGoods>().eq("distribution_goods_id", id));
//清除分销商品
distributionGoodsService.removeById(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

5
seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java → seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.distribution;
package cn.lili.controller.other.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;

2
seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java
View File

@@ -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;

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

@@ -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 = "修改优惠券状态")

3
seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java
View File

@@ -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.*;

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

@@ -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;

7
seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java
View File

@@ -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<String> addSeckillApply(@PathVariable String seckillId, @RequestBody List<SeckillApplyVO> 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<String> 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();
}

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

@@ -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<Object> edit(@PathVariable String id) {
if (freightTemplateService.removeFreightTemplate(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
freightTemplateService.removeFreightTemplate(id);
return ResultUtil.success();
}
}

3
seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java
View File

@@ -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;

6
seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java
View File

@@ -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<Object> cancel(@PathVariable String id) {
storeLogisticsService.removeById(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

6
seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java
View File

@@ -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<Object> delByIds(@PathVariable String id) {
storeAddressService.removeStoreAddress(id);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}

3
seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java
View File

@@ -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.*;

3
seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java
View File

@@ -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.*;

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

@@ -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<StoreDetail> 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<StoreDetail> 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<StoreDetail> editStoreAfterSaleAddress(@Valid StoreAfterSaleAddressDTO storeAfterSaleAddressDTO) {
//修改商家退货收件地址
if (storeDetailService.editStoreAfterSaleAddressDTO(storeAfterSaleAddressDTO)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
storeDetailService.editStoreAfterSaleAddressDTO(storeAfterSaleAddressDTO);
return ResultUtil.success();
}
}

3
seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java
View File

@@ -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;

3
seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java
View File

@@ -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;

3
seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java
View File

@@ -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;

2
seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java
View File

@@ -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;

2
seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java
View File

@@ -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;

3
seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java
View File

@@ -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.*;

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

@@ -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<Object> examine(@PathVariable String id) {
if (billService.check(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
billService.check(id);
return ResultUtil.success();
}
}

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

@@ -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<MemberEvaluationVO> 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();
}
}

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

@@ -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<OrderComplaintCommunicationVO> 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<OrderComplaintVO> 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<OrderComplaintVO> 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<Object> updateStatus(OrderComplaintOperationParams orderComplainVO) {
if (orderComplaintService.updateOrderComplainByStatus(orderComplainVO) != null) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
orderComplaintService.updateOrderComplainByStatus(orderComplainVO);
return ResultUtil.success();
}
}

3
seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java
View File

@@ -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;

3
seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java
View File

@@ -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.*;

2
seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java
View File

@@ -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;