modify

Helius

2021-03-17 81c0938a74845d38ac9efce7f2561d396ac716c7

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

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

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;
@@ -12,13 +16,14 @@
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;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -98,6 +103,13 @@
    @Resource
    private ShoppingGoodsService shoppingGoodsService;

    @Autowired
    private RabiitMqTemplate rabiitMqTemplate;

    @Value("${evn}")
    private String evn;


    /**
     * 新增服务单 jyy
     *
@@ -108,13 +120,15 @@
    public SysProjServices addSysProjServices(SysProjServices sysProjServices) throws GlobleException {

        //创建服务单
        SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        sysProjServices.setCreateStaffId(user.getSuId());
        sysProjServices.setShopId(user.getShopId());
        sysProjServices.setCompanyId(user.getCompanyId());
        if(WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY)!=null){
            SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
            sysProjServices.setCreateStaffId(user.getSuId());
            sysProjServices.setShopId(user.getShopId());
            sysProjServices.setCompanyId(user.getCompanyId());
        }


        sysProjServices.setCreateTime(new Date());
        // 设置状态为待预约
        sysProjServices.setState(Dictionary.SERVICE_STATU_DYY);
        sysProjServices.setServiceNo(codeService.getServiceOrderCode());
        Double hkPrice = 0.0;
        int i = sysProjServicesDao.insert(sysProjServices);
@@ -198,7 +212,7 @@
            //插入订单明细
            sysBeauticianState.setProjId(sysProjInfo.getId());
            sysBeauticianState.setServicesId(sysProjServices.getId());
            sysBeauticianState.setShopId(user.getShopId());
            sysBeauticianState.setShopId(sysProjServices.getShopId());
            sysBeauticianState.setState(Dictionary.BEATUI_STATE_DYY);
            beauticianStateDao.insert(sysBeauticianState);
        }
@@ -285,12 +299,9 @@
     */
    @Override
    public VerifyResult checkArrears(SysProjServices sysProjServices) {
        //检测欠款
       /* for (SysBeauticianState sysBeauticianState : sysProjServices.getServiceItems()) {

        // 检测欠款
       /*for (SysBeauticianState sysBeauticianState : sysProjServices.getServiceItems()) {
            SysProjUse sysProjUse = projUseService.findById(sysBeauticianState.getPuseId());



            ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(sysProjUse.getProjId());
            SysOrderItem orderItem = sysOrderItemService.findById(sysProjUse.getOrderItemId());
@@ -386,7 +397,7 @@


        // 设置成功状态
        projServices.setState(Dictionary.SERVICE_STATU_YYCG);
        projServices.setState(Dictionary.SERVICE_STATU_XPL);
        // 判断当前门店是否有历史美疗师
        LastestWorkBeatuistaff lastWorkStaff = new LastestWorkBeatuistaff();
        lastWorkStaff.setShopId(checkProjServices.getShopId());
@@ -561,10 +572,17 @@
        if (!projServices.getState().equals(Dictionary.SERVICE_STATU_FWWC)) {
            throw new GlobleException("该服务单状态为" + projServices.getState() + ",不可以进行当前操作!");
        } else {

            projServices.setState(Dictionary.SERVICE_STATU_FFJS);
            projServices.setConsumeTime(new Date());
            return sysProjServicesDao.update(projServices);
            int result=sysProjServicesDao.update(projServices);
            achieveNewService.addAchieveByServiceOrder(projServices);

            //发送微信公众号提醒
            UniformMsgParam uniformMsgParam=new UniformMsgParam(projServices.getCompanyId(),UniformMsgParam.GZH_FWWC);
            uniformMsgParam.put("serviceId",projServices.getId());
            rabiitMqTemplate.sendMsg(MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG+evn,uniformMsgParam.toJSONString());

            return result;
        }
    }

@@ -600,7 +618,7 @@
    @Override
    public int modifyPLProjServices(SysProjServices projServicesVo) throws GlobleException {
        SysProjServices projServices = sysProjServicesDao.selectById(projServicesVo.getId());

        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        if (!projServices.getState().equals(Dictionary.SERVICE_STATU_XPL)) {
            throw new GlobleException("该服务单状态为" + projServices.getState() + ",不可以进行当前操作!");
        }
@@ -615,7 +633,7 @@
            if(projServices.getDevisionId()!=null){
                outStore.setStaffId(projServices.getDevisionId());
            }else{
                SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);

                outStore.setStaffId(sysUsers.getSuId());
            }
            outStore.setServiceId(projServices.getId());
@@ -639,7 +657,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) {
@@ -655,8 +673,6 @@
                        sysOutStoreItem.setStoreId(storeInfo.getId());
                        sysOutStoreItem.setAmount(oldStoreTotal - storeInfo.getStoreTotal());
                        realOutStoreItemList.add(sysOutStoreItem);


                        storeInfoDao.update(storeInfo);
                        //扣除后剩余库存大于0则跳出扣除,否则剩余数量的负数的绝对值就是再次扣减的数量
                        if (surplus > 0) {
@@ -670,30 +686,15 @@
                    LogUtil.debug("未选择配料跳过sku={},amount={}", item.getSkuId(), item.getAmount());
                }
            }

            sysOutStoreItemDao.batchInsert(realOutStoreItemList);

        }

        // 设置服务单状态
        projServices.setState(Dictionary.SERVICE_STATU_PLWC);
        // 设置服务单操作流水
        // TODO 本功能待完善记录最新的排班员工
   /*   List<LastestWorkBeatuistaff> lastList = LastestWorkBeatuistaffDao.selectByModel(null);
      LastestWorkBeatuistaff lastWork = new LastestWorkBeatuistaff();
      if (lastList.size() > 0) {
         lastWork.setChangeDate(new Date());
         lastWork.setStaffId(projServices.getBeauticianId());
         LastestWorkBeatuistaffDao.insert(lastWork);
      } else {
        if(projServices.getDevisionId()==null){
            //如果没有设置配料师则默认为操作配料的人为配料师
            projServices.setDevisionId(sysUsers.getSuId());

         //TODO 有bug集合为零了
         LastestWorkBeatuistaff modifyObj = lastList.get(0);
         modifyObj.setChangeDate(new Date());
         modifyObj.setStaffId(projServices.getBeauticianId());
         LastestWorkBeatuistaffDao.update(modifyObj);
      }*/

        }
        return sysProjServicesDao.update(projServices);
    }