|
@@ -66,6 +66,8 @@ public class GoodsLogic {
|
|
|
GoodsDetailService goodsDetailService;
|
|
GoodsDetailService goodsDetailService;
|
|
|
@Resource
|
|
@Resource
|
|
|
GoodsAdviceNoticeService goodsAdviceNoticeService;
|
|
GoodsAdviceNoticeService goodsAdviceNoticeService;
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ GoodsAdviceNoticeItemService goodsAdviceNoticeItemService;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 商品列表
|
|
* 商品列表
|
|
@@ -207,6 +209,28 @@ public class GoodsLogic {
|
|
|
if (goodsSpec.getOrgPrice().doubleValue() == 0) {
|
|
if (goodsSpec.getOrgPrice().doubleValue() == 0) {
|
|
|
goodsSpec.setOrgPrice(goodsSpec.getOrgGoodsPrice());
|
|
goodsSpec.setOrgPrice(goodsSpec.getOrgGoodsPrice());
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ // 如果物料库存为0
|
|
|
|
|
+ if (goodsSpec.getStockNum() <= 0) {
|
|
|
|
|
+ final GoodsAdviceNotice notice = goodsAdviceNoticeService.lambdaQuery()
|
|
|
|
|
+ .eq(GoodsAdviceNotice::getCompanyWechatId, goods.getCompanyWechatId())
|
|
|
|
|
+ .eq(GoodsAdviceNotice::getGoodsId, goodsId)
|
|
|
|
|
+ .eq(GoodsAdviceNotice::getGoodsSpecId, goodsSpec.getGoodsSpecId())
|
|
|
|
|
+ .eq(GoodsAdviceNotice::getGoodsMaterialId, goodsSpec.getGoodsCode())
|
|
|
|
|
+ .eq(GoodsAdviceNotice::getIsNotice, false)
|
|
|
|
|
+ .one();
|
|
|
|
|
+
|
|
|
|
|
+ // 如果有到货通知未执行的
|
|
|
|
|
+ if (Objects.nonNull(notice)) {
|
|
|
|
|
+ final Integer count = goodsAdviceNoticeItemService.lambdaQuery()
|
|
|
|
|
+ .eq(GoodsAdviceNoticeItem::getGoodsAdviceNoticeId, notice.getId())
|
|
|
|
|
+ .eq(GoodsAdviceNoticeItem::getUserId, user.getUserId())
|
|
|
|
|
+ .count();
|
|
|
|
|
+ if (count > 0) {
|
|
|
|
|
+ goodsSpec.setAdviceNotice(true);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 总商品库存
|
|
// 总商品库存
|