Prechádzať zdrojové kódy

fix 忽略逻辑删除优惠卷

zoujiajian 3 rokov pred
rodič
commit
b71f8038c9

+ 4 - 0
netflix-dao/src/main/java/com/cyksj/mapper/manage/coupon/CouponMapper.java

@@ -3,6 +3,7 @@ package com.cyksj.mapper.manage.coupon;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.dto.CouponPopularizeDto;
 import com.cyksj.model.entity.Coupon;
+import org.apache.ibatis.annotations.Select;
 
 /*
  *项目名: netflix
@@ -12,4 +13,7 @@ import com.cyksj.model.entity.Coupon;
  */
 public interface CouponMapper extends BaseMapper<Coupon> {
 	CouponPopularizeDto checkExCode(String couponExCode);
+
+	@Select("select * from `coupon` where id = #{couponId}")
+	Coupon getCouponById(Long couponId);
 }

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/coupon/impl/CouponFontServiceImpl.java

@@ -244,7 +244,7 @@ public class CouponFontServiceImpl implements CouponFontService {
 
 	@Override
 	public void updateCouponUserValidTime(Long couponId, CouponUser couponUser) {
-		Coupon coupon = couponMapper.selectById(couponId);
+		Coupon coupon = couponMapper.getCouponById(couponId);
 		if (coupon.getIsValidTime()) {
 			couponUser.setValidStartTime(coupon.getValidStartTime());
 			couponUser.setValidEndTime(coupon.getValidEndTime());

+ 2 - 2
netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -222,7 +222,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		//存在优惠券
 		if (couponUser != null) {
 			Long couponId = couponUser.getCouponId();
-			Coupon coupon = couponMapper.selectById(couponId);
+			Coupon coupon = couponMapper.getCouponById(couponId);
 			BigDecimal couponMoney = null;
 			if (coupon.getType() == Coupon.Type.discount) {
 				BigDecimal discountMoney = payRequest.getDonMoney().multiply(coupon.getDiscount());
@@ -514,7 +514,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		//存在优惠券
 		if (couponUser != null) {
 			Long couponId = couponUser.getCouponId();
-			Coupon coupon = couponMapper.selectById(couponId);
+			Coupon coupon = couponMapper.getCouponById(couponId);
 			BigDecimal couponMoney = null;
 			if (coupon.getType() == Coupon.Type.discount) {
 				BigDecimal discountMoney = payRequest.getDonMoney().multiply(coupon.getDiscount()).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN);