init

bas-cloud-jiucaiyun-goods/pom.xml

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.ekingwin</groupId>
+	<artifactId>bas-cloud-jiucaiyun-goods</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name></name>
+	<url>http://www.ekingwin.com</url>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.5.10.RELEASE</version>
+	</parent>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-logging</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.github.swagger2markup</groupId>
+			<artifactId>swagger2markup</artifactId>
+			<version>1.3.3</version>
+		</dependency>
+
+		<!-- 将token存储在redis中 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.ekingwin</groupId>
+			<artifactId>bas-cloud-infrastructure</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		
+		<dependency>
+		    <groupId>org.apache.poi</groupId>
+		    <artifactId>poi</artifactId>
+		    <version>3.16</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.poi</groupId>
+		    <artifactId>poi-ooxml</artifactId>
+		    <version>3.16</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-scratchpad</artifactId>
+			<version>3.16</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml-schemas</artifactId>
+			<version>3.16</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-excelant</artifactId>
+			<version>3.16</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.ekingwin</groupId>
+			<artifactId>bas-cloud-mail</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>com.ekingwin</groupId>
+			<artifactId>bas-cloud-ldap</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.16.10</version>
+		</dependency>
+		<dependency>
+			<groupId>com.aliyun</groupId>
+			<artifactId>aliyun-java-sdk-core</artifactId>
+			<version>4.0.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-amqp</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>logback-classic</artifactId>
+					<groupId>ch.qos.logback</groupId>
+				</exclusion>
+			</exclusions>
+			<optional>true</optional>
+		</dependency>
+		<!-- <dependency>
+			<groupId>com.ekingwin</groupId>
+			<artifactId>bas-cloud-security-cas</artifactId>
+			<version>${project.version}</version>
+		</dependency> -->
+		
+<!--		<dependency>
+			<groupId>com.ekingwin</groupId>
+			<artifactId>bas-cloud-scheduler</artifactId>
+			<version>${project.version}</version>
+		</dependency>-->
+	   
+	</dependencies>
+	<build>
+		<plugins>
+
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<failOnMissingWebXml>false</failOnMissingWebXml>
+				</configuration>
+			</plugin>
+			<plugin>
+		        <groupId>org.apache.maven.plugins</groupId>
+		        <artifactId>maven-compiler-plugin</artifactId>
+		        <version>3.6.1</version>
+		        <configuration>
+		          <source>1.8</source>
+		          <target>1.8</target>
+		        </configuration>
+		     </plugin>			
+		</plugins>
+
+	</build>
+	<pluginRepositories>
+		<pluginRepository>
+			<id> bas5</id>
+			<name>maven ekingwin</name>
+			<url> http://222.187.245.149:8081/repository/maven-public/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+</project>

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/config/RabbitExchangeConfig.java

