第一次推送

pom.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <parent>
+        <groupId>com.hcloud.microserver</groupId>
+        <artifactId>common-parent</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../common-parent/pom.xml</relativePath>
+    </parent>
+    <groupId>com.hcloud.microserver</groupId>
+    <artifactId>goods-manage-client</artifactId>
+    <version>${goods.managerclient.version}</version>
+    <packaging>jar</packaging>
+
+    <name>goods-manage-client</name>
+    <description>Demo project for Spring Boot</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.hcloud.microserver</groupId>
+            <artifactId>common-core</artifactId>
+            <version>${common.core.version}</version>
+        </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>com.github.pagehelper</groupId>-->
+            <!--<artifactId>pagehelper-spring-boot-starter</artifactId>-->
+        <!--</dependency>-->
+
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal><!--可以把依赖的包都打包到生成的Jar包中 -->
+                        </goals>
+                        <!--可以生成不含依赖包的不可执行Jar包 -->
+                        <configuration> <classifier>exec</classifier> </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.18.1</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

src/main/java/com/hcloud/microservice/goods/facade/GoodsClientApplication.java

@@ -0,0 +1,14 @@
+package com.hcloud.microservice.goods.facade;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+//@SpringBootApplication
+public class GoodsClientApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(GoodsClientApplication.class, args);
+    }
+
+}
+

src/main/java/com/hcloud/microservice/goods/facade/clients/GoodsBatchGradeManagerService.java

@@ -0,0 +1,47 @@
+package com.hcloud.microservice.goods.facade.clients;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microservice.goods.facade.fallback.factory.GoodsBatchGradeFallback;
+import com.hcloud.microservice.goods.facade.forms.GoodsBatchGradeForm;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author xiezt
+ */
+@FeignClient(name = "goods-service" ,path = "/goods/grade",fallbackFactory = GoodsBatchGradeFallback.class)
+public interface GoodsBatchGradeManagerService {
+    /**
+     * 分页查询商品评级信息
+     * @param gradeForm
+     * @return
+     */
+    @PostMapping("/searchBatchGradeByPage")
+    ResultVO searchBatchGradeByPage(@RequestBody GoodsBatchGradeForm gradeForm);
+
+    /**
+     * 获取用户评级信息
+     * @param userId
+     * @param batchId
+     * @return
+     */
+    @GetMapping("/getBatchGradeByUserId")
+    ResultVO getBatchGradeByUserId(@RequestParam("userId") String userId,@RequestParam("batchId") String batchId);
+
+    /**
+     * 保存用户评级信息
+     * @param gradeForm
+     * @return
+     */
+    @PostMapping("/saveBatchGradeInfo")
+    ResultVO saveBatchGradeInfo(@RequestBody GoodsBatchGradeForm gradeForm);
+
+    /**
+     * 批量删除商品评级信息
+     * @param gradeForm
+     * @return
+     */
+    @PostMapping("/delBatchGradeInfo")
+    ResultVO delBatchGradeInfo(@RequestBody GoodsBatchGradeForm gradeForm);
+
+}

src/main/java/com/hcloud/microservice/goods/facade/clients/GoodsBatchManagerService.java

@@ -0,0 +1,81 @@
+package com.hcloud.microservice.goods.facade.clients;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microservice.goods.facade.fallback.factory.GoodsBatchManageFallback;
+import com.hcloud.microservice.goods.facade.forms.GoodsBatchInfoForm;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author xiezt
+ */
+@FeignClient(name = "goods-service" ,path = "/goods/batch",fallbackFactory = GoodsBatchManageFallback.class)
+public interface GoodsBatchManagerService {
+
+    /**
+     * 分页查询商品批次记录
+     * @param goodsBatchInfoForm
+     * @return
+     */
+   @PostMapping("/queryGoodsBatchRecordByPage")
+   ResultVO queryGoodsBatchRecordByPage(@RequestBody GoodsBatchInfoForm goodsBatchInfoForm);
+
+    /**
+     * 添加商品批次记录
+     * @param goodsBatchInfoForm
+     * @return
+     */
+   @PostMapping("/addGoodsBatchRecord")
+   ResultVO addGoodsBatchRecord(@RequestBody GoodsBatchInfoForm goodsBatchInfoForm);
+
+    /**
+     * 编辑商品批次记录
+     * @param goodsBatchInfoForm
+     * @return
+     */
+   @PostMapping("/editGoodsBatchRecord")
+   ResultVO editGoodsBatchRecord(@RequestBody GoodsBatchInfoForm goodsBatchInfoForm);
+
+    /**
+     * 查询商品批次记录明细
+     * @param guid
+     * @return
+     */
+   @GetMapping("/getGoodsBatchRecordById")
+   ResultVO getGoodsBatchRecordById(@RequestParam("id") String guid);
+
+    /**
+     * 删除商品批次记录
+     * @param guid
+     * @param orgGuid
+     * @return
+     */
+   @GetMapping("/delGoodsBatchRecordById")
+   ResultVO delGoodsBatchRecordById(@RequestParam("id") String guid,@RequestParam("orgGuid") String orgGuid);
+
+    /**
+     * 生成根据产品批次信息生成溯源码记录
+     * @param goodsBatchInfoForm
+     * @return
+     */
+   @PostMapping("/batchGoodsQRCode")
+   ResultVO batchGoodsQRCode(@RequestBody GoodsBatchInfoForm goodsBatchInfoForm);
+
+    /**
+     * 保存评价及评级信息
+     * @param goodsBatchInfoForm
+     * @return
+     */
+   @PostMapping("/saveFeedback")
+   ResultVO saveAllFeedbackInfo(@RequestBody GoodsBatchInfoForm goodsBatchInfoForm);
+
+    /**
+     * 查询用户商品批次评价信息
+     * @param batchId
+     * @param userId
+     * @return
+     */
+   @GetMapping("getAllFeedback")
+   ResultVO searchAllFeedbackInfo(@RequestParam("batchId") String batchId,@RequestParam("userId") String userId);
+
+}

src/main/java/com/hcloud/microservice/goods/facade/clients/GoodsDealerClient.java

@@ -0,0 +1,35 @@
+package com.hcloud.microservice.goods.facade.clients;
+
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microservice.goods.facade.entity.GoodsDealer;
+import com.hcloud.microservice.goods.facade.fallback.factory.GoodsDealerClientFallback;
+import com.hcloud.microservice.goods.facade.forms.GoodsDealerForm;
+
+@FeignClient(value="goods-service",path="/goods/dealer",fallbackFactory=GoodsDealerClientFallback.class)
+public interface GoodsDealerClient {
+
+	@PostMapping("/save")
+	ResultVO add(@RequestBody GoodsDealer goodsDealer);
+	
+	@PostMapping("/edit")
+	ResultVO edit(@RequestBody GoodsDealer goodsDealer);
+	
+	@GetMapping("/findById")
+	ResultVO findById(@RequestParam("guid") String guid);
+	
+	@PostMapping("/searchByPage")
+	ResultVO searchByPage(@RequestBody GoodsDealerForm goodsDealerForm);
+	
+	@GetMapping("/getMaxCode")
+	ResultVO getMaxCode();
+	
+	@GetMapping("/delete")
+	ResultVO delete(@RequestParam("guid") String guid);
+	
+}

src/main/java/com/hcloud/microservice/goods/facade/clients/GoodsFeedbackManagerService.java

@@ -0,0 +1,49 @@
+package com.hcloud.microservice.goods.facade.clients;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microservice.goods.facade.fallback.factory.GoodsFeedbackFallback;
+import com.hcloud.microservice.goods.facade.forms.GoodsBatchFeedbackForm;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author JYJ
+ */
+@FeignClient(name = "goods-service" ,path = "/goods/feedback",fallbackFactory = GoodsFeedbackFallback.class)
+public interface GoodsFeedbackManagerService {
+    /**
+     * 分页查询商品评价信息
+     * @param gradeForm
+     * @return
+     */
+    @PostMapping("/searchGoodsFeedbackByPage")
+    ResultVO searchGoodsFeedbackByPage(@RequestBody GoodsBatchFeedbackForm gradeForm);
+
+    /**
+     * 获取用户评价信息
+     * @param userId
+     * @param batchId
+     * @return
+     */
+    @GetMapping("/getGoodsFeedbackByUserId")
+    ResultVO getGoodsFeedbackByUserId(@RequestParam("userId") String userId,@RequestParam("batchId") String batchId);
+
+    /**
+     * 保存用户评价信息
+     * @param gradeForm
+     * @return
+     */
+    @PostMapping("/saveGoodsFeedbackInfo")
+    ResultVO saveGoodsFeedbackInfo(@RequestBody GoodsBatchFeedbackForm gradeForm);
+
+    /**
+     * 批量删除用户评价
+     * @param gradeForm
+     * @return
+     */
+    @PostMapping("/delGoodsFeedbackInfo")
+    ResultVO delGoodsFeedbackInfo(@RequestBody GoodsBatchFeedbackForm gradeForm);
+}

src/main/java/com/hcloud/microservice/goods/facade/clients/GoodsFieldManageService.java

@@ -0,0 +1,58 @@
+package com.hcloud.microservice.goods.facade.clients;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microservice.goods.facade.fallback.factory.GoodsFieldManageFallback;
+import com.hcloud.microservice.goods.facade.forms.GoodsFieldForm;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author JYJ
+ */
+@FeignClient(name = "goods-service" ,path = "/goods/field",fallbackFactory = GoodsFieldManageFallback.class)
+public interface GoodsFieldManageService {
+
+    /**
+     * 分页查询产地信息
+     * @param fieldForm
+     * @return
+     */
+    @PostMapping("/searchByPage")
+    ResultVO queryGoodsFieldByPage(@RequestBody GoodsFieldForm fieldForm);
+
+    /**
+     * 添加商品产地信息
+     * @param fieldForm
+     * @return
+     */
+    @PostMapping("/addGoodsField")
+    ResultVO addGoodsField(@RequestBody GoodsFieldForm fieldForm);
+
+    /**
+     * 编辑商品产地信息
+     * @param fieldForm
+     * @return
+     */
+    @PostMapping("/editGoodsField")
+    ResultVO editGoodsField(@RequestBody GoodsFieldForm fieldForm);
+
+    /**
+     * 获取商品产地明细信息
+     * @param guid
+     * @return
+     */
+    @GetMapping("/getGoodsField")
+    ResultVO getGoodsField(@RequestParam("id") String guid,@RequestParam("orgId") String orgGuid);
+
+    /**
+     * 删除商品产地信息
+     * @param guid
+     * @return
+     */
+    @GetMapping("/delGoodsField")
+    ResultVO delGoodsField(@RequestParam("id") String guid,@RequestParam("orgId") String orgGuid);
+
+}

src/main/java/com/hcloud/microservice/goods/facade/clients/GoodsManagerService.java

