|
@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.cyksj.common.exception.BusinessRuntimeException;
|
|
import com.cyksj.common.exception.BusinessRuntimeException;
|
|
|
import com.cyksj.common.util.Jsons;
|
|
import com.cyksj.common.util.Jsons;
|
|
|
-import com.cyksj.mapper.ChatgptUserMapper;
|
|
|
|
|
-import com.cyksj.mapper.GoodsDiscountPlusPurchaseRelationMapper;
|
|
|
|
|
-import com.cyksj.mapper.GoodsDonSkuMapper;
|
|
|
|
|
-import com.cyksj.mapper.UpgradePackageMapper;
|
|
|
|
|
|
|
+import com.cyksj.mapper.*;
|
|
|
import com.cyksj.mapper.shop.YhShopGoodsRateMapper;
|
|
import com.cyksj.mapper.shop.YhShopGoodsRateMapper;
|
|
|
import com.cyksj.mapper.shop.YhShopGoodsSkuMapper;
|
|
import com.cyksj.mapper.shop.YhShopGoodsSkuMapper;
|
|
|
import com.cyksj.mapper.shop.YhShopSkuSysTakeDownRecordMapper;
|
|
import com.cyksj.mapper.shop.YhShopSkuSysTakeDownRecordMapper;
|
|
@@ -48,6 +45,8 @@ public class CmsGoodsDonSkuServiceImpl extends ServiceImpl<GoodsDonSkuMapper,Goo
|
|
|
|
|
|
|
|
private final UpgradePackageMapper upgradePackageMapper;
|
|
private final UpgradePackageMapper upgradePackageMapper;
|
|
|
|
|
|
|
|
|
|
+ private final GoodsDonMapper goodsDonMapper;
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public void handleDiscountPurchaseGoods(GoodsDonSku sku, List<GoodsDiscountPlusPurchaseRelation> discountPlusPurchaseGoods) {
|
|
public void handleDiscountPurchaseGoods(GoodsDonSku sku, List<GoodsDiscountPlusPurchaseRelation> discountPlusPurchaseGoods) {
|
|
|
Long skuId = sku.getId();
|
|
Long skuId = sku.getId();
|
|
@@ -218,8 +217,9 @@ public class CmsGoodsDonSkuServiceImpl extends ServiceImpl<GoodsDonSkuMapper,Goo
|
|
|
if (sku == null) {
|
|
if (sku == null) {
|
|
|
throw BusinessRuntimeException.getInstance("优惠加购规格不存在");
|
|
throw BusinessRuntimeException.getInstance("优惠加购规格不存在");
|
|
|
}
|
|
}
|
|
|
- if (!sku.getStatus()) {
|
|
|
|
|
- throw BusinessRuntimeException.getInstance("{0}规格未上架", sku.getSpecVal());
|
|
|
|
|
|
|
+ if (sku.getStatus()) {
|
|
|
|
|
+ GoodsDon goodsDon = goodsDonMapper.selectById(sku.getGoodsId());
|
|
|
|
|
+ throw BusinessRuntimeException.getInstance("{0}优惠加购规格未上架", goodsDon.getTitle() + sku.getSpecVal());
|
|
|
}
|
|
}
|
|
|
if (disPrice == null || disPrice.compareTo(BigDecimal.ZERO) <= 0) {
|
|
if (disPrice == null || disPrice.compareTo(BigDecimal.ZERO) <= 0) {
|
|
|
throw BusinessRuntimeException.getInstance("请输入正确的优惠加购价格");
|
|
throw BusinessRuntimeException.getInstance("请输入正确的优惠加购价格");
|