From 22bef59bbd7a0ca2718abeaa15f5918480483791 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 24 Dec 2020 15:36:32 +0800 Subject: [PATCH] finish shopping goods detail interface --- zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java index 161010c..80af2ef 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java @@ -7,16 +7,14 @@ import com.matrix.core.tools.StringUtils; import com.matrix.core.tools.WebUtil; import com.matrix.system.app.dto.ShoppingGoodsListDto; +import com.matrix.system.app.vo.ShoppingGoodsDetailVo; import com.matrix.system.app.vo.ShoppingGoodsListVo; import com.matrix.system.common.bean.SysUsers; import com.matrix.system.common.dao.UtilDao; import com.matrix.system.common.tools.ServiceUtil; import com.matrix.system.constance.Dictionary; import com.matrix.system.constance.TableMapping; -import com.matrix.system.hive.bean.MoneyCardAssemble; -import com.matrix.system.hive.bean.ShoppingGoods; -import com.matrix.system.hive.bean.ShoppingGoodsAssemble; -import com.matrix.system.hive.bean.SysShopInfo; +import com.matrix.system.hive.bean.*; import com.matrix.system.hive.dao.MoneyCardAssembleDao; import com.matrix.system.hive.dao.ShoppingGoodsAssembleDao; import com.matrix.system.hive.dao.ShoppingGoodsDao; @@ -30,6 +28,7 @@ import javax.validation.constraints.NotNull; import java.awt.event.WindowStateListener; +import java.math.BigDecimal; import java.time.LocalDate; import java.util.ArrayList; import java.util.Date; @@ -487,6 +486,48 @@ public int findShoppingGoodsListTotalForApi(ShoppingGoodsListDto shoppingGoodsListDto) { SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); shoppingGoodsListDto.setShopId(user.getShopId()); + return shoppingGoodsDao.selectShopppingGoodsAipTotal(shoppingGoodsListDto); } + + @Override + public ShoppingGoodsDetailVo findApiShoppingGoodsDetailById(Long id) { + ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(id); + ShoppingGoodsDetailVo goodsDetailVo = goodsToGoodsDetailVo(shoppingGoods); + + if (ShoppingGoods.SHOPPING_GOODS_TYPE_TC.equals(shoppingGoods.getGoodType())) { + List<ShoppingGoodsDetailVo> products = shoppingGoodsAssembleDao.selectGoodsRelationGoodsList(shoppingGoods.getId(), ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP); + List<ShoppingGoodsDetailVo> proj = shoppingGoodsAssembleDao.selectGoodsRelationGoodsList(shoppingGoods.getId(), ShoppingGoods.SHOPPING_GOODS_TYPE_XM); + + goodsDetailVo.setAssembleTaocanProduct(products); + goodsDetailVo.setAssembleTaocanProj(proj); + } else if (ShoppingGoods.SHOPPING_GOODS_TYPE_XM.equals(shoppingGoods.getGoodType())) { + List<ShoppingGoodsDetailVo> products = shoppingGoodsAssembleDao.selectGoodsRelationGoodsList(shoppingGoods.getId(), null); + goodsDetailVo.setAssembleProj(products); + } else if (ShoppingGoods.SHOPPING_GOODS_TYPE_CZK.equals(shoppingGoods.getGoodType())) { + List<ShoppingGoodsDetailVo> cardGoods = moneyCardAssembleDao.selectCardRelationGoods(shoppingGoods.getId()); + List<ShoppingGoodsCategory> cardCategory = moneyCardAssembleDao.selectCardRelationCategory(shoppingGoods.getId()); + + goodsDetailVo.setAssembleProj(cardGoods); + goodsDetailVo.setCardCategory(cardCategory); + } + return goodsDetailVo; + } + + private ShoppingGoodsDetailVo goodsToGoodsDetailVo(ShoppingGoods shoppingGoods) { + ShoppingGoodsDetailVo goodsDetailVo = new ShoppingGoodsDetailVo(); + goodsDetailVo.setImg(shoppingGoods.getImg()); + goodsDetailVo.setGoodsName(shoppingGoods.getName()); + goodsDetailVo.setGoodsNo(shoppingGoods.getGoodsNo()); + goodsDetailVo.setGoodsType(shoppingGoods.getGoodType()); + goodsDetailVo.setDesc(shoppingGoods.getDescription()); + goodsDetailVo.setMaxSaleCnt(shoppingGoods.getCarMaxSaleCount()); + goodsDetailVo.setLimitBuyCnt(shoppingGoods.getIsOnce()); + goodsDetailVo.setMeasure(shoppingGoods.getMeasure()); + goodsDetailVo.setVolume(shoppingGoods.getVolume()); + goodsDetailVo.setSalePrice(BigDecimal.valueOf(shoppingGoods.getSealPice())); + goodsDetailVo.setSaleCnt(shoppingGoods.getRealSealCount()); + goodsDetailVo.setGiftPrice(BigDecimal.valueOf(shoppingGoods.getReferencePice() == null ? 0 : shoppingGoods.getReferencePice())); + return goodsDetailVo; + } } -- Gitblit v1.9.1