|
@@ -1135,6 +1135,7 @@ public class OrderBaseExcelLogic {
|
|
.filter(item -> item.getOrderBaseId().equals(pgOrderBase.getId()))
|
|
.filter(item -> item.getOrderBaseId().equals(pgOrderBase.getId()))
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
|
|
+
|
|
if (CollectionUtils.isNotEmpty(pgOrderProductList)) {
|
|
if (CollectionUtils.isNotEmpty(pgOrderProductList)) {
|
|
for (PgOrderProduct pgOrderProduct : pgOrderProductList) {
|
|
for (PgOrderProduct pgOrderProduct : pgOrderProductList) {
|
|
|
|
|
|
@@ -1142,6 +1143,9 @@ public class OrderBaseExcelLogic {
|
|
List<PgOrderProductDetail> pgOrderProductDetails = pgOrderProductDetailService.lambdaQuery()
|
|
List<PgOrderProductDetail> pgOrderProductDetails = pgOrderProductDetailService.lambdaQuery()
|
|
.in(PgOrderProductDetail::getOrderBaseId, pgOrderBase.getId()).list();
|
|
.in(PgOrderProductDetail::getOrderBaseId, pgOrderBase.getId()).list();
|
|
|
|
|
|
|
|
+ pgOrderProductDetailService.lambdaUpdate()
|
|
|
|
+ .in(PgOrderProductDetail::getOrderBaseId, pgOrderBase.getId()).remove();
|
|
|
|
+
|
|
if (!CollectionUtils.isEmpty(pgOrderProductDetails)){
|
|
if (!CollectionUtils.isEmpty(pgOrderProductDetails)){
|
|
|
|
|
|
pgOrderProduct.setId(pgOrderProduct.getId());
|
|
pgOrderProduct.setId(pgOrderProduct.getId());
|