+package com.ekingwin.bas.cloud.config;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConfigurationProperties(prefix = "rabbitmq.exchange")
+@Data
+@ApiModel("Rabbit配置文件")
+public class RabbitExchangeConfig {
+
+    /**
+     *  sap材料明细
+     */
+    private String sapgoods;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpCategoryMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+
+import com.ekingwin.bas.cloud.vo.IpCategorySuppliersVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface IpCategoryMapper {
+
+    /**
+     * 获取供应商信息
+     * @param baseUrl
+     * @param categoryId
+     * @return
+     */
+    List<IpCategorySuppliersVo> getSupplier(@Param(value = "baseUrl") String baseUrl ,@Param(value = "categoryId") String categoryId);
+
+
+    /**
+     * 获取分类信息
+     * @param categoryId
+     * @return
+     */
+    IpCategorySuppliersVo getCategory(@Param(value = "categoryId") String categoryId);
+
+
+    /**
+     * 修改分类是否显示
+     * @param baseUrl
+     * @param categoryId
+     * @param idDisplay
+     * @return
+     */
+    int updateCategory(@Param(value = "baseUrl")String baseUrl ,
+                       @Param(value = "categoryId") String categoryId,
+                       @Param(value = "idDisplay") String idDisplay );
+
+
+    /**
+     * 获取分类
+     * @param map
+     * @return
+     */
+   Map<String,Object>getGoodCateCode(Map<String,Object> map);
+
+
+
+    Map<String,Object>getGoodCateCodeByGr(Map<String,Object> map);
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodFavoriteMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.IpGoodFavoriteSearchDto;
+import com.ekingwin.bas.cloud.vo.IpGoodFavoriteSearchVo;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface IpGoodFavoriteMapper {
+
+
+    /**
+     * 查询收藏商品
+     * @param ipGoodFavoriteSearchDto
+     * @return
+     */
+    List<IpGoodFavoriteSearchVo> getGoodFavorite(IpGoodFavoriteSearchDto ipGoodFavoriteSearchDto);
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodFootMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.IpGoodFootDto;
+import com.ekingwin.bas.cloud.dto.IpGoodFootSearchDto;
+import com.ekingwin.bas.cloud.vo.IpGoodFootSearchVo;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface IpGoodFootMapper {
+
+    /**
+     * 查询浏览足迹
+     * @param ipGoodFootSearchDto
+     * @return
+     */
+    List<IpGoodFootSearchVo> getGoodFoot(IpGoodFootSearchDto ipGoodFootSearchDto);
+
+
+    /**
+     * 判断当天是否存在足迹
+     * @param ipGoodFootDto
+     * @return
+     */
+    int getFootByGoodsId(IpGoodFootDto ipGoodFootDto);
+
+
+    /**
+     * 保存
+     * @param ipGoodFootDto
+     * @return
+     */
+    int insertSelective(IpGoodFootDto ipGoodFootDto);
+
+
+    /**
+     *
+     * @param ipGoodFootDto
+     * @return
+     */
+    int updateFootTime(IpGoodFootDto ipGoodFootDto);
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodProcessMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.entity.IpGoodProcess;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface IpGoodProcessMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(IpGoodProcess record);
+
+    int insertSelective(IpGoodProcess record);
+
+    IpGoodProcess selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(IpGoodProcess record);
+
+    int updateByPrimaryKey(IpGoodProcess record);
+
+    /**
+     * 更新流程实例号
+     * @param instid
+     * @param id
+     * @return
+     */
+    int updateInstid(@Param(value = "instid") String instid,@Param(value = "id") Long id);
+
+    /**
+     * 根据流程实例号
+     * @param instid
+     * @return
+     */
+    IpGoodProcess getGoodsProcessByinstid(String instid);
+
+
+    /**
+     * 修改流程审批状态
+     * @param record
+     * @return
+     */
+    int updteStatusEnd(IpGoodProcess record);
+
+
+    /**
+    * 根据流程实例号获取商品类型
+    * @Param:  * @param instid
+    * @return: java.lang.String
+    * @Author: zhangjie
+    * @Date: 2019/11/9 14:27
+    */
+    String getGoodsCategory(String instid);
+
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsCategoryMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.IpGoodsCategoryDto;
+import com.ekingwin.bas.cloud.dto.SaveGoodsCategoryDto;
+import com.ekingwin.bas.cloud.vo.*;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-07-18 11:42
+ **/
+@Repository
+public interface IpGoodsCategoryMapper {
+
+    List<IpGoodsCategoryVo> getThirdClassify(IpGoodsCategoryDto ipGoodsCategoryDto);
+
+    IpThirdCategoryInfoVo getGoodsCategoryInfo( @Param(value="categoryId")String categoryId);
+
+    List<IpGoodsCategoryDetailVo> getThirdClassifyBy(IpGoodsCategoryDto ipGoodsCategoryDto);
+
+    int insertGoodsCategory(SaveGoodsCategoryDto saveGoodsCategoryDto);
+
+    int batchInsertCategorySup(@Param(value = "areaVos") List<IpGoodSupplierAreaVo> areaVos);
+
+    int batchInsertCategoryPrice(@Param(value = "salesPrice") List<IpCategoryGoodsPriceVo> salesPrice);
+
+    int updateGoodsCategory(SaveGoodsCategoryDto saveGoodsCategoryDto);
+
+    int deleteCategorySup(@Param(value = "categoryId") String categoryId);
+
+    int deleteCategoryPrice(@Param(value = "categoryId") String categoryId);
+
+    int getGoodsCountByCategoryCode(@Param(value = "categoryId")String categoryId);
+
+    int deleteGoodsCategory(@Param(value = "categoryId")String categoryId);
+
+    List<IpGoodsCategoryDetailVo> getNextLevelInfo(@Param(value="categoryId")String categoryId);
+
+    List<IpGoodsCategoryDetailVo> getGoodsCategoryInfoByLevel(IpGoodsCategoryDto ipGoodsCategoryDto);
+
+    List<IpGoodsCategoryDetailVo> getGoodsCategoryInfoByLevel1(IpGoodsCategoryDto ipGoodsCategoryDto);
+
+    List<IpGoodsCategoryDetailVo> getGoodsCategoryInfoByLevel2(IpGoodsCategoryDto ipGoodsCategoryDto);
+
+    int getCategoryCodeCount(@Param(value = "code") String code);
+
+
+    /**
+     * 获取区域信息
+     * @param goodsCategoryId
+     * @return
+     */
+    List<IpGoodSupplierAreaVo> getAreaInfo(String goodsCategoryId);
+
+
+    String getCompanyParent(String salesarea);
+
+    List<IpGoodSupplierAreaVo> getAreaInfoOrSupplierId(@Param(value = "id") String id,
+                                                       @Param(value = "supplierid") String supplierid);
+
+
+    List<GoodsCategoryTreeVo> getCompanyList(String salesarea);
+
+
+    /**
+     * 获取子级
+     * @param salesarea
+     * @return
+     */
+    String getCompanyChild(@Param(value = "salesarea") String salesarea);
+
+    /**
+     * 获取商品分类权限
+     * @param companyid
+     * @return
+     */
+    List<Map<String,Object>> getGoodsCategAuthority(@Param(value = "basUrl") String basUrl,@Param(value = "companyid") String  companyid);
+    /**
+     * 获取商品分类
+     * @param companyid
+     * @return
+     */
+    List<Map<String,Object>> getAllGoodsCategInfo(@Param(value = "basUrl") String basUrl,@Param(value = "id") String  id);
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsDraftMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.InsertMap;
+import com.ekingwin.bas.cloud.entity.IpGoodsEntity;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @program: rcworkspace
+ * @description:主表信息修改
+ * @author: zhangjie
+ * @create: 2019-06-27 16:07
+ **/
+@Repository
+public interface IpGoodsDraftMapper {
+
+    /**
+     * 新增商品
+     * @param insertMap
+     * @return
+     */
+    int insertGoods(InsertMap insertMap);
+
+    /**
+     * 修改商品信息
+     * @param insertMap
+     * @return
+     */
+    int updateGoods(InsertMap insertMap);
+
+    /**
+     * 根据流程表ID删除商品主数据
+     * @param id
+     * @return
+     */
+    int deleteGoodsProcess(Long id);
+
+    /**
+     * 根据流程i主表id获取详情
+     * @param id
+     * @return
+     */
+    Map<String,Object> getGoodsDetail(Long id);
+
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsEvaluationMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.GoodsEvaluationAgainDto;
+import com.ekingwin.bas.cloud.dto.IpGoodsEvaluationPageDto;
+import com.ekingwin.bas.cloud.entity.IpGoodsEvaluation;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface IpGoodsEvaluationMapper {
+
+    List<IpGoodsEvaluation> selectGoodsEvaluation(Long goodsId);
+    List<IpGoodsEvaluation> selectMyEvaluation(@Param(value = "goodsId") Long goodsId,@Param(value = "evaluationId") String evaluationId);
+
+    IpGoodsEvaluation selectGoodsComprehensiveScore(Long goodsId);
+
+    void saveGoodsEvaluation(IpGoodsEvaluation evaluation);
+
+    void updateOrderAllGoods(Map map);
+
+
+    /**
+     * 查询当前用户的权限问题
+     * @param
+     * @return
+     */
+    Integer queryJurisdiction(String evaluationId);
+
+    /**
+     * 查询回复信息
+     * @param id
+     * @return
+     */
+    List<GoodsEvaluationAgainDto> selectreply(Integer id);
+
+    /**
+     * 回复评价信息
+     * @param evaluationAgain
+     */
+    void addReplyGoodsEvaluation(GoodsEvaluationAgainDto evaluationAgain);
+
+    /**
+     * 可以所有评论都有权限删除
+     * @param evaluationAgain
+     */
+    void deleteEvaluation(GoodsEvaluationAgainDto evaluationAgain);
+
+    /**
+     * 所有评价对应的回复信息都有权限删除
+     * @param evaluationAgain
+     */
+    void deleteReply(GoodsEvaluationAgainDto evaluationAgain);
+
+    /**
+     * 可以删除自己评论
+     * @param evaluationAgain
+     */
+    void deleteMyEvaluation(GoodsEvaluationAgainDto evaluationAgain);
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsImgMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.entity.IpGoodsImg;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @program: rcworkspace
+ * @description:商品图片
+ * @author: zhangjie
+ * @create: 2019-06-27 15:28
+ **/
+@Repository
+public interface IpGoodsImgMapper {
+
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(IpGoodsImg record);
+
+    int insertSelective(IpGoodsImg record);
+
+    IpGoodsImg selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(IpGoodsImg record);
+
+    int updateByPrimaryKey(IpGoodsImg record);
+
+    /**
+     *
+     * 删除商品信息
+     * @param goodsId
+     * @return
+     */
+    int deleteByGoodsId(Long goodsId);
+
+    /**
+     * 获取所有图片
+     * @param goodsId
+     * @return
+     */
+    List<String> selectImgPath(Long goodsId);
+
+    /**
+     * 根据商品ID获取图片
+     * @param goodsId
+     * @return
+     */
+    IpGoodsImg selectByGoodsid(Long goodsId);
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsImgProcessMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.entity.IpGoodsImg;
+import com.ekingwin.bas.cloud.entity.IpGoodsImgProcess;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @program: rcworkspace
+ * @description:商品图片
+ * @author: zhangjie
+ * @create: 2019-06-27 15:28
+ **/
+@Repository
+public interface IpGoodsImgProcessMapper {
+
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(IpGoodsImgProcess record);
+
+    int insertSelective(IpGoodsImgProcess record);
+
+    IpGoodsImgProcess selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(IpGoodsImgProcess record);
+
+    int updateByPrimaryKey(IpGoodsImgProcess record);
+
+    /**
+     *
+     * 删除商品信息
+     * @param goodsId
+     * @return
+     */
+    int deleteByGoodsId(Long goodsId);
+
+    /**
+     * 获取所有图片
+     * @param goodsId
+     * @return
+     */
+    List<String> selectImgPath(Long goodsId);
+
+    /**
+     * 根据商品ID获取图片
+     * @param goodsId
+     * @return
+     */
+    IpGoodsImgProcess selectByGoodsid(Long goodsId);
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsLogsMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.entity.IpGoodsLogs;
+import com.ekingwin.bas.cloud.entity.IpGoodsLogsWithBLOBs;
+import com.ekingwin.bas.cloud.vo.IpGoodsLogsVo;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface IpGoodsLogsMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(IpGoodsLogsWithBLOBs record);
+
+    int insertSelective(IpGoodsLogsWithBLOBs record);
+
+    IpGoodsLogsWithBLOBs selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(IpGoodsLogsWithBLOBs record);
+
+    int updateByPrimaryKeyWithBLOBs(IpGoodsLogsWithBLOBs record);
+
+    int updateByPrimaryKey(IpGoodsLogs record);
+
+    /**
+     * 根据商品Id获取操作记录
+     * @param goodId
+     * @return
+     */
+    List<IpGoodsLogsWithBLOBs> getDetailByGoodsid(Long goodId);
+
+
+    /**
+     * 获取商品的操作记录
+     * @param goodsId
+     * @return
+     */
+    List<IpGoodsLogsVo> getLogByGoodsId(Long goodsId);
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsManageMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.vo.IpGoodsManageSuppliersVo;
+import com.ekingwin.bas.cloud.vo.IpGoodsManageVo;
+import com.ekingwin.bas.cloud.vo.IpGoodsSapPriceVo;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface IpGoodsManageMapper {
+
+
+
+    List<IpGoodsManageVo> getGoodsManage(String goodsId);
+
+
+    /**
+     *  根据分类获取供应商数据
+     * @param categoryId
+     * @return
+     */
+    List<IpGoodsManageSuppliersVo> getGoodsManageSupplier(String categoryId);
+
+
+    /**
+     * 获取根节点
+     * @param rootId
+     * @return
+     */
+    String getChildCode(String rootId);
+
+    /**
+     *  获取所有的项目编号
+     * @param treeId
+     * @return
+     */
+    List<String> getProjectCode(String treeId);
+
+
+    /**
+     *  sap价格
+     * @param goodsId
+     * @return
+     */
+    List<IpGoodsSapPriceVo> getGoodsPrice(String goodsId);
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.GoodsDetailDto;
+import com.ekingwin.bas.cloud.dto.GoodsMessageCategoryDto;
+import com.ekingwin.bas.cloud.dto.InsertMap;
+import com.ekingwin.bas.cloud.dto.IpGoodsStockDto;
+import com.ekingwin.bas.cloud.entity.IpGoodsEntity;
+import com.ekingwin.bas.cloud.vo.GoodsMessageCategoryVo;
+import com.ekingwin.bas.cloud.vo.GoodsMessageStatusVo;
+import com.ekingwin.bas.cloud.vo.IpProcessGoodsVo;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @program: rcworkspace
+ * @description:主表信息修改
+ * @author: zhangjie
+ * @create: 2019-06-27 16:07
+ **/
+@Repository
+public interface IpGoodsMapper {
+
+    /**
+     * 新增商品
+     * @param insertMap
+     * @return
+     */
+    int insertGoods(InsertMap insertMap);
+
+    /**
+     * 修改商品信息
+     * @param insertMap
+     * @return
+     */
+    int updateGoods(InsertMap insertMap);
+
+    /**
+     * 获取详情
+     * @param goodsId
+     * @return
+     */
+    Map<String,Object> getGoodsDetail(Long goodsId);
+
+
+    /**
+     * 获取商品编码
+     * @return
+     */
+    String getGoodNum();
+
+    /**
+     * 修改商品状态
+     * @param ipGoodsEntity
+     * @return
+     */
+    int updateGoodsStatus(IpGoodsEntity ipGoodsEntity);
+
+
+    /**
+     * 获取分类下所有的商品
+     * @param categoryId
+     * @return
+     */
+    List<String>  getGoodsId(String categoryId);
+
+    /**
+     * 修改商品三级分类信息
+     * @param map
+     * @return
+     */
+    int updateGoodsCategory(Map<String,String> map);
+
+    /**
+     * 修改商品一二级分类对应的分类名称
+     */
+    int updateFirSecCatrgoryName(Map<String,String> map);
+
+
+    /**
+     * 根据商品编号获取商品详情
+     * @param goodsnum
+     * @return
+     */
+    Map<String, Object> getGoodsDetailByNum(String goodsnum);
+
+    /**
+     * 判断商品是否在流程中
+     * @param goodsDetailDto
+     * @return
+     */
+    List<IpProcessGoodsVo> getGoodsNameByGoodsId(GoodsDetailDto goodsDetailDto);
+
+    /**
+     * 根据分类DI获取上架的商品数量
+     * @param categoryId
+     * @return
+     */
+    int getGoodsIdCount(String categoryId);
+
+    /**
+     * 获取三级分类
+     * @param goodsId
+     * @return
+     */
+    String getGoodsThreeCategory(String goodsId);
+
+
+    /**
+    * 获取商品的状态
+    * @Param:  * @param messageCategoryDto
+    * @return: java.util.List<com.ekingwin.bas.cloud.vo.GoodsMessageStatusVo>
+    * @Author: zhangjie
+    * @Date: 2019/10/21 21:39
+    */
+    List<GoodsMessageStatusVo> getGoodsStatus(GoodsMessageCategoryDto messageCategoryDto);
+
+
+
+    /**
+     * 获取一级分类
+     * @Param:  * @param messageCategoryDto
+     * @return: java.util.List<com.ekingwin.bas.cloud.vo.GoodsMessageCategoryVo>
+     * @Author: zhangjie
+     * @Date: 2019/10/21 22:20
+     */
+    List<GoodsMessageCategoryVo> getFirstCategory(GoodsMessageCategoryDto messageCategoryDto);
+
+    /**
+     * 获取二级分类
+     * @Param:  * @param messageCategoryDto
+     * @return: java.util.List<com.ekingwin.bas.cloud.vo.GoodsMessageCategoryVo>
+     * @Author: zhangjie
+     * @Date: 2019/10/21 22:20
+     */
+    List<GoodsMessageCategoryVo> getSecondCategory(GoodsMessageCategoryDto messageCategoryDto);
+
+    /**
+     * 获取三级分类
+     * @Param:  * @param messageCategoryDto
+     * @return: java.util.List<com.ekingwin.bas.cloud.vo.GoodsMessageCategoryVo>
+     * @Author: zhangjie
+     * @Date: 2019/10/21 22:20
+     */
+    List<GoodsMessageCategoryVo> getThreadCategory(GoodsMessageCategoryDto messageCategoryDto);
+
+    /**
+     * 获取商品信息
+     * @Param:  * @param messageCategoryDto
+     * @return: java.util.List<com.ekingwin.bas.cloud.vo.GoodsMessageCategoryVo>
+     * @Author: zhangjie
+     * @Date: 2019/10/21 22:20
+     */
+    List<Map<String,Object>> getAllGoodList(GoodsMessageCategoryDto messageCategoryDto);
+
+
+    /**
+    * 库存
+    * @Param:  * @param stockDto
+    * @return: int
+    * @Author: zhangjie
+    * @Date: 2019/11/2 15:55
+    */
+    int updateGoodsStock(IpGoodsStockDto stockDto);
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsPriceMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.IpGoodPriceDto;
+import com.ekingwin.bas.cloud.dto.IpGoodsStockDto;
+import com.ekingwin.bas.cloud.entity.IpGoodsPrice;
+import com.ekingwin.bas.cloud.vo.IpGoodsExcelVo;
+import com.ekingwin.bas.cloud.vo.LoginUserVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+/**
+ * @program: rcworkspace
+ * @description:商品价格
+ * @author: zhangjie
+ * @create: 2019-06-27 16:07
+ **/
+@Repository
+public interface IpGoodsPriceMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(IpGoodsPrice record);
+
+    int insertSelective(IpGoodsPrice record);
+
+    IpGoodsPrice selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(IpGoodsPrice record);
+
+    int updateByPrimaryKey(IpGoodsPrice record);
+
+    /**
+     * 根据商品ID删除商品价格
+     *
+     * @param goodsId the goods id
+     * @return int
+     */
+    int deleteByGoodsid(Long goodsId);
+
+    /**
+     * 标记为删除
+     * @param goodsId
+     * @return
+     */
+    int updateByGoodsid(Long goodsId);
+
+
+    /**
+     * 根据商品id获取商品价格
+     * @param goodsId
+     * @return
+     */
+    List<IpGoodsPrice> getDetailByGoodsid(Long goodsId);
+
+
+    /**
+     * 2获取外部用户的价格
+     * @param ipGoodPriceDto
+     * @return
+     */
+    IpGoodsPrice getOutGoodsPrice(IpGoodPriceDto ipGoodPriceDto);
+
+    /**
+    * 内部员工获取商品价格
+    * @Param:  * @param goodsId
+    * @return: com.ekingwin.bas.cloud.entity.IpGoodsPrice
+    * @Author: zhangjie
+    * @Date: 2019/10/28 20:53
+    */
+    IpGoodsPrice getOutGoodsPriceNbyg(Long goodsId);
+
+    /**
+     *  获取商品信息
+     * @param goodsId
+     * @return
+     */
+    List<IpGoodsPrice> getOutGoodsPriceList(Long goodsId);
+
+    /**
+     * 获取内部用户的价格
+     * @param orglist
+     * @param goodsId
+     * @return
+     */
+    IpGoodsPrice getInsideGoodsPrice(@Param(value = "orglist") String orglist,
+                                     @Param(value = "goodsId") Long goodsId);
+
+    /**
+     * 根据当前登录用户所在公司获取价格
+     * @param companyId
+     * @param goodsId
+     * @return
+     */
+    IpGoodsPrice getInsideGoodsPriceByCompanyId(@Param(value = "companyId") String companyId,
+                                                @Param(value = "goodsId") Long goodsId,
+                                                @Param(value = "orglist") String orglist);
+
+
+    /**
+     * 获取当前登录人所有岗位
+     * @param bassurl
+     * @param userId
+     * @return
+     */
+    List<String> getEmployUser(@Param(value = "baseurl") String bassurl,
+                               @Param(value = "userId") String userId);
+
+    /**
+     * 获取组织机构
+     * @param bassurl
+     * @param orgid
+     * @return
+     */
+    String getTree(@Param(value = "baseurl") String bassurl,
+                         @Param(value = "orgid") String orgid);
+
+
+
+    /**
+     * 获取组织机构
+     * @param bassurl
+     * @param orgid
+     * @return
+     */
+    String getParentTree(@Param(value = "baseurl") String bassurl,
+                         @Param(value = "orgid") String orgid);
+
+
+    /**
+     * 根据商品ID获取信息
+     *
+     * @param goodsId the goods id
+     * @return goods price by goods id
+     */
+    List<IpGoodsExcelVo> getGoodsPriceByGoodsId(@Param(value = "goodsId") String goodsId);
+
+
+    /**
+     * Gets user detail.
+     *
+     * @param userId the user id
+     * @return the user detail
+     */
+    /*
+     * 获取用户的信息
+     * @Param:  * @param userId
+     * @return: java.util.List<com.ekingwin.bas.cloud.vo.LoginUserVo>
+     * @Author: zhangjie
+     * @Date: 2019/10/28 20:45
+     */
+    List<LoginUserVo> getUserDetail(String userId);
+
+    /**
+     * 扣减库存
+     *
+     * @param goodsStockDto the goods stock dto
+     * @return int
+     */
+    int updateGoodsStock(IpGoodsStockDto goodsStockDto);
+
+    /**
+     * 根据商品ID和价格ID获取商品是否存在
+     *
+     * @param id      the id
+     * @param goodsId the goods id
+     * @return detail by goodsid count
+     */
+    int getDetailByGoodsidCount(@Param(value = "id") Long id,@Param(value = "goodsId") Long goodsId);
+
+
+    /**
+     * Gets category salare.
+     *
+     * @param categoryId the category id
+     * @param supplierid the supplierid
+     * @return category salare
+     */
+    List<String> getCategorySalare(@Param(value = "categoryId") String categoryId,@Param(value = "supplierid") String supplierid);
+
+
+    /**
+     * 获取供货品类类型
+     *
+     * @param salesarea the salesarea
+     * @return category tree type
+     */
+    String getCategoryTreeType(@Param(value = "salesarea") String salesarea);
+
+
+    /**
+     * 获取项目公司的个数
+     *
+     * @param salesarea the salesarea
+     * @return category xm company
+     */
+    int getCategoryXmCompany(@Param(value = "salesarea") String salesarea);
+
+    /**
+     * 获取城市公司的个数
+     *
+     * @param salesarea the salesarea
+     * @return category city company
+     */
+    int getCategoryCityCompany(@Param(value = "salesarea") String salesarea);
+
+
+    /**
+     * 获取项目人员
+     *
+     * @param salesarea the salesarea
+     * @return user persion xm
+     */
+    String getUserPersionXm(@Param(value = "salesarea") String salesarea);
+
+    /**
+     * 获取城市人员
+     *
+     * @param salesarea the salesarea
+     * @return user persion city
+     */
+    String getUserPersionCity(@Param(value = "salesarea") String salesarea);
+
+
+    /**
+     * 获取区域人员
+     *
+     * @param salesarea the salesarea
+     * @return user persion area
+     */
+    String getUserPersionArea(@Param(value = "salesarea") String salesarea);
+
+
+    /**
+     * 获取父级
+     *
+     * @param salesarea the salesarea
+     * @return company parent
+     */
+    String getCompanyParent(@Param(value = "salesarea") String salesarea);
+
+
+
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsPriceProcessMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.entity.IpGoodsPrice;
+import com.ekingwin.bas.cloud.entity.IpGoodsPriceProcess;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+/**
+ * @program: rcworkspace
+ * @description:商品价格
+ * @author: zhangjie
+ * @create: 2019-06-27 16:07
+ **/
+@Repository
+public interface IpGoodsPriceProcessMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(IpGoodsPriceProcess record);
+
+    int insertSelective(IpGoodsPriceProcess record);
+
+    IpGoodsPriceProcess selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(IpGoodsPriceProcess record);
+
+    int updateByPrimaryKey(IpGoodsPriceProcess record);
+
+    /**
+     * 根据商品ID删除商品价格
+     * @param goodsId
+     * @return
+     */
+    int deleteByGoodsid(Long goodsId);
+
+
+    /**
+     * 根据商品id获取商品价格
+     * @param goodsId
+     * @return
+     */
+    List<IpGoodsPriceProcess> getDetailByGoodsid(Long goodsId);
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsSolrMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.IpGoodsSearchDto;
+import com.ekingwin.bas.cloud.dto.IpLicensornameDto;
+import com.ekingwin.bas.cloud.vo.IpLicensornameVo;
+import com.ekingwin.bas.cloud.vo.LoginUserVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface IpGoodsSolrMapper {
+
+    /**
+     * 获取当前登录人所有岗位
+     * @param bassurl
+     * @param userId
+     * @return
+     */
+    List<String> getEmployUser(@Param(value = "baseurl") String bassurl,
+                               @Param(value = "userId") String userId);
+
+    /**
+     * 获取组织机构
+     * @param bassurl
+     * @param orgid
+     * @return
+     */
+    String getTree(@Param(value = "baseurl") String bassurl,
+                   @Param(value = "orgid") String orgid);
+
+
+
+    /**
+     * 获取组织机构
+     * @param bassurl
+     * @param orgid
+     * @return
+     */
+    String getParentTree(@Param(value = "baseurl") String bassurl,
+                         @Param(value = "orgid") String orgid);
+
+
+    /**
+     * 查询所有的授权商
+     * @param ipLicensornameDto
+     * @return
+     */
+    List<IpLicensornameVo> getLicensorname(IpLicensornameDto ipLicensornameDto);
+
+
+    /**
+     * 获取三级分类
+     * @param ipGoodsSearchDto
+     * @return
+     */
+    List<String> getCategoryId(IpGoodsSearchDto ipGoodsSearchDto);
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsSupplierFreightMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.entity.IpGoodsSupplierFreight;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @program: rcworkspace
+ * @description:商品运费
+ * @author: zhangjie
+ * @create: 2019-06-27 15:28
+ **/
+@Repository
+public interface IpGoodsSupplierFreightMapper {
+    /**
+     * 根据id删除
+     * @param id
+     * @return
+     */
+    int deleteByPrimaryKey(Long id);
+
+    int insert(IpGoodsSupplierFreight record);
+
+    int insertSelective(IpGoodsSupplierFreight record);
+
+    IpGoodsSupplierFreight selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(IpGoodsSupplierFreight record);
+
+    int updateByPrimaryKey(IpGoodsSupplierFreight record);
+
+    /**
+     * 删除运费信息
+     * @param goodsId
+     * @return
+     */
+    int deleteByGoodsId(Long goodsId);
+
+    /**
+     * 获取运费信息
+     * @param goodsId
+     * @return
+     */
+    List<IpGoodsSupplierFreight> selectByGoodsId(Long goodsId);
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsSupplierFreightProcessMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.entity.IpGoodsSupplierFreight;
+import com.ekingwin.bas.cloud.entity.IpGoodsSupplierFreightProcess;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @program: rcworkspace
+ * @description:商品运费
+ * @author: zhangjie
+ * @create: 2019-06-27 15:28
+ **/
+@Repository
+public interface IpGoodsSupplierFreightProcessMapper {
+    /**
+     * 根据id删除
+     * @param id
+     * @return
+     */
+    int deleteByPrimaryKey(Long id);
+
+    int insert(IpGoodsSupplierFreightProcess record);
+
+    int insertSelective(IpGoodsSupplierFreightProcess record);
+
+    IpGoodsSupplierFreightProcess selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(IpGoodsSupplierFreightProcess record);
+
+    int updateByPrimaryKey(IpGoodsSupplierFreightProcess record);
+
+    /**
+     * 删除运费信息
+     * @param goodsId
+     * @return
+     */
+    int deleteByGoodsId(Long goodsId);
+
+    /**
+     * 获取运费信息
+     * @param goodsId
+     * @return
+     */
+    List<IpGoodsSupplierFreightProcess> selectByGoodsId(Long goodsId);
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsSuppliersMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.IpGoodsFreightDto;
+import com.ekingwin.bas.cloud.entity.IpGoodsSuppliers;
+import com.ekingwin.bas.cloud.vo.GoodsSupplierInfoVo;
+import com.ekingwin.bas.cloud.vo.IpGoodsSupplierFreightVo;
+import com.ekingwin.bas.cloud.vo.IpGoodsSuppliersVo;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @program: rcworkspace
+ * @description:商品供应商
+ * @author: zhangjie
+ * @create: 2019-06-27 15:28
+ **/
+@Repository
+public interface IpGoodsSuppliersMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(IpGoodsSuppliers record);
+
+    int insertSelective(IpGoodsSuppliers record);
+
+    IpGoodsSuppliers selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(IpGoodsSuppliers record);
+
+    int updateByPrimaryKey(IpGoodsSuppliers record);
+
+    /**
+     * 删除供应商
+     * @param goodsId
+     * @return
+     */
+    int deleteByGoodsId(Long goodsId);
+
+    /**
+     * 获取供应商
+     * @param goodsId
+     * @return
+     */
+    List<IpGoodsSuppliersVo> selectByGoodsId(Long goodsId);
+
+
+    /**
+     * 根据区ID获取运费
+     * @param ipGoodsFreightDto
+     * @return
+     */
+    IpGoodsSupplierFreightVo getFreightPriceByAreaId(IpGoodsFreightDto ipGoodsFreightDto);
+
+    /**
+     * 根据城市ID获取运费
+     * @param ipGoodsFreightDto
+     * @return
+     */
+    IpGoodsSupplierFreightVo getFreightPriceByCityId(IpGoodsFreightDto ipGoodsFreightDto);
+
+
+    /**
+     * 根据省份IID获取运费
+     * @param ipGoodsFreightDto
+     * @return
+     */
+    IpGoodsSupplierFreightVo getFreightPriceByProvinceId(IpGoodsFreightDto ipGoodsFreightDto);
+
+
+    /**
+     * 根商品iD和供应商ID删除信息
+     * @param record
+     * @return
+     */
+    int deleteByGoodsIdAndSuppliers(IpGoodsSuppliers record);
+
+
+    /**
+     * 查询供应商的联系方式
+     * @param supplierid
+     * @return
+     */
+    GoodsSupplierInfoVo getGoodsSuppliersById(String supplierid);
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpGoodsSuppliersProcessMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.IpGoodsFreightDto;
+import com.ekingwin.bas.cloud.entity.IpGoodsSuppliers;
+import com.ekingwin.bas.cloud.entity.IpGoodsSuppliersProcess;
+import com.ekingwin.bas.cloud.vo.IpGoodsSupplierFreightVo;
+import com.ekingwin.bas.cloud.vo.IpGoodsSuppliersVo;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @program: rcworkspace
+ * @description:商品供应商
+ * @author: zhangjie
+ * @create: 2019-06-27 15:28
+ **/
+@Repository
+public interface IpGoodsSuppliersProcessMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(IpGoodsSuppliersProcess record);
+
+    int insertSelective(IpGoodsSuppliersProcess record);
+
+    IpGoodsSuppliersProcess selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(IpGoodsSuppliersProcess record);
+
+    int updateByPrimaryKey(IpGoodsSuppliersProcess record);
+
+    /**
+     * 删除供应商
+     * @param goodsId
+     * @return
+     */
+    int deleteByGoodsId(Long goodsId);
+
+    /**
+     * 获取供应商
+     * @param goodsId
+     * @return
+     */
+    List<IpGoodsSuppliersVo> selectByGoodsId(Long goodsId);
+
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpMainGoodsDataMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.GoodsDataDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author 许世文
+ * @Date 2019/8/6 15:44
+ * @Version 1.0
+ **/
+@Repository
+public interface IpMainGoodsDataMapper {
+
+    int getTopMaxSort();
+
+    int getRightMaxSort();
+
+    int getMiddleMaxSort();
+
+    int getPromotionSort();
+
+    int getSecondsSort();
+
+    int insertTopData(@Param(value = "topData") List<GoodsDataDto> topData);
+
+    int insertRightData(@Param(value = "rightData") List<GoodsDataDto> rightData);
+
+    int insertMiddleData(@Param(value = "middleData") List<GoodsDataDto> middleData);
+
+    int insertPromotionData(@Param(value = "middleData") List<GoodsDataDto> middleData);
+
+    int insertSecondsData(@Param(value = "middleData") List<GoodsDataDto> middleData);
+
+    int updateTopData(GoodsDataDto topData);
+
+    int updateRightData(GoodsDataDto rightData);
+
+    int updateMiddleData(GoodsDataDto middleData);
+
+    int updatePromotionData(GoodsDataDto middleData);
+
+    int updateSecondsData(GoodsDataDto middleData);
+
+    List<GoodsDataDto> getTopData(@Param(value = "basUrl") String basUrl,@Param(value = "judge") String judge);
+
+    List<GoodsDataDto> getRightData(@Param(value = "basUrl") String basUrl,@Param(value = "judge") String judge);
+
+    List<GoodsDataDto> getMiddleData(@Param(value = "basUrl") String basUrl,@Param(value = "judge") String judge);
+
+    List<GoodsDataDto> getPromotionData(@Param(value = "basUrl") String basUrl,@Param(value = "judge") String judge);
+
+    List<GoodsDataDto> getSecondsData(@Param(value = "judge") String judge);
+
+    int deleteTopData(@Param(value = "id") int id);
+
+    int deleteRightData(@Param(value = "id") int id);
+
+    int deleteMiddleData(@Param(value = "id") int id);
+
+    int deletePromotionData(@Param(value = "id") int id);
+
+    int deleteSecondsData(@Param(value = "id") int id);
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpMainGoodsMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.IpGoodsCategoryDto;
+import com.ekingwin.bas.cloud.dto.SaveGoodsCategoryDto;
+import com.ekingwin.bas.cloud.vo.*;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-07-18 11:42
+ **/
+@Repository
+public interface IpMainGoodsMapper {
+    /**
+     * 查询热门采购id
+     */
+    List<Map<String, Object>> getHotPurchaseId(@Param(value = "basdb") String basdb);
+    /**
+     * 查询热门采购信息
+     */
+    List<Map<String,Object>> getHotPurchaseInfo( @Param(value = "basdb") String basdb,@Param(value = "id") String id, @Param(value = "imgurl") String imgurl);
+    /**
+     * 查询新品上架信息
+     */
+    List<Map<String,Object>> getNewArrivalsInfo( @Param(value = "basdb") String basdb,@Param(value = "imgurl") String imgurl);
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpMobileAdvertisingLogsMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.IpMobileAdvertisingPageDto;
+import com.ekingwin.bas.cloud.dto.MobileAdvertisingDto;
+import com.ekingwin.bas.cloud.entity.IpMobileAdvertisingLogs;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface IpMobileAdvertisingLogsMapper {
+
+    void addMobileAdvertisingLogs(IpMobileAdvertisingLogs mobileAdvertisingLogs);
+
+    void updateMobileAdvertisingLogs(IpMobileAdvertisingLogs mobileAdvertisingLogs);
+
+    List<MobileAdvertisingDto> queryAdvertisingLogsList(IpMobileAdvertisingPageDto pageDto);
+
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpMobileAdvertisingMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.dto.IpMobileAdvertisingDto;
+import com.ekingwin.bas.cloud.dto.IpMobileAdvertisingPageDto;
+import com.ekingwin.bas.cloud.dto.MobileAdvertisingDto;
+import com.ekingwin.bas.cloud.entity.IpMobileAdvertising;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface IpMobileAdvertisingMapper {
+
+    IpMobileAdvertising selectAdvertisingMapper(@Param(value = "id")Integer id);
+
+    String selectSupplierNum(@Param(value = "goodsId")Integer goodsId);
+
+    void addMobileAdvertising(IpMobileAdvertising mobileAdvertising);
+
+    void updateMobileAdvertising(IpMobileAdvertising mobileAdvertising);
+
+
+    List<MobileAdvertisingDto> queryAdvertisingList(IpMobileAdvertisingPageDto pageDto);
+
+    List<MobileAdvertisingDto> queryAdvertise(IpMobileAdvertisingPageDto pageDto);
+
+    MobileAdvertisingDto queryAdvertising(IpMobileAdvertisingPageDto pageDto);
+
+
+    Integer selectIsSet(IpMobileAdvertising mobileAdvertising);
+
+    Integer selectLongTime(IpMobileAdvertising mobileAdvertising);
+
+    String selectConflictSave(IpMobileAdvertising mobileAdvertising);
+
+    String selectConflictUpdate(IpMobileAdvertising mobileAdvertising);
+
+
+    /**
+     * 查询已经失效的广告
+     */
+    List<IpMobileAdvertisingDto> selectMobileAdvertisingFailureDate();
+
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpSapGoodsDtoMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.vo.IpGoodsManageSapVo;
+import com.ekingwin.bas.cloud.vo.IpGoodsManageSuppliersVo;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface IpSapGoodsDtoMapper {
+
+
+    /**
+     * 批量插入历史
+     * @param list
+     * @return
+     */
+    int insert(List<IpGoodsManageSapVo> list);
+
+
+    /**
+     *  删除历史同步
+     * @param goodsId
+     * @return
+     */
+    int deleteByGoodsId(String goodsId);
+
+    /**
+     *  根据商品获取历史数据
+     * @param goodsId
+     * @return
+     */
+    List<IpGoodsManageSapVo> selectByGoodsId(String goodsId);
+
+    List<IpGoodsManageSuppliersVo> getSuppliers(String goodsId);
+
+    int insertSupplier(List<IpGoodsManageSuppliersVo>  list);
+
+
+
+
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dao/IpSearchHistoryMapper.java

+package com.ekingwin.bas.cloud.dao;
+
+import com.ekingwin.bas.cloud.entity.IpSearchHistory;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface IpSearchHistoryMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(IpSearchHistory record);
+
+    int insertSelective(IpSearchHistory record);
+
+    IpSearchHistory selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(IpSearchHistory record);
+
+    int updateByPrimaryKey(IpSearchHistory record);
+
+    /**
+     * 查询历史搜索记录
+     * @param inputperson
+     * @return
+     */
+    List<String> selectByUserId(String inputperson);
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/BasDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-06-28 18:25
+ **/
+@Data
+@ApiModel("公共信息")
+public class BasDto {
+
+   /* @ApiModelProperty(value = "组织人员信息", required = false)
+    private OrgInfoDto orginfo;*/
+
+    @ApiModelProperty(value = "操作人", required = false)
+    private String userid;
+
+    @ApiModelProperty(value = "操作人名称", required = false)
+    private String userName;
+
+    @ApiModelProperty(value = "数据库用户名",hidden = true)
+    private  String basurl;
+
+    @ApiModelProperty(value = "所属公司组织")
+    private String companyId;
+
+    @ApiModelProperty(value = "是否是供应商平台 Y 是 N否", required = false)
+    private String isSupplier;
+
+    @ApiModelProperty(value = "用户类型 XM 项目 GR 个人")
+    private String customerType;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/BasePageDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-06-30 10:38
+ **/
+@Data
+@ApiModel("分页基础信息")
+public class BasePageDto {
+
+
+    @ApiModelProperty(value = "页码", required = false)
+    private int pagenum;
+
+
+    @ApiModelProperty(value = "条数", required = false)
+    private int pagesize;
+
+
+    @ApiModelProperty(value = "查询条件", required = false)
+    private String searchData;
+
+    @ApiModelProperty(value = "数据库用户名",hidden = true)
+    private  String basurl;
+
+
+    @ApiModelProperty(value = "是否是供应商平台 Y 是 N否", required = false)
+    private String isSupplier;
+
+
+    @ApiModelProperty(value = "登录用户ID", required = false)
+    private  String userid;
+
+    @ApiModelProperty(value = "供应商ID", required = false)
+    private String supplierId;
+
+    @ApiModelProperty(value = "用户类型 XM 项目 GR 个人")
+    private String customerType;
+
+    @ApiModelProperty(value = "所在公司ID")
+    private String companyId;
+
+
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/BaseReturnDto.java

+package com.ekingwin.bas.cloud.dto;
+
+public class BaseReturnDto {
+	private String code;
+	private String message;
+	private Object content;
+	
+	public String getCode() {
+		return code;
+	}
+	public void setCode(String code) {
+		this.code = code;
+	}
+	public String getMessage() {
+		return message;
+	}
+	public void setMessage(String message) {
+		this.message = message;
+	}
+	public Object getContent() {
+		return content;
+	}
+	public void setContent(Object content) {
+		this.content = content;
+	}
+
+	
+	
+	
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/BoGoodUpDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-07-12 21:44
+ **/
+@Data
+@ApiModel("商品操作")
+public class BoGoodUpDto  extends  BasDto{
+
+
+    @ApiModelProperty(value = "商品编码", required = false)
+    private List<GoodsDetailDto> goods;
+
+    @ApiModelProperty(value = "操作类型 上架 ，下架 ，删除", required = false)
+    private String type;
+
+
+    @ApiModelProperty(value = "是否发起流程", required = false)
+    private String isProcess;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/CopyGoodsDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @ClassName :
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-10-22 20:51
+ **/
+@Data
+@ApiModel("商品复制")
+public class CopyGoodsDto extends BasDto {
+
+    private long goodsId;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/CreateProcessDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+@ApiModel("流程发起需要的参数信息")
+public class CreateProcessDto {
+    @ApiModelProperty(value = "用户登录账号", required = true)
+    private String userId;
+    @ApiModelProperty(value = "流程建模名称", required = true)
+    private String processName;
+    @ApiModelProperty(value = "主题", required = false)
+    private String subject;
+    @ApiModelProperty(value = "流程发起时的签字意见", required = false)
+    private String comment;
+    @ApiModelProperty(value = "流程参数", required = false)
+    private Map<String, Object> businessData;
+    @ApiModelProperty(value = "申请单号", required = false)
+    private String reqNo;
+    @ApiModelProperty(value = "固定值（97e13531669ebf79036fef457d2e26a5）", required = false)
+    protected String sign;
+    @ApiModelProperty(value = "租户ID（固定值:”BM_NGSP_WEB”）", required = false)
+    protected String sysId;
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/GoodsAddDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-06-27 15:28
+ **/
+@ApiModel("商品新增")
+@Data
+public class GoodsAddDto extends BasDto {
+
+    @ApiModelProperty(value = "商品主键", required = false)
+    private Long goodsId;
+
+    /**
+     * 商品信息
+     */
+    @ApiModelProperty(value = "商品信息", required = false)
+    private Map<String, Object> goodsMap;
+
+    /**
+     * 供应商运费
+     */
+    @ApiModelProperty(value = "供应商信息", required = false)
+    private List<IpGoodsSuppliersDto> supplierList;
+
+    /**
+     * 商品价格表
+     */
+    @ApiModelProperty(value = "商品价格", required = false)
+    private List<IpGoodsPriceDto> priceDtoList;
+
+    @ApiModelProperty(value = "图片", required = false)
+    private String urlid;
+
+    @ApiModelProperty(value = "商品描述", required = false)
+    private String details;
+
+    @ApiModelProperty(value = "规格参数", required = false)
+    private String description;
+
+
+
+    @ApiModelProperty(value = "是否直接上架 N否 Y是", required = false)
+    private String directiveground;
+
+    @ApiModelProperty(value = "暂存提交0 暂存 1提交", required = false)
+    private Integer status;
+
+    @ApiModelProperty(value = "操作类型 新增 编辑等", required = false)
+    private String type;
+
+    @ApiModelProperty(value = "流程实例号", required = false)
+    private String instid;
+
+    @ApiModelProperty(value = "商品编码", required = false)
+    private String goodsNum;
+
+    @ApiModelProperty(value = "主商品ID")
+    private String priceId;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/GoodsCategoryDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-07-08 13:37
+ **/
+@Data
+@ApiModel("分类信息修改")
+public class GoodsCategoryDto {
+
+    @ApiModelProperty(value = "分类信息ID" ,required = false)
+    private  String categoryId;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/GoodsCategoryTreeDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "获取销售价格所在区域")
+public class GoodsCategoryTreeDto  extends  BasDto{
+
+    @ApiModelProperty(value = "分类ID")
+    private String categoryId;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/GoodsDataDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author 许世文
+ * @Date 2019/8/6 15:16
+ * @Version 1.0
+ **/
+@Data
+@ApiModel("图片相关数据")
+public class GoodsDataDto {
+
+    @ApiModelProperty(value = "商品id")
+    private String goodsid;
+    @ApiModelProperty(value = "图片id")
+    private String urlid;
+    @ApiModelProperty(value = "描述")
+    private String des;
+    @ApiModelProperty(value = "链接地址")
+    private String linkaddress;
+    @ApiModelProperty(value = "供应商id")
+    private Long supplierid;
+    @ApiModelProperty(value = "供应商名称")
+    private String suppliername;
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "图片路径")
+    private String path;
+    @ApiModelProperty(value = "主键")
+    private int id;
+
+    @ApiModelProperty(value = "(GR.个人，XM.项目)")
+    private String judge;
+
+    @ApiModelProperty(value = "类别")
+    private String category;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/GoodsDetailDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-07-12 21:50
+ **/
+@Data
+@ApiModel("操作商品信息")
+public class GoodsDetailDto {
+
+    @ApiModelProperty(value = "商品名称",required = false)
+    private  String goodsname;
+
+    @ApiModelProperty(value = "商品编码",required = false)
+    private  String goodsnum;
+
+    @ApiModelProperty(value = "商品ID",required = false)
+    private  String goodsid;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/GoodsEvaluationAgainDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "商品的回复")
+public class GoodsEvaluationAgainDto {
+    //评价id
+    private Integer id;
+    private Integer pid;
+    //回复者
+    private String userid;
+    private String userName;
+    private String evaluationDate;
+    private Long ordergoodsId;
+    private Long orderId;
+    private Long goodsId;
+    private String goodsName;
+    private String comprehensiveScore;
+    private String goodsData;
+    private String logisticsEfficiency;
+    private String deliveryservice;
+    //回复内容
+    private String problemDescribe;
+    private String pictureUrl;
+    //当前登录人
+    private String evaluationId;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/GoodsGetDetailDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description: 获取商品详情
+ * @author: zhangjie
+ * @create: 2019-06-28 15:35
+ **/
+@Data
+public class GoodsGetDetailDto extends BasePageDto {
+
+    @ApiModelProperty(value = "商品主键",required = false)
+    private Long goodsId;
+
+
+    @ApiModelProperty(value = "流程实例号",required = false)
+    private String instid;
+
+    @ApiModelProperty(value = "商品查看类型 DETAIL")
+    private String checkType;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/GoodsMessageCategoryDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName :
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-10-21 19:42
+ **/
+@Data
+@ApiModel("商品管理库")
+public class GoodsMessageCategoryDto extends BasePageDto {
+
+    private String keyword;
+
+    private String pricesorttype;
+
+    @JsonProperty(value = "FTNPFirstCategoryCode")
+    private String FTNPFirstCategoryCode;
+
+    @JsonProperty(value = "FTNPSecondCategoryCode")
+    private String FTNPSecondCategoryCode;
+
+    @JsonProperty(value = "FTNPThreeCategoryCode")
+    private String FTNPThreeCategoryCode;
+
+    @ApiModelProperty(value = "品牌")
+    private String brand;
+
+    @ApiModelProperty(value = "商品名称")
+    private String name;
+
+    @ApiModelProperty(value = "最低价格")
+    private String floorPrice;
+
+    @ApiModelProperty(value = "最高价格")
+    private String ceilingPrice;
+
+    @ApiModelProperty(value = "状态")
+    private String state;
+
+    private String numsort;
+
+    private String inputdatesorttype;
+
+    private String categoryType;
+
+    @ApiModelProperty(value = "图片路径",hidden = true)
+    private String imgUrl;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/GoodsSpecificationDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "获取规格型号")
+@Data
+public class GoodsSpecificationDto extends BasDto {
+
+    @ApiModelProperty(value = "商品id")
+    private String goodsId;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/InsertMap.java

+package com.ekingwin.bas.cloud.dto;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-06-27 15:17
+ **/
+@Data
+public class InsertMap {
+
+
+    private  Long id;
+
+    private  String tableName;
+
+    private Map<String,Object> params;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpCategoryDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-07-09 10:59
+ **/
+@Data
+public class IpCategoryDto {
+
+    private String basUrl;
+
+    private String categoryId;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpExcelDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-08-02 16:48
+ **/
+@Data
+@ApiModel("EXCEL导出")
+public class IpExcelDto<T> {
+
+    private String sheetname;
+
+    private String [] columnname;
+
+    private List<T> dataListt;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodFavoriteSearchDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-08-08 17:24
+ **/
+@Data
+@ApiModel("商品查询收藏")
+public class IpGoodFavoriteSearchDto extends BasePageDto {
+
+    @ApiModelProperty(value = "商品图片位置",hidden = true)
+    private String goodsPath;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodFootDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "添加足迹")
+public class IpGoodFootDto {
+
+    private String userid;
+
+    private Long goodsid;
+
+    private String goodsname;
+
+    private String goodsurlid;
+
+    private String suppliernum;
+
+    private String companyId;
+
+    private Date inputdate=new Date();
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodFootSearchDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-08-08 14:46
+ **/
+@Data
+@ApiModel("查询商品足迹")
+public class IpGoodFootSearchDto extends BasePageDto  {
+
+
+    @ApiModelProperty(value = "商品图片位置",hidden = true)
+    private String goodsPath;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodPriceDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description: 计算商品的价格
+ * @author: zhangjie
+ * @create: 2019-07-22 16:43
+ **/
+@Data
+@ApiModel("计算商品价格")
+public class IpGoodPriceDto extends BasDto {
+
+
+    @ApiModelProperty(value = "商品主键",required = false)
+    private Long goodsId;
+
+    @ApiModelProperty(value = "客户类型Y 外部用户 N 内部用户",required = false)
+    private String isOutUser;
+
+    @ApiModelProperty(value = "客户类型",required = false,hidden = true)
+    private String custType;
+
+    @ApiModelProperty(value = "是否供应商计算价格")
+    private String isSupplierPrice;
+
+    @ApiModelProperty(value = "属性组合ID")
+    private String attrid;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodsCategoryDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-07-17 13:01
+ **/
+@Data
+@ApiModel("查询三级分类")
+public class IpGoodsCategoryDto extends BasePageDto {
+
+    @ApiModelProperty(value = "来源",required = false)
+    private String source;
+
+    @ApiModelProperty(value = "查询分类类型",required = true)
+    private String type;
+
+    @ApiModelProperty(value = "父id",required = true)
+    private String pid;
+
+    @ApiModelProperty(value = "分类类型",required = true)
+    private String categoryType;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodsEvaluationDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName: IpGoodsEvaluationDto
+ * @Author: liujunfeng
+ * @Date: 2019/10/25 18:19
+ * @description:
+ */
+@Data
+@ApiModel("商品评价")
+public class IpGoodsEvaluationDto extends BasDto{
+
+    @ApiModelProperty(value = "订单商品id" )
+    private Long ordergoodsId;
+
+    @ApiModelProperty(value = "订单id" )
+    private Long orderId;
+
+    @ApiModelProperty(value = "商品id" )
+    private Long goodsId;
+
+    @ApiModelProperty(value = "商品名称" )
+    private String goodsName;
+
+    @ApiModelProperty(value = "综合评分(1.极差,2.失望,3.一般,4.满意,5.惊喜)" )
+    private String comprehensiveScore;
+
+    @ApiModelProperty(value = "商品资料(1.极差,2.失望,3.一般,4.满意,5.惊喜)" )
+    private String goodsData;
+
+    @ApiModelProperty(value = "送货服务(1.极差,2.失望,3.一般,4.满意,5.惊喜)" )
+    private String deliveryservice;
+
+    @ApiModelProperty(value = "物流效率(1.极差,2.失望,3.一般,4.满意,5.惊喜)" )
+    private String logisticsEfficiency;
+
+    @ApiModelProperty(value = "问题描述" )
+    private String problemDescribe;
+
+    @ApiModelProperty(value = "照片url" )
+    private String pictureUrl;
+
+    @ApiModelProperty(value = "是否为追评(Y，N)" )
+    private String additional;
+
+    @ApiModelProperty(value = "评论ID" )
+    private Integer additionalId;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodsEvaluationPageDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @ClassName: IpGoodsEvaluationPageDto
+ * @Author: liujunfeng
+ * @Date: 2019/10/29 16:55
+ * @description:
+ */
+@Data
+public class IpGoodsEvaluationPageDto extends BasePageDto{
+
+    @ApiModelProperty(value = "评论人ID" )
+    private String evaluationId;
+
+    @ApiModelProperty(value = "评论人名称" )
+    private String evaluationName;
+
+    @ApiModelProperty(value = "评论时间" )
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date evaluationDate;
+
+    @ApiModelProperty(value = "订单商品id" )
+    private Long ordergoodsId;
+
+    @ApiModelProperty(value = "订单id" )
+    private Long orderId;
+
+    @ApiModelProperty(value = "商品id" )
+    private Long goodsId;
+
+    @ApiModelProperty(value = "商品名称" )
+    private String goodsName;
+
+    @ApiModelProperty(value = "综合评分(1.极差,2.失望,3.一般,4.满意,5.惊喜)" )
+    private String comprehensiveScore;
+
+    @ApiModelProperty(value = "商品资料(1.极差,2.失望,3.一般,4.满意,5.惊喜)" )
+    private String goodsData;
+
+    @ApiModelProperty(value = "物流效率(1.极差,2.失望,3.一般,4.满意,5.惊喜)" )
+    private String logisticsEfficiency;
+
+    @ApiModelProperty(value = "问题描述" )
+    private String problemDescribe;
+
+    @ApiModelProperty(value = "照片url" )
+    private String pictureUrl;
+
+    @ApiModelProperty(value = "是否为追评(Y，N)" )
+    private String additional;
+
+    @ApiModelProperty(value = "评论ID" )
+    private Integer additionalId;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodsFreightDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-06-30 19:30
+ **/
+@Data
+public class IpGoodsFreightDto {
+
+    @ApiModelProperty(value = "供应商ID",required = true)
+    private String supplierId;
+
+    @ApiModelProperty(value = "省",required = true)
+    private String provinceId;
+
+    @ApiModelProperty(value = "市",required = true)
+    private String cityId;
+
+    @ApiModelProperty(value = "区",required = true)
+    private String areaId;
+
+    @ApiModelProperty(value = "商品ID",required = true)
+    private Long goodsId;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodsLogsQuartzDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName: IpGoodsLogsQuartzDto
+ * @Author: liujunfeng
+ * @Date: 2020/1/14 11:46
+ * @description:
+ */
+@Data
+@ApiModel("商品日志")
+public class IpGoodsLogsQuartzDto {
+
+    @ApiModelProperty(value = "id",required = true)
+    private Integer id;
+
+    @ApiModelProperty(value = "商品id",required = true)
+    private Integer goodsid;
+
+    @ApiModelProperty(value = "操作类型",required = true)
+    private String operatetype;
+
+    @ApiModelProperty(value = "操作时间",required = true)
+    private Date operatedate;
+
+    @ApiModelProperty(value = "单价",required = true)
+    private String price;
+
+    @ApiModelProperty(value = "有效期",required = true)
+    private Date successdate;
+
+    @ApiModelProperty(value = "操作人",required = true)
+    private String submitpeople;
+
+    @ApiModelProperty(value = "销售区域(对应组织架构中的公司)",required = true)
+    private String salesarea;
+
+    @ApiModelProperty(value = "销售区域名称",required = true)
+    private String salesareaname;
+
+    @ApiModelProperty(value = "操作人姓名",required = true)
+    private String submitpeoplename;
+
+
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodsPriceDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-06-27 17:43
+ **/
+@Data
+@ApiModel("商品价格")
+public class IpGoodsPriceDto {
+
+    private Long id;
+
+    @ApiModelProperty(value = "客户类型",required = true)
+    private String custType;
+
+    @ApiModelProperty(value = "客户类型标识",required = true)
+    private String custCode;
+
+    @ApiModelProperty(value = "企业ID",required = true)
+    private String companyId;
+
+    @ApiModelProperty(value = "企业名称",required = true)
+    private String companyName;
+
+    @ApiModelProperty(value = "价格类型",required = true)
+    private String priceType;
+
+    @ApiModelProperty(value = "价格标识",required = true)
+    private String priceCode;
+
+    @ApiModelProperty(value = "含税价格",required = true)
+    private BigDecimal taxPrice;
+
+    @ApiModelProperty(value = "不含税价格",required = true)
+    private BigDecimal notaxPrice;
+
+    @ApiModelProperty(value = "调价额度",required = false)
+    private BigDecimal modifyPrice;
+
+    @ApiModelProperty(value = "颜色",required = false)
+    private String speciColor;
+
+    @ApiModelProperty(value = "型号",required = false)
+        private String speciModel;
+
+    @ApiModelProperty(value = "尺寸",required = false)
+    private String speciSize;
+
+    @ApiModelProperty(value = "其他",required = false)
+    private String speciOther;
+
+    @ApiModelProperty(value = "税率",required = false)
+    private String taxrate;
+
+    @ApiModelProperty(value = "含税单价",required = false)
+    private String allPrice;
+
+    @ApiModelProperty(value = "不含税单价",required = false)
+    private String allOutPrice;
+
+    @ApiModelProperty(value = "销售价格",required = false)
+    private String freightprice;
+
+    @ApiModelProperty(value = "库存",required = false)
+    private String stock;
+
+    @ApiModelProperty(value = "是否默认",required = false)
+    private String isDefault;
+
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodsProcessDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-07-13 20:04
+ **/
+@Data
+@ApiModel("流程结束处理商品信息")
+public class IpGoodsProcessDto {
+
+
+    @ApiModelProperty(value = "流程实例号",required = true)
+    private String instid;
+
+    @ApiModelProperty(value = "流程审批状态 PASS 成功 FAIL 失败",required = true)
+    private  String processStatus;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodsQuartzDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName: IpGoodsQuartzDto
+ * @Author: liujunfeng
+ * @Date: 2020/1/14 11:29
+ * @description:
+ */
+@Data
+@ApiModel("商品")
+public class IpGoodsQuartzDto {
+
+    @ApiModelProperty(value = "商品ID",required = true)
+    private Integer id;
+
+    @ApiModelProperty(value = "价格",required = true)
+    private String price;
+
+    @ApiModelProperty(value = "有效时间",required = true)
+    private Date successdate;
+
+    @ApiModelProperty(value = "销售区域(对应组织架构中的公司)",required = true)
+    private String salesarea;
+
+    @ApiModelProperty(value = "销售区域名称",required = true)
+    private String salesareaname;
+
+    @ApiModelProperty(value = "商品分类归属，所属个人还是项目",required = true)
+    private String ftnpjc;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodsSearchDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-07-26 09:53
+ **/
+@Data
+@ApiModel("solr查询商品")
+public class IpGoodsSearchDto {
+
+    private  String brand;
+
+    private String categoryid;
+
+    private  String ceilingPrice;
+
+    private  String companyId;
+
+    private  String  floorPrice;
+
+    private  String model;
+
+    private  String orderName;
+
+    private  String orderRule;
+
+    private  Integer pageIndex;
+
+    private  String keyword;
+
+    private  String userid;
+
+    @ApiModelProperty(value = "区分是项目还是个人商品 XM GR",required = true)
+    private String customerType;
+
+    @ApiModelProperty(value = "区分商品类型 HD 活动 常规CG",required = true)
+    private String ftnpconfiguration;
+
+    @ApiModelProperty(value = "是否开启岗位验证 Y开启 N不开启",required = true)
+    private String isJobVerification;
+
+    @ApiModelProperty(value = "客户类型 是否外部用户 Y是  N否",required = true)
+    private String custType;
+
+    private Integer pageSize;
+
+    private String suppliernum;
+
+    private String supplierid;
+
+    private String type;
+
+    @ApiModelProperty(value = "分类等级",required = true)
+    private int  categoryGrade=2;
+
+
+    private String categoryType;
+
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodsSolrDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-07-26 10:12
+ **/
+@Data
+@ApiModel("solr 查询调用实体")
+public class IpGoodsSolrDto implements Serializable {
+
+    @ApiModelProperty(value = "关键词",required = true)
+    private String jiucaiyun_keywords;
+    @ApiModelProperty(value = "分类id",required = true)
+    private String jiucaiyun_catalog;
+
+    @ApiModelProperty(value = "品牌",required = true)
+    private String jiucaiyun_brand;
+
+    @ApiModelProperty(value = "商品类型",required = true)
+    private String jiucaiyun_type;
+
+    @ApiModelProperty(value = "规格",required = true)
+    private String jiucaiyun_model;
+
+    @ApiModelProperty(value = "价格",required = true)
+    private String jiucaiyun_price;
+
+    @ApiModelProperty(value = "销量",required = true)
+    private String jiucaiyun_salesvolume;
+
+    @ApiModelProperty(value = "/ 销售限制",required = true)
+    private String jiucaiyun_permission;
+
+    @ApiModelProperty(value = "// 价格排序 asc升序，desc降序",required = true)
+    private String jiucaiyun_price_order;
+
+    @ApiModelProperty(value = "// 销量排序，按降序",required = true)
+    private String jiucaiyun_salesvolume_order;
+
+    @ApiModelProperty(value = "供应商ID",required = true)
+    private String jiucaiyun_supplierid;
+
+
+    @ApiModelProperty(value = "供应商编码",required = true)
+    private String jiucaiyun_suppliernum;
+
+    @ApiModelProperty(value = "客户等级",required = true)
+    private String jiucaiyun_level;
+
+    @ApiModelProperty(value = "区分是项目还是个人商品 XM GR",required = true)
+    private String jiucaiyun_ftnpjc;
+
+    @ApiModelProperty(value = "区分商品类型 HD 活动 常规CG",required = true)
+    private String jiucaiyun_ftnpconfiguration;
+
+    private Integer pageNo = 1;
+    private Integer pageSize = 10;
+    private Integer startRow;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodsStockDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName :
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-11-02 15:06
+ **/
+@Data
+@ApiModel("商品库存")
+public class IpGoodsStockDto {
+
+
+    private String goodsId;
+
+    private String goodsAmount;
+
+    @ApiModelProperty(value = "sucess 成功 ,fail 扣减")
+    private String type;
+
+    @ApiModelProperty(value = "规格属性ID")
+    private String attrId;
+
+    @ApiModelProperty(value = "商品类型 ")
+    private String goodsType;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodsSupplierFreightDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-06-27 16:49
+ **/
+@Data
+@ApiModel("供应商运费")
+public class IpGoodsSupplierFreightDto {
+
+    @ApiModelProperty(value = "省",required = true)
+    private String provinceName;
+
+    private String provinceId;
+
+    @ApiModelProperty(value = "市",required = true)
+    private String cityName;
+
+    private String cityId;
+
+    @ApiModelProperty(value = "区",required = true)
+    private String areaName;
+
+    private String areaId;
+
+    @ApiModelProperty(value = "运费",required = true)
+    private BigDecimal freightPrice;
+
+    @ApiModelProperty(value = "全地址",required = false)
+    private String address;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpGoodsSuppliersDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-06-29 10:12
+ **/
+@Data
+@ApiModel("供应商运费主表")
+public class IpGoodsSuppliersDto {
+
+    @ApiModelProperty(value = "供应商名称",required = true)
+    private  String supplierName;
+
+    @ApiModelProperty(value = "供应商标识",required = true)
+    private  String supplierId;
+
+
+    /**
+     * 供应商运费
+     */
+    @ApiModelProperty(value = "供应商运费", required = false)
+    private List<IpGoodsSupplierFreightDto> supplierFreightList;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpLicensornameDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-07-26 14:54
+ **/
+@Data
+@ApiModel("根据商品获取授权商")
+public class IpLicensornameDto {
+
+
+    private  String userid;
+
+    @ApiModelProperty(value = "是否开启岗位验证 Y开启 N不开启",required = true)
+    private String isJobVerification;
+
+    @ApiModelProperty(value = "客户类型 是否外部用户 Y是  N否",required = true)
+    private String custType;
+
+    private String companyId;
+
+    @ApiModelProperty(value = "商品ID",required = true)
+    private String id;
+
+    @ApiModelProperty(value = "销售区域",required = true,hidden = true)
+    private String salaes;
+
+    @ApiModelProperty(value = "数据库名",required = true,hidden = true)
+    private String baseUrl;
+
+    @ApiModelProperty(value = "分类ID",required = true,hidden = true)
+    private String  categoryId;
+
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpMobileAdvertisingDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName: IpMobileAdvertisingDto
+ * @Author: liujunfeng
+ * @Date: 2019/10/29 20:54
+ * @description:
+ */
+@Data
+@ApiModel("APP首页图片管理")
+public class IpMobileAdvertisingDto{
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "位置")
+    private String sort;
+
+    @ApiModelProperty(value = "序号")
+    private String pages;
+
+    @ApiModelProperty(value = "GR.个人，XM.项目")
+    private String judge;
+
+    @ApiModelProperty(value = "图片路径id")
+    private Integer urlid;
+
+    @ApiModelProperty(value = "商品id")
+    private Integer goodsid;
+
+    @ApiModelProperty(value = "供应商id")
+    private Long supplierid;
+
+    @ApiModelProperty(value = "链接地址")
+    private String linkaddress;
+
+    @ApiModelProperty(value = "描述")
+    private String info;
+
+    @ApiModelProperty(value = "生效时间")
+    private Date effectdate;
+
+    @ApiModelProperty(value = "失效时间")
+    private Date failuredate;
+
+    @ApiModelProperty(value = "录入人")
+    private String inputperson;
+
+    @ApiModelProperty(value = "录入时间")
+    private Date inputdate;
+
+    @ApiModelProperty(value = "是否被删除")
+    private Boolean isdel;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updatedate;
+
+    @ApiModelProperty(value = "供应商编码")
+    private String suppliernum;
+
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/IpMobileAdvertisingPageDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @ClassName: IpMobileAdvertisingDto
+ * @Author: liujunfeng
+ * @Date: 2019/10/29 20:54
+ * @description:
+ */
+@Data
+@ApiModel("APP首页图片查询")
+public class IpMobileAdvertisingPageDto extends BasePageDto{
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "序号")
+    private String pages;
+
+    @ApiModelProperty(value = "GR.个人，XM.项目")
+    private String judge;
+
+    @ApiModelProperty(value = "图片路径前缀",hidden = true)
+    private String basUrl;
+
+    @ApiModelProperty(value = "操作类型")
+    private String type;
+
+    @ApiModelProperty(value = "位置")
+    private String sort;
+
+    @ApiModelProperty(value = "生效时间开始")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date effectdatemin;
+
+    @ApiModelProperty(value = "生效时间结束")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date effectdatemax;
+
+    @ApiModelProperty(value = "失效时间开始")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date failuredatemin;
+
+    @ApiModelProperty(value = "失效时间结束")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date failuredatemax;
+
+    @ApiModelProperty(value = "录入人")
+    private String inputperson;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/MainGoodsDataDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @Date 2019/8/6 15:09
+ * @Version 1.0
+ **/
+@Data
+@ApiModel("首页图片管理数据")
+public class MainGoodsDataDto {
+
+    @ApiModelProperty(value = "公司id")
+    private String companyId;
+
+    @ApiModelProperty(value = "类型")
+    private String custType;
+
+    @ApiModelProperty(value = "用户id")
+    private String userid;
+
+    @ApiModelProperty(value = "GR.个人，XM.项目")
+    private String judge;
+
+    @ApiModelProperty(value = "轮播图右侧图片数据")
+    private List<GoodsDataDto> topadvertiseposition;
+
+    @ApiModelProperty(value = "轮播图图片数据")
+    private List<GoodsDataDto> top;
+
+    @ApiModelProperty(value = "中间推荐图片数据")
+    private List<GoodsDataDto> recommend;
+
+    @ApiModelProperty(value = "促销图片数据")
+    private List<GoodsDataDto> promotion;
+
+    @ApiModelProperty(value = "秒杀图片数据")
+    private List<GoodsDataDto> seconds;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/MobileAdvertisingDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import lombok.Data;
+
+/**
+ * @ClassName: MobileAdvertisingLogsDto
+ * @Author: liujunfeng
+ * @Date: 2019/11/2 13:30
+ * @description:
+ */
+@Data
+public class MobileAdvertisingDto {
+
+    private Integer id;
+    private String sort;
+    private String judge;
+    private String urlid;
+    private String url;
+    private Integer goodsid;
+    private Long supplierid;
+    private String linkaddress;
+    private String info;
+    private String effectdate;
+    private String failuredate;
+    private String inputperson;
+    private String inputdate;
+    private String  fullname;
+    private String type;
+
+    private String name;
+    private String price;
+    private String brand;
+    private String suppliernum;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/OrgInfoDto.java

+package com.ekingwin.bas.cloud.dto;
+
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:
+ * @author: zhangjie
+ * @create: 2019-06-28 18:26
+ **/
+@Data
+public class OrgInfoDto {
+    private  String companyid;
+
+    private String  companyname;
+
+    private String companyothersystemid;
+
+    private String deptid;
+
+    private  String  deptname;
+
+    private  String positionid;
+
+    private String positionname;
+
+    private String taxnum;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/dto/SaveGoodsCategoryDto.java

+package com.ekingwin.bas.cloud.dto;
+
+
+import com.ekingwin.bas.cloud.vo.IpCategoryGoodsPriceVo;
+import com.ekingwin.bas.cloud.vo.IpGoodSupplierAreaVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("新增分类信息参数")
+public class SaveGoodsCategoryDto {
+
+    @ApiModelProperty(value = "分类id")
+    private String id;
+
+    @ApiModelProperty(value = "厂商名称")
+    private String suppliername;
+
+    @ApiModelProperty(value = "排序")
+    private String sort;
+
+    @ApiModelProperty(value = "分类编码")
+    private String code;
+
+    @ApiModelProperty(value = "分类名称")
+    private String name;
+
+    @ApiModelProperty(value = "供货方式名称")
+    private String supplymodename;
+
+    @ApiModelProperty(value = "供货方式编码")
+    private String supplymodecode;
+
+    @ApiModelProperty(value = "厂商id")
+    private Integer supplierid;
+
+    @ApiModelProperty(value = "父id")
+    private Integer pid;
+
+    @ApiModelProperty(value = "分类类型")
+    private String type;
+
+    @ApiModelProperty(value = "分类所属首页 XM 项目类 GR 个人")
+    private String categoryType;
+
+    @ApiModelProperty(value = "图片id")
+    private Integer logoid;
+
+    @ApiModelProperty(value = "图片地址")
+    private String logoUrl;
+
+    @ApiModelProperty(value = "用户id")
+    private String userid;
+
+    @ApiModelProperty(value = "授权商集合")
+    private List<IpGoodSupplierAreaVo> area;
+
+    @ApiModelProperty(value = "销售价格集合")
+    private List<IpCategoryGoodsPriceVo> salesPrice;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodProcess.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class IpGoodProcess {
+    private Long id;
+
+    private Long goodsid;
+
+    private String instid;
+
+    private String type;
+
+    private Date createTime;
+
+    private String goodsnum;
+
+    private String createId;
+
+    /**
+     * 状态
+     */
+    private String status;
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsCategory.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+
+@Data
+@Entity
+public class IpGoodsCategory {
+    private Integer id;
+
+    private Integer pid;
+
+    private String code;
+
+    private String name;
+
+    private String type;
+
+    private Integer deptid;
+
+    private String treecode;
+
+    private Integer surfaceid;
+
+    private String mdmid;
+
+    private String sort;
+
+    private Integer supplierid;
+
+    private Long logoid;
+
+    private String supplymodecode;
+
+    private String supplymodename;
+
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsEntity.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import javax.naming.ldap.PagedResultsControl;
+
+/**
+ * @program: rcworkspace
+ * @description:商品主表
+ * @author: zhangjie
+ * @create: 2019-06-27 16:24
+ **/
+@Data
+public class IpGoodsEntity {
+
+    public  static  String TABLENAME="ip_s_goods";
+
+    private Long id;
+
+    private String goodsnum;
+
+    private Integer state;
+
+
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsEvaluation.java

+package com.ekingwin.bas.cloud.entity;
+
+import com.ekingwin.bas.cloud.dto.GoodsEvaluationAgainDto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName: IpGoodsEvaluation
+ * @Author: liujunfeng
+ * @Date: 2019/10/25 17:25
+ * @description:
+ */
+@Data
+public class IpGoodsEvaluation {
+
+    private Integer id;
+    private Integer pid;
+    private String userid;
+    private String userName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date evaluationDate;
+    private Long ordergoodsId;
+    private Long orderId;
+    private Long goodsId;
+    private String goodsName;
+    private String comprehensiveScore;
+    private String goodsData;
+    private String logisticsEfficiency;
+    private String deliveryservice;
+    private String problemDescribe;
+    private String pictureUrl;
+    private List<GoodsEvaluationAgainDto> evaluationAgain;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsImg.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Data
+@Table(name = "ip_goods_img")
+@Entity
+public class IpGoodsImg {
+    private Integer id;
+
+    private Long goodsid;
+
+    private String goodsimgid;
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsImgProcess.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Data
+@Table(name = "ip_goods_img_process")
+@Entity
+public class IpGoodsImgProcess {
+    private Integer id;
+
+    private Long goodsid;
+
+    private String goodsimgid;
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsLogs.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class IpGoodsLogs implements Serializable {
+    private Integer id;
+
+    private Integer goodsid;
+
+    private String operatetype;
+
+    private String operatedate;
+
+    private String price;
+
+    private String successdate;
+
+    private String submitpeople;
+
+    private String submitpeoplename;
+
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsLogsWithBLOBs.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+@Data
+public class IpGoodsLogsWithBLOBs extends IpGoodsLogs {
+    private String salesarea;
+
+    private String salesareaname;
+
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsPrice.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+
+
+/**
+ * 商品价格表
+ * @author zhangj
+ * @date 2019-06-27
+ */
+@Data
+@Table(name="ip_goods_price")
+@Entity
+public class IpGoodsPrice {
+    private Long id;
+
+    private Long goodsId;
+
+    private String custType;
+
+    private String custCode;
+
+    private String companyId;
+
+    private String companyName;
+
+    private String priceType;
+
+    private String priceCode;
+
+    private BigDecimal taxPrice;
+
+    private BigDecimal notaxPrice;
+
+    private BigDecimal modifyPrice;
+
+    private String speciColor;
+
+
+    private String speciModel;
+
+
+    private String speciSize;
+
+
+    private String speciOther;
+
+
+    private String taxrate;
+
+
+    private String allPrice;
+
+
+    private String allOutPrice;
+
+    private String freightprice;
+
+    private String stock;
+
+    private String updateName;
+
+    private String updateId;
+
+    private String isDefault;
+
+    private String isDelete;
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsPriceProcess.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+
+
+/**
+ * 商品价格表
+ * @author zhangj
+ * @date 2019-06-27
+ */
+@Data
+@Table(name="ip_s_goods_process")
+@Entity
+public class IpGoodsPriceProcess {
+    private Long id;
+
+    private Long goodsId;
+
+    private String custType;
+
+    private String custCode;
+
+    private String companyId;
+
+    private String companyName;
+
+    private String priceType;
+
+    private String priceCode;
+
+    private BigDecimal taxPrice;
+
+    private BigDecimal notaxPrice;
+
+    private BigDecimal modifyPrice;
+
+    private String speciColor;
+
+
+    private String speciModel;
+
+
+    private String speciSize;
+
+
+    private String speciOther;
+
+
+    private String taxrate;
+
+
+    private String allPrice;
+
+
+    private String allOutPrice;
+
+    private String freightprice;
+
+    private String stock;
+
+    private String isDefault;
+
+    private String priceId;
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsProcessEntity.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+/**
+ * @program: rcworkspace
+ * @description:商品主表
+ * @author: zhangjie
+ * @create: 2019-06-27 16:24
+ **/
+@Data
+public class IpGoodsProcessEntity {
+
+    public  static  String TABLENAME="ip_s_goods_process";
+
+    private Long id;
+
+    private String goodsnum;
+
+    private Integer state;
+
+
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsSupplierFreight.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * 供应商运费表
+ * @author zhangj
+ * @date 2019-06-27
+ */
+@Table(name = "ip_goods_supplier_freight")
+@Entity
+@Data
+public class IpGoodsSupplierFreight implements Serializable {
+
+    private Long id;
+
+    private Long goodsId;
+
+    private String provinceName;
+
+    private String provinceId;
+
+    private String cityName;
+
+    private String cityId;
+
+    private String areaName;
+
+    private String areaId;
+
+    private BigDecimal freightPrice;
+
+    private Date createTime;
+
+    private String address;
+
+    private Long goodsSuppliersId;
+
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsSupplierFreightProcess.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * 供应商运费表
+ * @author zhangj
+ * @date 2019-06-27
+ */
+@Table(name = "ip_goods_supplier_freight")
+@Entity
+@Data
+public class IpGoodsSupplierFreightProcess implements Serializable {
+
+    private Long id;
+
+    private Long goodsId;
+
+    private String provinceName;
+
+    private String provinceId;
+
+    private String cityName;
+
+    private String cityId;
+
+    private String areaName;
+
+    private String areaId;
+
+    private BigDecimal freightPrice;
+
+    private Date createTime;
+
+    private String address;
+
+    private Long goodsSuppliersId;
+
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsSuppliers.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 商品供应商表
+ * @author zhangj
+ * @date 2019-06-27
+ */
+@Data
+public class IpGoodsSuppliers {
+    private Long id;
+
+    private Long goodsId;
+
+    private String supplierName;
+
+    private String supplierId;
+
+    private List<IpGoodsSupplierFreight>  supplierFreightList;
+
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpGoodsSuppliersProcess.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 商品供应商表
+ * @author zhangj
+ * @date 2019-06-27
+ */
+@Data
+public class IpGoodsSuppliersProcess {
+    private Long id;
+
+    private Long goodsId;
+
+    private String supplierName;
+
+    private String supplierId;
+
+    private List<IpGoodsSupplierFreight>  supplierFreightList;
+
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpMobileAdvertising.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName: IpMobileAdvertising
+ * @Author: liujunfeng
+ * @Date: 2019/10/29 19:15
+ * @description:
+ */
+@Data
+public class IpMobileAdvertising {
+
+    private Integer id;
+    private String sort;
+    private String pages;
+    private String judge;
+    private Integer urlid;
+    private Integer goodsid;
+    private Long supplierid;
+    private String linkaddress;
+    private String info;
+    private Date effectdate;
+    private Date failuredate;
+    private String inputperson;
+    private Date inputdate;
+    private Boolean isdel;
+    private Date updatedate;
+    private String suppliernum;
+    private String url;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpMobileAdvertisingLogs.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName: IpMobileAdvertisingLogs
+ * @Author: liujunfeng
+ * @Date: 2019/10/30 11:04
+ * @description:
+ */
+@Data
+public class IpMobileAdvertisingLogs {
+
+    private Integer id;
+    private String sort;
+    private String judge;
+    private Integer urlid;
+    private Integer goodsid;
+    private Long supplierid;
+    private String linkaddress;
+    private String info;
+    private Date effectdate;
+    private Date failuredate;
+    private String inputperson;
+    private Date inputdate;
+    private String type;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpSapGoodsDto.java

+package com.ekingwin.bas.cloud.entity;
+
+import javax.persistence.Table;
+import java.util.Date;
+
+@Table(name = "ip_sap_goods")
+public class IpSapGoodsDto {
+    private String id;
+
+    private String taxrate;
+
+    private String unit;
+
+    private String price;
+
+    private String taxfreeprice;
+
+    private String goodsnum;
+
+    private String goodsname;
+
+    private String specifications;
+
+    private String projectcode;
+
+    private String billgoodsname;
+
+    private String billtypecode;
+
+    private String taxtypecode;
+
+    private String cashprice;
+
+    private String taxfreecashprice;
+
+    private String contractid;
+
+    private String goodsid;
+
+    private String valid;
+
+    private Date createTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getTaxrate() {
+        return taxrate;
+    }
+
+    public void setTaxrate(String taxrate) {
+        this.taxrate = taxrate == null ? null : taxrate.trim();
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit == null ? null : unit.trim();
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price == null ? null : price.trim();
+    }
+
+    public String getTaxfreeprice() {
+        return taxfreeprice;
+    }
+
+    public void setTaxfreeprice(String taxfreeprice) {
+        this.taxfreeprice = taxfreeprice == null ? null : taxfreeprice.trim();
+    }
+
+    public String getGoodsnum() {
+        return goodsnum;
+    }
+
+    public void setGoodsnum(String goodsnum) {
+        this.goodsnum = goodsnum == null ? null : goodsnum.trim();
+    }
+
+    public String getGoodsname() {
+        return goodsname;
+    }
+
+    public void setGoodsname(String goodsname) {
+        this.goodsname = goodsname == null ? null : goodsname.trim();
+    }
+
+    public String getSpecifications() {
+        return specifications;
+    }
+
+    public void setSpecifications(String specifications) {
+        this.specifications = specifications == null ? null : specifications.trim();
+    }
+
+    public String getProjectcode() {
+        return projectcode;
+    }
+
+    public void setProjectcode(String projectcode) {
+        this.projectcode = projectcode == null ? null : projectcode.trim();
+    }
+
+    public String getBillgoodsname() {
+        return billgoodsname;
+    }
+
+    public void setBillgoodsname(String billgoodsname) {
+        this.billgoodsname = billgoodsname == null ? null : billgoodsname.trim();
+    }
+
+    public String getBilltypecode() {
+        return billtypecode;
+    }
+
+    public void setBilltypecode(String billtypecode) {
+        this.billtypecode = billtypecode == null ? null : billtypecode.trim();
+    }
+
+    public String getTaxtypecode() {
+        return taxtypecode;
+    }
+
+    public void setTaxtypecode(String taxtypecode) {
+        this.taxtypecode = taxtypecode == null ? null : taxtypecode.trim();
+    }
+
+    public String getCashprice() {
+        return cashprice;
+    }
+
+    public void setCashprice(String cashprice) {
+        this.cashprice = cashprice == null ? null : cashprice.trim();
+    }
+
+    public String getTaxfreecashprice() {
+        return taxfreecashprice;
+    }
+
+    public void setTaxfreecashprice(String taxfreecashprice) {
+        this.taxfreecashprice = taxfreecashprice == null ? null : taxfreecashprice.trim();
+    }
+
+    public String getContractid() {
+        return contractid;
+    }
+
+    public void setContractid(String contractid) {
+        this.contractid = contractid == null ? null : contractid.trim();
+    }
+
+    public String getGoodsid() {
+        return goodsid;
+    }
+
+    public void setGoodsid(String goodsid) {
+        this.goodsid = goodsid == null ? null : goodsid.trim();
+    }
+
+    public String getValid() {
+        return valid;
+    }
+
+    public void setValid(String valid) {
+        this.valid = valid == null ? null : valid.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/entity/IpSearchHistory.java

+package com.ekingwin.bas.cloud.entity;
+
+import lombok.Data;
+
+@Data
+public class IpSearchHistory {
+    private Long id;
+
+    private String keyword;
+
+    private String inputdate;
+
+    private String inputperson;
+
+    private Integer resultnum;
+
+    private String state;
+
+
+    private String basUrl;
+
+}
\ No newline at end of file

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/goods/dao/SupplierGoodsDao.java

+package com.ekingwin.bas.cloud.goods.dao;
+
+import com.ekingwin.bas.cloud.goods.dao.entity.Supplier;
+import com.ekingwin.bas.cloud.goods.dao.entity.SupplierGoods;
+import com.ekingwin.bas.cloud.goods.dto.SupplierGoodsDto;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface SupplierGoodsDao {
+    List<Map<String,Object>> querySupplierGoods(SupplierGoodsDto supplierGoodsDto );
+     Supplier querySupplier(SupplierGoodsDto supplierGoodsDto );
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/goods/dao/entity/Supplier.java

+package com.ekingwin.bas.cloud.goods.dao.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@ApiModel("供应商信息")
+@Data
+public class Supplier {
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+    @ApiModelProperty(value = "固话")
+    private String fixedphone;
+    @ApiModelProperty(value = "供应商名称")
+    private String supplier;
+    @ApiModelProperty(value = "商品信息")
+    private List<Map<String,Object>> goodsList;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/goods/dao/entity/SupplierGoods.java

+package com.ekingwin.bas.cloud.goods.dao.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class SupplierGoods {
+    @ApiModelProperty(value = "主键")
+    private int id;
+    @ApiModelProperty(value = "商品id")
+    private String goodsnum;
+    @ApiModelProperty(value = "图片id")
+    private String urlid;
+    @ApiModelProperty(value = "商品名称")
+    private String name;
+    @ApiModelProperty(value = "图片路径")
+    private String path;
+    @ApiModelProperty(value = "有效期")
+    private String successdate;
+    @ApiModelProperty(value = "单价")
+    private BigDecimal price;
+
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/goods/dto/SupplierGoodsDetail.java

+package com.ekingwin.bas.cloud.goods.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SupplierGoodsDetail {
+    @ApiModelProperty(value = "商品主键",required = false)
+    private Long goodsId;
+    @ApiModelProperty(value = "商品查看类型 DETAIL")
+    private String checkType;
+    @ApiModelProperty(value = "公司id",required = false)
+    private String companyid;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/goods/dto/SupplierGoodsDto.java

+package com.ekingwin.bas.cloud.goods.dto;
+
+import com.ekingwin.bas.cloud.dto.BasePageDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("供应商在售商品")
+public class SupplierGoodsDto extends BasePageDto  {
+
+    @ApiModelProperty(value = "/ 商品名",required = true)
+    private String name;
+    @ApiModelProperty(value = "/ 一级分类",required = true)
+    private String FTNPFirstCategoryCode;
+    @ApiModelProperty(value = "/ 二级分类",required = true)
+    private String FTNPSecondCategoryCode;
+    @ApiModelProperty(value = "/ 三级分类",required = true)
+    private String FTNPThreeCategoryCode;
+    @ApiModelProperty(value = "最小单价",required = true)
+    private BigDecimal minprice;
+    @ApiModelProperty(value = "最大单价",required = true)
+    private BigDecimal maxprice;
+    @ApiModelProperty(value = "商品类型",required = true)
+    private String jiucaiyun_type;
+    @ApiModelProperty(value = "// 价格排序 asc升序，desc降序",required = true)
+    private String jiucaiyun_price_order;
+    @ApiModelProperty(value = "品牌",required = true)
+    private String jiucaiyun_brand;
+    @ApiModelProperty(value = "// 销量排序，按降序",required = true)
+    private String jiucaiyun_salesvolume_order;
+//    @ApiModelProperty(value = "//供应商id",required = true)
+//    private String  supplierid;
+    @ApiModelProperty(value = "//供应商",required = true)
+    private String  supplier;
+
+//    @ApiModelProperty(value = "页码", required = false)
+//    private int pagenum;
+
+//    @ApiModelProperty(value = "条数", required = false)
+//    private int pagesize;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/goods/service/SupplierGoodsService.java

+package com.ekingwin.bas.cloud.goods.service;
+
+import com.ekingwin.bas.cloud.dto.GoodsGetDetailDto;
+import com.ekingwin.bas.cloud.dto.IpGoodsSearchDto;
+import com.ekingwin.bas.cloud.goods.dao.entity.Supplier;
+import com.ekingwin.bas.cloud.goods.dao.entity.SupplierGoods;
+import com.ekingwin.bas.cloud.goods.dto.SupplierGoodsDetail;
+import com.ekingwin.bas.cloud.goods.dto.SupplierGoodsDto;
+import com.ekingwin.bas.cloud.vo.GoodsDeatilVo;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SupplierGoodsService {
+    /**
+     * 查询供应商在售商品
+     * @param ipGoodsSearchDto
+     * @return
+     * @throws Exception
+     */
+    String  getsQueryData(IpGoodsSearchDto ipGoodsSearchDto) throws Exception;
+
+    /**
+     * 查询供应商在售商品
+     * @param supplierGoodsDto
+     * @return
+     * @throws Exception
+     */
+    Supplier queryData(SupplierGoodsDto supplierGoodsDto) throws Exception;
+
+    GoodsDeatilVo getGoodsDetail (SupplierGoodsDetail supplierGoodsDetail)throws  Exception;
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/goods/web/SupplierGoodsController.java

+package com.ekingwin.bas.cloud.goods.web;
+
+import com.ekingwin.bas.cloud.dto.GoodsGetDetailDto;
+import com.ekingwin.bas.cloud.dto.IpGoodsSearchDto;
+import com.ekingwin.bas.cloud.goods.dao.entity.Supplier;
+import com.ekingwin.bas.cloud.goods.dao.entity.SupplierGoods;
+import com.ekingwin.bas.cloud.goods.dto.SupplierGoodsDetail;
+import com.ekingwin.bas.cloud.goods.dto.SupplierGoodsDto;
+import com.ekingwin.bas.cloud.goods.service.SupplierGoodsService;
+import com.ekingwin.bas.cloud.infra.dto.BaseResult;
+import com.ekingwin.bas.cloud.infra.utils.common.ResultUtils;
+import com.ekingwin.bas.cloud.service.IpGoodFootService;
+import com.ekingwin.bas.cloud.service.IpGoodsDraftService;
+import com.ekingwin.bas.cloud.service.IpGoodsService;
+import com.ekingwin.bas.cloud.util.Result;
+import com.ekingwin.bas.cloud.vo.GoodsDeatilVo;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/supplierGoods/")
+@Api(tags = "首页供应商在售商品接口", description = "首页供应商在售商品接口", value = "首页供应商在售商品接口")
+public class SupplierGoodsController {
+    @Autowired
+    private SupplierGoodsService supplierGoodsService;
+    @Autowired
+    private IpGoodFootService ipGoodFootService;
+    @Autowired
+    private IpGoodsService ipGoodsService;
+//    @ApiOperation(value = "查询供应商在售商品", notes = "查询供应商在售商品")
+//    @PostMapping(value = "/getsSolrData")
+//    public Result getsSolrData(@RequestBody IpGoodsSearchDto ipGoodsSearchDto) throws  Exception{
+//        String jsonObject =supplierGoodsService.getsQueryData(ipGoodsSearchDto);
+//        return  Result.ok(jsonObject);
+//    }
+    @ApiOperation(value = "查询供应商在售商品", notes = "查询供应商在售商品")
+    @PostMapping(value = "/queryData")
+    public BaseResult queryData(@RequestBody SupplierGoodsDto supplierGoodsDto) throws  Exception{
+
+        Supplier supplier= supplierGoodsService.queryData(supplierGoodsDto);
+        return  ResultUtils.build(supplier);
+    }
+
+    @ApiOperation(value = "获取供应商商品详情", notes = "获取供应商商品详情",response = GoodsDeatilVo.class)
+    @PostMapping(value = "/getGoodsDetail")
+    public Result getGoodsDetail(@RequestBody SupplierGoodsDetail  supplierGoodsDetail) throws  Exception{
+        GoodsDeatilVo goodsDeatilVo=supplierGoodsService.getGoodsDetail(supplierGoodsDetail);
+        return  Result.ok(goodsDeatilVo);
+    }
+
+
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/goodsMge/dao/GoodsDetailDao.java

+package com.ekingwin.bas.cloud.goodsMge.dao;
+
+import com.ekingwin.bas.cloud.goodsMge.dto.*;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author kan
+ * @version 1.0.0
+ * @ClassName GoodsDetailDao.java
+ * @Description TODO
+ * @createTime 2020/3/23 14:14
+ */
+public interface GoodsDetailDao {
+    /**
+     * 商品详情
+     * @param id
+     * @return
+     */
+    List<GoodsMgeDto> getGoodsDetail(String id);
+    List<SupplierDto> getSupplier(String supplierid);
+
+    List<GoodsMgeDto> getGoods(String id);
+
+    GoodsMgeDto getSalesVolume(String id);
+
+    List<DescribeListDto> describeList(String id);
+
+    List<GoodsLogsDto> getGoodsLogs(String id);
+
+    String getsalesareas(@Param("companyid")String companyid, @Param("twmallbas")String twmallbas);
+    
+    List<GoodsLogsDto> getauthoritymark(@Param("id")String id,@Param("salesarea") String salesarea);
+
+    List<UrlImgidDto> getNotJdGoods(@Param("id") String id,@Param("baseurl")String baseurl);
+
+    List<UrlImgidDto> getJdGoods(String id);
+
+    List<ReceiptDto> getReceiptList(@Param("id")String id,@Param("twmallbas")String twmallbas,@Param("start")int start,@Param("pagesize")int pagesize);
+
+    List<UrlImgidDto> getUrlImgid(@Param("goodsid")int goodsid, @Param("twmallbas")String twmallbas, @Param("baseurl")String baseurl);
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/goodsMge/dto/DescribeListDto.java

+package com.ekingwin.bas.cloud.goodsMge.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author kan
+ * @version 1.0.0
+ * @ClassName DescribeListDto.java
+ * @Description TODO
+ * @createTime 2020/3/23 17:57
+ */
+@Data
+public class DescribeListDto {
+    @ApiModelProperty(value = "描述名称",required = true)
+    private String describeName;
+    @ApiModelProperty(value = "描述内容",required = true)
+    private String describeContent;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/goodsMge/dto/DetailGradeDto.java

+package com.ekingwin.bas.cloud.goodsMge.dto;
+
+import lombok.Data;
+
+/**
+ * @author kan
+ * @version 1.0.0
+ * @ClassName DetailGradeDto.java
+ * @Description TODO
+ * @createTime 2020/3/24 9:25
+ */
+@Data
+public class DetailGradeDto {
+    private DetailGradeViewsDto body;
+    private int count;
+}

bas-cloud-jiucaiyun-goods/src/main/java/com/ekingwin/bas/cloud/goodsMge/dto/DetailGradeViewsDto.java

+package com.ekingwin.bas.cloud.goodsMge.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author kan
+ * @version 1.0.0
+ * @ClassName DetailGradeViewsDto.java
+ * @Description TODO
+ * @createTime 2020/3/24 9:26
+ */
+@Data
+public class DetailGradeViewsDto {
+    private int goodsreviewsgrade;
+    private List<ReceiptDto> goodsreviews;
+}