diff --git a/src/main/java/com/ycwl/basic/biz/PriceBiz.java b/src/main/java/com/ycwl/basic/biz/PriceBiz.java index eb1b71fa..e85d1354 100644 --- a/src/main/java/com/ycwl/basic/biz/PriceBiz.java +++ b/src/main/java/com/ycwl/basic/biz/PriceBiz.java @@ -1,8 +1,6 @@ package com.ycwl.basic.biz; import com.ycwl.basic.model.mobile.order.IsBuyBatchRespVO; -import com.ycwl.basic.model.pc.coupon.entity.CouponEntity; -import com.ycwl.basic.model.pc.couponRecord.resp.CouponRecordQueryResp; import com.ycwl.basic.model.pc.face.entity.FaceEntity; import com.ycwl.basic.model.pc.order.entity.OrderEntity; import com.ycwl.basic.model.pc.price.entity.PriceConfigEntity; diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppCouponController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppCouponController.java deleted file mode 100644 index ff5bd104..00000000 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppCouponController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.ycwl.basic.controller.mobile; - -import com.ycwl.basic.constant.BaseContextHandler; -import com.ycwl.basic.model.mobile.coupon.req.ClaimCouponReq; -import com.ycwl.basic.model.pc.coupon.entity.CouponEntity; -import com.ycwl.basic.model.pc.couponRecord.entity.CouponRecordEntity; -import com.ycwl.basic.service.mobile.AppCouponRecordService; -import com.ycwl.basic.utils.ApiResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("/api/mobile/coupon/v1") -public class AppCouponController { - - @Autowired - private AppCouponRecordService appCouponRecordService; - - /** - * 根据memberId、faceId和type查找优惠券记录 - */ - @GetMapping("/record") - public ApiResponse getCouponRecords( - @RequestParam Long faceId, - @RequestParam Integer type) { - CouponRecordEntity record = appCouponRecordService.queryByMemberIdAndFaceIdAndType(Long.valueOf(BaseContextHandler.getUserId()), faceId, type); - return ApiResponse.success(record); - } - - /** - * 领取优惠券 - */ - @PostMapping("/claim") - public ApiResponse claimCoupon(@RequestBody ClaimCouponReq request) { - request.setMemberId(Long.valueOf(BaseContextHandler.getUserId())); - try { - CouponEntity coupon = appCouponRecordService.claimCoupon( - request.getMemberId(), - request.getFaceId(), - request.getType() - ); - return ApiResponse.success(coupon); - } catch (RuntimeException e) { - return ApiResponse.fail(e.getMessage()); - } - } -} diff --git a/src/main/java/com/ycwl/basic/controller/pc/CouponController.java b/src/main/java/com/ycwl/basic/controller/pc/CouponController.java deleted file mode 100644 index 4d88410f..00000000 --- a/src/main/java/com/ycwl/basic/controller/pc/CouponController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.ycwl.basic.controller.pc; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.ycwl.basic.biz.PriceBiz; -import com.ycwl.basic.model.pc.coupon.entity.CouponEntity; -import com.ycwl.basic.model.pc.coupon.req.CouponQueryReq; -import com.ycwl.basic.model.pc.coupon.resp.CouponRespVO; -import com.ycwl.basic.model.pc.price.resp.GoodsListRespVO; -import com.ycwl.basic.service.pc.CouponService; -import com.ycwl.basic.utils.ApiResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/api/coupon/v1") -// 优惠券管理 -public class CouponController { - @Autowired - private CouponService couponService; - @Autowired - private PriceBiz priceBiz; - - @GetMapping("/{scenicId}/goodsList") - public ApiResponse> scenicGoodsList(@PathVariable Long scenicId) { - List data = priceBiz.listGoodsByScenic(scenicId); - data.add(new GoodsListRespVO(-1L, "一口价", -1)); - return ApiResponse.success(data); - } - - // 新增优惠券 - @PostMapping("/add") - public ApiResponse add(@RequestBody CouponEntity coupon) { - return ApiResponse.success(couponService.add(coupon)); - } - - // 更新优惠券 - @PostMapping("/update/{id}") - public ApiResponse update(@PathVariable Integer id, @RequestBody CouponEntity coupon) { - coupon.setId(id); - return ApiResponse.success(couponService.update(coupon)); - } - - @PutMapping("/updateStatus/{id}") - public ApiResponse updateStatus(@PathVariable Integer id) { - return ApiResponse.success(couponService.updateStatus(id)); - } - - // 删除优惠券 - @DeleteMapping("/delete/{id}") - public ApiResponse delete(@PathVariable Integer id) { - return ApiResponse.success(couponService.delete(id)); - } - - // 根据ID查询优惠券 - @GetMapping("/get/{id}") - public ApiResponse getById(@PathVariable Integer id) { - return ApiResponse.success(couponService.getById(id)); - } - - // 分页查询优惠券列表 - @PostMapping("/page") - public ApiResponse> list(@RequestBody CouponQueryReq couponQuery) { - PageHelper.startPage(couponQuery.getPageNum(), couponQuery.getPageSize()); - List list = couponService.list(couponQuery); - PageInfo pageInfo = new PageInfo<>(list); - return ApiResponse.success(pageInfo); - } -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/controller/pc/CouponRecordController.java b/src/main/java/com/ycwl/basic/controller/pc/CouponRecordController.java deleted file mode 100644 index 00a542f9..00000000 --- a/src/main/java/com/ycwl/basic/controller/pc/CouponRecordController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.ycwl.basic.controller.pc; - -import com.github.pagehelper.PageInfo; -import com.ycwl.basic.model.pc.couponRecord.req.CouponRecordPageQueryReq; -import com.ycwl.basic.model.pc.couponRecord.resp.CouponRecordPageResp; -import com.ycwl.basic.service.pc.CouponRecordService; -import com.ycwl.basic.utils.ApiResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("/api/coupon/record/v1") -public class CouponRecordController { - - @Autowired - private CouponRecordService couponRecordService; - - @PostMapping("/page") - public ApiResponse> pageQuery(@RequestBody CouponRecordPageQueryReq query) { - return couponRecordService.pageQuery(query); - } -} diff --git a/src/main/java/com/ycwl/basic/mapper/CouponMapper.java b/src/main/java/com/ycwl/basic/mapper/CouponMapper.java deleted file mode 100644 index 51ee1fd1..00000000 --- a/src/main/java/com/ycwl/basic/mapper/CouponMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.ycwl.basic.mapper; -import com.ycwl.basic.model.pc.coupon.entity.CouponEntity; -import com.ycwl.basic.model.pc.coupon.req.CouponQueryReq; -import com.ycwl.basic.model.pc.coupon.resp.CouponRespVO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface CouponMapper { - List selectByQuery(CouponQueryReq query); - - int updateStatus(Integer id); - - CouponEntity getById(Integer couponId); - - int insert(CouponEntity coupon); - - int updateById(CouponEntity coupon); - - int deleteById(Integer id); - - List selectList(); - - CouponEntity selectById(Integer id); - - CouponEntity selectByScenicIdAndTypeAndStatus(Long scenicId, Integer type, Integer status); -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/mapper/CouponRecordMapper.java b/src/main/java/com/ycwl/basic/mapper/CouponRecordMapper.java deleted file mode 100644 index 21aad0eb..00000000 --- a/src/main/java/com/ycwl/basic/mapper/CouponRecordMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.ycwl.basic.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ycwl.basic.model.pc.couponRecord.entity.CouponRecordEntity; -import com.ycwl.basic.model.pc.couponRecord.req.CouponRecordPageQueryReq; -import com.ycwl.basic.model.pc.couponRecord.resp.CouponRecordPageResp; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface CouponRecordMapper extends BaseMapper { - List queryByUserWithGoodsId(Long scenicId, Long memberId, String goodsId); - - List queryByMemberIdAndFaceId(Long memberId, Long faceId); - - CouponRecordEntity queryByMemberIdAndFaceIdAndType(Long memberId, Long faceId, Integer type); - - List selectByPageQuery(CouponRecordPageQueryReq query); -} diff --git a/src/main/java/com/ycwl/basic/model/pc/coupon/entity/CouponEntity.java b/src/main/java/com/ycwl/basic/model/pc/coupon/entity/CouponEntity.java deleted file mode 100644 index 07edfcda..00000000 --- a/src/main/java/com/ycwl/basic/model/pc/coupon/entity/CouponEntity.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.ycwl.basic.model.pc.coupon.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.Date; - -@Data -@TableName("coupon") -public class CouponEntity { - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - private Long scenicId; - - // 新增优惠券名称字段 - private String name; - - // 优惠券描述 - private String description; - - // 倒计时字段（仅用于展示） - private String countdown; - - // 广播字段，仅用于展示 - private String broadcast; - - /** - * 优惠券类别，0：普通优惠券；1：第一次推送；2：第二次；3：第三次 - */ - private Integer type; - /** - * 价格配置ID，逗号分隔字符串 - */ - private String configIds; - /** - * 0降价，1打折 - */ - private Integer discountType; - private BigDecimal discountPrice; - /** - * 状态：0不开启；1开启 - */ - private Integer status; - private Date createAt; - - private Integer deleted; - private Date deletedAt; - - public BigDecimal calculateDiscountPrice(BigDecimal originalPrice) { - if (originalPrice == null) { - return BigDecimal.ZERO; - } - if (discountType == 0) { - return discountPrice; - } else { - return originalPrice.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN).multiply(discountPrice); - } - } - public BigDecimal calculateDiscountPrice(String originalPrice) { - if (originalPrice == null) { - return BigDecimal.ZERO; - } - BigDecimal priceObj = new BigDecimal(originalPrice); - if (discountType == 0) { - return discountPrice; - } else { - return priceObj.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN).multiply(discountPrice); - } - } - public String calculateDiscountedPrice(String originalPrice) { - if (originalPrice == null) { - return "0.00"; - } - BigDecimal priceObj = new BigDecimal(originalPrice); - if (discountType == 0) { - return priceObj.subtract(discountPrice).setScale(2, RoundingMode.HALF_DOWN).toString(); - } else { - return priceObj.subtract(priceObj.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN).multiply(discountPrice)).setScale(2, RoundingMode.HALF_DOWN).toString(); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/model/pc/coupon/req/CouponQueryReq.java b/src/main/java/com/ycwl/basic/model/pc/coupon/req/CouponQueryReq.java deleted file mode 100644 index 7d35d549..00000000 --- a/src/main/java/com/ycwl/basic/model/pc/coupon/req/CouponQueryReq.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.ycwl.basic.model.pc.coupon.req; - -import lombok.Data; -import com.ycwl.basic.model.common.BaseQueryParameterReq; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -@EqualsAndHashCode(callSuper = true) -@Data -// 优惠券查询请求参数 -public class CouponQueryReq extends BaseQueryParameterReq { - // 景区ID - private Long scenicId; - private String name; - - // 优惠券类型：0普通/1首次推送/2二次/3三次 - private Integer type; - - // 折扣类型：0降价/1打折 - private Integer discountType; - - // 状态：0关闭/1开启 - private Integer status; - - // 创建时间起始 - private Date createAtStart; - - // 创建时间结束 - private Date createAtEnd; -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/model/pc/coupon/resp/CouponRespVO.java b/src/main/java/com/ycwl/basic/model/pc/coupon/resp/CouponRespVO.java deleted file mode 100644 index 5c7c9852..00000000 --- a/src/main/java/com/ycwl/basic/model/pc/coupon/resp/CouponRespVO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.ycwl.basic.model.pc.coupon.resp; - -import lombok.Data; -import java.math.BigDecimal; -import java.util.Date; - -@Data -public class CouponRespVO { - private Integer id; - private Long scenicId; - private String scenicName; - - // 新增优惠券名称字段 - private String name; - - // 优惠券描述 - private String description; - - // 倒计时字段（仅用于展示） - private String countdown; - - // 通知展示字段，仅用于展示 - private String broadcast; - - /** - * 优惠券类别，0：普通优惠券；1：第一次推送；2：第二次；3：第三次 - */ - private Integer type; - /** - * 价格配置ID，逗号分隔字符串 - */ - private String configIds; - /** - * 0降价，1打折 - */ - private Integer discountType; - private BigDecimal discountPrice; - /** - * 状态：0不开启；1开启 - */ - private Integer status; - private Date createAt; -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/model/pc/couponRecord/entity/CouponRecordEntity.java b/src/main/java/com/ycwl/basic/model/pc/couponRecord/entity/CouponRecordEntity.java deleted file mode 100644 index 5b2b29b6..00000000 --- a/src/main/java/com/ycwl/basic/model/pc/couponRecord/entity/CouponRecordEntity.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.ycwl.basic.model.pc.couponRecord.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.util.Date; - -@Data -@TableName("coupon_record") -public class CouponRecordEntity { - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - private Integer couponId; - private Long memberId; - private Long faceId; - private Integer status; - private Date createTime; - private Date usedTime; - private Long usedOrderId; - - private Integer deleted; - private Date deletedAt; -} diff --git a/src/main/java/com/ycwl/basic/model/pc/couponRecord/req/CouponRecordPageQueryReq.java b/src/main/java/com/ycwl/basic/model/pc/couponRecord/req/CouponRecordPageQueryReq.java deleted file mode 100644 index ea483425..00000000 --- a/src/main/java/com/ycwl/basic/model/pc/couponRecord/req/CouponRecordPageQueryReq.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.ycwl.basic.model.pc.couponRecord.req; - -import lombok.Data; - -@Data -public class CouponRecordPageQueryReq { - private Integer pageNum = 1; - private Integer pageSize = 10; - private Long scenicId; - private String couponName; - private Integer couponType; - private Integer status; -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/model/pc/couponRecord/req/CouponRecordUserQueryReq.java b/src/main/java/com/ycwl/basic/model/pc/couponRecord/req/CouponRecordUserQueryReq.java deleted file mode 100644 index 04e82117..00000000 --- a/src/main/java/com/ycwl/basic/model/pc/couponRecord/req/CouponRecordUserQueryReq.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.ycwl.basic.model.pc.couponRecord.req; - -import lombok.Data; - -@Data -public class CouponRecordUserQueryReq { - private Long scenicId; - private Long memberId; - private Long faceId; - private Integer couponType; -} diff --git a/src/main/java/com/ycwl/basic/model/pc/couponRecord/resp/CouponRecordPageResp.java b/src/main/java/com/ycwl/basic/model/pc/couponRecord/resp/CouponRecordPageResp.java deleted file mode 100644 index f969f646..00000000 --- a/src/main/java/com/ycwl/basic/model/pc/couponRecord/resp/CouponRecordPageResp.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.ycwl.basic.model.pc.couponRecord.resp; - -import lombok.Data; - -import java.util.Date; - -@Data -public class CouponRecordPageResp { - private Integer id; - private Integer couponId; - private String couponName; - private Integer couponType; - private String couponTypeName; - private Long scenicId; - private String scenicName; - private Long memberId; - private Long faceId; - private Integer status; - private String statusName; - private Date createTime; - private Date usedTime; - private Long usedOrderId; -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/model/pc/couponRecord/resp/CouponRecordQueryResp.java b/src/main/java/com/ycwl/basic/model/pc/couponRecord/resp/CouponRecordQueryResp.java deleted file mode 100644 index 15537c78..00000000 --- a/src/main/java/com/ycwl/basic/model/pc/couponRecord/resp/CouponRecordQueryResp.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.ycwl.basic.model.pc.couponRecord.resp; - -import com.ycwl.basic.model.pc.coupon.entity.CouponEntity; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -@Data -public class CouponRecordQueryResp { - private boolean exist = false; - private Integer id; - private Long scenicId; - private Integer couponId; - private Long memberId; - private Long faceId; - private Integer status; - private Date createTime; - private Date usedTime; - private Long usedOrderId; - private CouponEntity coupon; - - public boolean isUsable() { - return Integer.valueOf(0).equals(status); - } -} diff --git a/src/main/java/com/ycwl/basic/service/mobile/AppCouponRecordService.java b/src/main/java/com/ycwl/basic/service/mobile/AppCouponRecordService.java deleted file mode 100644 index f7c8badc..00000000 --- a/src/main/java/com/ycwl/basic/service/mobile/AppCouponRecordService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ycwl.basic.service.mobile; - -import com.ycwl.basic.model.pc.coupon.entity.CouponEntity; -import com.ycwl.basic.model.pc.couponRecord.entity.CouponRecordEntity; - -import java.util.List; - -public interface AppCouponRecordService { - - List queryByMemberIdAndFaceId(Long memberId, Long faceId); - - CouponRecordEntity queryByMemberIdAndFaceIdAndType(Long memberId, Long faceId, Integer type); - - CouponEntity claimCoupon(Long memberId, Long faceId, Integer type); -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/AppCouponRecordServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/AppCouponRecordServiceImpl.java deleted file mode 100644 index 643e22a4..00000000 --- a/src/main/java/com/ycwl/basic/service/mobile/impl/AppCouponRecordServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.ycwl.basic.service.mobile.impl; - -import com.ycwl.basic.mapper.CouponMapper; -import com.ycwl.basic.mapper.CouponRecordMapper; -import com.ycwl.basic.model.pc.coupon.entity.CouponEntity; -import com.ycwl.basic.model.pc.couponRecord.entity.CouponRecordEntity; -import com.ycwl.basic.model.pc.face.entity.FaceEntity; -import com.ycwl.basic.repository.FaceRepository; -import com.ycwl.basic.service.mobile.AppCouponRecordService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -@Service -public class AppCouponRecordServiceImpl implements AppCouponRecordService { - - @Autowired - private CouponRecordMapper couponRecordMapper; - - @Autowired - private CouponMapper couponMapper; - @Autowired - private FaceRepository faceRepository; - - @Override - public List queryByMemberIdAndFaceId(Long memberId, Long faceId) { - return couponRecordMapper.queryByMemberIdAndFaceId(memberId, faceId); - } - - @Override - public CouponRecordEntity queryByMemberIdAndFaceIdAndType(Long memberId, Long faceId, Integer type) { - return couponRecordMapper.queryByMemberIdAndFaceIdAndType(memberId, faceId, type); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public CouponEntity claimCoupon(Long memberId, Long faceId, Integer type) { - // 检查是否已经领取过该类型的优惠券 - CouponRecordEntity existingRecord = couponRecordMapper.queryByMemberIdAndFaceIdAndType(memberId, faceId, type); - if (existingRecord != null) { - throw new RuntimeException("该用户已经领取过此类型的优惠券"); - } - FaceEntity face = faceRepository.getFace(faceId); - if (face == null) { - throw new RuntimeException("人脸数据不存在"); - } - // 查找可用的优惠券 - Long scenicId = face.getScenicId(); - CouponEntity coupon = couponMapper.selectByScenicIdAndTypeAndStatus(scenicId, type, 1); - - if (coupon == null) { - throw new RuntimeException("未找到可领取的优惠券"); - } - - // 创建优惠券记录 - CouponRecordEntity record = new CouponRecordEntity(); - record.setCouponId(coupon.getId()); - record.setMemberId(memberId); - record.setFaceId(faceId); - record.setStatus(0); // 有效状态 - record.setCreateTime(new Date()); - - couponRecordMapper.insert(record); - return coupon; - } -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java index eb0691ba..32a12539 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java @@ -26,7 +26,6 @@ import com.ycwl.basic.mapper.*; import com.ycwl.basic.model.mobile.goods.*; import com.ycwl.basic.model.mobile.order.IsBuyRespVO; import com.ycwl.basic.model.mobile.order.PriceObj; -import com.ycwl.basic.model.pc.couponRecord.resp.CouponRecordQueryResp; import com.ycwl.basic.model.pc.device.entity.DeviceEntity; import com.ycwl.basic.model.pc.face.entity.FaceEntity; import com.ycwl.basic.model.pc.face.resp.FaceRespVO; diff --git a/src/main/java/com/ycwl/basic/service/pc/CouponRecordService.java b/src/main/java/com/ycwl/basic/service/pc/CouponRecordService.java deleted file mode 100644 index b765b2fb..00000000 --- a/src/main/java/com/ycwl/basic/service/pc/CouponRecordService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.ycwl.basic.service.pc; - -import com.github.pagehelper.PageInfo; -import com.ycwl.basic.model.pc.couponRecord.req.CouponRecordPageQueryReq; -import com.ycwl.basic.model.pc.couponRecord.resp.CouponRecordPageResp; -import com.ycwl.basic.utils.ApiResponse; - -public interface CouponRecordService { - ApiResponse> pageQuery(CouponRecordPageQueryReq query); -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/service/pc/CouponService.java b/src/main/java/com/ycwl/basic/service/pc/CouponService.java deleted file mode 100644 index 53ae4f77..00000000 --- a/src/main/java/com/ycwl/basic/service/pc/CouponService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.ycwl.basic.service.pc; - -import com.ycwl.basic.model.pc.coupon.entity.CouponEntity; -import com.ycwl.basic.model.pc.coupon.req.CouponQueryReq; -import com.ycwl.basic.model.pc.coupon.resp.CouponRespVO; - -import java.util.List; - -public interface CouponService { - Integer add(CouponEntity coupon); - Boolean update(CouponEntity coupon); - Boolean delete(Integer id); - CouponEntity getById(Integer id); - List list(CouponQueryReq query); - - Boolean updateStatus(Integer id); -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/CouponRecordServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/CouponRecordServiceImpl.java deleted file mode 100644 index 56fc2cac..00000000 --- a/src/main/java/com/ycwl/basic/service/pc/impl/CouponRecordServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.ycwl.basic.service.pc.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.ycwl.basic.mapper.CouponRecordMapper; -import com.ycwl.basic.model.pc.couponRecord.entity.CouponRecordEntity; -import com.ycwl.basic.model.pc.couponRecord.req.CouponRecordPageQueryReq; -import com.ycwl.basic.model.pc.couponRecord.resp.CouponRecordPageResp; -import com.ycwl.basic.service.pc.CouponRecordService; -import com.ycwl.basic.utils.ApiResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class CouponRecordServiceImpl extends ServiceImpl implements CouponRecordService { - - @Autowired - private CouponRecordMapper couponRecordMapper; - - @Override - public ApiResponse> pageQuery(CouponRecordPageQueryReq query) { - PageHelper.startPage(query.getPageNum(), query.getPageSize()); - List list = couponRecordMapper.selectByPageQuery(query); - PageInfo pageInfo = new PageInfo<>(list); - return ApiResponse.success(pageInfo); - } -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/CouponServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/CouponServiceImpl.java deleted file mode 100644 index 2acd60ef..00000000 --- a/src/main/java/com/ycwl/basic/service/pc/impl/CouponServiceImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.ycwl.basic.service.pc.impl; -import com.ycwl.basic.mapper.CouponMapper; -import com.ycwl.basic.model.pc.coupon.entity.CouponEntity; -import com.ycwl.basic.model.pc.coupon.req.CouponQueryReq; -import com.ycwl.basic.model.pc.coupon.resp.CouponRespVO; -import com.ycwl.basic.repository.ScenicRepository; -import com.ycwl.basic.service.pc.CouponService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - -@Service -public class CouponServiceImpl implements CouponService { - - @Autowired - private CouponMapper couponMapper; - @Autowired - private ScenicRepository scenicRepository; - - @Override - public Integer add(CouponEntity coupon) { - return couponMapper.insert(coupon); - } - - @Override - public Boolean update(CouponEntity coupon) { - return couponMapper.updateById(coupon) > 0; - } - - @Override - public Boolean delete(Integer id) { - return couponMapper.deleteById(id) > 0; - } - - @Override - public CouponEntity getById(Integer id) { - return couponMapper.selectById(id); - } - - @Override - public List list(CouponQueryReq query) { - List list = couponMapper.selectByQuery(query); - - // 批量获取景区名称 - List scenicIds = list.stream() - .map(CouponRespVO::getScenicId) - .filter(Objects::nonNull) - .distinct() - .collect(Collectors.toList()); - Map scenicNames = scenicRepository.batchGetScenicNames(scenicIds); - - // 设置景区名称 - list.forEach(item -> { - if (item.getScenicId() != null) { - item.setScenicName(scenicNames.get(item.getScenicId())); - } - }); - - return list; - } - - @Override - public Boolean updateStatus(Integer id) { - return couponMapper.updateStatus(id) > 0; - } -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java index cdc584d4..40e60b8f 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java @@ -28,7 +28,6 @@ import com.ycwl.basic.model.mobile.order.IsBuyRespVO; import com.ycwl.basic.model.mobile.order.OrderAppPageReq; import com.ycwl.basic.model.mobile.order.PriceObj; import com.ycwl.basic.model.mobile.order.RefundOrderReq; -import com.ycwl.basic.model.pc.couponRecord.resp.CouponRecordQueryResp; import com.ycwl.basic.model.pc.face.entity.FaceEntity; import com.ycwl.basic.model.pc.member.resp.MemberRespVO; import com.ycwl.basic.model.pc.order.entity.OrderEntity; diff --git a/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java b/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java index 6e21df28..127e7520 100644 --- a/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java +++ b/src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java @@ -1,16 +1,11 @@ package com.ycwl.basic.task; import cn.hutool.core.date.DateUtil; -import com.ycwl.basic.integration.message.dto.ZtMessage; import com.ycwl.basic.integration.message.service.ZtMessageProducerService; import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO; -import com.ycwl.basic.mapper.CouponMapper; import com.ycwl.basic.mapper.MemberMapper; import com.ycwl.basic.mapper.VideoMapper; -import com.ycwl.basic.model.pc.coupon.req.CouponQueryReq; -import com.ycwl.basic.model.pc.coupon.resp.CouponRespVO; import com.ycwl.basic.model.pc.member.resp.MemberRespVO; -import com.ycwl.basic.model.pc.mp.MpConfigEntity; import com.ycwl.basic.integration.common.manager.ScenicConfigManager; import com.ycwl.basic.model.pc.notify.req.WechatSubscribeNotifyTriggerRequest; import com.ycwl.basic.model.pc.notify.resp.WechatSubscribeNotifyTriggerResult; diff --git a/src/main/resources/mapper/CouponMapper.xml b/src/main/resources/mapper/CouponMapper.xml deleted file mode 100644 index a08b1557..00000000 --- a/src/main/resources/mapper/CouponMapper.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - UPDATE coupon - SET status = IF(status = 1, 0, 1) - WHERE id = #{id} - - - - - - INSERT INTO coupon ( - scenic_id, name, description, countdown, broadcast, - config_ids, discount_price, type, discount_type, - status, create_at, deleted, deleted_at - ) VALUES ( - #{scenicId}, #{name}, #{description}, #{countdown}, #{broadcast}, - #{configIds}, #{discountPrice}, #{type}, #{discountType}, - #{status}, #{createAt}, #{deleted}, #{deletedAt} - ) - - - - UPDATE coupon SET - scenic_id = #{scenicId}, - name = #{name}, - description = #{description}, - countdown = #{countdown}, - broadcast = #{broadcast}, - config_ids = #{configIds}, - discount_price = #{discountPrice}, - type = #{type}, - discount_type = #{discountType}, - status = #{status}, - create_at = #{createAt}, - deleted = #{deleted}, - deleted_at = #{deletedAt} - WHERE id = #{id} - - - - UPDATE coupon SET deleted = 1, deleted_at = NOW() WHERE id = #{id} - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/CouponRecordMapper.xml b/src/main/resources/mapper/CouponRecordMapper.xml deleted file mode 100644 index a6aa9370..00000000 --- a/src/main/resources/mapper/CouponRecordMapper.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - \ No newline at end of file