@@ -0,0 +1,54 @@
+package com.hcloud.microservice.goods.facade.clients;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microservice.goods.facade.fallback.factory.GoodsManageFallback;
+import com.hcloud.microservice.goods.facade.forms.GoodsInfoForm;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author xiezt
+ */
+@FeignClient(name = "goods-service",path = "/goods/info",fallbackFactory =GoodsManageFallback.class )
+public interface GoodsManagerService {
+
+    /**
+     * 分页查询商品信息
+     * @param goodsInfoForm
+     * @return
+     */
+    @PostMapping("/searchByPage")
+    ResultVO searchGoodsInfoByPage(@RequestBody GoodsInfoForm goodsInfoForm);
+
+    /**
+     * 添加产品信息
+     * @param goodsInfoForm
+     * @return
+     */
+    @PostMapping("/addGoodsInfo")
+    ResultVO addGoodsInfo(@RequestBody GoodsInfoForm goodsInfoForm);
+
+    /**
+     * 编辑产品信息
+     * @param goodsInfoForm
+     * @return
+     */
+    @PostMapping("/editGoodsInfo")
+    ResultVO editGoodsInfo(@RequestBody GoodsInfoForm goodsInfoForm);
+
+    /**
+     * 通过Id获取产品信息明细
+     * @param guid
+     * @return
+     */
+    @GetMapping("/getGoodsInfoById")
+    ResultVO getGoodsInfoById(@RequestParam("id") String guid);
+
+    /**
+     * 删除产品信息
+     * @param guid
+     * @return
+     */
+    @GetMapping("/delGoodsInfoById")
+    ResultVO delGoodsInfoById(@RequestParam("id") String guid);
+}

src/main/java/com/hcloud/microservice/goods/facade/clients/GoodsProInputsManagerService.java

@@ -0,0 +1,48 @@
+package com.hcloud.microservice.goods.facade.clients;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microservice.goods.facade.fallback.factory.GoodsProInputsFallback;
+import com.hcloud.microservice.goods.facade.forms.GoodsProInputsForm;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author JYJ
+ */
+@FeignClient(name = "goods-service" ,path = "/pro/inputs",fallbackFactory = GoodsProInputsFallback.class)
+public interface GoodsProInputsManagerService {
+    /**
+     * 分页查询投入品内容
+     * @param goodsProInputsForm
+     * @return
+     */
+    @PostMapping("/searchProInputsByPage")
+    ResultVO searchProInputsByPage(@RequestBody GoodsProInputsForm goodsProInputsForm);
+
+    /**
+     * 查询投入品列表通过商品批次键
+     * @param foreignKey
+     * @return
+     */
+    @GetMapping("/searchProInputsByFK")
+    ResultVO searchProInputsByFK(@RequestParam("fk") String foreignKey);
+
+    /**
+     * 删除投入品信息
+     * @param pk
+     * @return
+     */
+    @GetMapping("/delProInputs")
+    ResultVO delProInputs(@RequestParam("pk") String pk);
+
+    /**
+     * 保存投入品信息
+     * @param goodsProInputsForm
+     * @return
+     */
+    @PostMapping("/saveProInputs")
+    ResultVO saveProInputs(@RequestBody GoodsProInputsForm goodsProInputsForm);
+}

src/main/java/com/hcloud/microservice/goods/facade/clients/GoodsProNormalManagerService.java

@@ -0,0 +1,48 @@
+package com.hcloud.microservice.goods.facade.clients;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microservice.goods.facade.fallback.factory.GoodsProNormalFallback;
+import com.hcloud.microservice.goods.facade.forms.GoodsProNormalForm;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author JYJ
+ */
+@FeignClient(name = "goods-service" ,path = "/pro/normal",fallbackFactory = GoodsProNormalFallback.class)
+public interface GoodsProNormalManagerService {
+    /**
+     * 分页查询流通信息
+     * @param goodsProNormalForm
+     * @return
+     */
+    @PostMapping("/searchProNormalByPage")
+    ResultVO searchProNormalByPage(@RequestBody GoodsProNormalForm goodsProNormalForm);
+
+    /**
+     * 保存流程通用信息
+     * @param goodsProNormalForm
+     * @return
+     */
+    @PostMapping("/saveProNormal")
+    ResultVO saveProNormal(@RequestBody GoodsProNormalForm goodsProNormalForm);
+
+    /**
+     * 更新流通通用信息
+     * @param goodsProNormalForm
+     * @return
+     */
+    @PostMapping("/updateProNormal")
+    ResultVO updateProNormal(@RequestBody GoodsProNormalForm goodsProNormalForm);
+
+    /**
+     * 通过主键删除通用流通信息
+     * @param pk
+     * @return
+     */
+    @GetMapping("/delProNormalByPK")
+    ResultVO delProNormalByPK(@RequestParam("pk") String pk);
+}

src/main/java/com/hcloud/microservice/goods/facade/clients/GoodsQRCodeManagerService.java

@@ -0,0 +1,83 @@
+package com.hcloud.microservice.goods.facade.clients;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microservice.goods.facade.fallback.factory.GoodsQRCodeManageFallback;
+import com.hcloud.microservice.goods.facade.forms.GoodsQRCodeInfoForm;
+
+import java.util.List;
+
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author xiezt
+ */
+@FeignClient(name = "goods-service",path = "/qrcode/info",fallbackFactory = GoodsQRCodeManageFallback.class )
+public interface GoodsQRCodeManagerService {
+
+    /**
+     * 分页查询商品溯源码信息
+     * @param goodsQRCodeInfoForm
+     * @return
+     */
+    @PostMapping("/searchByPage")
+    ResultVO searchGoodsQRCodeByPage(@RequestBody GoodsQRCodeInfoForm goodsQRCodeInfoForm);
+
+    /**
+     * 获取商品溯源码明细信息
+     * @param guid
+     * @return
+     */
+    @GetMapping("/getGoodsQRCodeById")
+    ResultVO getGoodsQRCodeById(@RequestParam("id") String guid);
+
+    /**
+     * 删除商品溯源码信息
+     * @param goodsQRCodeInfoForm
+     * @return
+     */
+    @PostMapping("/delGoodsQRCodeById")
+    ResultVO delGoodsQRCodeById(@RequestBody GoodsQRCodeInfoForm goodsQRCodeInfoForm);
+
+    /**
+     * 查询导出溯源码信息
+     * @param guid
+     * @return
+     */
+    @GetMapping("/searchGoodsQRCodeForExport")
+    ResultVO searchGoodsQRCodeForExport(@RequestParam("id") String guid);
+
+    /**
+     * 通过二维码传输码查询溯源码信息
+     * @param tokenStr
+     * @return
+     */
+    @GetMapping("/searchByToken")
+    ResultVO searchGoodsQRCodeInfoByTokenStr(@RequestParam("token") String tokenStr);
+
+    /**
+     * 通过二维码传输码预览溯源码信息
+     * @param tokenStr
+     * @return
+     */
+    @GetMapping("/getDetailByToken")
+    ResultVO getGoodsQRCodeDetailInfoByToken(@RequestParam("token") String tokenStr);
+    
+    /**
+     * 通过生成记录Id查询打印溯源码信息
+     * @author lym
+     * @param recordId
+     * @return
+     */
+    @PostMapping("/getPrintDetail")
+    ResultVO getPrintDetail(@RequestBody GoodsQRCodeInfoForm goodsQRCodeInfoForm);
+    
+    /**
+     * 修改打印状态
+     * @author lym
+     * @param ids
+     * @return
+     */
+    @PostMapping("/updateQRIsPrint")
+    ResultVO updateQRIsPrint(@RequestBody List<String> ids);
+}

src/main/java/com/hcloud/microservice/goods/facade/clients/GoodsQRCodeRecordManagerService.java

@@ -0,0 +1,100 @@
+package com.hcloud.microservice.goods.facade.clients;
+
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microservice.goods.facade.entity.GoodsQRCodeRecord;
+import com.hcloud.microservice.goods.facade.fallback.factory.GoodsQRCodeRecordManageFallback;
+import com.hcloud.microservice.goods.facade.forms.GoodsQRCodeRecordForm;
+import com.hcloud.microservice.goods.facade.forms.GoodsQRCodeRecordStatForm;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author xiezt
+ */
+@FeignClient(name = "goods-service" ,path = "/qrcode/record",fallbackFactory = GoodsQRCodeRecordManageFallback.class)
+public interface GoodsQRCodeRecordManagerService {
+
+    /**
+     * 分页查询溯源码生成记录
+     * @param goodsQRCodeRecordForm
+     * @return
+     */
+    @PostMapping("/searchByPage")
+    ResultVO searchGoodsQRCodeRecordByPage(@RequestBody GoodsQRCodeRecordForm goodsQRCodeRecordForm);
+
+    /**
+     * 查询溯源码生成记录为导出
+     * @param goodsQRCodeRecordForm
+     * @return
+     */
+    @PostMapping("/searchForExport")
+    ResultVO searchGoodsQRCodeRecordForExport(@RequestBody GoodsQRCodeRecordForm goodsQRCodeRecordForm);
+
+    /**
+     * 废除溯源码生成记录（逻辑删除）
+     * @param goodsQRCodeRecordForm
+     * @return
+     */
+    @PostMapping("/delGoodsQRCodeRecord")
+    ResultVO delGoodsQRCodeRecord(@RequestBody GoodsQRCodeRecordForm goodsQRCodeRecordForm);
+
+    /**
+     * 通过recordId查询生成记录明细
+     * @param goodsQRCodeRecordForm
+     * @return
+     */
+    @GetMapping("/getGoodsQRCodeInfoByRecordId")
+    ResultVO getGoodsQRCodeInfoByRecordId(@RequestBody GoodsQRCodeRecordForm goodsQRCodeRecordForm);
+
+    /**
+     * 物理删除溯源码生成记录
+     * @param recordId
+     * @return
+     */
+    @GetMapping("/delQRCodeInfoPhysical")
+    ResultVO delQRCodeInfoPhysical(@RequestParam("recordId") String recordId);
+
+    /**
+     * 统计一年各月的扫码人数
+     * @param goodsQRCodeRecordStatForm
+     * @return
+     */
+    @PostMapping("/statOneYear")
+    ResultVO statOneYearScanNumber(@RequestBody GoodsQRCodeRecordStatForm goodsQRCodeRecordStatForm);
+
+    /**
+     * 统计昨天和历史累计扫码人数
+     * @param goodsQRCodeRecordStatForm
+     * @return
+     */
+    @PostMapping("/statYesterdayAndAllTime")
+    ResultVO statYesterdayAndAllTimeScanNumber(@RequestBody GoodsQRCodeRecordStatForm goodsQRCodeRecordStatForm);
+
+    /**
+     * 统计一天24个整点每个整点时段的扫码人数
+     * @param goodsQRCodeRecordStatForm
+     * @return
+     */
+    @PostMapping("/statOneDayAllHours")
+    ResultVO statOneDayAllHoursScanNumber(@RequestBody GoodsQRCodeRecordStatForm goodsQRCodeRecordStatForm);
+
+    /**
+     * 统计一周7天每天的扫码人数
+     * @param goodsQRCodeRecordStatForm
+     * @return
+     */
+    @PostMapping("/statOneWeekSevenDay")
+    ResultVO statOneWeekSevenDayScanNumber(@RequestBody GoodsQRCodeRecordStatForm goodsQRCodeRecordStatForm);
+
+    /**
+     * 统计本月每天的扫码人数
+     * @param goodsQRCodeRecordStatForm
+     * @return
+     */
+    @PostMapping("/statOneMonthAllDays")
+    ResultVO statOneMonthAllDaysScanNumber(@RequestBody GoodsQRCodeRecordStatForm goodsQRCodeRecordStatForm);
+}

src/main/java/com/hcloud/microservice/goods/facade/clients/GoodsTracedUserManagerService.java

