From d3386ce4a4439ee740ca79d33ac7040963a18948 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 24 Apr 2020 11:31:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
index 7325ba4..81aad5a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
@@ -154,22 +154,17 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
- //int v = productOrderDetailService.batchInsert(list);
- for (int i = 0; i < list.size(); i++) {
- if (!productOrderDetailService.saveOrUpdate(list.get(i))) {
- //写入订单明细失败，则删除订单记录数据
- Boolean e = productOrderService.removeById(list.get(0).getOrderId());
-// //删除已写入的订单明细
-// Map<String, Object> idList = new HashMap<String, Object>();
-// idList.put("orderId", list.get(i).getOrderId());
-// boolean delDetail = productOrderDetailService.removeByMap(idList);
- if (e)
- return ResultBody.failed().msg("充值数据保存失败，订单已撤回！");
- else
- return ResultBody.failed().msg("充值数据保存失败，订单撤回失败！");
- }
+ Boolean v = productOrderDetailService.saveBatch(list);
+ if (v) {
+ return ResultBody.ok().data(list.size()).msg("产品充值成功");
+ } else {
+ //写入订单明细失败，则删除订单记录数据
+ Boolean e = productOrderService.removeById(list.get(0).getOrderId());
+ if (e)
+ return ResultBody.failed().msg("充值数据保存失败，订单已撤回！");
+ else
+ return ResultBody.failed().msg("充值数据保存失败，订单撤回失败！");
}
- return ResultBody.ok().data(list.size()).msg("产品充值成功");
}
}
--
Gitblit v1.8.0