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

Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
lifenlong
2021-05-19 19:13:53 +08:00
parent 64c095f20e 97defc8a12
commit 120189ef99
199 changed files with 785 additions and 1243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java
View File

@@ -1,13 +1,12 @@
package cn.lili.controller.goods;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.vos.CategoryVO;
import cn.lili.modules.goods.service.CategoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

3
buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.goods;
import cn.hutool.core.text.CharSequenceUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.distribution.service.DistributionService;
@@ -21,7 +21,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.web.bind.annotation.GetMapping;

5
buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.member;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dos.MemberCoupon;
@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -82,7 +81,7 @@ public class CouponBuyerController {
public ResultMessage<Object> receiveCoupon(@NotNull(message = "优惠券ID不能为空") @PathVariable("couponId") String couponId) {
memberCouponService.checkCouponLimit(couponId, UserContext.getCurrentUser().getId());
memberCouponService.receiveCoupon(couponId, UserContext.getCurrentUser().getId(), UserContext.getCurrentUser().getNickName());
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "通过id获取")

17
buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.member;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.service.FootprintService;
@@ -44,19 +42,16 @@ public class FootprintController {
@ApiImplicitParam(name = "ids", value = "商品ID", required = true, allowMultiple = true, dataType = "String", paramType = "path")
@DeleteMapping(value = "/delByIds/{ids}")
public ResultMessage<Object> delAllByIds(@NotNull(message = "商品ID不能为空") @PathVariable("ids") List ids) {
if (footprintService.deleteByIds(ids)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
footprintService.deleteByIds(ids);
return ResultUtil.success();
}
@ApiOperation(value = "清空足迹")
@DeleteMapping
public ResultMessage<Object> deleteAll() {
if (footprintService.clean()) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
footprintService.clean();
return ResultUtil.success();
}
@ApiOperation(value = "获取当前会员足迹数量")

20
buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java
View File

@@ -1,12 +1,9 @@
package cn.lili.controller.member;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.base.service.RegionService;
import cn.lili.modules.member.entity.dos.MemberAddress;
import cn.lili.modules.promotion.service.MemberAddressService;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,9 +33,6 @@ public class MemberAddressBuyerController {
@Autowired
private MemberAddressService memberAddressService;
@Autowired
private RegionService regionService;
@ApiOperation(value = "获取会员收件地址分页列表")
@GetMapping
public ResultMessage<IPage<MemberAddress>> page(PageVO page) {
@@ -63,6 +57,9 @@ public class MemberAddressBuyerController {
public ResultMessage<MemberAddress> addShippingAddress(@Valid MemberAddress shippingAddress) {
//添加会员地址
shippingAddress.setMemberId(UserContext.getCurrentUser().getId());
if(shippingAddress.getIsDefault()==null){
shippingAddress.setIsDefault(false);
}
return ResultUtil.data(memberAddressService.saveMemberAddress(shippingAddress));
}
@@ -71,6 +68,9 @@ public class MemberAddressBuyerController {
public ResultMessage<MemberAddress> editShippingAddress(@Valid MemberAddress shippingAddress) {
//修改会员地址
shippingAddress.setMemberId(UserContext.getCurrentUser().getId());
if(shippingAddress.getIsDefault()==null){
shippingAddress.setIsDefault(false);
}
return ResultUtil.data(memberAddressService.updateMemberAddress(shippingAddress));
}
@@ -78,10 +78,8 @@ public class MemberAddressBuyerController {
@ApiImplicitParam(name = "id", value = "会员地址ID", dataType = "String", paramType = "path")
@DeleteMapping(value = "/delById/{id}")
public ResultMessage<Object> delShippingAddressById(@PathVariable String id) {
if (memberAddressService.removeMemberAddress(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
memberAddressService.removeMemberAddress(id);
return ResultUtil.success();
}
}

3
buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.member;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.service.GoodsCollectionService;
@@ -9,7 +9,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

3
buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.member;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.MemberEvaluation;
import cn.lili.modules.member.entity.dto.EvaluationQueryParams;
@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

3
buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.member;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.message.entity.enums.MessageStatusEnum;
@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

3
buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.member;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.vo.MemberReceiptAddVO;
@@ -11,7 +11,6 @@ import cn.lili.modules.member.service.MemberReceiptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

3
buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java
View File

@@ -1,12 +1,11 @@
package cn.lili.controller.member;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.MemberSign;
import cn.lili.modules.member.service.MemberSignService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;

6
buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.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.verification.enums.VerificationEnums;
import cn.lili.common.verification.service.VerificationService;
import cn.lili.common.vo.ResultMessage;
@@ -18,7 +18,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.web.bind.annotation.*;
@@ -108,8 +107,9 @@ public class MemberWalletBuyerController {
}
this.memberWalletService.setMemberWalletPassword(member, newPassword);
return ResultUtil.data("修改成功");
} else {
throw new ServiceException(ResultCode.WALLET_NOT_EXIT_ERROR);
}
throw new ServiceException(ResultCode.ERROR);
}

2
buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.member;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.MemberWithdrawApply;

2
buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.member;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.MemberPointsHistory;

3
buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.member;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.trade.entity.dos.Recharge;
@@ -10,7 +10,6 @@ import cn.lili.modules.order.trade.service.RechargeService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;

2
buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.member;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.entity.dos.ServiceNotice;

3
buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.other;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.page.entity.dos.Article;
import cn.lili.modules.page.entity.dto.ArticleSearchParams;
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

10
buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java
View File

@@ -1,9 +1,7 @@
package cn.lili.controller.other;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.page.entity.dos.Feedback;
import cn.lili.modules.page.service.FeedbackService;
@@ -35,10 +33,8 @@ public class FeedbackBuyerController {
@PostMapping()
public ResultMessage<Object> save(Feedback feedback) {
feedback.setUserName(UserContext.getCurrentUser().getNickName());
if (feedbackService.save(feedback)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
feedbackService.save(feedback);
return ResultUtil.success();
}
}

3
buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java
View File

@@ -1,12 +1,11 @@
package cn.lili.controller.other;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.entity.dos.Logistics;
import cn.lili.modules.system.service.LogisticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

3
buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.other;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.page.entity.dto.PageDataDTO;
import cn.lili.modules.page.entity.enums.PageEnum;
@@ -8,7 +8,6 @@ import cn.lili.modules.page.entity.vos.PageDataVO;
import cn.lili.modules.page.service.PageDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

2
buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java
View File

@@ -1,7 +1,7 @@
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.Distribution;
import cn.lili.modules.distribution.entity.dos.DistributionOrder;

2
buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.other.distribution;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.distribution.entity.dos.DistributionCash;

10
buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java
View File

@@ -1,8 +1,6 @@
package cn.lili.controller.other.distribution;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.distribution.entity.dto.DistributionGoodsSearchParams;
import cn.lili.modules.distribution.entity.vos.DistributionGoodsVO;
@@ -54,9 +52,7 @@ public class DistributionGoodsBuyerController {
@GetMapping(value = "/checked/{distributionGoodsId}")
public ResultMessage<IPage<DistributionGoodsVO>> distributionCheckGoods(
@NotNull(message = "分销商品不能为空") @PathVariable("distributionGoodsId") String distributionGoodsId) {
if (distributionSelectedGoodsService.add(distributionGoodsId)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
distributionSelectedGoodsService.add(distributionGoodsId);
return ResultUtil.success();
}
}

2
buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.other.distribution;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.distribution.entity.dos.DistributionOrder;
import cn.lili.modules.distribution.entity.vos.DistributionOrderSearchParams;

4
buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
View File

@@ -3,7 +3,7 @@ package cn.lili.controller.passport;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.sms.SmsUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.verification.enums.VerificationEnums;
import cn.lili.common.verification.service.VerificationService;
import cn.lili.common.vo.ResultMessage;
@@ -112,7 +112,7 @@ public class MemberBuyerController {
if (smsUtil.verifyCode(mobile, VerificationEnums.FIND_USER, uuid, code)) {
//校验是否通过手机号可获取会员,存在则将会员信息存入缓存，有效时间3分钟
if (memberService.findByMobile(uuid, mobile)) {
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
}
throw new ServiceException(ResultCode.VERIFICATION_ERROR);

3
buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java
View File

@@ -1,14 +1,13 @@
package cn.lili.controller.passport.connect;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.connect.service.ConnectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

2
buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java
View File

@@ -4,7 +4,7 @@ package cn.lili.controller.passport.connect;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.token.Token;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.connect.entity.dto.AuthCallback;
import cn.lili.modules.connect.entity.dto.ConnectAuthUser;

2
buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.passport.connect;
import cn.lili.common.token.Token;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.connect.entity.dto.WechatMPLoginParams;
import cn.lili.modules.connect.service.ConnectService;

2
buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.payment;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.payment.kit.CashierSupport;
import cn.lili.modules.payment.kit.dto.PayParam;

3
buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java
View File

@@ -1,7 +1,7 @@
package cn.lili.controller.promotion;
import cn.hutool.core.date.DateUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
@@ -15,7 +15,6 @@ import cn.lili.modules.promotion.service.PromotionGoodsService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

2
buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.promotion;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.dos.PointsGoodsCategory;

2
buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.promotion;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.promotion.entity.vos.SeckillGoodsVO;
import cn.lili.modules.promotion.entity.vos.SeckillTimelineVO;

11
buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java
View File

@@ -1,9 +1,7 @@
package cn.lili.controller.purchase;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.purchase.entity.dos.PurchaseOrder;
import cn.lili.modules.purchase.entity.params.PurchaseOrderSearchParams;
@@ -65,11 +63,8 @@ public class PurchaseBuyerController {
@ApiImplicitParam(name = "id", value = "采购单ID", required = true, dataType = "Long", paramType = "path")
@PutMapping("/{id}")
public ResultMessage<Object> close(@NotNull @PathVariable String id) {
if (purchaseOrderService.close(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
purchaseOrderService.close(id);
return ResultUtil.success();
}
}

2
buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java
View File

@@ -1,6 +1,6 @@
package cn.lili.controller.purchase;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.purchase.entity.dos.PurchaseQuoted;
import cn.lili.modules.purchase.entity.vos.PurchaseQuotedVO;

22
buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java
View File

@@ -1,9 +1,7 @@
package cn.lili.controller.store;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.aop.PageViewPoint;
@@ -80,28 +78,22 @@ public class StoreBuyerController {
@ApiOperation(value = "申请店铺第一步-填写企业信息")
@PutMapping(value = "/apply/first")
public ResultMessage<Object> applyFirstStep(StoreCompanyDTO storeCompanyDTO) {
if (storeService.applyFirstStep(storeCompanyDTO)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
storeService.applyFirstStep(storeCompanyDTO);
return ResultUtil.success();
}
@ApiOperation(value = "申请店铺第二步-填写银行信息")
@PutMapping(value = "/apply/second")
public ResultMessage<Object> applyFirstStep(StoreBankDTO storeBankDTO) {
if (storeService.applySecondStep(storeBankDTO)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
storeService.applySecondStep(storeBankDTO);
return ResultUtil.success();
}
@ApiOperation(value = "申请店铺第三步-填写其他信息")
@PutMapping(value = "/apply/third")
public ResultMessage<Object> applyFirstStep(StoreOtherInfoDTO storeOtherInfoDTO) {
if (storeService.applyThirdStep(storeOtherInfoDTO)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
storeService.applyThirdStep(storeOtherInfoDTO);
return ResultUtil.success();
}
@ApiOperation(value = "获取当前登录会员的店铺信息-入驻店铺")

2
buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.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.dos.AfterSaleReason;

30
buyer-api/src/main/java/cn/lili/controller/trade/CartController.java
View File

@@ -2,7 +2,7 @@ package cn.lili.controller.trade;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.cart.entity.enums.CartTypeEnum;
@@ -13,7 +13,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
@@ -52,7 +51,7 @@ public class CartController {
@NotNull(message = "购买数量不能为空") @Min(value = 1, message = "加入购物车数量必须大于0") Integer num,
String cartType) {
cartService.add(skuId, num, cartType);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@@ -86,7 +85,7 @@ public class CartController {
public ResultMessage<Object> update(@NotNull(message = "产品id不能为空") @PathVariable(name = "skuId") String skuId,
Integer num) {
cartService.updateNum(skuId, num);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@@ -98,7 +97,7 @@ public class CartController {
public ResultMessage<Object> updateChecked(@NotNull(message = "产品id不能为空") @PathVariable(name = "skuId") String skuId,
boolean checked) {
cartService.checked(skuId, checked);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@@ -106,7 +105,7 @@ public class CartController {
@PostMapping(value = "/sku/checked", produces = MediaType.APPLICATION_JSON_VALUE)
public ResultMessage<Object> updateAll(boolean checked) {
cartService.checkedAll(checked);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@@ -119,7 +118,7 @@ public class CartController {
@PostMapping(value = "/store/{storeId}", produces = MediaType.APPLICATION_JSON_VALUE)
public ResultMessage<Object> updateStoreAll(@NotNull(message = "卖家id不能为空") @PathVariable(name = "storeId") String storeId, boolean checked) {
cartService.checkedStore(storeId, checked);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@@ -127,7 +126,7 @@ public class CartController {
@DeleteMapping()
public ResultMessage<Object> clean() {
cartService.clean();
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@@ -138,7 +137,7 @@ public class CartController {
@DeleteMapping(value = "/sku/remove")
public ResultMessage<Object> delete(String[] skuIds) {
cartService.delete(skuIds);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@@ -169,7 +168,7 @@ public class CartController {
String way) {
try {
cartService.shippingAddress(shippingAddressId, way);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
} catch (ServiceException se) {
log.error(ResultCode.SHIPPING_NOT_APPLY.message(), se);
throw new ServiceException(ResultCode.SHIPPING_NOT_APPLY);
@@ -193,7 +192,7 @@ public class CartController {
String way) {
try {
cartService.shippingMethod(selleId, shippingMethod, way);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
} catch (Exception e) {
log.error(ResultCode.CART_ERROR.message(), e);
throw new ServiceException(ResultCode.CART_ERROR);
@@ -207,7 +206,7 @@ public class CartController {
@GetMapping("/select/receipt")
public ResultMessage<Object> selectReceipt(String way, ReceiptVO receiptVO) {
this.cartService.shippingReceipt(receiptVO, way);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "选择优惠券")
@@ -219,7 +218,7 @@ public class CartController {
@GetMapping("/select/coupon")
public ResultMessage<Object> selectCoupon(String way, @NotNull(message = "优惠券id不能为空") String memberCouponId, boolean used) {
this.cartService.selectCoupon(memberCouponId, way, used);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@@ -229,11 +228,10 @@ public class CartController {
try {
// 读取选中的列表
return ResultUtil.data(this.cartService.createTrade(tradeParams));
} catch (ServiceException e) {
throw e;
} catch (Exception e) {
log.error(ResultCode.ORDER_ERROR.message(), e);
if (e.getMessage().equals(ResultCode.SHIPPING_NOT_APPLY.message())) {
throw new ServiceException(ResultCode.SHIPPING_NOT_APPLY);
}
throw new ServiceException(ResultCode.ORDER_ERROR);
}
}

8
buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.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.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
@@ -73,7 +73,7 @@ public class OrderBuyerController {
throw new ServiceException(ResultCode.ORDER_DELIVERED_ERROR);
}
orderService.complete(orderSn);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "取消订单")
@@ -84,7 +84,7 @@ public class OrderBuyerController {
@PostMapping(value = "/{orderSn}/cancel")
public ResultMessage<Object> cancel(@ApiIgnore @PathVariable String orderSn, @RequestParam String reason) {
orderService.cancel(orderSn, reason);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "删除订单")
@@ -94,7 +94,7 @@ public class OrderBuyerController {
@DeleteMapping(value = "/{orderSn}")
public ResultMessage<Object> deleteOrder(@PathVariable String orderSn) {
orderService.deleteOrder(orderSn);
return ResultUtil.success(ResultCode.SUCCESS);
return ResultUtil.success();
}
@ApiOperation(value = "查询物流踪迹")

17
buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.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;
@@ -79,21 +77,16 @@ public class OrderComplaintBuyerController {
public ResultMessage<OrderComplaintCommunicationVO> addCommunication(@RequestParam String complainId, @RequestParam String content) {
AuthUser currentUser = UserContext.getCurrentUser();
OrderComplaintCommunicationVO communicationVO = new OrderComplaintCommunicationVO(complainId, content, CommunicationOwnerEnum.BUYER.name(), currentUser.getId(), currentUser.getNickName());
if (orderComplaintCommunicationService.addCommunication(communicationVO)) {
return ResultUtil.data(communicationVO);
}
throw new ServiceException(ResultCode.ERROR);
orderComplaintCommunicationService.addCommunication(communicationVO);
return ResultUtil.data(communicationVO);
}
@ApiOperation(value = "取消售后")
@ApiImplicitParam(name = "id", value = "投诉单ID", required = true, paramType = "path")
@PutMapping(value = "/status/{id}")
public ResultMessage<Object> cancel(@PathVariable String id) {
if (orderComplaintService.cancel(id)) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
orderComplaintService.cancel(id);
return ResultUtil.success();
}

2
buyer-api/src/main/java/cn/lili/controller/trade/ReceiptBuyerController.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.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.entity.dos.Receipt;

2
buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.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.trade.entity.dos.Recharge;
import cn.lili.modules.order.trade.service.RechargeService;

2
buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java
View File

@@ -3,7 +3,7 @@ package cn.lili.controller.trade;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.PageUtil;
import cn.lili.common.utils.ResultUtil;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.trade.entity.dos.WalletLog;