no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/parts/WebsitPartsSalesOrderLogic.java

@@ -410,10 +410,10 @@ public class WebsitPartsSalesOrderLogic {
                 }
                 // 非申请单检验配件网点库存是否大于0
                 if (partsSalesOrderBean.getIsApply()) {
-                    if (partsWebsitStockList.stream().noneMatch(o ->
+                    if (!partsWebsitStockList.stream().filter(o ->
                             item.getPartsWebsitId().equals(o.getPartsWebsitId())
                                     && item.getPartsNumber().equals(o.getGoodsId())
-                    )) {
+                    ).findAny().isPresent()) {
                         result.put("isSuccess", Boolean.FALSE);
                         result.put("msg", String.join("配件编号:", item.getPartsNumber(), ",在网点编号:", partsSalesOrderBean.getWebsitId(), "没有库存"));
                         break;

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsSalesOrderLogic.java

@@ -235,7 +235,7 @@ public class WebsitPartsSalesOrderLogic {
                 }
                 // 非申请单检验配件网点库存是否大于0
                 if (!partsSalesOrderBean.getIsApply()) {
-                    if (partsWebsitStockList.stream().filter(o ->
+                    if (!partsWebsitStockList.stream().filter(o ->
                             item.getPartsWebsitId().equals(o.getPartsWebsitId())
                                     && item.getPartsNumber().equals(o.getGoodsId())
                     ).findAny().isPresent()) {
@@ -743,6 +743,7 @@ public class WebsitPartsSalesOrderLogic {
                 .eq(WebsitSalesPayOrder::getCompanyWechatId, partsSalesOrderBean.getCompanyWechatId())
                 .eq(WebsitSalesPayOrder::getWebsitId, partsSalesOrderBean.getWebsitId())
                 .eq(WebsitSalesPayOrder::getOrderId, partsSalesOrderBean.getId())
+                .eq(WebsitSalesPayOrder::getPayType, PayTypeEnum.ALLINPAY.getKey())
                 .in(WebsitSalesPayOrder::getOrderType, PayOrderTypeEnum.S.getKey())
                 .orderByAsc(WebsitSalesPayOrder::getCreateTime)
                 .list();