1

935090232@qq.com

2021-01-29 bf48bb112bf8d5b1564eb5ac6e4809909f24887a

1

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java

@@ -4,7 +4,7 @@
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.OrderListDto;
@@ -17,12 +17,9 @@
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.constance.SystemConstance;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.hievEnum.PayMethodEnum;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.pojo.CzXkVo;
import com.matrix.system.hive.pojo.ShoppingCarItem;
@@ -38,7 +35,10 @@

import javax.servlet.http.HttpSession;
import javax.validation.constraints.NotEmpty;
import java.util.*;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;

/**
 * @date 2016-07-03 20:53
@@ -920,7 +920,7 @@
                if (sum < outStoreItem.getAmount()) {
                    ShoppingGoods sysGoods = shoppingGoodsDao.selectById(outStoreItem.getSkuId());
                    if (sysGoods != null) {
                        throw new GlobleException("出库失败：【" + sysGoods.getName() + "库存不足】");
                        throw new GlobleException("出库失败：【" + sysGoods.getName()+"-"+sysGoods.getCode()+  "库存不足】");
                    } else {
                        throw new GlobleException("出库失败没有找到出库产品");
                    }

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java

@@ -1,12 +1,14 @@
package com.matrix.system.hive.service.imp;

import com.alibaba.fastjson.JSONObject;
import com.matrix.component.rabbitmq.RabiitMqTemplate;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.pojo.VerifyResult;
import com.matrix.core.tools.*;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.ServiceOrderListDto;
import com.matrix.system.app.vo.ServiceOrderListVo;
import com.matrix.system.common.bean.SysUsers;
@@ -14,9 +16,7 @@
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.pojo.MyBeauticianCount;
import com.matrix.system.hive.service.*;
import com.matrix.system.shopXcx.mqTask.MQTaskRouting;
import com.matrix.system.wechart.templateMsg.UniformMsgParam;
@@ -660,7 +660,7 @@
                    double sum = stores.stream().mapToDouble(item2 -> item2.getStoreTotal()).sum();
                    Double needAmount = MoneyUtil.div(item.getAmount(), Double.valueOf(shoppingGoods.getVolume()));
                    if (sum < needAmount) {
                        throw new GlobleException("出库失败：【" + shoppingGoods.getName() + "库存不足】");
                        throw new GlobleException("出库失败：【" + shoppingGoods.getName()+"-"+shoppingGoods.getCode()+  "库存不足】");
                    }
                    //循环获取所有批次产品，并扣减库存
                    for (SysStoreInfo storeInfo : stores) {

 zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/MoneyCardUseMapperImpl.java

@@ -2,10 +2,11 @@

import com.matrix.system.app.vo.VipCardListVo;
import com.matrix.system.hive.bean.MoneyCardUse;

import javax.annotation.Generated;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Generated;

@Generated(
    value = "org.mapstruct.ap.MappingProcessor",

 zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/QuestionMapperImpl.java

@@ -5,9 +5,10 @@
import com.matrix.system.hive.bean.Answer;
import com.matrix.system.hive.bean.Question;
import com.matrix.system.hive.bean.VipAnswer;

import javax.annotation.Generated;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Generated;

@Generated(
    value = "org.mapstruct.ap.MappingProcessor",

 zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysBeauticianStateMapperImpl.java

@@ -6,10 +6,11 @@
import com.matrix.system.hive.bean.ShoppingGoods;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysProjUse;

import javax.annotation.Generated;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Generated;

@Generated(
    value = "org.mapstruct.ap.MappingProcessor",

 zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysProjUseMapperImpl.java

@@ -4,10 +4,11 @@
import com.matrix.system.app.vo.ServiceTcVo;
import com.matrix.system.hive.bean.SysProjUse;
import com.matrix.system.hive.bean.SysProjUseFlow;

import javax.annotation.Generated;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import javax.annotation.Generated;

@Generated(
    value = "org.mapstruct.ap.MappingProcessor",

 zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysSkinCheckRecordMapperImpl.java

@@ -6,9 +6,10 @@
import com.matrix.system.app.vo.SkinCheckListVo;
import com.matrix.system.hive.bean.SysSkinCheckRecord;
import com.matrix.system.hive.bean.SysSkinDetail;

import javax.annotation.Generated;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Generated;

@Generated(
    value = "org.mapstruct.ap.MappingProcessor",

 zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysStoreInfoMapperImpl.java

@@ -5,10 +5,11 @@
import com.matrix.system.hive.bean.ShoppingGoods;
import com.matrix.system.hive.bean.SysStoreInfo;
import com.matrix.system.hive.pojo.StoreInOutRecordVO;

import javax.annotation.Generated;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Generated;

@Generated(
    value = "org.mapstruct.ap.MappingProcessor",

 zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysUsersMapperImpl.java

@@ -4,9 +4,10 @@
import com.matrix.system.app.vo.BeauticianVo;
import com.matrix.system.app.vo.UserInfoDetailVo;
import com.matrix.system.common.bean.SysUsers;

import javax.annotation.Generated;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Generated;

@Generated(
    value = "org.mapstruct.ap.MappingProcessor",

 zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysWorkBeatuistaffMapperImpl.java

@@ -2,9 +2,10 @@

import com.matrix.system.app.vo.BeauticianVo;
import com.matrix.system.hive.bean.SysWorkBeatuistaff;

import javax.annotation.Generated;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Generated;

@Generated(
    value = "org.mapstruct.ap.MappingProcessor",