zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java
@@ -95,8 +95,6 @@ */ @Transactional(rollbackFor = Exception.class) public int createOrder(HttpSession session, ShoppingCarItemsVo car); /** * 补交 * @Title: updateAfterMoney @@ -116,10 +114,6 @@ public SysOrder updateAddCardMoney(CzXkVo czVo); public void addOutStore(SysOrder sourceOrder); public void setShopSelCount(SysOrder sourceOrder); /** zq-erp/src/main/java/com/matrix/system/hive/service/SysOutStoreService.java
@@ -14,6 +14,7 @@ /** * 新增SysOutStore * 立即出库 * */ public int add(SysOutStore sysOutStore); zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java
@@ -13,6 +13,7 @@ import com.matrix.core.constance.MatrixConstance; import com.matrix.core.exception.GlobleException; import com.matrix.core.tools.LogUtil; import com.matrix.core.tools.StringUtils; import com.matrix.core.tools.WebUtil; import com.matrix.system.common.bean.BusParameterSettings; import com.matrix.system.common.bean.SysUsers; @@ -20,8 +21,7 @@ import com.matrix.system.common.dao.BusParameterSettingsDao; import com.matrix.system.constance.Dictionary; import com.matrix.system.hive.bean.*; import com.matrix.system.hive.dao.ShoppingGoodsDao; import com.matrix.system.hive.dao.SysOrderFlowDao; import com.matrix.system.hive.dao.*; import com.matrix.system.hive.dto.MoneyCardOperationDto; import com.matrix.system.hive.dto.MoneyCardPayDto; import com.matrix.system.hive.dto.ProjUseOperationDto; @@ -29,9 +29,15 @@ import com.matrix.system.hive.service.CodeService; import com.matrix.system.hive.service.MoneyCardUseService; import com.matrix.system.hive.service.SysProjUseService; import com.matrix.system.score.constant.ScoreSettingConstant; import com.matrix.system.score.entity.ScoreVipDetail; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -48,11 +54,24 @@ @Autowired SysVipInfoDao sysVipInfoDao; @Autowired private SysStoreInfoDao storeInfoDao; @Autowired private SysProjUseService sysProjUseService; @Autowired SysOutStoreDao sysOutStoreDao; @Autowired private CodeService codeService; @Autowired ShoppingGoodsAssembleDao shoppingGoodsAssembleDao; @Autowired SysOutStoreItemDao sysOutStoreItemDao; @Autowired ShoppingGoodsDao shoppingGoodsDao; @@ -63,6 +82,9 @@ @Autowired BusParameterSettingsDao busParameterSettingsDao; @Autowired private WarehouseDao warehouseDao; @Autowired MoneyCardUseService moneyCardUseService; @@ -234,5 +256,279 @@ } /** * 新增出库单并更新本店库存 * jyytodo 继续优化 * @param order */ public void addOutStore(SysOrder order) { BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, order.getCompanyId()); if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) { List<SysOutStoreItem> storeItemList = new ArrayList<>(); for (SysOrderItem sysOrderItem : order.getItems()) { if (ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP.equals(sysOrderItem.getType())) { SysOutStoreItem storeItem = new SysOutStoreItem(); storeItem.setSkuId(sysOrderItem.getGoodsId()); storeItem.setAmount(Double.valueOf(sysOrderItem.getCount())); storeItemList.add(storeItem); } else if (ShoppingGoods.SHOPPING_GOODS_TYPE_TC.equals(sysOrderItem.getType()) || ShoppingGoods.SHOPPING_GOODS_TYPE_ZHK.equals(sysOrderItem.getType())) { List<ShoppingGoodsAssemble> goodsList = new ArrayList<>(); goodsList.addAll(shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(sysOrderItem.getGoodsId(), ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP)); if (ShoppingGoods.SHOPPING_GOODS_TYPE_ZHK.equals(sysOrderItem.getType())) { //综合卡处理,中的套餐，中的家居产品 List<ShoppingGoodsAssemble> zhkAssemble = shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(sysOrderItem.getGoodsId(), ShoppingGoods.SHOPPING_GOODS_TYPE_TC); zhkAssemble.forEach(item -> { goodsList.addAll(shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(item.getAssembleGoodId(), ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP)); }); } goodsList.forEach(item -> { SysOutStoreItem storeItem = new SysOutStoreItem(); storeItem.setSkuId(item.getAssembleGoodId()); storeItem.setAmount(Double.valueOf(item.getTotal())); storeItemList.add(storeItem); }); } } if (CollectionUtils.isNotEmpty(storeItemList)) { Long warehouseId = warehouseDao.findShopWarehouse(order.getShopId()).get(0).getId(); SysOutStore outStore = new SysOutStore(); outStore.setOutStoreNo(codeService.getOutStoreCode()); outStore.setOrderId(order.getId()); outStore.setShopId(order.getShopId()); outStore.setShopId(order.getShopId()); outStore.setStaffId(order.getStaffId()); outStore.setType(Dictionary.OUT_STORE_JJCPCK); outStore.setServiceNo(order.getOrderNo()); outStore.setTime(new Date()); outStore.setCheckStatus(Dictionary.CHECK_STATUS_DSH); outStore.setCompanyId(order.getCompanyId()); sysOutStoreDao.insert(outStore); //出库明细，根据批次维度定义 List<SysOutStoreItem> realOutStoreItemList = new ArrayList<>(); storeItemList.forEach(outStoreItem -> { //设置出库主键 outStoreItem.setOutStoreId(outStore.getId()); //计算库存总数是否满足本次扣减的需求 List<SysStoreInfo> stores = storeInfoDao.selectStoInfoBySku(outStoreItem.getSkuId(), warehouseId); double sum = stores.stream().mapToDouble(item -> item.getStoreTotal()).sum(); if (sum < outStoreItem.getAmount()) { ShoppingGoods sysGoods = shoppingGoodsDao.selectById(outStoreItem.getSkuId()); if (sysGoods != null) { throw new GlobleException("出库失败：【" + sysGoods.getName() + "库存不足】"); } else { throw new GlobleException("出库失败没有找到出库产品"); } } //循环获取所有批次产品，并扣减库存 Double number = outStoreItem.getAmount(); for (SysStoreInfo storeInfo : stores) { Double oldStoreTotal = storeInfo.getStoreTotal(); Double surplus = storeInfo.getStoreTotal() - number; //更新库存 storeInfo.setStoreTotal(surplus < 0 ? 0 : surplus); //每次扣减库存都创建一个出库记录 SysOutStoreItem sysOutStoreItem = new SysOutStoreItem(); BeanUtils.copyProperties(outStoreItem, sysOutStoreItem); sysOutStoreItem.setStoreId(storeInfo.getId()); sysOutStoreItem.setAmount(oldStoreTotal - storeInfo.getStoreTotal()); realOutStoreItemList.add(sysOutStoreItem); storeInfoDao.update(storeInfo); //扣除后剩余库存大于0则跳出扣除,否则剩余数量的负数的绝对值就是再次扣减的数量 if (surplus > 0) { break; } else { number = Math.abs(surplus); } } }); sysOutStoreItemDao.batchInsert(realOutStoreItemList); } } else { LogUtil.debug("不管理库存"); } } /** * 设置会员消费积分 * @param pageOrder */ public void addVipScore(SysOrder pageOrder) { SysVipInfo vipInfo = sysVipInfoDao.selectById(pageOrder.getVipId()); List<SysOrderFlow> flows = pageOrder.getFlows(); int[] cashScore = {0, 0, 0}; //现金支付金额 BigDecimal cashPayAmount = flows.stream() .filter(item -> (!item.getPayMethod().equals("储值卡")) && (!item.getPayMethod().equals("欠款"))) .map(SysOrderFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add); BusParameterSettings cashConsumption = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.CASH_CONSUMPTION, vipInfo.getCompanyId()); if (cashPayAmount != null && cashPayAmount.compareTo(BigDecimal.ZERO) > 0 && StringUtils.isNotBlank(cashConsumption.getParamValue())) { BigDecimal scoreSetting0 = new BigDecimal(cashConsumption.getParamValue()); if (scoreSetting0.compareTo(BigDecimal.ZERO) > 0) { cashScore[0] = cashPayAmount.divide(scoreSetting0).intValue(); } if (StringUtils.isNotBlank(cashConsumption.getParamValue1())) { BigDecimal scoreSetting1 = new BigDecimal(cashConsumption.getParamValue1()); if (scoreSetting1.compareTo(BigDecimal.ZERO) > 0) { cashScore[1] = cashPayAmount.divide(scoreSetting1).intValue(); } } if (StringUtils.isNotBlank(cashConsumption.getParamValue2())) { BigDecimal scoreSetting2 = new BigDecimal(cashConsumption.getParamValue2()); if (scoreSetting2.compareTo(BigDecimal.ZERO) > 0) { cashScore[2] = cashPayAmount.divide(scoreSetting2).intValue(); } } } int[] cardScore = {0, 0, 0}; //储值卡本金支付金额 BigDecimal cardPayAmount = flows.stream() .filter(item -> item.getPayMethod().equals("储值卡") && item.getIsGift().equals("N")) .map(SysOrderFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add); BusParameterSettings principalBalanceConsumption = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.PRINCIPAL_BALANCE_CONSUMPTION, vipInfo.getCompanyId()); if (cardPayAmount != null && cardPayAmount.compareTo(BigDecimal.ZERO) > 0 && StringUtils.isNotBlank(principalBalanceConsumption.getParamValue())) { BigDecimal scoreSetting0 = new BigDecimal(principalBalanceConsumption.getParamValue()); if (scoreSetting0.compareTo(BigDecimal.ZERO) > 0) { cardScore[0] = cardPayAmount.divide(scoreSetting0).intValue(); } if (StringUtils.isNotBlank(principalBalanceConsumption.getParamValue1())) { BigDecimal scoreSetting1 = new BigDecimal(principalBalanceConsumption.getParamValue1()); if (scoreSetting1.compareTo(BigDecimal.ZERO) > 0) { cardScore[1] = cardPayAmount.divide(scoreSetting1).intValue(); } } if (StringUtils.isNotBlank(principalBalanceConsumption.getParamValue2())) { BigDecimal scoreSetting2 = new BigDecimal(principalBalanceConsumption.getParamValue2()); if (scoreSetting2.compareTo(BigDecimal.ZERO) > 0) { cardScore[2] = cardPayAmount.divide(scoreSetting2).intValue(); } } } int[] giftScore = {0, 0, 0}; //储值卡本赠送付金额 BigDecimal giftPayAmount = flows.stream() .filter(item -> item.getPayMethod().equals("储值卡") && item.getIsGift().equals("Y")) .map(SysOrderFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add); BusParameterSettings bonusBalanceConsumption = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.BONUS_BALANCE_CONSUMPTION, vipInfo.getCompanyId()); if (giftPayAmount != null && giftPayAmount.compareTo(BigDecimal.ZERO) > 0 && StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue())) { BigDecimal scoreSetting0 = new BigDecimal(bonusBalanceConsumption.getParamValue()); if (scoreSetting0.compareTo(BigDecimal.ZERO) > 0) { giftScore[0] = giftPayAmount.divide(scoreSetting0).intValue(); } if (StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue1())) { BigDecimal scoreSetting1 = new BigDecimal(bonusBalanceConsumption.getParamValue1()); if (scoreSetting1.compareTo(BigDecimal.ZERO) > 0) { giftScore[1] = giftPayAmount.divide(scoreSetting1).intValue(); } } if (StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue2())) { BigDecimal scoreSetting2 = new BigDecimal(bonusBalanceConsumption.getParamValue2()); if (scoreSetting2.compareTo(BigDecimal.ZERO) > 0) { giftScore[2] = giftPayAmount.divide(scoreSetting2).intValue(); } } } int selfScore = cashScore[0] + cardScore[0] + giftScore[0]; int parentScore = cashScore[1] + cardScore[1] + giftScore[1]; int topParentScore = cashScore[2] + cardScore[2] + giftScore[2]; //添加自己的积分 if (selfScore > 0) { scoreVipDetailService.addScore( vipInfo.getId(), pageOrder.getStaffId(), pageOrder.getShopId(), selfScore, pageOrder.getId(), ScoreVipDetail.SCORE_VIP_TYPE_CASH, "消费奖励" ); } if (vipInfo.getRecommendId() != null) { //推荐注册老带新积分奖励 SysVipInfo referrerVip = sysVipInfoDao.selectById(vipInfo.getRecommendId()); if (parentScore > 0) { scoreVipDetailService.addScore( referrerVip.getId(), pageOrder.getStaffId(), pageOrder.getShopId(), parentScore, pageOrder.getId(), ScoreVipDetail.SCORE_VIP_TYPE_CASH, "推荐消费奖励" ); } //推荐注册二级带新积分奖励 if (referrerVip.getRecommendId() != null) { SysVipInfo topVipInfo = sysVipInfoDao.selectById(referrerVip.getRecommendId()); if (topParentScore > 0) { scoreVipDetailService.addScore( topVipInfo.getId(), pageOrder.getStaffId(), pageOrder.getShopId(), topParentScore, pageOrder.getId(), ScoreVipDetail.SCORE_VIP_TYPE_CASH, "推荐消费奖励" ); } } } } } zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -42,7 +42,6 @@ import com.matrix.system.score.service.ScoreVipDetailService; import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting; import com.matrix.system.wechart.templateMsg.UniformMsgParam; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -144,9 +143,6 @@ @Autowired private SysOrderServiceHelper sysOrderServiceHelper; @Autowired private SysProjServicesService projServicesService; @@ -501,14 +497,13 @@ sysOrderServiceHelper.addTaocanProj(pageOrder); // 新增出库单 addOutStore(pageOrder); sysOrderServiceHelper.addOutStore(pageOrder); // 设置业绩 achieveNewService.addAchaeveByOrder(pageOrder); //设置会员积分 addVipScore(pageOrder); sysOrderServiceHelper.addVipScore(pageOrder); //保存订单收款日志 saveOrderSkLog(pageOrder); @@ -636,159 +631,6 @@ } /** * 设置会员消费积分 * @param pageOrder */ private void addVipScore(SysOrder pageOrder) { SysVipInfo vipInfo = sysVipInfoDao.selectById(pageOrder.getVipId()); List<SysOrderFlow> flows = pageOrder.getFlows(); int[] cashScore = {0, 0, 0}; //现金支付金额 BigDecimal cashPayAmount = flows.stream() .filter(item -> (!item.getPayMethod().equals("储值卡")) && (!item.getPayMethod().equals("欠款"))) .map(SysOrderFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add); BusParameterSettings cashConsumption = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.CASH_CONSUMPTION, vipInfo.getCompanyId()); if (cashPayAmount != null && cashPayAmount.compareTo(BigDecimal.ZERO) > 0 && StringUtils.isNotBlank(cashConsumption.getParamValue())) { BigDecimal scoreSetting0 = new BigDecimal(cashConsumption.getParamValue()); if (scoreSetting0.compareTo(BigDecimal.ZERO) > 0) { cashScore[0] = cashPayAmount.divide(scoreSetting0).intValue(); } if (StringUtils.isNotBlank(cashConsumption.getParamValue1())) { BigDecimal scoreSetting1 = new BigDecimal(cashConsumption.getParamValue1()); if (scoreSetting1.compareTo(BigDecimal.ZERO) > 0) { cashScore[1] = cashPayAmount.divide(scoreSetting1).intValue(); } } if (StringUtils.isNotBlank(cashConsumption.getParamValue2())) { BigDecimal scoreSetting2 = new BigDecimal(cashConsumption.getParamValue2()); if (scoreSetting2.compareTo(BigDecimal.ZERO) > 0) { cashScore[2] = cashPayAmount.divide(scoreSetting2).intValue(); } } } int[] cardScore = {0, 0, 0}; //储值卡本金支付金额 BigDecimal cardPayAmount = flows.stream() .filter(item -> item.getPayMethod().equals("储值卡") && item.getIsGift().equals("N")) .map(SysOrderFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add); BusParameterSettings principalBalanceConsumption = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.PRINCIPAL_BALANCE_CONSUMPTION, vipInfo.getCompanyId()); if (cardPayAmount != null && cardPayAmount.compareTo(BigDecimal.ZERO) > 0 && StringUtils.isNotBlank(principalBalanceConsumption.getParamValue())) { BigDecimal scoreSetting0 = new BigDecimal(principalBalanceConsumption.getParamValue()); if (scoreSetting0.compareTo(BigDecimal.ZERO) > 0) { cardScore[0] = cardPayAmount.divide(scoreSetting0).intValue(); } if (StringUtils.isNotBlank(principalBalanceConsumption.getParamValue1())) { BigDecimal scoreSetting1 = new BigDecimal(principalBalanceConsumption.getParamValue1()); if (scoreSetting1.compareTo(BigDecimal.ZERO) > 0) { cardScore[1] = cardPayAmount.divide(scoreSetting1).intValue(); } } if (StringUtils.isNotBlank(principalBalanceConsumption.getParamValue2())) { BigDecimal scoreSetting2 = new BigDecimal(principalBalanceConsumption.getParamValue2()); if (scoreSetting2.compareTo(BigDecimal.ZERO) > 0) { cardScore[2] = cardPayAmount.divide(scoreSetting2).intValue(); } } } int[] giftScore = {0, 0, 0}; //储值卡本赠送付金额 BigDecimal giftPayAmount = flows.stream() .filter(item -> item.getPayMethod().equals("储值卡") && item.getIsGift().equals("Y")) .map(SysOrderFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add); BusParameterSettings bonusBalanceConsumption = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.BONUS_BALANCE_CONSUMPTION, vipInfo.getCompanyId()); if (giftPayAmount != null && giftPayAmount.compareTo(BigDecimal.ZERO) > 0 && StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue())) { BigDecimal scoreSetting0 = new BigDecimal(bonusBalanceConsumption.getParamValue()); if (scoreSetting0.compareTo(BigDecimal.ZERO) > 0) { giftScore[0] = giftPayAmount.divide(scoreSetting0).intValue(); } if (StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue1())) { BigDecimal scoreSetting1 = new BigDecimal(bonusBalanceConsumption.getParamValue1()); if (scoreSetting1.compareTo(BigDecimal.ZERO) > 0) { giftScore[1] = giftPayAmount.divide(scoreSetting1).intValue(); } } if (StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue2())) { BigDecimal scoreSetting2 = new BigDecimal(bonusBalanceConsumption.getParamValue2()); if (scoreSetting2.compareTo(BigDecimal.ZERO) > 0) { giftScore[2] = giftPayAmount.divide(scoreSetting2).intValue(); } } } int selfScore = cashScore[0] + cardScore[0] + giftScore[0]; int parentScore = cashScore[1] + cardScore[1] + giftScore[1]; int topParentScore = cashScore[2] + cardScore[2] + giftScore[2]; //添加自己的积分 if (selfScore > 0) { scoreVipDetailService.addScore( vipInfo.getId(), pageOrder.getStaffId(), pageOrder.getShopId(), selfScore, pageOrder.getId(), ScoreVipDetail.SCORE_VIP_TYPE_CASH, "消费奖励" ); } if (vipInfo.getRecommendId() != null) { //推荐注册老带新积分奖励 SysVipInfo referrerVip = sysVipInfoDao.selectById(vipInfo.getRecommendId()); if (parentScore > 0) { scoreVipDetailService.addScore( referrerVip.getId(), pageOrder.getStaffId(), pageOrder.getShopId(), parentScore, pageOrder.getId(), ScoreVipDetail.SCORE_VIP_TYPE_CASH, "推荐消费奖励" ); } //推荐注册二级带新积分奖励 if (referrerVip.getRecommendId() != null) { SysVipInfo topVipInfo = sysVipInfoDao.selectById(referrerVip.getRecommendId()); if (topParentScore > 0) { scoreVipDetailService.addScore( topVipInfo.getId(), pageOrder.getStaffId(), pageOrder.getShopId(), topParentScore, pageOrder.getId(), ScoreVipDetail.SCORE_VIP_TYPE_CASH, "推荐消费奖励" ); } } } } @@ -802,7 +644,6 @@ @Override public void updateAfterMoney(SysOrder pageOrder) { SysOrder sourceOrder = sysOrderDao.selectById(pageOrder.getId()); //添加支付流水 sysOrderServiceHelper.addOrderFlow(pageOrder,true); @@ -836,122 +677,6 @@ } /** * @param order 新增出库单并更新本店库存 * @author:姜友瑶 * @date 2016年9月2日 */ @Override public void addOutStore(SysOrder order) { BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, order.getCompanyId()); if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) { List<SysOutStoreItem> storeItemList = new ArrayList<>(); for (SysOrderItem sysOrderItem : order.getItems()) { if (ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP.equals(sysOrderItem.getType())) { SysOutStoreItem storeItem = new SysOutStoreItem(); storeItem.setSkuId(sysOrderItem.getGoodsId()); storeItem.setAmount(Double.valueOf(sysOrderItem.getCount())); storeItemList.add(storeItem); } else if (ShoppingGoods.SHOPPING_GOODS_TYPE_TC.equals(sysOrderItem.getType()) || ShoppingGoods.SHOPPING_GOODS_TYPE_ZHK.equals(sysOrderItem.getType())) { List<ShoppingGoodsAssemble> goodsList = new ArrayList<>(); goodsList.addAll(shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(sysOrderItem.getGoodsId(), ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP)); if (ShoppingGoods.SHOPPING_GOODS_TYPE_ZHK.equals(sysOrderItem.getType())) { //综合卡处理,中的套餐，中的家居产品 List<ShoppingGoodsAssemble> zhkAssemble = shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(sysOrderItem.getGoodsId(), ShoppingGoods.SHOPPING_GOODS_TYPE_TC); zhkAssemble.forEach(item -> { goodsList.addAll(shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(item.getAssembleGoodId(), ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP)); }); } goodsList.forEach(item -> { SysOutStoreItem storeItem = new SysOutStoreItem(); storeItem.setSkuId(item.getAssembleGoodId()); storeItem.setAmount(Double.valueOf(item.getTotal())); storeItemList.add(storeItem); }); } } if (CollectionUtils.isNotEmpty(storeItemList)) { Long warehouseId = warehouseDao.findShopWarehouse(order.getShopId()).get(0).getId(); SysOutStore outStore = new SysOutStore(); outStore.setOutStoreNo(codeService.getOutStoreCode()); outStore.setOrderId(order.getId()); outStore.setShopId(order.getShopId()); outStore.setShopId(order.getShopId()); outStore.setStaffId(order.getStaffId()); outStore.setType(Dictionary.OUT_STORE_JJCPCK); outStore.setServiceNo(order.getOrderNo()); outStore.setTime(new Date()); outStore.setCheckStatus(Dictionary.CHECK_STATUS_DSH); outStore.setCompanyId(order.getCompanyId()); sysOutStoreDao.insert(outStore); //出库明细，根据批次维度定义 List<SysOutStoreItem> realOutStoreItemList = new ArrayList<>(); storeItemList.forEach(outStoreItem -> { //设置出库主键 outStoreItem.setOutStoreId(outStore.getId()); //计算库存总数是否满足本次扣减的需求 List<SysStoreInfo> stores = storeInfoDao.selectStoInfoBySku(outStoreItem.getSkuId(), warehouseId); double sum = stores.stream().mapToDouble(item -> item.getStoreTotal()).sum(); if (sum < outStoreItem.getAmount()) { ShoppingGoods sysGoods = shoppingGoodsDao.selectById(outStoreItem.getSkuId()); if (sysGoods != null) { throw new GlobleException("出库失败：【" + sysGoods.getName() + "库存不足】"); } else { throw new GlobleException("出库失败没有找到出库产品"); } } //循环获取所有批次产品，并扣减库存 Double number = outStoreItem.getAmount(); for (SysStoreInfo storeInfo : stores) { Double oldStoreTotal = storeInfo.getStoreTotal(); Double surplus = storeInfo.getStoreTotal() - number; //更新库存 storeInfo.setStoreTotal(surplus < 0 ? 0 : surplus); //每次扣减库存都创建一个出库记录 SysOutStoreItem sysOutStoreItem = new SysOutStoreItem(); BeanUtils.copyProperties(outStoreItem, sysOutStoreItem); sysOutStoreItem.setStoreId(storeInfo.getId()); sysOutStoreItem.setAmount(oldStoreTotal - storeInfo.getStoreTotal()); realOutStoreItemList.add(sysOutStoreItem); storeInfoDao.update(storeInfo); //扣除后剩余库存大于0则跳出扣除,否则剩余数量的负数的绝对值就是再次扣减的数量 if (surplus > 0) { break; } else { number = Math.abs(surplus); } } }); sysOutStoreItemDao.batchInsert(realOutStoreItemList); } } else { LogUtil.debug("不管理库存"); } }
@@ -43,6 +43,7 @@ @Autowired private CodeService codeService; @Override @Transactional(rollbackFor = Exception.class) public int add(SysOutStore sysOutStore) { zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderOutSotoreTask.java
@@ -5,13 +5,10 @@ import com.matrix.core.tools.LogUtil; import com.matrix.system.hive.bean.SysOrder; import com.matrix.system.hive.dao.SysOrderDao; import com.matrix.system.hive.service.SysOrderService; import com.rabbitmq.client.DeliverCallback; import com.rabbitmq.client.Delivery; import com.matrix.system.hive.service.imp.SysOrderServiceHelper; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import java.io.IOException; import java.util.List; import java.util.Map; @@ -24,7 +21,7 @@ SysOrderDao sysOrderDao; @Autowired SysOrderService orderService; SysOrderServiceHelper sysOrderServiceHelper; @Override public String getName() { @@ -47,7 +44,7 @@ List<SysOrder> list = sysOrderDao.selectByModel(sourceOrder); if (CollectionUtils.isNotEmpty(list)) { //订单出库 orderService.addOutStore(list.get(0)); sysOrderServiceHelper.addOutStore(list.get(0)); } else { LogUtil.error("订单编号{}erp不存在", orderNo); } zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java
@@ -22,14 +22,10 @@ import com.matrix.system.shopXcx.dao.ShopOrderDao; import com.matrix.system.shopXcx.dao.ShopOrderDetailsDao; import com.matrix.system.shopXcx.dao.ShopSkuDao; import com.rabbitmq.client.DeliverCallback; import com.rabbitmq.client.Delivery; import org.apache.logging.log4j.message.Message; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import java.io.IOException; import java.util.Date; import java.util.List; import java.util.Map; @@ -210,9 +206,6 @@ // 改变客户项目套餐使用情况 sysOrderServiceHelper.addTaocanProj(sourceOrder); // 设置销量 orderService.setShopSelCount(sourceOrder); SysOrderFlow flow = new SysOrderFlow(); flow.setFlowNo(codeService.getFlowCode() + "-" + i);
