|
@@ -1371,15 +1371,13 @@ public class OrderBaseLogic {
|
|
|
|
|
|
//判断有无导入过
|
|
//判断有无导入过
|
|
List<PgOrderProductDetail> pgOrderProductDetails = pgOrderProductDetailService.lambdaQuery()
|
|
List<PgOrderProductDetail> pgOrderProductDetails = pgOrderProductDetailService.lambdaQuery()
|
|
- .in(PgOrderProductDetail::getProductId, pgOrderProducts.getId()).list();
|
|
|
|
|
|
+ .in(PgOrderProductDetail::getOrderProductId, pgOrderProducts.getId()).list();
|
|
|
|
|
|
pgOrderProductDetailService.lambdaUpdate()
|
|
pgOrderProductDetailService.lambdaUpdate()
|
|
- .in(PgOrderProductDetail::getProductId, pgOrderProducts.getId()).remove();
|
|
|
|
|
|
+ .in(PgOrderProductDetail::getOrderProductId, pgOrderProducts.getId()).remove();
|
|
|
|
|
|
if (!CollectionUtils.isEmpty(pgOrderProductDetails)) {
|
|
if (!CollectionUtils.isEmpty(pgOrderProductDetails)) {
|
|
|
|
|
|
- pgOrderProducts.setId(pgOrderProducts.getId());
|
|
|
|
-
|
|
|
|
int sort = 0;
|
|
int sort = 0;
|
|
List<PgOrderProductDetail> pgOrderProductDetailList = pgOrderProductDetails.stream()
|
|
List<PgOrderProductDetail> pgOrderProductDetailList = pgOrderProductDetails.stream()
|
|
.filter(item -> !item.getStatus().equals("WAIT")).collect(Collectors.toList());
|
|
.filter(item -> !item.getStatus().equals("WAIT")).collect(Collectors.toList());
|