fix

netflix-dao/src/main/java/com/cyksj/mapper/manage/coupon/CouponUserMapper.java

@@ -9,6 +9,7 @@ import com.cyksj.model.views.CouponActiveView;
 import com.cyksj.model.views.CouponUserView;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -19,7 +20,7 @@ import java.util.Map;
  *创建时间:2022/11/18 11:43
  */
 public interface CouponUserMapper extends BaseMapper<CouponUser> {
-	Page<CouponUserView> getAvailableCouponList(@Param("skuId") Long skuId, @Param("couponId") Long couponId, @Param("goodsId") Long goodsId, @Param("userId") Long userId, @Param("isRenew") Boolean isRenew, @Param("page") IPage<CouponUserView> page);
+	Page<CouponUserView> getAvailableCouponList(@Param("skuId") Long skuId, @Param("skuMoney") BigDecimal skuMoney, @Param("couponId") Long couponId, @Param("goodsId") Long goodsId, @Param("userId") Long userId, @Param("isRenew") Boolean isRenew, @Param("page") IPage<CouponUserView> page);
 
 	List<CouponUserView> countAvailableCouponList(@Param("goodsId") Long goodsId, @Param("skuId") Long skuId, @Param("userId") Long userId, @Param("isRenew") Boolean isRenew);
 

netflix-dao/src/main/resources/mapper/CouponUserMapper.xml

@@ -21,6 +21,7 @@
         cp.use_scope,
         cu.created_time,
         cu.status as couponUserStatus,
+        if(type = 'discount',${skuMoney} * (1-cp.discount),reduce_money) as couponMoney,
         if(ck.id is null, 0, 1) as 'isAvailable',
         if(ca.id is not null and ca.expiry_status = 0,false,true) flag,
         (case
@@ -55,6 +56,7 @@
         <if test="couponId != null">
             order by case when cp.id = #{couponId} then 2 else isAvailable end desc,orderby
         </if>)s where flag = 1 and couponUserStatus != 'used' and orderby != 2
+           order by couponMoney desc
     </select>
 
     <select id="countAvailableCouponList" resultType="com.cyksj.model.views.CouponUserView">

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

@@ -135,7 +135,7 @@ public class CouponFontServiceImpl implements CouponFontService {
 		if (goodsDonSkuView.getType() == 2) {
 			goodsId = goodsDonSkuView.getGoodsId();
 		}
-		Page<CouponUserView> availableCouponList = couponUserMapper.getAvailableCouponList(skuId, couponId, goodsId, userId, isRenew, new Page<>(start, limit));
+		Page<CouponUserView> availableCouponList = couponUserMapper.getAvailableCouponList(skuId, skuMoney, couponId, goodsId, userId, isRenew, new Page<>(start, limit));
 		Optional.ofNullable(availableCouponList).ifPresent(page->{
 			page.getRecords().stream().forEach(data->{
 				String str = couponSkuMapper.selectGoodsSkuStr(data.getCouponId());