满减活动金额字段

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDiscountActivityServiceImpl.java

@@ -48,12 +48,27 @@ public class MkDiscountActivityServiceImpl extends ServiceImpl<MkDiscountActivit
         Page<MkDiscountActivityDTO> page = pageAs(PageUtil.buildPage(), queryWrapper, MkDiscountActivityDTO.class);
         page.getRecords().forEach(
                 item -> item.setThresholds(thresholdMapper.selectListByQuery(
-                        new QueryWrapper().eq(MkDiscountThreshold::getActivityId, item.getId())
+                        new QueryWrapper()
+                                .eq(MkDiscountThreshold::getActivityId, item.getId())
+                                .orderBy(MkDiscountThreshold::getFullAmount, true)
                 ))
         );
         return page;
     }
 
+    @Override
+    public MkDiscountActivityDTO checkDiscountAct(Long shopId, boolean couponShare, boolean vipShare, boolean pointsShare) {
+        MkDiscountActivityDTO activityDTO = getActivityByShopId(shopId);
+        AssertUtil.isNull(activityDTO, "店铺未配置满减活动");
+        //检查是否开启了优惠券抵扣
+        AssertUtil.isNotEqual(activityDTO.getCouponShare() == 1, couponShare, "满减活动与优惠券不可共用");
+        //检查是否开启了会员抵扣
+        AssertUtil.isNotEqual(activityDTO.getVipPriceShare() == 1, vipShare, "满减活动与会员价不可共用");
+        //检查是否开启了积分抵扣
+        AssertUtil.isNotEqual(activityDTO.getPointsShare() == 1, pointsShare, "满减活动与积分抵扣不可共用");
+        return activityDTO;
+    }
+
     @Override
     public MkDiscountActivityDTO getActivityByShopId(Long shopId) {
         ShopInfo shopInfo = shopInfoService.getById(shopId);
@@ -67,7 +82,9 @@ public class MkDiscountActivityServiceImpl extends ServiceImpl<MkDiscountActivit
         }
         MkDiscountActivityDTO activityDTO = BeanUtil.toBean(activity, MkDiscountActivityDTO.class);
         activityDTO.setThresholds(thresholdMapper.selectListByQuery(
-                new QueryWrapper().eq(MkDiscountThreshold::getActivityId, activity.getId())
+                new QueryWrapper()
+                        .eq(MkDiscountThreshold::getActivityId, activity.getId())
+                        .orderBy(MkDiscountThreshold::getFullAmount, false)
         ));
         return activityDTO;
     }