From ca4773db9919ce63571ae2dbee39d3c6135168eb Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Tue, 31 May 2022 23:27:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E5=B8=83=E5=95=86?= =?UTF-8?q?=E5=93=81+=E8=BD=AC=E6=B4=BE=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/goods/GoodsController.java | 1 + .../web/controller/order/OrderController.java | 10 +++ .../com/ghy/goods/mapper/GoodsAreaMapper.java | 3 +- .../com/ghy/goods/mapper/GoodsImgsMapper.java | 2 +- .../ghy/goods/mapper/GoodsStandardMapper.java | 3 +- .../ghy/goods/service/GoodsImgsService.java | 2 +- .../service/impl/GoodsAreaServiceImpl.java | 1 + .../service/impl/GoodsImgsServiceImpl.java | 3 +- .../mapper/goods/GoodsAreaMapper.xml | 17 ++-- .../mapper/goods/GoodsImgsMapper.xml | 47 +++++----- .../mapper/goods/GoodsStandardMapper.xml | 88 +++++++++---------- 11 files changed, 90 insertions(+), 87 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java index 0c9ba4dc..a0e57b9b 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java @@ -68,6 +68,7 @@ public class GoodsController extends BaseController { goodsService.addGoods(goods); return AjaxResult.success("新增成功"); }catch (Exception e){ + e.printStackTrace(); logger.error(e.getMessage()); return AjaxResult.error(ExceptionUtil.getExceptionMessage(e)); } diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index fea09019..6c99805d 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -108,6 +108,16 @@ public class OrderController extends BaseController { od.setRevTime(new Date()); orderDetailService.insertOrderDetail(od); + // 批量生成订单商品 + request.getGoodsList().forEach(goods->{ + OrderGoods orderGoods = new OrderGoods(); + orderGoods.setGoodsId(goods.getGoodsStandardId()); + orderGoods.setGoodsNum(goods.getNum()); + orderGoods.setOrderId(od.getId()); + orderGoods.setServerGoodsNum(0); + orderGoodsService.insertOrderGoods(orderGoods); + }); + String leaderTeamMoney = assignWorker.getLeaderTeamMoney(); String leaderTeamRate = assignWorker.getLeaderTeamRate(); // 派单师傅的钱 diff --git a/ghy-goods/src/main/java/com/ghy/goods/mapper/GoodsAreaMapper.java b/ghy-goods/src/main/java/com/ghy/goods/mapper/GoodsAreaMapper.java index b938c711..d540ff15 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/mapper/GoodsAreaMapper.java +++ b/ghy-goods/src/main/java/com/ghy/goods/mapper/GoodsAreaMapper.java @@ -1,6 +1,7 @@ package com.ghy.goods.mapper; import com.ghy.goods.domain.GoodsArea; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,6 +17,6 @@ public interface GoodsAreaMapper { * @param areas 区域集合id * @return 批量insert成功条数 */ - int batchInsert(List areas); + int batchInsert(@Param("areas") List areas); } diff --git a/ghy-goods/src/main/java/com/ghy/goods/mapper/GoodsImgsMapper.java b/ghy-goods/src/main/java/com/ghy/goods/mapper/GoodsImgsMapper.java index f9668636..345384cf 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/mapper/GoodsImgsMapper.java +++ b/ghy-goods/src/main/java/com/ghy/goods/mapper/GoodsImgsMapper.java @@ -18,7 +18,7 @@ public interface GoodsImgsMapper { * @param goodsImgs 商品图片信息 * @return 成功条数 */ - int batchInsert(Collection goodsImgs); + int batchInsert(@Param("goodsImgs") List goodsImgs); /** * 批量修改商品图片 diff --git a/ghy-goods/src/main/java/com/ghy/goods/mapper/GoodsStandardMapper.java b/ghy-goods/src/main/java/com/ghy/goods/mapper/GoodsStandardMapper.java index a5c83483..79ca2aec 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/mapper/GoodsStandardMapper.java +++ b/ghy-goods/src/main/java/com/ghy/goods/mapper/GoodsStandardMapper.java @@ -2,6 +2,7 @@ package com.ghy.goods.mapper; import com.ghy.goods.domain.GoodsStandard; import com.ghy.goods.request.AppGoodsRequest; +import org.apache.ibatis.annotations.Param; import java.util.Collection; import java.util.List; @@ -34,7 +35,7 @@ public interface GoodsStandardMapper { * @param goodsStandardList 批量添加商品规格 * @return 添加成功条数 */ - int batchInsert(List goodsStandardList); + int batchInsert(@Param("goodsStandards") List goodsStandardList); /** * @param request 校验的商品数量 diff --git a/ghy-goods/src/main/java/com/ghy/goods/service/GoodsImgsService.java b/ghy-goods/src/main/java/com/ghy/goods/service/GoodsImgsService.java index 71b20c03..f317319a 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/service/GoodsImgsService.java +++ b/ghy-goods/src/main/java/com/ghy/goods/service/GoodsImgsService.java @@ -17,7 +17,7 @@ public interface GoodsImgsService { * @param goodsImgs 商品图片信息 * @return */ - int batchInsert(Collection goodsImgs); + int batchInsert(List goodsImgs); /** * 批量编辑商品图片信息 diff --git a/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsAreaServiceImpl.java b/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsAreaServiceImpl.java index cb87d8ce..d9bc8ddc 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsAreaServiceImpl.java +++ b/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsAreaServiceImpl.java @@ -4,6 +4,7 @@ import com.ghy.goods.domain.GoodsArea; import com.ghy.goods.mapper.GoodsAreaMapper; import com.ghy.goods.service.GoodsAreaService; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsImgsServiceImpl.java b/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsImgsServiceImpl.java index 5fb1c795..7d672e5a 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsImgsServiceImpl.java +++ b/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsImgsServiceImpl.java @@ -23,8 +23,7 @@ public class GoodsImgsServiceImpl implements GoodsImgsService { GoodsImgsMapper goodsImgsMapper; @Override - public int batchInsert(Collection goodsImgs) { - if (CollectionUtils.isEmpty(goodsImgs)) return 0; + public int batchInsert(List goodsImgs) { return goodsImgsMapper.batchInsert(goodsImgs); } diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsAreaMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsAreaMapper.xml index c795710a..970f9de2 100644 --- a/ghy-goods/src/main/resources/mapper/goods/GoodsAreaMapper.xml +++ b/ghy-goods/src/main/resources/mapper/goods/GoodsAreaMapper.xml @@ -24,18 +24,11 @@ - - - INSERT INTO goods_imgs( - goods_imgs_id, - goods_id, - img_url - ) - VALUES( - #{goodsImgsId}, - #{goodsId}, - #{imgUrl} - ); + + INSERT INTO goods_area ( goods_id,country_area_id) + VALUES + + (#{area.goodsId},#{area.countryAreaId}) diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsImgsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsImgsMapper.xml index 7ffa6c67..1e35c2a8 100644 --- a/ghy-goods/src/main/resources/mapper/goods/GoodsImgsMapper.xml +++ b/ghy-goods/src/main/resources/mapper/goods/GoodsImgsMapper.xml @@ -3,10 +3,10 @@ - - - - + + + + @@ -22,7 +22,9 @@ - DELETE FROM goods_imgs WHERE goods_id = #{goodsId} + DELETE + FROM goods_imgs + WHERE goods_id = #{goodsId} - - - INSERT INTO goods_imgs( - goods_imgs_id, - goods_id, - img_url, - remark, - create_by, - create_time) - VALUES( - #{goodsImgsId}, - #{goodsId}, - #{imgUrl}, - #{remark}, - #{createBy}, - sysdate()); + + INSERT INTO + goods_imgs + ( + goods_id, + img_url, + remark, + create_by, + create_time + ) + VALUES + + ( + #{goodsImg.goodsId}, + #{goodsImg.imgUrl}, + #{goodsImg.remark}, + #{goodsImg.createBy}, + sysdate() + ) diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml index e8723236..d050bd7e 100644 --- a/ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml +++ b/ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml @@ -3,31 +3,43 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - SELECT goods_standard_id, goods_standard_name, goods_id, dept_goods_category_id, goods_price, - discount_price, group_price, goods_num, create_by, create_time, sale_num, status, update_by, update_time, + SELECT goods_standard_id, + goods_standard_name, + goods_id, + dept_goods_category_id, + goods_price, + discount_price, + group_price, + goods_num, + create_by, + create_time, + sale_num, + status, + update_by, + update_time, remark FROM goods_standard - + - - - INSERT INTO goods_standard( - goods_standard_name, - goods_id, - dept_goods_category_id - goods_price, - discount_price, - group_price, - goods_num, - sale_num, - status, - remark, - create_by, - create_time + + INSERT INTO goods_standard ( + goods_standard_name, goods_id, dept_goods_category_id, goods_price, discount_price, group_price, goods_num, + sale_num, status, remark, create_by, create_time ) + VALUES + + ( + #{goodsStandard.goodsStandardName}, #{goodsStandard.goodsId}, #{goodsStandard.deptGoodsCategoryId}, #{goodsStandard.goodsPrice}, #{goodsStandard.discountPrice}, + #{goodsStandard.groupPrice}, #{goodsStandard.goodsNum}, #{goodsStandard.saleNum}, #{goodsStandard.status}, #{goodsStandard.remark}, #{goodsStandard.createBy}, sysdate() ) - VALUES( - #{goodsStandardName}, - #{goodsId}, - #{deptGoodsCategoryId} - #{goodsPrice}, - #{discountPrice}, - #{groupPrice}, - #{goodsNum}, - #{saleNum}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ); - +