@@ -0,0 +1,49 @@
+package com.hcloud.microservice.goods.facade.clients;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microservice.goods.facade.fallback.factory.GoodsTracedUserFallback;
+import com.hcloud.microservice.goods.facade.forms.GoodsTracedUserForm;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author xiezt
+ */
+@FeignClient(name = "goods-service" ,path = "/traced/user",fallbackFactory = GoodsTracedUserFallback.class)
+public interface GoodsTracedUserManagerService {
+
+    /**
+     * 查询用户信息通过第三方编码
+     * @param code
+     * @return
+     */
+	@PostMapping("searchByCode")
+    ResultVO searchTracedUserByCode(@RequestBody GoodsTracedUserForm tracedUserForm);
+
+    /**
+     * 保存用户信息
+     * @param tracedUserForm
+     * @return
+     */
+    @PostMapping("saveTracedUser")
+    ResultVO saveTracedUser(@RequestBody GoodsTracedUserForm tracedUserForm);
+
+    /**
+     * 更新用户信息
+     * @param tracedUserForm
+     * @return
+     */
+    @PostMapping("updateTracedUser")
+    ResultVO updateTracedUser(@RequestBody GoodsTracedUserForm tracedUserForm);
+
+    /**
+     * 分页查询溯源用户信息
+     * @param tracedUserForm
+     * @return
+     */
+    @PostMapping("/searchTracedUserByPage")
+    ResultVO searchTracedUserByPage(@RequestBody GoodsTracedUserForm tracedUserForm);
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsAssayInfo.java

@@ -0,0 +1,110 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+public class GoodsAssayInfo extends BaseEntity {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsBatchId;
+
+    private String assayDepartment;
+
+    private String assayImgs;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkGoodsBatchId() {
+        return fkGoodsBatchId;
+    }
+
+    public void setFkGoodsBatchId(String fkGoodsBatchId) {
+        this.fkGoodsBatchId = fkGoodsBatchId == null ? null : fkGoodsBatchId.trim();
+    }
+
+    public String getAssayDepartment() {
+        return assayDepartment;
+    }
+
+    public void setAssayDepartment(String assayDepartment) {
+        this.assayDepartment = assayDepartment == null ? null : assayDepartment.trim();
+    }
+
+    public String getAssayImgs() {
+        return assayImgs;
+    }
+
+    public void setAssayImgs(String assayImgs) {
+        this.assayImgs = assayImgs == null ? null : assayImgs.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsBatchFeedback.java

@@ -0,0 +1,139 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import java.util.Date;
+
+public class GoodsBatchFeedback extends BaseEntity {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsBatchGuid;
+    
+    private String fkBatchRecordGuid;
+
+    private Integer gradeLevel;
+
+    private String commentVal;
+
+    private String commentTitle;
+
+    private Integer checked;
+
+    private String checkedUser;
+
+    private String feedbackUser;
+
+    private Integer state;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getFkGoodsBatchGuid() {
+        return fkGoodsBatchGuid;
+    }
+
+    public void setFkGoodsBatchGuid(String fkGoodsBatchGuid) {
+        this.fkGoodsBatchGuid = fkGoodsBatchGuid == null ? null : fkGoodsBatchGuid.trim();
+    }
+
+    public String getCommentVal() {
+        return commentVal;
+    }
+
+    public void setCommentVal(String commentVal) {
+        this.commentVal = commentVal == null ? null : commentVal.trim();
+    }
+
+    public String getCommentTitle() {
+        return commentTitle;
+    }
+
+    public void setCommentTitle(String commentTitle) {
+        this.commentTitle = commentTitle==null ? null:commentTitle.trim();
+    }
+
+    public Integer getChecked() {
+        return checked;
+    }
+
+    public void setChecked(Integer checked) {
+        this.checked = checked;
+    }
+
+    public String getCheckedUser() {
+        return checkedUser;
+    }
+
+    public void setCheckedUser(String checkedUser) {
+        this.checkedUser = checkedUser == null ? null : checkedUser.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public void setFeedbackUser(String feedbackUser) {
+        this.feedbackUser = feedbackUser ==null ? null:feedbackUser.trim();
+    }
+
+    public String getFeedbackUser() {
+        return feedbackUser;
+    }
+
+    public Integer getGradeLevel() {
+        return gradeLevel;
+    }
+
+    public void setGradeLevel(Integer gradeLevel) {
+        this.gradeLevel = gradeLevel;
+
+    }
+
+	public String getFkBatchRecordGuid() {
+		return fkBatchRecordGuid;
+	}
+
+	public void setFkBatchRecordGuid(String fkBatchRecordGuid) {
+		this.fkBatchRecordGuid = fkBatchRecordGuid;
+	}
+    
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsBatchGrade.java

@@ -0,0 +1,100 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+public class GoodsBatchGrade extends BaseEntity {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsBatchGuid;
+    
+    private String fkBatchRecordGuid;
+
+    private Integer gradeStart;
+
+    private Integer state;
+
+    private String gradeUser;
+
+    private Date createTime;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getFkGoodsBatchGuid() {
+        return fkGoodsBatchGuid;
+    }
+
+    public void setFkGoodsBatchGuid(String fkGoodsBatchGuid) {
+        this.fkGoodsBatchGuid = fkGoodsBatchGuid == null ? null : fkGoodsBatchGuid.trim();
+    }
+
+    public Integer getGradeStart() {
+        return gradeStart;
+    }
+
+    public void setGradeStart(Integer gradeStart) {
+        this.gradeStart = gradeStart;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getGradeUser() {
+        return gradeUser;
+    }
+
+    public void setGradeUser(String gradeUser) {
+        this.gradeUser = gradeUser == null ? null : gradeUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+	public String getFkBatchRecordGuid() {
+		return fkBatchRecordGuid;
+	}
+
+	public void setFkBatchRecordGuid(String fkBatchRecordGuid) {
+		this.fkBatchRecordGuid = fkBatchRecordGuid;
+	}
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsBatchInfo.java

@@ -0,0 +1,190 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+public class GoodsBatchInfo extends BaseEntity {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkFieldGuid;
+
+    private String fkGoodsGuid;
+
+    private String goodsName;
+
+    private String goodsBatchNo;
+
+    private String goodsUnit;
+
+    private Date goodsProductDate;
+
+    private String goodsExpired;
+
+    private Integer goodsQrcodeLimited;
+
+    private String goodsBatchImages;
+
+    private String goodsSaleUrl;
+
+    private String goodsFeedbackStar;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getFkFieldGuid() {
+        return fkFieldGuid;
+    }
+
+    public void setFkFieldGuid(String fkFieldGuid) {
+        this.fkFieldGuid = fkFieldGuid == null ? null : fkFieldGuid.trim();
+    }
+
+    public String getFkGoodsGuid() {
+        return fkGoodsGuid;
+    }
+
+    public void setFkGoodsGuid(String fkGoodsGuid) {
+        this.fkGoodsGuid = fkGoodsGuid == null ? null : fkGoodsGuid.trim();
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName == null ? null : goodsName.trim();
+    }
+
+    public String getGoodsBatchNo() {
+        return goodsBatchNo;
+    }
+
+    public void setGoodsBatchNo(String goodsBatchNo) {
+        this.goodsBatchNo = goodsBatchNo == null ? null : goodsBatchNo.trim();
+    }
+
+    public String getGoodsUnit() {
+        return goodsUnit;
+    }
+
+    public void setGoodsUnit(String goodsUnit) {
+        this.goodsUnit = goodsUnit == null ? null : goodsUnit.trim();
+    }
+
+    public Date getGoodsProductDate() {
+        return goodsProductDate;
+    }
+
+    public void setGoodsProductDate(Date goodsProductDate) {
+        this.goodsProductDate = goodsProductDate;
+    }
+
+    public String getGoodsExpired() {
+        return goodsExpired;
+    }
+
+    public void setGoodsExpired(String goodsExpired) {
+        this.goodsExpired = goodsExpired == null ? null : goodsExpired.trim();
+    }
+
+    public Integer getGoodsQrcodeLimited() {
+        return goodsQrcodeLimited;
+    }
+
+    public void setGoodsQrcodeLimited(Integer goodsQrcodeLimited) {
+        this.goodsQrcodeLimited = goodsQrcodeLimited;
+    }
+
+    public String getGoodsBatchImages() {
+        return goodsBatchImages;
+    }
+
+    public void setGoodsBatchImages(String goodsBatchImages) {
+        this.goodsBatchImages = goodsBatchImages == null ? null : goodsBatchImages.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public void setGoodsSaleUrl(String goodsSaleUrl) {
+        this.goodsSaleUrl = goodsSaleUrl == null ? null:goodsSaleUrl.trim();
+    }
+
+    public String getGoodsSaleUrl() {
+        return goodsSaleUrl;
+    }
+
+    public void setGoodsFeedbackStar(String goodsFeedbackStar) {
+        this.goodsFeedbackStar = goodsFeedbackStar==null ? null:goodsFeedbackStar.trim();
+    }
+
+    public String getGoodsFeedbackStar() {
+        return goodsFeedbackStar;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsBatchLabel.java

@@ -0,0 +1,85 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import java.util.Date;
+
+public class GoodsBatchLabel {
+    private String guid;
+
+    private String fkGoodsBatchGuid;
+
+    private String fkGoodLabelGuid;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkGoodsBatchGuid() {
+        return fkGoodsBatchGuid;
+    }
+
+    public void setFkGoodsBatchGuid(String fkGoodsBatchGuid) {
+        this.fkGoodsBatchGuid = fkGoodsBatchGuid == null ? null : fkGoodsBatchGuid.trim();
+    }
+
+    public String getFkGoodLabelGuid() {
+        return fkGoodLabelGuid;
+    }
+
+    public void setFkGoodLabelGuid(String fkGoodLabelGuid) {
+        this.fkGoodLabelGuid = fkGoodLabelGuid == null ? null : fkGoodLabelGuid.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsDealer.java

@@ -0,0 +1,214 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import java.util.Date;
+
+public class GoodsDealer {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String dealerCode;
+
+    private String dealerName;
+
+    private String linkPhone;
+
+    private String fkPostionId;
+
+    private String dealerAddress;
+
+    private String latitudeLongitude;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private String remark;
+    
+    private String provinceId;
+
+    private String cityId;
+
+    private String countyId;
+    
+    private String provinceName;
+    
+    private String cityName;
+    
+    private String countyName;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getDealerCode() {
+        return dealerCode;
+    }
+
+    public void setDealerCode(String dealerCode) {
+        this.dealerCode = dealerCode == null ? null : dealerCode.trim();
+    }
+
+    public String getDealerName() {
+        return dealerName;
+    }
+
+    public void setDealerName(String dealerName) {
+        this.dealerName = dealerName == null ? null : dealerName.trim();
+    }
+
+    public String getLinkPhone() {
+        return linkPhone;
+    }
+
+    public void setLinkPhone(String linkPhone) {
+        this.linkPhone = linkPhone == null ? null : linkPhone.trim();
+    }
+
+    public String getFkPostionId() {
+        return fkPostionId;
+    }
+
+    public void setFkPostionId(String fkPostionId) {
+        this.fkPostionId = fkPostionId == null ? null : fkPostionId.trim();
+    }
+
+    public String getDealerAddress() {
+    	String address = this.provinceName;
+    	if(this.cityName != null) {
+    		address += "-" + this.cityName;
+    	}
+    	if(this.countyName != null) {
+    		address += "-" + this.countyName;
+    	}
+    	this.dealerAddress = address;
+        return dealerAddress;
+    }
+
+    public void setDealerAddress(String dealerAddress) {
+        this.dealerAddress = dealerAddress == null ? null : dealerAddress.trim();
+    }
+
+    public String getLatitudeLongitude() {
+        return latitudeLongitude;
+    }
+
+    public void setLatitudeLongitude(String latitudeLongitude) {
+        this.latitudeLongitude = latitudeLongitude == null ? null : latitudeLongitude.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+	public String getProvinceId() {
+		return provinceId;
+	}
+
+	public void setProvinceId(String provinceId) {
+		this.provinceId = provinceId;
+	}
+
+	public String getCityId() {
+		return cityId;
+	}
+
+	public void setCityId(String cityId) {
+		this.cityId = cityId;
+	}
+
+	public String getCountyId() {
+		return countyId;
+	}
+
+	public void setCountyId(String countyId) {
+		this.countyId = countyId;
+	}
+
+	public String getProvinceName() {
+		return provinceName;
+	}
+
+	public void setProvinceName(String provinceName) {
+		this.provinceName = provinceName;
+	}
+
+	public String getCityName() {
+		return cityName;
+	}
+
+	public void setCityName(String cityName) {
+		this.cityName = cityName;
+	}
+
+	public String getCountyName() {
+		return countyName;
+	}
+
+	public void setCountyName(String countyName) {
+		this.countyName = countyName;
+	}
+    
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsField.java

@@ -0,0 +1,167 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import java.util.Date;
+
+public class GoodsField extends BaseEntity {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fieldCode;
+
+    private String fieldName;
+
+    private String fkPostionId;
+
+    private String fieldAddress;
+
+    private String fieldArea;
+
+    private String saleGoodsRange;
+
+    private String fieldImages;
+
+    private String remark;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private String oneMap;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getFieldCode() {
+        return fieldCode;
+    }
+
+    public void setFieldCode(String fieldCode) {
+        this.fieldCode = fieldCode == null ? null : fieldCode.trim();
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public void setFieldName(String fieldName) {
+        this.fieldName = fieldName == null ? null : fieldName.trim();
+    }
+
+    public String getFkPostionId() {
+        return fkPostionId;
+    }
+
+    public void setFkPostionId(String fkPostionId) {
+        this.fkPostionId = fkPostionId == null ? null : fkPostionId.trim();
+    }
+
+    public String getFieldAddress() {
+        return fieldAddress;
+    }
+
+    public void setFieldAddress(String fieldAddress) {
+        this.fieldAddress = fieldAddress == null ? null : fieldAddress.trim();
+    }
+
+    public String getFieldArea() {
+        return fieldArea;
+    }
+
+    public void setFieldArea(String fieldArea) {
+        this.fieldArea = fieldArea == null ? null : fieldArea.trim();
+    }
+
+    public String getSaleGoodsRange() {
+        return saleGoodsRange;
+    }
+
+    public void setSaleGoodsRange(String saleGoodsRange) {
+        this.saleGoodsRange = saleGoodsRange == null ? null : saleGoodsRange.trim();
+    }
+
+    public String getFieldImages() {
+        return fieldImages;
+    }
+
+    public void setFieldImages(String fieldImages) {
+        this.fieldImages = fieldImages == null ? null : fieldImages.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public String getOneMap() {
+        return oneMap;
+    }
+
+    public void setOneMap(String oneMap) {
+        this.oneMap = oneMap;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsInfo.java

@@ -0,0 +1,130 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+public class GoodsInfo extends BaseEntity {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private Integer fkGoodsType;
+
+    private String goodsCode;
+
+    private String goodsName;
+
+    private String goodsRemark;
+
+    private String goodsImages;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public Integer getFkGoodsType() {
+        return fkGoodsType;
+    }
+
+    public void setFkGoodsType(Integer fkGoodsType) {
+        this.fkGoodsType = fkGoodsType;
+    }
+
+    public String getGoodsCode() {
+        return goodsCode;
+    }
+
+    public void setGoodsCode(String goodsCode) {
+        this.goodsCode = goodsCode == null ? null : goodsCode.trim();
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName == null ? null : goodsName.trim();
+    }
+
+    public String getGoodsRemark() {
+        return goodsRemark;
+    }
+
+    public void setGoodsRemark(String goodsRemark) {
+        this.goodsRemark = goodsRemark == null ? null : goodsRemark.trim();
+    }
+
+    public String getGoodsImages() {
+        return goodsImages;
+    }
+
+    public void setGoodsImages(String goodsImages) {
+        this.goodsImages = goodsImages == null ? null : goodsImages.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsInfoAuxiliary.java

@@ -0,0 +1,117 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import java.util.Date;
+
+public class GoodsInfoAuxiliary extends BaseEntity {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsGuid;
+
+    private String fkAuxItmeId;
+
+    private String auxItme;
+
+    private String auxItmeVal;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getFkGoodsGuid() {
+        return fkGoodsGuid;
+    }
+
+    public void setFkGoodsGuid(String fkGoodsGuid) {
+        this.fkGoodsGuid = fkGoodsGuid == null ? null : fkGoodsGuid.trim();
+    }
+
+    public String getFkAuxItmeId() {
+        return fkAuxItmeId;
+    }
+
+    public void setFkAuxItmeId(String fkAuxItmeId) {
+        this.fkAuxItmeId = fkAuxItmeId == null ? null : fkAuxItmeId.trim();
+    }
+
+    public String getAuxItme() {
+        return auxItme;
+    }
+
+    public void setAuxItme(String auxItme) {
+        this.auxItme = auxItme == null ? null : auxItme.trim();
+    }
+
+    public String getAuxItmeVal() {
+        return auxItmeVal;
+    }
+
+    public void setAuxItmeVal(String auxItmeVal) {
+        this.auxItmeVal = auxItmeVal == null ? null : auxItmeVal.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsInterAuxiliary.java

@@ -0,0 +1,151 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class GoodsInterAuxiliary {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsGuid;
+
+    private String fkGoodsBatchGuid;
+
+    private String fkGoodsInterGuid;
+
+    private String auxItme;
+
+    @ApiModelProperty(value="扩展属性标准数据",example="扩展属性标准数据")
+    private String auxItmeNormval;
+
+    @ApiModelProperty(value="扩展属性产品数据",example="扩展属性产品数据")
+    private String auxItemProductval;
+    
+    @ApiModelProperty(value="单位",example="单位")
+    private String unit;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getFkGoodsGuid() {
+        return fkGoodsGuid;
+    }
+
+    public void setFkGoodsGuid(String fkGoodsGuid) {
+        this.fkGoodsGuid = fkGoodsGuid == null ? null : fkGoodsGuid.trim();
+    }
+
+    public String getFkGoodsBatchGuid() {
+        return fkGoodsBatchGuid;
+    }
+
+    public void setFkGoodsBatchGuid(String fkGoodsBatchGuid) {
+        this.fkGoodsBatchGuid = fkGoodsBatchGuid == null ? null : fkGoodsBatchGuid.trim();
+    }
+
+    public String getFkGoodsInterGuid() {
+        return fkGoodsInterGuid;
+    }
+
+    public void setFkGoodsInterGuid(String fkGoodsInterGuid) {
+        this.fkGoodsInterGuid = fkGoodsInterGuid == null ? null : fkGoodsInterGuid.trim();
+    }
+
+    public String getAuxItme() {
+        return auxItme;
+    }
+
+    public void setAuxItme(String auxItme) {
+        this.auxItme = auxItme == null ? null : auxItme.trim();
+    }
+
+    public String getAuxItmeNormval() {
+        return auxItmeNormval;
+    }
+
+    public void setAuxItmeNormval(String auxItmeNormval) {
+        this.auxItmeNormval = auxItmeNormval == null ? null : auxItmeNormval.trim();
+    }
+
+    public String getAuxItemProductval() {
+        return auxItemProductval;
+    }
+
+    public void setAuxItemProductval(String auxItemProductval) {
+        this.auxItemProductval = auxItemProductval == null ? null : auxItemProductval.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+	public String getUnit() {
+		return unit;
+	}
+
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+    
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsInterInfo.java

@@ -0,0 +1,165 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import java.util.Date;
+
+public class GoodsInterInfo {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsGuid;
+
+    private String fkGoodsBatchGuid;
+
+    private String livespan;
+
+    private String totalPrecipitation;
+
+    private String totalTemperature;
+
+    private String avgTemperature;
+
+    private String precipitationRate;
+
+    private String sunDate;
+
+    private String avgOrganicMatter;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getFkGoodsGuid() {
+        return fkGoodsGuid;
+    }
+
+    public void setFkGoodsGuid(String fkGoodsGuid) {
+        this.fkGoodsGuid = fkGoodsGuid == null ? null : fkGoodsGuid.trim();
+    }
+
+    public String getFkGoodsBatchGuid() {
+        return fkGoodsBatchGuid;
+    }
+
+    public void setFkGoodsBatchGuid(String fkGoodsBatchGuid) {
+        this.fkGoodsBatchGuid = fkGoodsBatchGuid == null ? null : fkGoodsBatchGuid.trim();
+    }
+
+    public String getLivespan() {
+        return livespan;
+    }
+
+    public void setLivespan(String livespan) {
+        this.livespan = livespan == null ? null : livespan.trim();
+    }
+
+    public String getTotalPrecipitation() {
+        return totalPrecipitation;
+    }
+
+    public void setTotalPrecipitation(String totalPrecipitation) {
+        this.totalPrecipitation = totalPrecipitation == null ? null : totalPrecipitation.trim();
+    }
+
+    public String getTotalTemperature() {
+        return totalTemperature;
+    }
+
+    public void setTotalTemperature(String totalTemperature) {
+        this.totalTemperature = totalTemperature == null ? null : totalTemperature.trim();
+    }
+
+    public String getAvgTemperature() {
+        return avgTemperature;
+    }
+
+    public void setAvgTemperature(String avgTemperature) {
+        this.avgTemperature = avgTemperature == null ? null : avgTemperature.trim();
+    }
+
+    public String getPrecipitationRate() {
+        return precipitationRate;
+    }
+
+    public void setPrecipitationRate(String precipitationRate) {
+        this.precipitationRate = precipitationRate == null ? null : precipitationRate.trim();
+    }
+
+    public String getSunDate() {
+        return sunDate;
+    }
+
+    public void setSunDate(String sunDate) {
+        this.sunDate = sunDate == null ? null : sunDate.trim();
+    }
+
+    public String getAvgOrganicMatter() {
+        return avgOrganicMatter;
+    }
+
+    public void setAvgOrganicMatter(String avgOrganicMatter) {
+        this.avgOrganicMatter = avgOrganicMatter == null ? null : avgOrganicMatter.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsLabel.java

@@ -0,0 +1,75 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import java.util.Date;
+
+public class GoodsLabel {
+    private String guid;
+
+    private String labelName;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getLabelName() {
+        return labelName;
+    }
+
+    public void setLabelName(String labelName) {
+        this.labelName = labelName == null ? null : labelName.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsProInputs.java

@@ -0,0 +1,147 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import java.util.Date;
+
+public class GoodsProInputs extends BaseEntity {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsBatchGuid;
+
+    private String proInputsNo;
+
+    private String proInputsName;
+
+    private String inputsProcessName;
+
+    private Date inputsTime;
+
+    private String inputDoUser;
+
+    private String inputProviderUser;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getFkGoodsBatchGuid() {
+        return fkGoodsBatchGuid;
+    }
+
+    public void setFkGoodsBatchGuid(String fkGoodsBatchGuid) {
+        this.fkGoodsBatchGuid = fkGoodsBatchGuid == null ? null : fkGoodsBatchGuid.trim();
+    }
+
+    public String getProInputsNo() {
+        return proInputsNo;
+    }
+
+    public void setProInputsNo(String proInputsNo) {
+        this.proInputsNo = proInputsNo == null ? null : proInputsNo.trim();
+    }
+
+    public String getProInputsName() {
+        return proInputsName;
+    }
+
+    public void setProInputsName(String proInputsName) {
+        this.proInputsName = proInputsName == null ? null : proInputsName.trim();
+    }
+
+    public String getInputsProcessName() {
+        return inputsProcessName;
+    }
+
+    public void setInputsProcessName(String inputsProcessName) {
+        this.inputsProcessName = inputsProcessName == null ? null : inputsProcessName.trim();
+    }
+
+    public Date getInputsTime() {
+        return inputsTime;
+    }
+
+    public void setInputsTime(Date inputsTime) {
+        this.inputsTime = inputsTime;
+    }
+
+    public String getInputDoUser() {
+        return inputDoUser;
+    }
+
+    public void setInputDoUser(String inputDoUser) {
+        this.inputDoUser = inputDoUser == null ? null : inputDoUser.trim();
+    }
+
+    public String getInputProviderUser() {
+        return inputProviderUser;
+    }
+
+    public void setInputProviderUser(String inputProviderUser) {
+        this.inputProviderUser = inputProviderUser == null ? null : inputProviderUser.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsProNormal.java

@@ -0,0 +1,157 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import java.util.Date;
+
+public class GoodsProNormal extends BaseEntity {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsBatchGuid;
+
+    private Integer processType;
+
+    private String processItem;
+
+    private Date processTime;
+
+    private String processUser;
+
+    private String processDesc;
+
+    private String processAddress;
+
+    private String processImgs;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getFkGoodsBatchGuid() {
+        return fkGoodsBatchGuid;
+    }
+
+    public void setFkGoodsBatchGuid(String fkGoodsBatchGuid) {
+        this.fkGoodsBatchGuid = fkGoodsBatchGuid == null ? null : fkGoodsBatchGuid.trim();
+    }
+
+    public Integer getProcessType() {
+        return processType;
+    }
+
+    public void setProcessType(Integer processType) {
+        this.processType = processType;
+    }
+
+    public String getProcessItem() {
+        return processItem;
+    }
+
+    public void setProcessItem(String processItem) {
+        this.processItem = processItem == null ? null : processItem.trim();
+    }
+
+    public Date getProcessTime() {
+        return processTime;
+    }
+
+    public void setProcessTime(Date processTime) {
+        this.processTime = processTime;
+    }
+
+    public String getProcessUser() {
+        return processUser;
+    }
+
+    public void setProcessUser(String processUser) {
+        this.processUser = processUser == null ? null : processUser.trim();
+    }
+
+    public String getProcessDesc() {
+        return processDesc;
+    }
+
+    public void setProcessDesc(String processDesc) {
+        this.processDesc = processDesc == null ? null : processDesc.trim();
+    }
+
+    public String getProcessAddress() {
+        return processAddress;
+    }
+
+    public void setProcessAddress(String processAddress) {
+        this.processAddress = processAddress == null ? null : processAddress.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public void setProcessImgs(String processImgs) {
+        this.processImgs = processImgs == null ? null:processImgs.trim();
+    }
+
+    public String getProcessImgs() {
+        return processImgs;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsQRCodeInfo.java

@@ -0,0 +1,170 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+public class GoodsQRCodeInfo extends BaseEntity {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsGuid;
+
+    private String fkBatchRecordGuid;
+
+    private String qrcode;
+
+    private String qrcodeToken;
+
+    private String qrcodeUrl;
+
+    private String qrcodeImg;
+
+    private Integer scanCount;
+
+    private Date scanFirstTimed;
+
+    private Date scanLastTimed;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getFkGoodsGuid() {
+        return fkGoodsGuid;
+    }
+
+    public void setFkGoodsGuid(String fkGoodsGuid) {
+        this.fkGoodsGuid = fkGoodsGuid == null ? null : fkGoodsGuid.trim();
+    }
+
+    public String getFkBatchRecordGuid() {
+        return fkBatchRecordGuid;
+    }
+
+    public void setFkBatchRecordGuid(String fkBatchRecordGuid) {
+        this.fkBatchRecordGuid = fkBatchRecordGuid == null ? null : fkBatchRecordGuid.trim();
+    }
+
+    public String getQrcode() {
+        return qrcode;
+    }
+
+    public void setQrcode(String qrcode) {
+        this.qrcode = qrcode == null ? null : qrcode.trim();
+    }
+
+    public String getQrcodeToken() {
+        return qrcodeToken;
+    }
+
+    public void setQrcodeToken(String qrcodeToken) {
+        this.qrcodeToken = qrcodeToken == null ? null : qrcodeToken.trim();
+    }
+
+    public String getQrcodeUrl() {
+        return qrcodeUrl;
+    }
+
+    public void setQrcodeUrl(String qrcodeUrl) {
+        this.qrcodeUrl = qrcodeUrl == null ? null : qrcodeUrl.trim();
+    }
+
+    public String getQrcodeImg() {
+        return qrcodeImg;
+    }
+
+    public void setQrcodeImg(String qrcodeImg) {
+        this.qrcodeImg = qrcodeImg == null ? null : qrcodeImg.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public void setScanCount(Integer scanCount) {
+        this.scanCount = scanCount;
+    }
+
+    public void setScanFirstTimed(Date scanFirstTimed) {
+        this.scanFirstTimed = scanFirstTimed;
+    }
+
+    public void setScanLastTimed(Date scanLastTimed) {
+        this.scanLastTimed = scanLastTimed;
+    }
+
+    public Integer getScanCount() {
+        return scanCount;
+    }
+
+    public Date getScanFirstTimed() {
+        return scanFirstTimed;
+    }
+
+    public Date getScanLastTimed() {
+        return scanLastTimed;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsQRCodeRecord.java

@@ -0,0 +1,150 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+public class GoodsQRCodeRecord extends BaseEntity {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsBatchGuid;
+
+    private String goodsParentQrcode;
+
+    private Date qrcodeRecordTime;
+
+    private Integer originNum;
+
+    private Integer cancelNum;
+
+    private Integer usedNum;
+
+    private Integer scanNum;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getFkGoodsBatchGuid() {
+        return fkGoodsBatchGuid;
+    }
+
+    public void setFkGoodsBatchGuid(String fkGoodsBatchGuid) {
+        this.fkGoodsBatchGuid = fkGoodsBatchGuid == null ? null : fkGoodsBatchGuid.trim();
+    }
+
+    public String getGoodsParentQrcode() {
+        return goodsParentQrcode;
+    }
+
+    public void setGoodsParentQrcode(String goodsParentQrcode) {
+        this.goodsParentQrcode = goodsParentQrcode == null ? null : goodsParentQrcode.trim();
+    }
+
+    public Date getQrcodeRecordTime() {
+        return qrcodeRecordTime;
+    }
+
+    public void setQrcodeRecordTime(Date qrcodeRecordTime) {
+        this.qrcodeRecordTime = qrcodeRecordTime;
+    }
+
+    public Integer getOriginNum() {
+        return originNum;
+    }
+
+    public void setOriginNum(Integer originNum) {
+        this.originNum = originNum;
+    }
+
+    public Integer getCancelNum() {
+        return cancelNum;
+    }
+
+    public void setCancelNum(Integer cancelNum) {
+        this.cancelNum = cancelNum;
+    }
+
+    public Integer getUsedNum() {
+        return usedNum;
+    }
+
+    public void setUsedNum(Integer usedNum) {
+        this.usedNum = usedNum;
+    }
+
+    public Integer getScanNum() {
+        return scanNum;
+    }
+
+    public void setScanNum(Integer scanNum) {
+        this.scanNum = scanNum;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsTracedUser.java

@@ -0,0 +1,140 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+public class GoodsTracedUser extends BaseEntity {
+    private String guid;
+
+    private String tracedUserOpenid;
+
+    private String tracedTel;
+
+    private String tracedUserName;
+
+    private String tracedUserMail;
+
+    private String tracedUserImg;
+
+    private Integer tracedSex;
+
+    private String tracedThirdCode;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid == null ? null : guid.trim();
+    }
+
+    public String getTracedUserOpenid() {
+        return tracedUserOpenid;
+    }
+
+    public void setTracedUserOpenid(String tracedUserOpenid) {
+        this.tracedUserOpenid = tracedUserOpenid == null ? null : tracedUserOpenid.trim();
+    }
+
+    public String getTracedTel() {
+        return tracedTel;
+    }
+
+    public void setTracedTel(String tracedTel) {
+        this.tracedTel = tracedTel == null ? null : tracedTel.trim();
+    }
+
+    public String getTracedUserName() {
+        return tracedUserName;
+    }
+
+    public void setTracedUserName(String tracedUserName) {
+        this.tracedUserName = tracedUserName == null ? null : tracedUserName.trim();
+    }
+
+    public String getTracedUserMail() {
+        return tracedUserMail;
+    }
+
+    public void setTracedUserMail(String tracedUserMail) {
+        this.tracedUserMail = tracedUserMail == null ? null : tracedUserMail.trim();
+    }
+
+    public String getTracedUserImg() {
+        return tracedUserImg;
+    }
+
+    public void setTracedUserImg(String tracedUserImg) {
+        this.tracedUserImg = tracedUserImg == null ? null : tracedUserImg.trim();
+    }
+
+    public Integer getTracedSex() {
+        return tracedSex;
+    }
+
+    public void setTracedSex(Integer tracedSex) {
+        this.tracedSex = tracedSex;
+    }
+
+    public String getTracedThirdCode() {
+        return tracedThirdCode;
+    }
+
+    public void setTracedThirdCode(String tracedThirdCode) {
+        this.tracedThirdCode = tracedThirdCode == null ? null : tracedThirdCode.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/entity/GoodsType.java

@@ -0,0 +1,80 @@
+package com.hcloud.microservice.goods.facade.entity;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+public class GoodsType extends BaseEntity {
+    private Integer id;
+
+    private String fkOrgGuid;
+
+    private String parentCode;
+
+    private String typeCode;
+
+    private String typeName;
+
+    private Integer state;
+
+    private Date modified;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getFkOrgGuid() {
+        return fkOrgGuid;
+    }
+
+    public void setFkOrgGuid(String fkOrgGuid) {
+        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
+    }
+
+    public String getParentCode() {
+        return parentCode;
+    }
+
+    public void setParentCode(String parentCode) {
+        this.parentCode = parentCode == null ? null : parentCode.trim();
+    }
+
+    public String getTypeCode() {
+        return typeCode;
+    }
+
+    public void setTypeCode(String typeCode) {
+        this.typeCode = typeCode == null ? null : typeCode.trim();
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName == null ? null : typeName.trim();
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getModified() {
+        return modified;
+    }
+
+    public void setModified(Date modified) {
+        this.modified = modified;
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/GoodsBatchGradeFactory.java

@@ -0,0 +1,10 @@
+package com.hcloud.microservice.goods.facade.fallback;
+
+import com.hcloud.microservice.goods.facade.clients.GoodsBatchGradeManagerService;
+
+/**
+ * @author JYJ
+ */
+public interface GoodsBatchGradeFactory extends GoodsBatchGradeManagerService {
+
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/GoodsBatchManageFactory.java

@@ -0,0 +1,9 @@
+package com.hcloud.microservice.goods.facade.fallback;
+
+import com.hcloud.microservice.goods.facade.clients.GoodsBatchManagerService;
+
+/**
+ * @author xiezt
+ */
+public interface GoodsBatchManageFactory extends GoodsBatchManagerService {
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/GoodsDealerClientFactory.java

@@ -0,0 +1,7 @@
+package com.hcloud.microservice.goods.facade.fallback;
+
+import com.hcloud.microservice.goods.facade.clients.GoodsDealerClient;
+
+public interface GoodsDealerClientFactory extends GoodsDealerClient{
+
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/GoodsFeedbackFactory.java

@@ -0,0 +1,10 @@
+package com.hcloud.microservice.goods.facade.fallback;
+
+import com.hcloud.microservice.goods.facade.clients.GoodsFeedbackManagerService;
+
+/**
+ * @author JYJ
+ */
+public interface GoodsFeedbackFactory extends GoodsFeedbackManagerService {
+
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/GoodsFieldManageFactory.java

@@ -0,0 +1,9 @@
+package com.hcloud.microservice.goods.facade.fallback;
+
+import com.hcloud.microservice.goods.facade.clients.GoodsFieldManageService;
+
+/**
+ * @author xiezt
+ */
+public interface GoodsFieldManageFactory extends GoodsFieldManageService {
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/GoodsManageFactory.java

@@ -0,0 +1,9 @@
+package com.hcloud.microservice.goods.facade.fallback;
+
+import com.hcloud.microservice.goods.facade.clients.GoodsManagerService;
+
+/**
+ * @author xiezt
+ */
+public interface GoodsManageFactory extends GoodsManagerService {
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/GoodsProInputsFactory.java

@@ -0,0 +1,10 @@
+package com.hcloud.microservice.goods.facade.fallback;
+
+import com.hcloud.microservice.goods.facade.clients.GoodsProInputsManagerService;
+
+/**
+ * @author xiezt
+ */
+public interface GoodsProInputsFactory extends GoodsProInputsManagerService {
+
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/GoodsProNormalFactory.java

@@ -0,0 +1,10 @@
+package com.hcloud.microservice.goods.facade.fallback;
+
+import com.hcloud.microservice.goods.facade.clients.GoodsProNormalManagerService;
+
+/**
+ * @author JYJ
+ */
+public interface GoodsProNormalFactory extends GoodsProNormalManagerService {
+
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/GoodsQRCodeManageFactory.java

@@ -0,0 +1,9 @@
+package com.hcloud.microservice.goods.facade.fallback;
+
+import com.hcloud.microservice.goods.facade.clients.GoodsQRCodeManagerService;
+
+/**
+ * @author xiezt
+ */
+public interface GoodsQRCodeManageFactory extends GoodsQRCodeManagerService {
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/GoodsQRCodeRecordManageFactory.java

@@ -0,0 +1,9 @@
+package com.hcloud.microservice.goods.facade.fallback;
+
+import com.hcloud.microservice.goods.facade.clients.GoodsQRCodeRecordManagerService;
+
+/**
+ * @author xiezt
+ */
+public interface GoodsQRCodeRecordManageFactory extends GoodsQRCodeRecordManagerService {
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/GoodsTracedUserFactory.java

@@ -0,0 +1,10 @@
+package com.hcloud.microservice.goods.facade.fallback;
+
+import com.hcloud.microservice.goods.facade.clients.GoodsTracedUserManagerService;
+
+/**
+ * @author xiezt
+ */
+public interface GoodsTracedUserFactory extends GoodsTracedUserManagerService {
+
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/factory/GoodsBatchGradeFallback.java

@@ -0,0 +1,65 @@
+package com.hcloud.microservice.goods.facade.fallback.factory;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microservice.goods.facade.fallback.GoodsBatchGradeFactory;
+import com.hcloud.microservice.goods.facade.forms.GoodsBatchGradeForm;
+import feign.hystrix.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author JYJ
+ */
+@Component
+public class GoodsBatchGradeFallback implements FallbackFactory<GoodsBatchGradeFactory> {
+
+    @Override
+    public GoodsBatchGradeFactory create(Throwable cause) {
+        return new GoodsBatchGradeFactory(){
+            /**
+             * 分页查询商品评级信息
+             *
+             * @param gradeForm
+             * @return
+             */
+            @Override
+            public ResultVO searchBatchGradeByPage(GoodsBatchGradeForm gradeForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 获取用户评级信息
+             *
+             * @param userId
+             * @param batchId
+             * @return
+             */
+            @Override
+            public ResultVO getBatchGradeByUserId(String userId, String batchId) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 保存用户评级信息
+             *
+             * @param gradeForm
+             * @return
+             */
+            @Override
+            public ResultVO saveBatchGradeInfo(GoodsBatchGradeForm gradeForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 批量删除商品评级信息
+             *
+             * @param gradeForm
+             * @return
+             */
+            @Override
+            public ResultVO delBatchGradeInfo(GoodsBatchGradeForm gradeForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+        };
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/factory/GoodsBatchManageFallback.java

@@ -0,0 +1,73 @@
+package com.hcloud.microservice.goods.facade.fallback.factory;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microservice.goods.facade.fallback.GoodsBatchManageFactory;
+import com.hcloud.microservice.goods.facade.forms.GoodsBatchInfoForm;
+import feign.hystrix.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xiezt
+ */
+@Component
+public class GoodsBatchManageFallback implements FallbackFactory<GoodsBatchManageFactory> {
+
+    @Override
+    public GoodsBatchManageFactory create(Throwable cause) {
+        return new GoodsBatchManageFactory() {
+            @Override
+            public ResultVO queryGoodsBatchRecordByPage(GoodsBatchInfoForm goodsBatchInfoForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO addGoodsBatchRecord(GoodsBatchInfoForm goodsBatchInfoForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO editGoodsBatchRecord(GoodsBatchInfoForm goodsBatchInfoForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO getGoodsBatchRecordById(String guid) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO delGoodsBatchRecordById(String guid,String orgGuid) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO batchGoodsQRCode(GoodsBatchInfoForm goodsBatchInfoForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 保存评价及评级信息
+             *
+             * @param goodsBatchInfoForm
+             * @return
+             */
+            @Override
+            public ResultVO saveAllFeedbackInfo(GoodsBatchInfoForm goodsBatchInfoForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 查询用户商品批次评价信息
+             *
+             * @param batchId
+             * @param userId
+             * @return
+             */
+            @Override
+            public ResultVO searchAllFeedbackInfo(String batchId, String userId) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+        };
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/factory/GoodsDealerClientFallback.java

@@ -0,0 +1,60 @@
+package com.hcloud.microservice.goods.facade.fallback.factory;
+
+import org.springframework.stereotype.Component;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microservice.goods.facade.entity.GoodsDealer;
+import com.hcloud.microservice.goods.facade.fallback.GoodsDealerClientFactory;
+import com.hcloud.microservice.goods.facade.forms.GoodsDealerForm;
+
+import feign.hystrix.FallbackFactory;
+
+@Component
+public class GoodsDealerClientFallback implements FallbackFactory<GoodsDealerClientFactory>{
+
+	@Override
+	public GoodsDealerClientFactory create(Throwable cause) {
+		// TODO Auto-generated method stub
+		return new GoodsDealerClientFactory() {
+
+			@Override
+			public ResultVO add(GoodsDealer goodsDealer) {
+				// TODO Auto-generated method stub
+				return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+			}
+
+			@Override
+			public ResultVO edit(GoodsDealer goodsDealer) {
+				// TODO Auto-generated method stub
+				return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+			}
+
+			@Override
+			public ResultVO findById(String guid) {
+				// TODO Auto-generated method stub
+				return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+			}
+
+			@Override
+			public ResultVO searchByPage(GoodsDealerForm goodsDealerForm) {
+				// TODO Auto-generated method stub
+				return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+			}
+
+			@Override
+			public ResultVO getMaxCode() {
+				// TODO Auto-generated method stub
+				return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+			}
+
+			@Override
+			public ResultVO delete(String guid) {
+				// TODO Auto-generated method stub
+				return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+			}
+			
+		};
+	}
+
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/factory/GoodsFeedbackFallback.java

@@ -0,0 +1,65 @@
+package com.hcloud.microservice.goods.facade.fallback.factory;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microservice.goods.facade.fallback.GoodsFeedbackFactory;
+import com.hcloud.microservice.goods.facade.forms.GoodsBatchFeedbackForm;
+import feign.hystrix.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xiezt
+ */
+@Component
+public class GoodsFeedbackFallback implements FallbackFactory<GoodsFeedbackFactory> {
+
+    @Override
+    public GoodsFeedbackFactory create(Throwable cause) {
+        return new GoodsFeedbackFactory(){
+            /**
+             * 分页查询商品评价信息
+             *
+             * @param gradeForm
+             * @return
+             */
+            @Override
+            public ResultVO searchGoodsFeedbackByPage(GoodsBatchFeedbackForm gradeForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 获取用户评价信息
+             *
+             * @param userId
+             * @param batchId
+             * @return
+             */
+            @Override
+            public ResultVO getGoodsFeedbackByUserId(String userId, String batchId) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 保存用户评价信息
+             *
+             * @param gradeForm
+             * @return
+             */
+            @Override
+            public ResultVO saveGoodsFeedbackInfo(GoodsBatchFeedbackForm gradeForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 批量删除用户评价
+             *
+             * @param gradeForm
+             * @return
+             */
+            @Override
+            public ResultVO delGoodsFeedbackInfo(GoodsBatchFeedbackForm gradeForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+        };
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/factory/GoodsFieldManageFallback.java

@@ -0,0 +1,46 @@
+package com.hcloud.microservice.goods.facade.fallback.factory;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microservice.goods.facade.fallback.GoodsFieldManageFactory;
+import com.hcloud.microservice.goods.facade.forms.GoodsFieldForm;
+import feign.hystrix.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @author xiezt
+ */
+@Component
+public class GoodsFieldManageFallback implements FallbackFactory<GoodsFieldManageFactory> {
+
+    @Override
+    public GoodsFieldManageFactory create(Throwable cause) {
+        return new GoodsFieldManageFactory() {
+            @Override
+            public ResultVO queryGoodsFieldByPage(GoodsFieldForm fieldForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO addGoodsField(GoodsFieldForm fieldForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO editGoodsField(GoodsFieldForm fieldForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO getGoodsField(String guid,String orgGuid) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO delGoodsField(String guid,String orgGuid) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+        };
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/factory/GoodsManageFallback.java

@@ -0,0 +1,51 @@
+package com.hcloud.microservice.goods.facade.fallback.factory;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microservice.goods.facade.fallback.GoodsManageFactory;
+import com.hcloud.microservice.goods.facade.forms.GoodsInfoForm;
+import feign.hystrix.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xiezt
+ */
+@Component
+public class GoodsManageFallback implements FallbackFactory<GoodsManageFactory> {
+
+    @Override
+    public GoodsManageFactory create(Throwable cause) {
+        return new GoodsManageFactory() {
+            @Override
+            public ResultVO searchGoodsInfoByPage(GoodsInfoForm goodsInfoForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO addGoodsInfo(GoodsInfoForm goodsInfoForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO editGoodsInfo(GoodsInfoForm goodsInfoForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO getGoodsInfoById(String guid) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 删除产品信息
+             *
+             * @param guid
+             * @return
+             */
+            @Override
+            public ResultVO delGoodsInfoById(String guid) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+        };
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/factory/GoodsProInputsFallback.java

@@ -0,0 +1,64 @@
+package com.hcloud.microservice.goods.facade.fallback.factory;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microservice.goods.facade.fallback.GoodsProInputsFactory;
+import com.hcloud.microservice.goods.facade.forms.GoodsProInputsForm;
+import feign.hystrix.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xiezt
+ */
+@Component
+public class GoodsProInputsFallback implements FallbackFactory<GoodsProInputsFactory> {
+
+    @Override
+    public GoodsProInputsFactory create(Throwable cause) {
+        return new GoodsProInputsFactory(){
+            /**
+             * 分页查询投入品内容
+             *
+             * @param goodsProInputsForm
+             * @return
+             */
+            @Override
+            public ResultVO searchProInputsByPage(GoodsProInputsForm goodsProInputsForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 查询投入品列表通过商品批次键
+             *
+             * @param foreignKey
+             * @return
+             */
+            @Override
+            public ResultVO searchProInputsByFK(String foreignKey) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 删除投入品信息
+             *
+             * @param pk
+             * @return
+             */
+            @Override
+            public ResultVO delProInputs(String pk) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 保存投入品信息
+             *
+             * @param goodsProInputsForm
+             * @return
+             */
+            @Override
+            public ResultVO saveProInputs(GoodsProInputsForm goodsProInputsForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+        };
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/factory/GoodsProNormalFallback.java

@@ -0,0 +1,64 @@
+package com.hcloud.microservice.goods.facade.fallback.factory;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microservice.goods.facade.fallback.GoodsProNormalFactory;
+import com.hcloud.microservice.goods.facade.forms.GoodsProNormalForm;
+import feign.hystrix.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xiezt
+ */
+@Component
+public class GoodsProNormalFallback implements FallbackFactory<GoodsProNormalFactory> {
+
+    @Override
+    public GoodsProNormalFactory create(Throwable cause) {
+        return new GoodsProNormalFactory(){
+            /**
+             * 分页查询流通信息
+             *
+             * @param goodsProNormalForm
+             * @return
+             */
+            @Override
+            public ResultVO searchProNormalByPage(GoodsProNormalForm goodsProNormalForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 保存流程通用信息
+             *
+             * @param goodsProNormalForm
+             * @return
+             */
+            @Override
+            public ResultVO saveProNormal(GoodsProNormalForm goodsProNormalForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 更新流通通用信息
+             *
+             * @param goodsProNormalForm
+             * @return
+             */
+            @Override
+            public ResultVO updateProNormal(GoodsProNormalForm goodsProNormalForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 通过主键删除通用流通信息
+             *
+             * @param pk
+             * @return
+             */
+            @Override
+            public ResultVO delProNormalByPK(String pk) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+        };
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/factory/GoodsQRCodeManageFallback.java

@@ -0,0 +1,71 @@
+package com.hcloud.microservice.goods.facade.fallback.factory;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microservice.goods.facade.fallback.GoodsQRCodeManageFactory;
+import com.hcloud.microservice.goods.facade.forms.GoodsQRCodeInfoForm;
+import feign.hystrix.FallbackFactory;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xiezt
+ */
+@Component
+public class GoodsQRCodeManageFallback implements FallbackFactory<GoodsQRCodeManageFactory> {
+
+    @Override
+    public GoodsQRCodeManageFactory create(Throwable cause) {
+        return new GoodsQRCodeManageFactory() {
+            @Override
+            public ResultVO searchGoodsQRCodeByPage(GoodsQRCodeInfoForm goodsQRCodeInfoForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO getGoodsQRCodeById(String guid) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO delGoodsQRCodeById(GoodsQRCodeInfoForm goodsQRCodeInfoForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO searchGoodsQRCodeForExport(String guid) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO searchGoodsQRCodeInfoByTokenStr(String tokenStr) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 通过二维码传输码预览溯源码信息
+             *
+             * @param tokenStr
+             * @return
+             */
+            @Override
+            public ResultVO getGoodsQRCodeDetailInfoByToken(String tokenStr) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+			@Override
+			public ResultVO getPrintDetail(GoodsQRCodeInfoForm goodsQRCodeInfoForm) {
+				// TODO Auto-generated method stub
+				return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+			}
+
+			@Override
+			public ResultVO updateQRIsPrint(List<String> ids) {
+				// TODO Auto-generated method stub
+				return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+			}
+        };
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/factory/GoodsQRCodeRecordManageFallback.java

@@ -0,0 +1,88 @@
+package com.hcloud.microservice.goods.facade.fallback.factory;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microservice.goods.facade.fallback.GoodsQRCodeRecordManageFactory;
+import com.hcloud.microservice.goods.facade.forms.GoodsQRCodeRecordForm;
+import com.hcloud.microservice.goods.facade.forms.GoodsQRCodeRecordStatForm;
+import feign.hystrix.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author xiezt
+ */
+@Component
+public class GoodsQRCodeRecordManageFallback implements FallbackFactory<GoodsQRCodeRecordManageFactory> {
+
+    @Override
+    public GoodsQRCodeRecordManageFactory create(Throwable cause) {
+        return new GoodsQRCodeRecordManageFactory() {
+            @Override
+            public ResultVO searchGoodsQRCodeRecordByPage(GoodsQRCodeRecordForm goodsQRCodeRecordForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO searchGoodsQRCodeRecordForExport(GoodsQRCodeRecordForm goodsQRCodeRecordForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO delGoodsQRCodeRecord(GoodsQRCodeRecordForm goodsQRCodeRecordForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO getGoodsQRCodeInfoByRecordId(@RequestBody GoodsQRCodeRecordForm goodsQRCodeRecordForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 物理删除溯源码生成记录
+             *
+             * @param recordId
+             * @return
+             */
+            @Override
+            public ResultVO delQRCodeInfoPhysical(String recordId) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 统计一年个月的扫码人数
+             * @param goodsQRCodeRecordStatForm
+             * @return
+             */
+            @Override
+            public ResultVO statOneYearScanNumber(GoodsQRCodeRecordStatForm goodsQRCodeRecordStatForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 统计昨天和历史累计扫码人数
+             * @param goodsQRCodeRecordStatForm
+             * @return
+             */
+            @Override
+            public ResultVO statYesterdayAndAllTimeScanNumber(GoodsQRCodeRecordStatForm goodsQRCodeRecordStatForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO statOneDayAllHoursScanNumber(GoodsQRCodeRecordStatForm goodsQRCodeRecordStatForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO statOneWeekSevenDayScanNumber(GoodsQRCodeRecordStatForm goodsQRCodeRecordStatForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            @Override
+            public ResultVO statOneMonthAllDaysScanNumber(GoodsQRCodeRecordStatForm goodsQRCodeRecordStatForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+        };
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/fallback/factory/GoodsTracedUserFallback.java

@@ -0,0 +1,65 @@
+package com.hcloud.microservice.goods.facade.fallback.factory;
+
+import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microservice.goods.facade.fallback.GoodsTracedUserFactory;
+import com.hcloud.microservice.goods.facade.forms.GoodsTracedUserForm;
+import feign.hystrix.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author xiezt
+ */
+@Component
+public class GoodsTracedUserFallback implements FallbackFactory<GoodsTracedUserFactory> {
+
+    @Override
+    public GoodsTracedUserFactory create(Throwable cause) {
+        return new GoodsTracedUserFactory(){
+            /**
+             * 查询用户信息通过第三方编码
+             *
+             * @param code
+             * @return
+             */
+            @Override
+            public ResultVO searchTracedUserByCode(@RequestBody GoodsTracedUserForm tracedUserForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 保存用户信息
+             *
+             * @param tracedUserForm
+             * @return
+             */
+            @Override
+            public ResultVO saveTracedUser(GoodsTracedUserForm tracedUserForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 更新用户信息
+             *
+             * @param tracedUserForm
+             * @return
+             */
+            @Override
+            public ResultVO updateTracedUser(GoodsTracedUserForm tracedUserForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+
+            /**
+             * 分页查询溯源用户信息
+             *
+             * @param tracedUserForm
+             * @return
+             */
+            @Override
+            public ResultVO searchTracedUserByPage(GoodsTracedUserForm tracedUserForm) {
+                return new ResultVO(ResultEnum.SYS_BREAK_ERROR);
+            }
+        };
+    }
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsAssayInfoForm.java

@@ -0,0 +1,42 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class GoodsAssayInfoForm extends BaseForm {
+
+    private String guid;
+
+    private String fkGoodsBatchId;
+
+    private String assayDepartment;
+
+    private String assayImgs;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    /**
+     * 辅助列表
+     */
+    private List<GoodsInfoAuxiliaryForm> auxList;
+
+    /**
+     * 图片列表
+     */
+    private List<String> imagesList;
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsBatchFeedbackForm.java

@@ -0,0 +1,56 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import java.util.List;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author JYJ
+ */
+@Slf4j
+@Data
+public class GoodsBatchFeedbackForm extends BaseForm {
+
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsBatchGuid;
+    
+    private String fkBatchRecordGuid;
+
+    @ApiModelProperty(value="评价星级",example="评价星级")
+    private Integer gradeLevel;
+
+    @ApiModelProperty(value="评价内容",example="评价内容")
+    private String commentVal;
+
+    private String commentTitle;
+
+    private Integer checked;
+
+    private String checkedUser;
+
+    private String feedbackUser;
+
+    private String beginTime;
+
+    private String endTime;
+
+    private List<String> pkList;
+
+    private Integer gradeStar;
+
+    private String goodsBatchNo;
+
+    private String goodsName;
+
+    private String tracedUserName;
+
+    private String condStr;
+
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsBatchGradeForm.java

@@ -0,0 +1,33 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+/**
+ * @author JYJ
+ */
+@Slf4j
+@Data
+public class GoodsBatchGradeForm extends BaseForm {
+
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsBatchGuid;
+    
+    private String fkBatchRecordGuid;
+
+    private Integer gradeStart;
+
+    private String gradeUser;
+
+    private String beginTime;
+
+    private String endTime;
+
+    private List<String> pkList;
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsBatchInfoForm.java

@@ -0,0 +1,115 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import java.util.Date;
+import java.util.List;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import com.hcloud.microservice.goods.facade.entity.GoodsInterAuxiliary;
+import com.hcloud.microservice.goods.facade.entity.GoodsLabel;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author JYJ
+ */
+@Data
+public class GoodsBatchInfoForm extends BaseForm {
+
+    private String guid;
+
+    private String fkFieldGuid;
+
+    private String fkGoodsGuid;
+
+    private String goodsName;
+
+    private String fkGoodsBatchGuid;
+    
+    private String goodsBatchNo;
+
+    private String goodsUnit;
+
+    private Date goodsProductDate;
+
+    private String goodsExpired;
+
+    private Integer goodsQrcodeLimited;
+
+    private String goodsBatchImages;
+
+    private String goodsSaleUrl;
+    /**
+     * 评价星级
+     */
+    private String goodsFeedbackStar;
+    /**
+     * 二维码生成个数
+     */
+    private Integer qrcodeCount;
+
+    /**
+     * 辅助列表
+     */
+    private List<GoodsInfoAuxiliaryForm> auxList;
+
+    /**
+     * 图片列表
+     */
+    private List<String> imagesList;
+    /**
+     * 生成日期字符串
+     */
+    private String productDateStr;
+    /**
+     * 检验检疫信息
+     */
+    private GoodsAssayInfoForm assayInfoForm;
+
+    /**
+     * 生产原料列表
+     */
+    private List<GoodsProInputsForm> inputsFormList;
+
+    /**
+     * 通用生产过程列表(原料生产过程)
+     */
+    private List<GoodsProNormalForm> materialList;
+
+    /**
+     * 通用生产过程列表(加工流通过程)
+     */
+    private List<GoodsProNormalForm> productList;
+    /**
+     * 评价信息
+     */
+    private GoodsBatchFeedbackForm feedbackForm;
+    /**
+     * 评级信息
+     */
+    private GoodsBatchGradeForm gradeForm;
+    /**
+     * 评价信息
+     */
+    private String tracedUserId;
+    /**
+     * 是否对商品评价
+     */
+    private Integer isFeedback;
+    /**
+     * 是否对商品评级
+     */
+    private Integer isGrade;
+    
+    @ApiModelProperty(value="产品标签")
+    private List<GoodsLabel> labelList;
+    
+    /*@ApiModelProperty(example="物联监测信息")
+    private GoodsInterInfoForm interInfoForm;*/
+    
+    @ApiModelProperty(example="物联监测信息")
+    private List<GoodsInterAuxiliary> interAuxList;
+    
+    @ApiModelProperty(value="产品标签")
+    private String labelNames;
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsDealerForm.java

@@ -0,0 +1,46 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 产品经销商信息
+ * @author admin
+ *
+ */
+@Data
+public class GoodsDealerForm extends BaseForm{
+	
+	private String guid;
+
+    private String fkOrgGuid;
+
+    @ApiModelProperty(value="经销商编码",example="经销商编码")
+    private String dealerCode;
+
+    @ApiModelProperty(value="经销商名称",example="经销商名称")
+    private String dealerName;
+
+    @ApiModelProperty(value="联系方式",example="联系方式")
+    private String linkPhone;
+
+    @ApiModelProperty(value="产地区域guid",example="产地区域guid")
+    private String fkPostionId;
+
+    @ApiModelProperty(value="产地详细地址",example="产地详细地址")
+    private String dealerAddress;
+
+    @ApiModelProperty(value="经纬度",example="经纬度")
+    private String latitudeLongitude;
+    
+    @ApiModelProperty(value="备注信息",example="备注信息")
+    private String remark;
+    
+    private String provinceId;
+
+    private String cityId;
+
+    private String countyId;
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsFieldForm.java

@@ -0,0 +1,54 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class GoodsFieldForm extends BaseForm {
+
+    private String guid;
+
+    private String fieldCode;
+
+    private String fieldName;
+
+    private String fkPostionId;
+
+    private String fieldAddress;
+
+    private String fieldArea;
+
+    private String saleGoodsRange;
+
+    private String fieldImages;
+
+    private String remark;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private List<GoodsInfoAuxiliaryForm> auxList;
+
+    private List<String> imagesList;
+
+    private String provinceId;
+
+    private String cityId;
+
+    private String countyId;
+
+    private String oneMap;
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsInfoAuxiliaryForm.java

@@ -0,0 +1,33 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class GoodsInfoAuxiliaryForm extends BaseForm {
+
+    private String guid;
+
+    private String fkGoodsGuid;
+
+    private String fkAuxItmeId;
+
+    private String auxItme;
+
+    private String auxItmeVal;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsInfoForm.java

@@ -0,0 +1,35 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+@Data
+public class GoodsInfoForm extends BaseForm {
+
+    private String guid;
+
+    private Integer fkGoodsType;
+
+    private String goodsCode;
+
+    private String goodsName;
+
+    private String goodsRemark;
+
+    private String goodsImages;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsInterInfoForm.java

@@ -0,0 +1,52 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import java.util.Date;
+import java.util.List;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import com.hcloud.microservice.goods.facade.entity.GoodsInterAuxiliary;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 物联监测环境信息
+ * @author lym
+ *
+ */
+@Data
+public class GoodsInterInfoForm extends BaseForm{
+
+	private String guid;
+
+	@ApiModelProperty(value="产品guid",example="产品guid")
+    private String fkGoodsGuid;
+
+	@ApiModelProperty(value="产品批次guid",example="产品批次guid")
+    private String fkGoodsBatchGuid;
+
+	@ApiModelProperty(value="生长周期",example="生长周期")
+    private String livespan;
+
+	@ApiModelProperty(value="全年降水量（mm）",example="全年降水量（mm）")
+    private String totalPrecipitation;
+
+	@ApiModelProperty(value="全年积温(℃）",example="全年积温(℃）")
+    private String totalTemperature;
+
+	@ApiModelProperty(value="生长期日均温（℃）",example="生长期日均温（℃）")
+    private String avgTemperature;
+
+	@ApiModelProperty(value="生长期日均湿度(占全天比率%)",example="生长期日均湿度(占全天比率%)")
+    private String precipitationRate;
+
+	@ApiModelProperty(value="年均有效日照时长（h）",example="年均有效日照时长（h）")
+    private String sunDate;
+
+	@ApiModelProperty(value="土壤有机质平均含量",example="土壤有机质平均含量")
+    private String avgOrganicMatter;
+	
+	@ApiModelProperty(example="物联监测辅助信息")
+	private List<GoodsInterAuxiliary> auxList;
+
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsProInputsForm.java

@@ -0,0 +1,33 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+@Data
+@Slf4j
+public class GoodsProInputsForm extends BaseForm {
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsBatchGuid;
+
+    private String proInputsNo;
+
+    private String proInputsName;
+
+    private String inputsProcessName;
+
+    private Date inputsTime;
+
+    private String inputDoUser;
+
+    private String inputProviderUser;
+
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsProNormalForm.java

@@ -0,0 +1,36 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+@Slf4j
+@Data
+public class GoodsProNormalForm extends BaseForm {
+
+    private String guid;
+
+    private String fkOrgGuid;
+
+    private String fkGoodsBatchGuid;
+
+    private Integer processType;
+
+    private String processItem;
+
+    private Date processTime;
+
+    private String processUser;
+
+    private String processDesc;
+
+    private String processAddress;
+
+    private String processImgs;
+
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsQRCodeInfoForm.java

@@ -0,0 +1,98 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import java.util.Date;
+import java.util.List;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import com.hcloud.microserver.commoncore.util.string.ConvertStringToList;
+import com.hcloud.microservice.goods.facade.entity.GoodsDealer;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xiezt
+ */
+@Data
+public class GoodsQRCodeInfoForm extends BaseForm {
+
+    private String guid;
+
+    private String fkGoodsGuid;
+
+    private String fkBatchRecordGuid;
+
+    private String qrcode;
+
+    private String qrcodeToken;
+
+    private String qrcodeUrl;
+
+    private String qrcodeImg;
+
+    private Integer scanCount;
+
+    private Date scanFirstTimed;
+
+    private Date scanLastTimed;
+
+    private GoodsBatchInfoForm goodsBatchInfoForm;
+
+    private GoodsFieldForm goodsFieldForm;
+
+    private GoodsAssayInfoForm assayInfoForm;
+
+    private Integer codeCount;
+
+    private String goodsBatchInfoId;
+
+    private String qrcodeParentCode;
+
+    private String goodsName;
+
+    private String orgAddress;
+
+    private String orgName;
+
+    private String principals;
+
+    private String tel;
+
+    private String remark;
+
+    private String companyUrl;
+
+    private String companyTel;
+
+    private String qqCode;
+
+    private String wxQRImg;
+
+    private List<GoodsProNormalForm> sourceList;
+
+    private List<GoodsProNormalForm> productList;
+
+    private List<GoodsProInputsForm> inputsList;
+    
+    @ApiModelProperty(value="企业log",example="企业log")
+    private String ico;
+    
+    @ApiModelProperty(value="天猫地址",example="天猫地址")
+    private String tmallUrl;
+    
+    @ApiModelProperty(value="京东地址",example="京东地址")
+    private String jdUrl;
+    
+    @ApiModelProperty(value="资格证书",example="资格证书")
+    private String qualificaImgs;
+    
+    private List<String> qualificaImgsList;
+    
+    private List<String> getQualificaImgsList(){
+    	qualificaImgsList = ConvertStringToList.getListFormSplitString(this.qualificaImgs, ";");
+    	return qualificaImgsList;
+    }
+    
+    //@ApiModelProperty(value="经销商信息",example="经销商信息")
+    //private List<GoodsDealer> dealerList;
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsQRCodeRecordForm.java

@@ -0,0 +1,44 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+@Data
+public class GoodsQRCodeRecordForm extends BaseForm {
+    private String guid;
+
+    private String fkGoodsBatchGuid;
+
+    private String goodsParentQrcode;
+
+    private Date qrcodeRecordTime;
+
+    private Integer originNum;
+
+    private Integer cancelNum;
+
+    private Integer usedNum;
+
+    private Integer scanNum;
+
+    private Integer state;
+
+    private String createUser;
+
+    private Date createTime;
+
+    private String modifiedUser;
+
+    private Date modifiedTime;
+
+    private String goodsName;
+
+    private String goodsBatchNo;
+
+    private Integer codeCount;
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsQRCodeRecordStatForm.java

@@ -0,0 +1,22 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 统计二维码扫描人数的form
+ * @author 朱修贤
+ * @date 2019年4月28日11点55分
+ */
+@Data
+public class GoodsQRCodeRecordStatForm {
+
+    private String fkOrgGuid;
+    private Integer year;
+    
+    @ApiModelProperty(value="开始时间",example="开始时间")
+    private String startDate;
+    
+    @ApiModelProperty(value="结束时间",example="结束时间")
+    private String endDate;
+}

src/main/java/com/hcloud/microservice/goods/facade/forms/GoodsTracedUserForm.java

@@ -0,0 +1,30 @@
+package com.hcloud.microservice.goods.facade.forms;
+
+import com.hcloud.microserver.commoncore.base.BaseForm;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author JYJ
+ */
+@Data
+public class GoodsTracedUserForm extends BaseForm {
+
+    private String guid;
+
+    private String tracedUserOpenid;
+
+    private String tracedTel;
+
+    private String tracedUserName;
+
+    private String tracedUserMail;
+
+    private String tracedUserImg;
+
+    private Integer tracedSex;
+
+    private String tracedThirdCode;
+
+}

src/main/java/com/hcloud/microservice/goods/facade/results/ScanNumStatResult.java

@@ -0,0 +1,33 @@
+package com.hcloud.microservice.goods.facade.results;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author 朱修贤
+ * @date 2019年4月26日17点27分
+ * @description 统计二维码扫描人数的结果集
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ScanNumStatResult extends BaseEntity {
+    private Integer january;
+    private Integer february;
+    private Integer march;
+    private Integer april;
+    private Integer may;
+    private Integer june;
+    private Integer july;
+    private Integer august;
+    private Integer september;
+    private Integer october;
+    private Integer november;
+    private Integer december;
+
+    private Integer hour;
+    private Integer dayOfWeek;
+    private Integer dayOfMonth;
+    private Integer scanNum;
+    private Integer newScanNum;
+}

src/main/java/com/hcloud/microservice/goods/facade/results/ScanNumStatisResult.java

@@ -0,0 +1,21 @@
+package com.hcloud.microservice.goods.facade.results;
+
+import com.hcloud.microserver.commoncore.base.BaseEntity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 统计二维码扫描人数的柱状图结果集
+ * @author admin
+ *
+ */
+@Data
+public class ScanNumStatisResult extends BaseEntity{
+
+	@ApiModelProperty(value="时间",example="时间")
+	private String date;
+	
+	@ApiModelProperty(value="数量",example="数量")
+	private Integer num;
+}