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

'合并master'

Browse Source
This commit is contained in:
fengtianyangyang
2022-01-11 14:50:06 +08:00
parent 60b4ab5c5b bbed7afdcb
commit 87f637099c
519 changed files with 8935 additions and 8472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package cn.lili.controller.other.distribution;
package cn.lili.controller.distribution;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.distribution.entity.dos.DistributionGoods;
@@ -9,7 +10,6 @@ import cn.lili.modules.distribution.entity.dto.DistributionGoodsSearchParams;
import cn.lili.modules.distribution.entity.vos.DistributionGoodsVO;
import cn.lili.modules.distribution.service.DistributionGoodsService;
import cn.lili.modules.distribution.service.DistributionSelectedGoodsService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;

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

@@ -1,4 +1,4 @@
package cn.lili.controller.other.distribution;
package cn.lili.controller.distribution;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;

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

@@ -2,7 +2,6 @@ package cn.lili.controller.goods;
import cn.lili.modules.goods.entity.vos.ParameterGroupVO;
import cn.lili.modules.goods.service.CategoryParameterGroupService;
import cn.lili.modules.goods.service.ParametersService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;

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

@@ -3,6 +3,7 @@ package cn.lili.controller.goods;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.DraftGoods;
@@ -10,7 +11,6 @@ import cn.lili.modules.goods.entity.dto.DraftGoodsDTO;
import cn.lili.modules.goods.entity.dto.DraftGoodsSearchParams;
import cn.lili.modules.goods.entity.vos.DraftGoodsVO;
import cn.lili.modules.goods.service.DraftGoodsService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

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

@@ -1,12 +1,12 @@
package cn.lili.controller.goods;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.StoreGoodsLabel;
import cn.lili.modules.goods.entity.vos.StoreGoodsLabelVO;
import cn.lili.modules.goods.service.StoreGoodsLabelService;
import cn.lili.common.security.OperationalJudgment;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;

