修改包名

ANDRU-PC\Andru

2021-12-15 c500774dada56d6e72a1b5dc06217248f7428696

修改包名

 phi_platform_common/src/main/java/com/hx/phip/dao/mapper/UserProjectItemMapper.java

@@ -22,6 +22,8 @@
    Map<String,Object> selectOneMap(SqlSentence sqlSentence);
    /**查询，返回实体类没有大数据的*/
    UserProjectItem selectOneByKey(Object object);
    /**查询，返回实体类没有大数据的*/
    UserProjectItem selectOneByUserProjectId(Object object);
    /**查询，返回实体类有大数据的*/
    UserProjectItem selectOneByKeyBlob(Object object);
    /**更新，返回更新数量*/

 phi_platform_common/src/main/java/com/hx/phip/dto/DeductionDto.java

 phi_platform_common/src/main/resources/mapper/UserProjectItemMapper.xml

@@ -56,6 +56,13 @@
        WHERE id = #{value}
    </select>

    <select id="selectOneByUserProjectId" resultType="com.hx.phiappt.model.user.UserProjectItem" parameterType="java.lang.Object" >
        select
            *
        from user_project_item
        WHERE userProjectId = #{value}
    </select>

    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.user.UserProjectItem" parameterType="java.lang.Object" >
        select 
            id,total,actualTotal,oriPrice,curPrice,buyNum,usedTotal,notUsedNum,usedNum,shopId,shopName,departmentCode,departmentName,effectiveStatus,timeLimit,limitStartTime,limitEndTime,commonType,commonId,usedOne,userProjectId,userId,orderItemId,isDel,createTime

 phi_platform_common/src/main/resources/mapper/UserProjectUsedMapper.xml

@@ -8,7 +8,7 @@
    <!-- 整个实体类修改，表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,usedMethod = #{usedMethod},commonId = #{commonId},usedType = #{usedType},usedNum = #{usedNum},shopId = #{shopId},shopName = #{shopName},userProjectId = #{userProjectId},userProjectItemId = #{userProjectItemId},sourceCode = #{sourceCode},sourceName = #{sourceName},isDel = #{isDel},createTime = #{createTime}
            ,userId = #{userId},usedMethod = #{usedMethod},commonId = #{commonId},usedType = #{usedType},usedNum = #{usedNum},shopId = #{shopId},shopName = #{shopName},departmentCode = #{departmentCode},departmentName = #{departmentName},userProjectId = #{userProjectId},userProjectItemId = #{userProjectItemId},sourceCode = #{sourceCode},sourceName = #{sourceName},isDel = #{isDel},createTime = #{createTime}
        </trim>
    </sql>
     
