From b4192138b40135b13bf7c770525764d131c6f12e Mon Sep 17 00:00:00 2001 From: 侯瑞军 <411269194@kidgrow.com> Date: Thu, 23 Apr 2020 19:23:54 +0800 Subject: [PATCH] 修改批量写入数据的,使用系统内置的函数 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 25 +++++------- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 9 ---- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java | 2 - kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 24 ------------ kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysAreaServiceImpl.java | 1 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 11 ----- 6 files changed, 11 insertions(+), 61 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java index 821f8ab..69a2150 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java @@ -44,6 +44,4 @@ * @return ProductOrderDetail对象 */ List<GroupProductDetail> groupProductDetail(Page<GroupProductDetail> page, @Param("p") Map<String, Object> params); - /**批量添加*/ - int batchInsert(List<ProductOrderDetail> list); } diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java index e2e8920..481f979 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java @@ -7,7 +7,6 @@ import com.kidgrow.oprationcenter.vo.GroupProductDetail; import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail; -import java.util.List; import java.util.Map; /** @@ -50,13 +49,5 @@ * @return */ ResultBody updateEnabled(Map<String, Object> params); - - /** - * 批量写入数据 - * @param list - * @return - */ - int batchInsert(List<ProductOrderDetail> list); - } diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java index c9d43d5..50fa2c3 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java @@ -91,15 +91,4 @@ int i = baseMapper.updateById(productOrder); return i > 0 ? ResultBody.ok().data(productOrder).msg("更新成功") : ResultBody.failed("更新失败"); } - - /** - * 批量写入数据 - * @param list - * @return - */ - @Override - public int batchInsert(List<ProductOrderDetail> list) { - - return baseMapper.batchInsert(list); - } } diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml index d204937..0ad53bf 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml @@ -135,28 +135,4 @@ GROUP BY DE.pro_id order by pro_count desc </select> - - <!-- 定义 批量添加数据 --> - <insert id="batchInsert" parameterType="java.util.List"> - insert into product_order_detail - (order_id, - pro_id, - pro_name, - is_share, - ailight_count, - record_count, - pro_begintime, - pro_endtime) - values - <foreach collection="list" item="item" index="index" separator=","> - (#{item.orderId} , - #{item.proId} , - #{item.proName} , - #{item.isShare} , - #{item.ailightCount} , - #{item.recordCount} , - #{item.proBegintime} , - #{item.proEndtime}) - </foreach> - </insert> </mapper> \ No newline at end of file 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("产品充值成功"); } } diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysAreaServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysAreaServiceImpl.java index a93657a..a6e6b6e 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysAreaServiceImpl.java +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysAreaServiceImpl.java @@ -42,6 +42,7 @@ */ @Override public SysArea findByObject(SysArea sysArea){ + return baseMapper.findByObject(sysArea); } /** -- Gitblit v1.8.0