4
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.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.Goods;
@@ -16,7 +17,6 @@ import cn.lili.modules.goods.service.GoodsService;
import cn.lili.modules.goods.service.GoodsSkuService;
import cn.lili.modules.store.entity.dos.StoreDetail;
import cn.lili.modules.store.service.StoreDetailService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
@@ -84,7 +84,7 @@ public class GoodsStoreController {
StoreDetail storeDetail = OperationalJudgment.judgment(storeDetailService.getStoreDetail(storeId));
Integer stockWarnNum = storeDetail.getStockWarning();
goodsSearchParams.setStoreId(storeId);
goodsSearchParams.setQuantity(stockWarnNum);
goodsSearchParams.setLeQuantity(stockWarnNum);
goodsSearchParams.setMarketEnable(GoodsStatusEnum.UPPER.name());
IPage<GoodsSku> goodsSku = goodsSkuService.getGoodsSkuByPage(goodsSearchParams);
StockWarningVO stockWarning = new StockWarningVO(stockWarnNum, goodsSku);

16
seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java → seller-api/src/main/java/cn/lili/controller/member/BillStoreController.java
View File

@@ -1,16 +1,17 @@
package cn.lili.controller.trade;
package cn.lili.controller.member;
import cn.lili.common.context.ThreadContextHolder;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
import cn.lili.modules.order.order.service.StoreFlowService;
import cn.lili.modules.store.entity.dos.Bill;
import cn.lili.modules.store.entity.dto.BillSearchParams;
import cn.lili.modules.store.entity.vos.BillListVO;
import cn.lili.modules.store.service.BillService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -36,6 +37,9 @@ public class BillStoreController {
@Autowired
private BillService billService;
@Autowired
private StoreFlowService storeFlowService;
@ApiOperation(value = "获取结算单分页")
@GetMapping(value = "/getByPage")
public ResultMessage<IPage<BillListVO>> getByPage(BillSearchParams billSearchParams) {
@@ -59,7 +63,7 @@ public class BillStoreController {
@GetMapping(value = "/{id}/getStoreFlow")
public ResultMessage<IPage<StoreFlow>> getStoreFlow(@PathVariable String id, String flowType, PageVO pageVO) {
OperationalJudgment.judgment(billService.getById(id));
return ResultUtil.data(billService.getStoreFlow(id, flowType, pageVO));
return ResultUtil.data(storeFlowService.getStoreFlow(id, flowType, pageVO));
}
@ApiOperation(value = "获取商家分销订单流水分页")
@@ -69,7 +73,7 @@ public class BillStoreController {
@GetMapping(value = "/{id}/getDistributionFlow")
public ResultMessage<IPage<StoreFlow>> getDistributionFlow(@PathVariable String id, PageVO pageVO) {
OperationalJudgment.judgment(billService.getById(id));
return ResultUtil.data(billService.getDistributionFlow(id, pageVO));
return ResultUtil.data(storeFlowService.getDistributionFlow(id, pageVO));
}
@ApiOperation(value = "核对结算单")
@@ -81,13 +85,13 @@ public class BillStoreController {
return ResultUtil.success();
}
@ApiOperation(value = "下载结算单",produces="application/octet-stream")
@ApiOperation(value = "下载结算单", produces = "application/octet-stream")
@ApiImplicitParam(name = "id", value = "结算单ID", required = true, paramType = "path", dataType = "String")
@GetMapping(value = "/downLoad/{id}")
public void downLoadDeliverExcel(@PathVariable String id) {
OperationalJudgment.judgment(billService.getById(id));
HttpServletResponse response = ThreadContextHolder.getHttpResponse();
billService.download(response,id);
billService.download(response, id);
}

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

@@ -1,13 +1,13 @@
package cn.lili.controller.trade;
package cn.lili.controller.member;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dto.EvaluationQueryParams;
import cn.lili.modules.member.entity.vo.MemberEvaluationListVO;
import cn.lili.modules.member.entity.vo.MemberEvaluationVO;
import cn.lili.modules.member.service.MemberEvaluationService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

4
seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java → seller-api/src/main/java/cn/lili/controller/message/StoreMessageController.java
View File

@@ -1,7 +1,8 @@
package cn.lili.controller.settings;
package cn.lili.controller.message;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@@ -9,7 +10,6 @@ import cn.lili.modules.message.entity.dos.StoreMessage;
import cn.lili.modules.message.entity.enums.MessageStatusEnum;
import cn.lili.modules.message.entity.vos.StoreMessageQueryVO;
import cn.lili.modules.message.service.StoreMessageService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

12
seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java → seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java
View File

@@ -1,15 +1,15 @@
package cn.lili.controller.trade;
package cn.lili.controller.order;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.entity.dos.AfterSale;
import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams;
import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
import cn.lili.modules.order.order.service.AfterSaleService;
import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams;
import cn.lili.modules.order.aftersale.entity.vo.AfterSaleVO;
import cn.lili.modules.order.aftersale.service.AfterSaleService;
import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
import cn.lili.modules.system.entity.vo.Traces;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

4
seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java → seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java
View File

@@ -1,7 +1,8 @@
package cn.lili.controller.trade;
package cn.lili.controller.order;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@@ -10,7 +11,6 @@ import cn.lili.modules.order.order.entity.enums.CommunicationOwnerEnum;
import cn.lili.modules.order.order.entity.vo.*;
import cn.lili.modules.order.order.service.OrderComplaintCommunicationService;
import cn.lili.modules.order.order.service.OrderComplaintService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

4
seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java → seller-api/src/main/java/cn/lili/controller/order/OrderLogStoreController.java
View File

@@ -1,11 +1,11 @@
package cn.lili.controller.trade;
package cn.lili.controller.order;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.order.trade.entity.dos.OrderLog;
import cn.lili.modules.order.trade.service.OrderLogService;
import cn.lili.common.security.OperationalJudgment;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;

6
seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java → seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
View File

@@ -1,19 +1,19 @@
package cn.lili.controller.trade;
package cn.lili.controller.order;
import cn.lili.common.context.ThreadContextHolder;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.member.service.StoreLogisticsService;
import cn.lili.modules.order.order.entity.dto.OrderExportDTO;
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
import cn.lili.modules.order.order.service.OrderPriceService;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.system.service.StoreLogisticsService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

4
seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java → seller-api/src/main/java/cn/lili/controller/order/ReceiptStoreController.java
View File

@@ -1,6 +1,7 @@
package cn.lili.controller.trade;
package cn.lili.controller.order;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@@ -9,7 +10,6 @@ import cn.lili.modules.order.order.entity.dto.OrderReceiptDTO;
import cn.lili.modules.order.order.entity.dto.ReceiptSearchParams;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.order.order.service.ReceiptService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

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

@@ -4,9 +4,9 @@ package cn.lili.controller.other;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.service.StoreLogisticsService;
import cn.lili.modules.store.entity.dos.StoreLogistics;
import cn.lili.modules.system.entity.vo.StoreLogisticsVO;
import cn.lili.modules.system.service.StoreLogisticsService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

2
seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java
View File

@@ -3,13 +3,13 @@ package cn.lili.controller.other.broadcast;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.Studio;
import cn.lili.modules.goods.entity.vos.StudioVO;
import cn.lili.modules.goods.service.StudioService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

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

@@ -8,7 +8,7 @@ import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.service.MemberService;
import cn.lili.modules.verification.enums.VerificationEnums;
import cn.lili.modules.verification.entity.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

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

@@ -4,15 +4,14 @@ import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dos.Coupon;
import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
import cn.lili.modules.promotion.entity.vos.CouponSearchParams;
import cn.lili.modules.promotion.entity.dto.search.CouponSearchParams;
import cn.lili.modules.promotion.entity.vos.CouponVO;
import cn.lili.modules.promotion.service.CouponService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
@@ -45,14 +44,14 @@ public class CouponStoreController {
page.setNotConvert(true);
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
queryParam.setStoreId(storeId);
IPage<CouponVO> coupons = couponService.getCouponsByPageFromMongo(queryParam, page);
IPage<CouponVO> coupons = couponService.pageVOFindAll(queryParam, page);
return ResultUtil.data(coupons);
}
@ApiOperation(value = "获取优惠券详情")
@GetMapping("/{couponId}")
public ResultMessage<Coupon> getCouponList(@PathVariable String couponId) {
CouponVO coupon = OperationalJudgment.judgment(couponService.getCouponDetailFromMongo(couponId));
CouponVO coupon = OperationalJudgment.judgment(couponService.getDetail(couponId));
return ResultUtil.data(coupon);
}
@@ -62,20 +61,23 @@ public class CouponStoreController {
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
couponVO.setStoreId(currentUser.getStoreId());
couponVO.setStoreName(currentUser.getStoreName());
couponService.add(couponVO);
return ResultUtil.data(couponVO);
if (couponService.savePromotions(couponVO)) {
return ResultUtil.data(couponVO);
}
return ResultUtil.error(ResultCode.COUPON_SAVE_ERROR);
}
@PutMapping(consumes = "application/json", produces = "application/json")
@ApiOperation(value = "修改优惠券")
public ResultMessage<Coupon> updateCoupon(@RequestBody CouponVO couponVO) {
OperationalJudgment.judgment(couponService.getCouponDetailFromMongo(couponVO.getId()));
OperationalJudgment.judgment(couponService.getById(couponVO.getId()));
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
couponVO.setStoreId(currentUser.getStoreId());
couponVO.setStoreName(currentUser.getStoreName());
couponVO.setPromotionStatus(PromotionStatusEnum.NEW.name());
CouponVO coupon = couponService.updateCoupon(couponVO);
return ResultUtil.data(coupon);
if (couponService.updatePromotions(couponVO)) {
return ResultUtil.data(couponVO);
}
return ResultUtil.error(ResultCode.COUPON_SAVE_ERROR);
}
@DeleteMapping(value = "/{ids}")
@@ -87,19 +89,16 @@ public class CouponStoreController {
queryWrapper.eq(Coupon::getStoreId, storeId);
List<Coupon> list = couponService.list(queryWrapper);
List<String> filterIds = list.stream().map(Coupon::getId).collect(Collectors.toList());
for (String id : filterIds) {
couponService.deleteCoupon(id);
}
return ResultUtil.success();
return couponService.removePromotions(filterIds) ? ResultUtil.success() : ResultUtil.error(ResultCode.COUPON_DELETE_ERROR);
}
@ApiOperation(value = "修改优惠券状态")
@PutMapping("/status")
public ResultMessage<Object> updateCouponStatus(String couponIds, String promotionStatus) {
public ResultMessage<Object> updateCouponStatus(String couponIds, Long startTime, Long endTime) {
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
String[] split = couponIds.split(",");
List<String> couponIdList = couponService.list(new LambdaQueryWrapper<Coupon>().in(Coupon::getId, Arrays.asList(split)).eq(Coupon::getStoreId, currentUser.getStoreId())).stream().map(Coupon::getId).collect(Collectors.toList());
if (couponService.updateCouponStatus(couponIdList, PromotionStatusEnum.valueOf(promotionStatus))) {
if (couponService.updateStatus(couponIdList, startTime, endTime)) {
return ResultUtil.success(ResultCode.COUPON_EDIT_STATUS_SUCCESS);
}
throw new ServiceException(ResultCode.COUPON_EDIT_STATUS_ERROR);

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

@@ -3,15 +3,14 @@ package cn.lili.controller.promotion;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
import cn.lili.modules.promotion.entity.dos.FullDiscount;
import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams;
import cn.lili.modules.promotion.entity.dto.search.FullDiscountSearchParams;
import cn.lili.modules.promotion.service.FullDiscountService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -20,6 +19,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Collections;
import java.util.Objects;
/**
@@ -42,9 +42,10 @@ public class FullDiscountStoreController {
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
fullDiscountVO.setStoreId(currentUser.getStoreId());
fullDiscountVO.setStoreName(currentUser.getStoreName());
fullDiscountVO.setPromotionStatus(PromotionStatusEnum.NEW.name());
FullDiscount fullDiscount = fullDiscountService.addFullDiscount(fullDiscountVO);
return ResultUtil.data(fullDiscount);
if (!fullDiscountService.savePromotions(fullDiscountVO)) {
return ResultUtil.error(ResultCode.PINTUAN_ADD_ERROR);
}
return ResultUtil.data(fullDiscountVO);
}
@ApiOperation(value = "通过id获取")
@@ -56,10 +57,10 @@ public class FullDiscountStoreController {
@ApiOperation(value = "根据条件分页查询满优惠活动")
@GetMapping
public ResultMessage<IPage<FullDiscountVO>> getFullDiscountByPage(FullDiscountSearchParams searchParams, PageVO page) {
public ResultMessage<IPage<FullDiscount>> getFullDiscountByPage(FullDiscountSearchParams searchParams, PageVO page) {
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
searchParams.setStoreId(storeId);
IPage<FullDiscountVO> fullDiscountByPage = fullDiscountService.getFullDiscountByPageFromMongo(searchParams, page);
IPage<FullDiscount> fullDiscountByPage = fullDiscountService.pageFindAll(searchParams, page);
return ResultUtil.data(fullDiscountByPage);
}
@@ -70,15 +71,17 @@ public class FullDiscountStoreController {
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
fullDiscountVO.setStoreId(currentUser.getStoreId());
fullDiscountVO.setStoreName(currentUser.getStoreName());
fullDiscountService.modifyFullDiscount(fullDiscountVO);
if (!fullDiscountService.updatePromotions(fullDiscountVO)) {
return ResultUtil.error(ResultCode.PINTUAN_EDIT_ERROR);
}
return ResultUtil.success(ResultCode.FULL_DISCOUNT_EDIT_SUCCESS);
}
@ApiOperation(value = "删除满优惠活动")
@DeleteMapping("/{id}")
public ResultMessage<String> deleteFullDiscount(@PathVariable String id) {
OperationalJudgment.judgment(fullDiscountService.getFullDiscount(id));
fullDiscountService.deleteFullDiscount(id);
OperationalJudgment.judgment(fullDiscountService.getById(id));
fullDiscountService.removePromotions(Collections.singletonList(id));
return ResultUtil.success(ResultCode.FULL_DISCOUNT_EDIT_DELETE);
}
@@ -88,10 +91,10 @@ public class FullDiscountStoreController {
@ApiImplicitParam(name = "id", value = "满额活动ID", required = true, paramType = "path"),
@ApiImplicitParam(name = "promotionStatus", value = "满额活动状态", required = true, paramType = "path")
})
@PutMapping("/status/{id}/{promotionStatus}")
public ResultMessage<Object> updateCouponStatus(@PathVariable String id, @PathVariable String promotionStatus) {
@PutMapping("/status/{id}")
public ResultMessage<Object> updateCouponStatus(@PathVariable String id, Long startTime, Long endTime) {
OperationalJudgment.judgment(fullDiscountService.getFullDiscount(id));
if (fullDiscountService.updateFullDiscountStatus(id, PromotionStatusEnum.valueOf(promotionStatus))) {
if (fullDiscountService.updateStatus(Collections.singletonList(id), startTime, endTime)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
return ResultUtil.error(ResultCode.ERROR);

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

@@ -1,20 +1,22 @@
package cn.lili.controller.promotion;
import cn.hutool.core.util.ArrayUtil;
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
import cn.lili.modules.promotion.entity.vos.PintuanSearchParams;
import cn.lili.modules.promotion.entity.dos.Pintuan;
import cn.lili.modules.promotion.entity.dos.PromotionGoods;
import cn.lili.modules.promotion.entity.dto.search.PintuanSearchParams;
import cn.lili.modules.promotion.entity.dto.search.PromotionGoodsSearchParams;
import cn.lili.modules.promotion.entity.vos.PintuanVO;
import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams;
import cn.lili.modules.promotion.service.PintuanService;
import cn.lili.modules.promotion.service.PromotionGoodsService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,8 +24,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 店铺端,拼团管理接口
@@ -44,30 +48,28 @@ public class PintuanStoreController {
@GetMapping
@ApiOperation(value = "根据条件分页查询拼团活动列表")
public ResultMessage<IPage<PintuanVO>> getPintuanByPage(PintuanSearchParams queryParam, PageVO pageVo) {
public ResultMessage<IPage<Pintuan>> getPintuanByPage(PintuanSearchParams queryParam, PageVO pageVo) {
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
queryParam.setStoreId(currentUser.getStoreId());
IPage<PintuanVO> pintuanByPageFromMongo = pintuanService.getPintuanByPageFromMongo(queryParam, pageVo);
return ResultUtil.data(pintuanByPageFromMongo);
return ResultUtil.data(pintuanService.pageFindAll(queryParam, pageVo));
}
@GetMapping(value = "/{id}")
@ApiOperation(value = "通过id获取")
public ResultMessage<PintuanVO> get(@PathVariable String id) {
PintuanVO pintuan = OperationalJudgment.judgment(pintuanService.getPintuanByIdFromMongo(id));
PintuanVO pintuan = OperationalJudgment.judgment(pintuanService.getPintuanVO(id));
return ResultUtil.data(pintuan);
}
@GetMapping("/goods/{pintuanId}")
@ApiOperation(value = "根据条件分页查询拼团活动商品列表")
public ResultMessage<IPage<PromotionGoodsDTO>> getPintuanGoodsByPage(@PathVariable String pintuanId, PageVO pageVo) {
public ResultMessage<IPage<PromotionGoods>> getPintuanGoodsByPage(@PathVariable String pintuanId, PageVO pageVo) {
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
PromotionGoodsSearchParams searchParams = new PromotionGoodsSearchParams();
searchParams.setStoreId(currentUser.getStoreId());
searchParams.setPromotionId(pintuanId);
searchParams.setPromotionType(PromotionTypeEnum.PINTUAN.name());
IPage<PromotionGoodsDTO> promotionGoods = promotionGoodsService.getPromotionGoods(searchParams, pageVo);
return ResultUtil.data(promotionGoods);
return ResultUtil.data(promotionGoodsService.pageFindAll(searchParams, pageVo));
}
@PostMapping(consumes = "application/json", produces = "application/json")
@@ -76,7 +78,7 @@ public class PintuanStoreController {
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
pintuan.setStoreId(currentUser.getStoreId());
pintuan.setStoreName(currentUser.getStoreName());
if (pintuanService.addPintuan(pintuan)) {
if (pintuanService.savePromotions(pintuan)) {
return ResultUtil.success(ResultCode.PINTUAN_ADD_SUCCESS);
}
throw new ServiceException(ResultCode.PINTUAN_ADD_ERROR);
@@ -85,42 +87,38 @@ public class PintuanStoreController {
@PutMapping(consumes = "application/json", produces = "application/json")
@ApiOperation(value = "修改拼团活动")
public ResultMessage<String> editPintuan(@RequestBody @Validated PintuanVO pintuan) {
OperationalJudgment.judgment(pintuanService.getPintuanByIdFromMongo(pintuan.getId()));
OperationalJudgment.judgment(pintuanService.getById(pintuan.getId()));
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
pintuan.setStoreId(currentUser.getStoreId());
pintuan.setStoreName(currentUser.getStoreName());
if (pintuanService.modifyPintuan(pintuan)) {
if (pintuan.getPromotionGoodsList() != null && !pintuan.getPromotionGoodsList().isEmpty()) {
List<String> skuIds = pintuan.getPromotionGoodsList().stream().map(PromotionGoods::getSkuId).collect(Collectors.toList());
pintuan.setScopeId(ArrayUtil.join(skuIds.toArray(), ","));
} else {
pintuan.setScopeId(null);
}
if (pintuanService.updatePromotions(pintuan)) {
return ResultUtil.success(ResultCode.PINTUAN_EDIT_SUCCESS);
}
throw new ServiceException(ResultCode.PINTUAN_EDIT_ERROR);
}
@PutMapping("/open/{pintuanId}")
@ApiOperation(value = "手动开启拼团活动")
@PutMapping("/status/{pintuanId}")
@ApiOperation(value = "操作拼团活动状态")
public ResultMessage<String> openPintuan(@PathVariable String pintuanId, Long startTime, Long endTime) {
OperationalJudgment.judgment(pintuanService.getPintuanByIdFromMongo(pintuanId));
if (pintuanService.openPintuan(pintuanId, new Date(startTime), new Date(endTime))) {
OperationalJudgment.judgment(pintuanService.getById(pintuanId));
if (pintuanService.updateStatus(Collections.singletonList(pintuanId), startTime, endTime)) {
return ResultUtil.success(ResultCode.PINTUAN_MANUAL_OPEN_SUCCESS);
}
throw new ServiceException(ResultCode.PINTUAN_MANUAL_OPEN_ERROR);
}
@PutMapping("/close/{pintuanId}")
@ApiOperation(value = "手动关闭拼团活动")
public ResultMessage<String> closePintuan(@PathVariable String pintuanId) {
OperationalJudgment.judgment(pintuanService.getPintuanByIdFromMongo(pintuanId));
if (pintuanService.closePintuan(pintuanId)) {
return ResultUtil.success(ResultCode.PINTUAN_MANUAL_CLOSE_SUCCESS);
}
throw new ServiceException(ResultCode.PINTUAN_MANUAL_CLOSE_ERROR);
}
@DeleteMapping("/{pintuanId}")
@ApiOperation(value = "手动删除拼团活动")
public ResultMessage<String> deletePintuan(@PathVariable String pintuanId) {
OperationalJudgment.judgment(pintuanService.getPintuanByIdFromMongo(pintuanId));
if (pintuanService.deletePintuan(pintuanId)) {
OperationalJudgment.judgment(pintuanService.getById(pintuanId));
if (pintuanService.removePromotions(Collections.singletonList(pintuanId))) {
return ResultUtil.success(ResultCode.PINTUAN_DELETE_SUCCESS);
}
throw new ServiceException(ResultCode.PINTUAN_DELETE_ERROR);

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

@@ -1,17 +1,16 @@
package cn.lili.controller.promotion;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dos.Seckill;
import cn.lili.modules.promotion.entity.dos.SeckillApply;
import cn.lili.modules.promotion.entity.dto.search.SeckillSearchParams;
import cn.lili.modules.promotion.entity.vos.SeckillApplyVO;
import cn.lili.modules.promotion.entity.vos.SeckillSearchParams;
import cn.lili.modules.promotion.entity.vos.SeckillVO;
import cn.lili.modules.promotion.service.SeckillApplyService;
import cn.lili.modules.promotion.service.SeckillService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -38,8 +37,8 @@ public class SeckillStoreController {
@GetMapping
@ApiOperation(value = "获取秒杀活动列表")
public ResultMessage<IPage<SeckillVO>> getSeckillPage(SeckillSearchParams queryParam, PageVO pageVo) {
IPage<SeckillVO> seckillPage = seckillService.getSeckillByPageFromMongo(queryParam, pageVo);
public ResultMessage<IPage<Seckill>> getSeckillPage(SeckillSearchParams queryParam, PageVO pageVo) {
IPage<Seckill> seckillPage = seckillService.pageFindAll(queryParam, pageVo);
return ResultUtil.data(seckillPage);
}
@@ -48,14 +47,14 @@ public class SeckillStoreController {
public ResultMessage<IPage<SeckillApply>> getSeckillApplyPage(SeckillSearchParams queryParam, PageVO pageVo) {
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
queryParam.setStoreId(storeId);
IPage<SeckillApply> seckillPage = seckillApplyService.getSeckillApplyFromMongo(queryParam, pageVo);
IPage<SeckillApply> seckillPage = seckillApplyService.getSeckillApplyPage(queryParam, pageVo);
return ResultUtil.data(seckillPage);
}
@GetMapping("/{seckillId}")
@ApiOperation(value = "获取秒杀活动")
@ApiOperation(value = "获取秒杀活动信息")
public ResultMessage<Seckill> getSeckill(@PathVariable String seckillId) {
return ResultUtil.data(seckillService.getSeckillByIdFromMongo(seckillId));
return ResultUtil.data(seckillService.getById(seckillId));
}
@GetMapping("/apply/{seckillApplyId}")

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

@@ -1,11 +1,11 @@
package cn.lili.controller.settings;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.store.entity.vos.FreightTemplateVO;
import cn.lili.modules.store.service.FreightTemplateService;
import cn.lili.common.security.OperationalJudgment;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;

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

@@ -2,12 +2,12 @@ package cn.lili.controller.settings;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.store.entity.dos.StoreAddress;
import cn.lili.modules.store.service.StoreAddressService;
import cn.lili.common.security.OperationalJudgment;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

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

@@ -56,6 +56,14 @@ public class StoreSettingsController {
return ResultUtil.data(result);
}
@ApiOperation(value = "修改商家设置")
@PutMapping("/merchantEuid")
public ResultMessage<Object> edit(String merchantEuid) {
//修改UDESK设置
Boolean result = storeDetailService.editMerchantEuid(merchantEuid);
return ResultUtil.data(result);
}
@ApiOperation(value = "修改店铺库存预警数量")
@ApiImplicitParam(name = "stockWarning", value = "库存预警数量", required = true, dataType = "Integer", paramType = "query")
@PutMapping("/updateStockWarning")

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

@@ -5,7 +5,7 @@ import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.service.GoodsStatisticsDataService;
import cn.lili.modules.statistics.service.StoreFlowStatisticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,13 +31,13 @@ public class GoodsStatisticsStoreController {
* 商品统计
*/
@Autowired
private GoodsStatisticsDataService goodsStatisticsDataService;
private StoreFlowStatisticsService storeFlowStatisticsService;
@ApiOperation(value = "获取统计列表,排行前一百的数据")
@GetMapping
public ResultMessage<List<GoodsStatisticsDataVO>> getByPage(GoodsStatisticsQueryParam statisticsQueryParam) {
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
statisticsQueryParam.setStoreId(storeId);
return ResultUtil.data(goodsStatisticsDataService.getGoodsStatisticsData(statisticsQueryParam, 100));
return ResultUtil.data(storeFlowStatisticsService.getGoodsStatisticsData(statisticsQueryParam, 100));
}
}

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

@@ -6,8 +6,8 @@ import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.entity.vo.StoreIndexStatisticsVO;
import cn.lili.modules.statistics.service.GoodsStatisticsDataService;
import cn.lili.modules.statistics.service.IndexStatisticsService;
import cn.lili.modules.statistics.service.StoreFlowStatisticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +33,7 @@ public class IndexStatisticsStoreController {
* 热卖商品统计
*/
@Autowired
private GoodsStatisticsDataService goodsStatisticsDataService;
private StoreFlowStatisticsService storeFlowStatisticsService;
/**
* 首页统计
*/
@@ -45,7 +45,7 @@ public class IndexStatisticsStoreController {
public ResultMessage<List<GoodsStatisticsDataVO>> getByPage(GoodsStatisticsQueryParam statisticsQueryParam) {
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
statisticsQueryParam.setStoreId(storeId);
return ResultUtil.data(goodsStatisticsDataService.getGoodsStatisticsData(statisticsQueryParam, 100));
return ResultUtil.data(storeFlowStatisticsService.getGoodsStatisticsData(statisticsQueryParam, 100));
}
@ApiOperation(value = "获取首页查询数据")

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

@@ -4,14 +4,13 @@ import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.entity.dos.AfterSale;
import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
import cn.lili.modules.order.order.service.AfterSaleService;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.OrderOverviewVO;
import cn.lili.modules.statistics.entity.vo.OrderStatisticsDataVO;
import cn.lili.modules.statistics.service.OrderStatisticsDataService;
import cn.lili.modules.statistics.service.AfterSaleStatisticsService;
import cn.lili.modules.statistics.service.OrderStatisticsService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -36,21 +35,16 @@ import java.util.Objects;
@RequestMapping("/store/statistics/order")
public class OrderStatisticsStoreController {
/**
* 订单
*/
@Autowired
private OrderService orderService;
/**
* 售后
*/
@Autowired
private AfterSaleService afterSaleService;
private AfterSaleStatisticsService afterSaleStatisticsService;
/**
* 订单统计
*/
@Autowired
private OrderStatisticsDataService orderStatisticsDataService;
private OrderStatisticsService orderStatisticsService;
@ApiOperation(value = "订单概览统计")
@GetMapping("/overview")
@@ -58,7 +52,7 @@ public class OrderStatisticsStoreController {
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
try {
statisticsQueryParam.setStoreId(storeId);
return ResultUtil.data(orderStatisticsDataService.overview(statisticsQueryParam));
return ResultUtil.data(orderStatisticsService.overview(statisticsQueryParam));
} catch (Exception e) {
log.error("订单概览统计错误", e);
}
@@ -71,7 +65,7 @@ public class OrderStatisticsStoreController {
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
try {
statisticsQueryParam.setStoreId(storeId);
return ResultUtil.data(orderStatisticsDataService.statisticsChart(statisticsQueryParam));
return ResultUtil.data(orderStatisticsService.statisticsChart(statisticsQueryParam));
} catch (Exception e) {
log.error("订单图表统计错误", e);
}
@@ -85,7 +79,7 @@ public class OrderStatisticsStoreController {
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
try {
statisticsQueryParam.setStoreId(storeId);
return ResultUtil.data(orderService.getStatistics(statisticsQueryParam, pageVO));
return ResultUtil.data(orderStatisticsService.getStatistics(statisticsQueryParam, pageVO));
} catch (Exception e) {
log.error("订单统计错误", e);
}
@@ -98,6 +92,6 @@ public class OrderStatisticsStoreController {
public ResultMessage<IPage<AfterSale>> refund(StatisticsQueryParam statisticsQueryParam, PageVO pageVO) {
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
statisticsQueryParam.setStoreId(storeId);
return ResultUtil.data(afterSaleService.getStatistics(statisticsQueryParam, pageVO));
return ResultUtil.data(afterSaleStatisticsService.getStatistics(statisticsQueryParam, pageVO));
}
}

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

@@ -5,7 +5,7 @@ import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.PlatformViewVO;
import cn.lili.modules.statistics.service.PlatformViewDataService;
import cn.lili.modules.statistics.service.PlatformViewService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,13 +27,13 @@ import java.util.Objects;
@RequestMapping("/store/statistics/view")
public class ViewStatisticsStoreController {
@Autowired
private PlatformViewDataService platformViewDataService;
private PlatformViewService platformViewService;
@ApiOperation(value = "流量数据 表单获取")
@GetMapping("/list")
public ResultMessage<List<PlatformViewVO>> getByPage(StatisticsQueryParam queryParam) {
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
queryParam.setStoreId(storeId);
return ResultUtil.data(platformViewDataService.list(queryParam));
return ResultUtil.data(platformViewService.list(queryParam));
}
}

10
seller-api/src/main/resources/application.yml
View File

@@ -29,15 +29,6 @@ spring:
admin:
client:
url: http://127.0.0.1:8000
# mongodb
data:
mongodb:
uri: 127.0.0.1:27017
database: lilishop
username: root
password: lilishop
authentication-database: admin
# replica-set-name: mongoreplset
cache:
type: redis
# Redis
@@ -171,7 +162,6 @@ logging:
cn.lili: info
# org.hibernate: debug
# org.springframework: debug
# org.springframework.data.mongodb.core: debug
file:
# 指定路径
path: lili-logs