@@ -19,7 +19,7 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into user_project_used (id,usedMethod,commonId,usedType,usedNum,shopId,shopName,userProjectId,userProjectItemId,sourceCode,sourceName,isDel,createTime)  values (#{id},#{usedMethod},#{commonId},#{usedType},#{usedNum},#{shopId},#{shopName},#{userProjectId},#{userProjectItemId},#{sourceCode},#{sourceName},#{isDel},#{createTime})
        insert into user_project_used (id,userId,usedMethod,commonId,usedType,usedNum,shopId,shopName,departmentCode,departmentName,userProjectId,userProjectItemId,sourceCode,sourceName,isDel,createTime)  values (#{id},#{userId},#{usedMethod},#{commonId},#{usedType},#{usedNum},#{shopId},#{shopName},#{departmentCode},#{departmentName},#{userProjectId},#{userProjectItemId},#{sourceCode},#{sourceName},#{isDel},#{createTime})
    </insert>

    <select id="selectList" resultType="com.hx.phiappt.model.user.UserProjectUsed" parameterType="com.hx.mybatisTool.SqlSentence" >
@@ -51,14 +51,14 @@

    <select id="selectOneByKey" resultType="com.hx.phiappt.model.user.UserProjectUsed" parameterType="java.lang.Object" >
        select 
            id,usedMethod,commonId,usedType,usedNum,shopId,shopName,userProjectId,userProjectItemId,sourceCode,sourceName,isDel,createTime
            id,userId,usedMethod,commonId,usedType,usedNum,shopId,shopName,departmentCode,departmentName,userProjectId,userProjectItemId,sourceCode,sourceName,isDel,createTime
        from user_project_used
        WHERE id = #{value}
    </select>

    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.user.UserProjectUsed" parameterType="java.lang.Object" >
        select 
            id,usedMethod,commonId,usedType,usedNum,shopId,shopName,userProjectId,userProjectItemId,sourceCode,sourceName,isDel,createTime
            id,userId,usedMethod,commonId,usedType,usedNum,shopId,shopName,departmentCode,departmentName,userProjectId,userProjectItemId,sourceCode,sourceName,isDel,createTime
        from user_project_used
        WHERE id = #{value}
    </select>

 phi_platform_user/src/main/java/com/hx/phip/AutoDomeUtil.java

@@ -49,8 +49,8 @@
        urlData.setTotalUrl(packageName);
        urlData.actionUrlData(controllerPackRoot,packageName + ".controller");
        urlData.daoUrlData(commonPackRoot,packageName + ".dao.mapper");
        urlData.serviceUrlData(controllerPackRoot,packageName + fileName +".service");
        urlData.serviceImplUrlData(controllerPackRoot,packageName + fileName +".service.impl");
        urlData.serviceUrlData(controllerPackRoot,packageName + ".service" + fileName );
        urlData.serviceImplUrlData(controllerPackRoot,packageName +".service"+ fileName+".impl");
        urlData.mapperUrlData(commonPackRootResourse, "mapper");

        // 文件夹没有创建创建文件夹

 phi_platform_user/src/main/java/com/hx/phip/controller/deduction/DeductionController.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/deduction/controller/DeductionController.java
@@ -1,4 +1,4 @@
package com.hx.phip.deduction.controller;
package com.hx.phip.controller.deduction;

import com.alibaba.fastjson.JSONArray;
import com.hx.common.BaseController;
@@ -7,10 +7,10 @@
import com.hx.phiappt.model.ComparePhotoRecord;
import com.hx.phiappt.model.ComparePhotoRecordPictures;
import com.hx.phiappt.model.deduction.*;
import com.hx.phip.deduction.service.*;
import com.hx.phip.dto.DeductionDto;
import com.hx.phip.service.ComparePhotoRecordPicturesService;
import com.hx.phip.service.ComparePhotoRecordService;
import com.hx.phip.service.deduction.*;
import com.hx.resultTool.Result;
import com.hx.util.StringUtils;
import com.platform.constants.LoginConstant;

 phi_platform_user/src/main/java/com/hx/phip/service/deduction/DeductionDeviceParameterService.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/deduction/service/DeductionDeviceParameterService.java
@@ -1,4 +1,4 @@
package com.hx.phip.deduction.service;
package com.hx.phip.service.deduction;

import com.hx.phiappt.model.deduction.DeductionDeviceParameter;
import com.hx.mybatisTool.SqlSentence;

 phi_platform_user/src/main/java/com/hx/phip/service/deduction/DeductionDrugsService.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/deduction/service/DeductionDrugsService.java
@@ -1,4 +1,4 @@
package com.hx.phip.deduction.service;
package com.hx.phip.service.deduction;

import com.hx.phiappt.model.deduction.DeductionDrugs;
import com.hx.mybatisTool.SqlSentence;

 phi_platform_user/src/main/java/com/hx/phip/service/deduction/DeductionJoinService.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/deduction/service/DeductionJoinService.java
@@ -1,4 +1,4 @@
package com.hx.phip.deduction.service;
package com.hx.phip.service.deduction;

import com.hx.phiappt.model.deduction.DeductionJoin;
import com.hx.mybatisTool.SqlSentence;

 phi_platform_user/src/main/java/com/hx/phip/service/deduction/DeductionProjectService.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/deduction/service/DeductionProjectService.java
@@ -1,4 +1,4 @@
package com.hx.phip.deduction.service;
package com.hx.phip.service.deduction;

import com.hx.phiappt.model.deduction.DeductionProject;
import com.hx.mybatisTool.SqlSentence;

 phi_platform_user/src/main/java/com/hx/phip/service/deduction/DeductionSignService.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/deduction/service/DeductionSignService.java
@@ -1,4 +1,4 @@
package com.hx.phip.deduction.service;
package com.hx.phip.service.deduction;

import com.hx.phiappt.model.deduction.DeductionSign;
import com.hx.mybatisTool.SqlSentence;

 phi_platform_user/src/main/java/com/hx/phip/service/deduction/DeductionSingleService.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/deduction/service/DeductionSingleService.java
@@ -1,4 +1,4 @@
package com.hx.phip.deduction.service;
package com.hx.phip.service.deduction;

import com.hx.phiappt.model.deduction.DeductionSingle;
import com.hx.mybatisTool.SqlSentence;

 phi_platform_user/src/main/java/com/hx/phip/service/deduction/impl/DeductionDeviceParameterServiceImpl.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/deduction/service/impl/DeductionDeviceParameterServiceImpl.java
@@ -1,4 +1,4 @@
package com.hx.phip.deduction.service.impl;
package com.hx.phip.service.deduction.impl;

import javax.annotation.Resource;

@@ -8,7 +8,7 @@
import com.hx.exception.TipsException;
import com.hx.phip.dao.mapper.DeductionDeviceParameterMapper;
import com.hx.phiappt.model.deduction.DeductionDeviceParameter;
import com.hx.phip.deduction.service.DeductionDeviceParameterService;
import com.hx.phip.service.deduction.DeductionDeviceParameterService;
import com.hx.mybatisTool.SqlSentence;
import java.util.List;
import java.util.Map;

 phi_platform_user/src/main/java/com/hx/phip/service/deduction/impl/DeductionDrugsServiceImpl.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/deduction/service/impl/DeductionDrugsServiceImpl.java
@@ -1,4 +1,4 @@
package com.hx.phip.deduction.service.impl;
package com.hx.phip.service.deduction.impl;

import javax.annotation.Resource;

@@ -8,7 +8,7 @@
import com.hx.exception.TipsException;
import com.hx.phip.dao.mapper.DeductionDrugsMapper;
import com.hx.phiappt.model.deduction.DeductionDrugs;
import com.hx.phip.deduction.service.DeductionDrugsService;
import com.hx.phip.service.deduction.DeductionDrugsService;
import com.hx.mybatisTool.SqlSentence;
import java.util.List;
import java.util.Map;

 phi_platform_user/src/main/java/com/hx/phip/service/deduction/impl/DeductionJoinServiceImpl.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/deduction/service/impl/DeductionJoinServiceImpl.java
@@ -1,14 +1,14 @@
package com.hx.phip.deduction.service.impl;
package com.hx.phip.service.deduction.impl;

import javax.annotation.Resource;

import com.hx.phip.service.deduction.DeductionJoinService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.hx.exception.TipsException;
import com.hx.phip.dao.mapper.DeductionJoinMapper;
import com.hx.phiappt.model.deduction.DeductionJoin;
import com.hx.phip.deduction.service.DeductionJoinService;
import com.hx.mybatisTool.SqlSentence;
import java.util.List;
import java.util.Map;

 phi_platform_user/src/main/java/com/hx/phip/service/deduction/impl/DeductionProjectServiceImpl.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/deduction/service/impl/DeductionProjectServiceImpl.java
@@ -1,4 +1,4 @@
package com.hx.phip.deduction.service.impl;
package com.hx.phip.service.deduction.impl;

import javax.annotation.Resource;

@@ -8,7 +8,7 @@
import com.hx.exception.TipsException;
import com.hx.phip.dao.mapper.DeductionProjectMapper;
import com.hx.phiappt.model.deduction.DeductionProject;
import com.hx.phip.deduction.service.DeductionProjectService;
import com.hx.phip.service.deduction.DeductionProjectService;
import com.hx.mybatisTool.SqlSentence;
import java.util.List;
import java.util.Map;

 phi_platform_user/src/main/java/com/hx/phip/service/deduction/impl/DeductionSignServiceImpl.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/deduction/service/impl/DeductionSignServiceImpl.java
@@ -1,4 +1,4 @@
package com.hx.phip.deduction.service.impl;
package com.hx.phip.service.deduction.impl;

import javax.annotation.Resource;

@@ -8,7 +8,7 @@
import com.hx.exception.TipsException;
import com.hx.phip.dao.mapper.DeductionSignMapper;
import com.hx.phiappt.model.deduction.DeductionSign;
import com.hx.phip.deduction.service.DeductionSignService;
import com.hx.phip.service.deduction.DeductionSignService;
import com.hx.mybatisTool.SqlSentence;
import java.util.List;
import java.util.Map;

 phi_platform_user/src/main/java/com/hx/phip/service/deduction/impl/DeductionSingleServiceImpl.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/deduction/service/impl/DeductionSingleServiceImpl.java
@@ -1,4 +1,4 @@
package com.hx.phip.deduction.service.impl;
package com.hx.phip.service.deduction.impl;

import javax.annotation.Resource;

@@ -9,8 +9,8 @@
import com.hx.phiappt.common.UserProjectUsedCon;
import com.hx.phiappt.model.*;
import com.hx.phiappt.model.deduction.*;
import com.hx.phiappt.model.order.OrdersTotal;
import com.hx.phiappt.model.user.UserProject;
import com.hx.phiappt.model.user.UserProjectItem;
import com.hx.phiappt.model.user.UserProjectUsed;
import com.hx.phiappt.model.warehouse.ShopWarehouse;
import com.hx.phip.dao.mapper.*;
@@ -22,7 +22,7 @@
import org.springframework.transaction.annotation.Transactional;

import com.hx.exception.TipsException;
import com.hx.phip.deduction.service.DeductionSingleService;
import com.hx.phip.service.deduction.DeductionSingleService;
import com.hx.mybatisTool.SqlSentence;

import java.util.Date;
@@ -36,6 +36,8 @@

    @Resource
    private CommonDao commonDao;
    @Resource
    private UserProjectItemMapper userProjectItemMapper;
    @Resource
    private OrdersTotalMapper ordersTotalMapper;
    @Resource
@@ -114,6 +116,12 @@

        // 项目划扣处理
        if(userProject.getType() != null && OrderGoodsConstants.TYPE_PROJECT.equals(userProject.getType())) {
            // 获取项目详情
            UserProjectItem userProjectItem = userProjectItemMapper.selectOneByUserProjectId(userProject.getId());
            if(userProjectItem == null){
                throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"未找到你的项目详细信息！");
            }

            // 新增判断次数是否充足
            if(type == BaseEntity.YES) {
                // 判断项目可划扣次数是否充足
@@ -165,11 +173,6 @@
                throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"未找到你要执行项目的项目信息！");
            }

            OrdersTotal ordersTotal = ordersTotalMapper.selectOneByUserProjectId(userProject.getId());
            if(ordersTotal == null){
                throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"未找到你的订单信息！");
            }

            // 处理划扣项目
            DeductionProject deductionProject;
            // 执行次数
@@ -191,12 +194,12 @@
            deductionProject.setProjectNo(userProject.getGoodsNo());
            deductionProject.setProjectName(project.getName());
            deductionProject.setPrice(project.getPrice());
            deductionProject.setShopId(ordersTotal.getShopId());
            deductionProject.setShopName(ordersTotal.getShopName());
            deductionProject.setShopId(userProjectItem.getShopId());
            deductionProject.setShopName(userProjectItem.getShopName());
            // 科室编号为空默认科室
            if(StringUtils.isEmpty(deductionDto.getDepartmentCode()) && StringUtils.isEmpty(deductionDto.getDepartmentName())){
                deductionProject.setDepartmentCode(ordersTotal.getDepartmentCode());
                deductionProject.setDepartmentName(ordersTotal.getDepartmentName());
                deductionProject.setDepartmentCode(userProjectItem.getDepartmentCode());
                deductionProject.setDepartmentName(userProjectItem.getDepartmentName());
            }else{
                deductionProject.setDepartmentCode(deductionDto.getDepartmentCode());
                deductionProject.setDepartmentName(deductionDto.getDepartmentName());
@@ -446,28 +449,31 @@
                }
            }

            // 处理项目剩余可划扣次数
            // 处理项目剩余可划扣次数并添加使用记录
            if(type == BaseEntity.YES) {
                handleUserProjectNotUsedNum(deductionSingle.getId(), userProject.getId(), deductionDto.getDeductionNum(),
                        deductionDto.getSourceCode(),deductionDto.getSourceName(),ordersTotal.getShopId(),ordersTotal.getShopName());
                handleUserProjectNotUsedNum(deductionSingle.getId(), deductionSingle.getUserId(), userProject.getId(), deductionDto.getDeductionNum(),
                        deductionDto.getSourceCode(),deductionDto.getSourceName(),deductionProject.getShopId(),deductionProject.getShopName(),
                        deductionProject.getDepartmentCode(),deductionProject.getDepartmentName());
            }
        }else{
            throw new PlatTipsException(PlatformCode.ERROR_TIPS,"商品划扣还在开发中！");
        }
    }


    /**
     * 处理减扣划扣次数
     * @param deductionSingleId 划扣项目清单标识id
     * @param userId 用户id
     * @param userProjectId 用户项目id
     * @param deductionNum 划扣次数
     * @param sourceCode 来源code
     * @param sourceName 来源名称
     * @param shopId 门店id
     * @param shopName 门店名称
     * @param departmentCode 科室编码
     * @param departmentName 科室名称
     */
    private void handleUserProjectNotUsedNum(String deductionSingleId,String userProjectId,Integer deductionNum,String sourceCode,String sourceName,String shopId,String shopName){
    private void handleUserProjectNotUsedNum(String deductionSingleId,String userId,String userProjectId,Integer deductionNum,String sourceCode,String sourceName,String shopId,String shopName,String departmentCode,String departmentName){
        SqlSentence sqlSentence = new SqlSentence();
        Map<String,Object> map = new HashMap<>();
        map.put("isDel", BaseEntity.NO);
@@ -490,12 +496,15 @@
        }else{
            // 添加划扣日志
            UserProjectUsed userProjectUsed = new UserProjectUsed();
            userProjectUsed.setUserId(userId);
            userProjectUsed.setUsedMethod(UserProjectUsedCon.USED_METHOD_DEDUCTION_SINGLE);
            userProjectUsed.setCommonId(deductionSingleId);
            userProjectUsed.setUsedType(type);
            userProjectUsed.setUsedNum(deductionNum);
            userProjectUsed.setShopId(shopId);
            userProjectUsed.setShopName(shopName);
            userProjectUsed.setDepartmentCode(departmentCode);
            userProjectUsed.setDepartmentName(departmentName);
            userProjectUsed.setUserProjectId(userProjectId);
            userProjectUsed.setSourceCode(sourceCode);
            userProjectUsed.setSourceName(sourceName);
@@ -562,12 +571,10 @@
                throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"未找到你的划扣记录里面的项目信息！");
            }

            OrdersTotal ordersTotal = ordersTotalMapper.selectOneByUserProjectId(deductionProject.getUserProjectId());
            if(ordersTotal == null){
                throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"未找到你的订单信息！");
            }
            handleUserProjectNotUsedNum(deductionSingle.getId(), deductionProject.getUserProjectId(), -deductionProject.getNum(),
                    sourceCode, sourceName, ordersTotal.getShopId(), ordersTotal.getShopName());
            // 处理项目剩余可划扣次数并添加使用记录
            handleUserProjectNotUsedNum(deductionSingle.getId(), deductionSingle.getUserId(), deductionProject.getUserProjectId(), -deductionProject.getNum(),
                    sourceCode, sourceName, deductionProject.getShopId(),deductionProject.getShopName(),
                    deductionProject.getDepartmentCode(),deductionProject.getDepartmentName());
        }
    }


 phi_platform_user/src/main/java/com/hx/phip/service/order/impl/OrderServiceImpl.java

