diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/dto/GroupByCouponStateDto.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/dto/GroupByCouponStateDto.java similarity index 88% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/dto/GroupByCouponStateDto.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/dto/GroupByCouponStateDto.java index 24cb4b9a..aee642db 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/dto/GroupByCouponStateDto.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/dto/GroupByCouponStateDto.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.marketing.dto; +package com.bonus.canteen.core.marketing.coupon.dto; public class GroupByCouponStateDto { private Integer couponState; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/mapper/MktCouponMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/mapper/MktCouponMapper.java index c575377f..4dc3e484 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/mapper/MktCouponMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/mapper/MktCouponMapper.java @@ -1,18 +1,12 @@ package com.bonus.canteen.core.marketing.coupon.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.bonus.canteen.core.autth.config.LeNiuDataPermission; -import com.bonus.canteen.core.autth.enums.DataPermissionTypeEnum; import com.bonus.canteen.core.marketing.coupon.model.MktCoupon; +import com.bonus.canteen.core.marketing.coupon.dto.GroupByCouponStateDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import java.math.BigDecimal; -import java.time.LocalDate; import java.util.List; -import java.util.Set; @Mapper public interface MktCouponMapper extends BaseMapper { @@ -39,9 +33,9 @@ public interface MktCouponMapper extends BaseMapper { // Integer countUserCouponNum(@Param("couponType") Integer couponType, @Param("numStart") Long numStart, @Param("numEnd") Long numEnd); // // List getGroupByStatusCouponNum(@Param("backIds") List backIds, @Param("makeIds") List makeIds); -// -// List getGroupByCouponState(@Param("custId") Long custId); -// + + List getGroupByCouponState(@Param("custId") Long custId); + // List getCouponCountByFixedAndCustId(@Param("fixedId") Long fixedId, @Param("custIds") List custIds, @Param("now") String now); // // BigDecimal calculateDailyBalance(); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/impl/MktCouponServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/impl/MktCouponServiceImpl.java index e3366986..9654dea4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/impl/MktCouponServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/impl/MktCouponServiceImpl.java @@ -3,12 +3,10 @@ package com.bonus.canteen.core.marketing.coupon.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bonus.canteen.core.marketing.dto.GroupByCouponStateDto; +import com.bonus.canteen.core.marketing.coupon.dto.GroupByCouponStateDto; import com.bonus.canteen.core.marketing.dto.GroupCuponDto; import com.bonus.canteen.core.marketing.vo.MktCouponMobileVO; import com.bonus.canteen.core.marketing.vo.MktCouponTmplBackVO; @@ -28,7 +26,6 @@ import com.bonus.canteen.core.marketing.coupon.service.MktCouponService; import com.bonus.canteen.core.marketing.coupon.vo.MktCouponMobileUsableVO; import com.bonus.canteen.core.order.common.constants.OrderTypeEnum; import com.bonus.common.houqin.i18n.I18n; -import com.github.pagehelper.PageHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -36,11 +33,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.lang.invoke.SerializedLambda; import java.math.BigDecimal; import java.time.LocalDate; import java.util.*; -import java.util.stream.Collectors; @Service public class MktCouponServiceImpl extends ServiceImpl implements MktCouponService { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/vo/MktGroupVo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/vo/MktGroupVo.java index 590f6c66..a5f1e0e3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/vo/MktGroupVo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/vo/MktGroupVo.java @@ -1,7 +1,7 @@ package com.bonus.canteen.core.marketing.vo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.bonus.canteen.core.marketing.dto.GroupByCouponStateDto; +import com.bonus.canteen.core.marketing.coupon.dto.GroupByCouponStateDto; import io.swagger.annotations.ApiModelProperty; import java.util.Iterator; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/marketing/MktCouponMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/marketing/MktCouponMapper.xml new file mode 100644 index 00000000..51cfd5cc --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/marketing/MktCouponMapper.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +