Merge remote-tracking branch 'origin/dev' into dev

peng

3 天以前 bdf04af3958fb7a61f3180aa1efb795ba8ac00d2

 framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java

@@ -91,6 +91,21 @@

    @Autowired
    private MemberCouponMapper memberCouponMapper;

    @Override
    public Long getCouponsCountByIdAndMemberId(String couponId){
        AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
        Long count = 0L;
        if (StringUtils.isNotBlank(currentUser.getId())) {
            count = new LambdaQueryChainWrapper<>(memberCouponMapper)
                    .eq(MemberCoupon::getCouponId,couponId)
                    .eq(MemberCoupon::getMemberId,currentUser.getId())
                    .count();
        }

        return count;
    }

    @Override
    public void getUserCouponsStatus(List<CouponVO> list) {
        AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());