@@ -11,8 +11,8 @@
import com.hx.phip.service.order.OrderService;
import com.hx.phip.service.*;
import com.hx.phip.tool.CreateNo;
import com.hx.phip.user.service.UserProjectItemService;
import com.hx.phip.user.service.UserProjectService;
import com.hx.phip.service.user.UserProjectItemService;
import com.hx.phip.service.user.UserProjectService;
import com.hx.util.SimpleEncrypt;
import com.hx.util.StringUtils;
import com.platform.exception.PlatTipsException;

 phi_platform_user/src/main/java/com/hx/phip/service/user/UserProjectItemService.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/user/service/UserProjectItemService.java
@@ -1,4 +1,4 @@
package com.hx.phip.user.service;
package com.hx.phip.service.user;

import com.hx.phiappt.model.user.UserProjectItem;
import com.hx.mybatisTool.SqlSentence;

 phi_platform_user/src/main/java/com/hx/phip/service/user/UserProjectService.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/user/service/UserProjectService.java
@@ -1,4 +1,4 @@
package com.hx.phip.user.service;
package com.hx.phip.service.user;

import com.hx.phiappt.model.user.UserProject;
import com.hx.mybatisTool.SqlSentence;

 phi_platform_user/src/main/java/com/hx/phip/service/user/UserProjectUsedService.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/user/service/UserProjectUsedService.java
