xiaoyong931011
2023-09-11 790ed3c2799b395cc2b51c7c070c8a73cd9203a1
优惠卷
5 files modified
31 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java 12 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -235,4 +235,13 @@
        return memberService.memberCoupon(mallMemberCouponDto);
    }
    @ApiOperation(value = "优惠卷详情", notes = "优惠卷详情")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = MallMemberCouponVo.class)
    })
    @GetMapping(value = "/couponDetails/{id}")
    public FebsResponse couponDetails(@PathVariable("id") Long id) {
        return memberService.couponDetails(id);
    }
}
src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
@@ -87,4 +87,6 @@
    FebsResponse getCoupon(GetCouponDto getCouponDto);
    FebsResponse memberCoupon(MallMemberCouponDto mallMemberCouponDto);
    FebsResponse couponDetails(Long id);
}
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -912,6 +912,18 @@
        return new FebsResponse().success().data(pages);
    }
    @Override
    public FebsResponse couponDetails(Long id) {
        Long memberId = LoginUserUtil.getLoginUser().getId();
        MallMemberCoupon mallMemberCoupon = mallMemberCouponMapper.selectById(id);
        MallMemberCouponVo mallMemberCouponVo = new MallMemberCouponVo();
        mallMemberCouponVo.setCouponName(mallMemberCoupon.getCouponName());
        MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(mallMemberCoupon.getCouponId());
        mallMemberCouponVo.setCostAmount(mallGoodsCoupon.getCostAmount());
        mallMemberCouponVo.setRealAmount(mallGoodsCoupon.getRealAmount());
        return new FebsResponse().success().data(mallMemberCouponVo);
    }
    private  String getXcxLoginUrl(String code) {
        String wechatLoginUrl =xcxProperties.getWecharLoginUrl();
        return String.format(wechatLoginUrl, xcxProperties.getXcxAppid(), xcxProperties.getXcxSecret(), code);
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -212,7 +212,7 @@
                        BigDecimal costAmount = mallGoodsCoupon.getCostAmount();
                        BigDecimal realAmount = mallGoodsCoupon.getRealAmount();
                        if(amount.compareTo(costAmount) >= 0){
                            amount = (amount.subtract(realAmount).compareTo(BigDecimal.ZERO) > 0 ? amount : BigDecimal.ZERO);
                            amount = (amount.subtract(realAmount).compareTo(BigDecimal.ZERO) > 0 ? amount.subtract(realAmount) : BigDecimal.ZERO);
                            orderItem.setMemberCouponId(memberCouponId);
                        }
                    }
src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java
@@ -24,6 +24,12 @@
    @ApiModelProperty(value = "商品名称")
    private String goodsName;
    @ApiModelProperty(value = "优惠卷ID")
    private Long memberCouponId;
    @ApiModelProperty(value = "推销员邀请码")
    private String memberInviteId;
    @ApiModelProperty(value = "样式名称")
    private String styleName;