@@ -1,4 +1,4 @@
package com.hx.phip.user.service;
package com.hx.phip.service.user;

import com.hx.phiappt.model.user.UserProjectUsed;
import com.hx.mybatisTool.SqlSentence;

 phi_platform_user/src/main/java/com/hx/phip/service/user/impl/UserProjectItemServiceImpl.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/user/service/impl/UserProjectItemServiceImpl.java
@@ -1,4 +1,4 @@
package com.hx.phip.user.service.impl;
package com.hx.phip.service.user.impl;

import javax.annotation.Resource;

@@ -8,7 +8,7 @@
import com.hx.exception.TipsException;
import com.hx.phip.dao.mapper.UserProjectItemMapper;
import com.hx.phiappt.model.user.UserProjectItem;
import com.hx.phip.user.service.UserProjectItemService;
import com.hx.phip.service.user.UserProjectItemService;
import com.hx.mybatisTool.SqlSentence;
import java.util.List;
import java.util.Map;

 phi_platform_user/src/main/java/com/hx/phip/service/user/impl/UserProjectServiceImpl.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/user/service/impl/UserProjectServiceImpl.java
@@ -1,4 +1,4 @@
package com.hx.phip.user.service.impl;
package com.hx.phip.service.user.impl;

import javax.annotation.Resource;

@@ -8,7 +8,7 @@
import com.hx.exception.TipsException;
import com.hx.phip.dao.mapper.UserProjectMapper;
import com.hx.phiappt.model.user.UserProject;
import com.hx.phip.user.service.UserProjectService;
import com.hx.phip.service.user.UserProjectService;
import com.hx.mybatisTool.SqlSentence;
import java.util.List;
import java.util.Map;

 phi_platform_user/src/main/java/com/hx/phip/service/user/impl/UserProjectUsedServiceImpl.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/user/service/impl/UserProjectUsedServiceImpl.java
@@ -1,4 +1,4 @@
package com.hx.phip.user.service.impl;
package com.hx.phip.service.user.impl;

import javax.annotation.Resource;

@@ -8,7 +8,7 @@
import com.hx.exception.TipsException;
import com.hx.phip.dao.mapper.UserProjectUsedMapper;
import com.hx.phiappt.model.user.UserProjectUsed;
import com.hx.phip.user.service.UserProjectUsedService;
import com.hx.phip.service.user.UserProjectUsedService;
import com.hx.mybatisTool.SqlSentence;
import java.util.List;
import java.util.Map;

 phi_platform_user/src/main/java/com/hx/phip/service/warehouse/ShopWarehouseService.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/warehouse/service/ShopWarehouseService.java
@@ -1,4 +1,4 @@
package com.hx.phip.warehouse.service;
package com.hx.phip.service.warehouse;

import com.hx.phiappt.model.warehouse.ShopWarehouse;
import com.hx.mybatisTool.SqlSentence;

 phi_platform_user/src/main/java/com/hx/phip/service/warehouse/impl/ShopWarehouseServiceImpl.java

File was renamed from phi_platform_user/src/main/java/com/hx/phip/warehouse/service/impl/ShopWarehouseServiceImpl.java
@@ -1,14 +1,14 @@
package com.hx.phip.warehouse.service.impl;
package com.hx.phip.service.warehouse.impl;

import javax.annotation.Resource;

import com.hx.phip.service.warehouse.ShopWarehouseService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.hx.exception.TipsException;
import com.hx.phip.dao.mapper.ShopWarehouseMapper;
import com.hx.phiappt.model.warehouse.ShopWarehouse;
import com.hx.phip.warehouse.service.ShopWarehouseService;
import com.hx.mybatisTool.SqlSentence;
import java.util.List;
import java.util.Map;