From a4c260180dab777b9adab22a224b24ab1bc4cd4f Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 20 九月 2022 10:52:10 +0800
Subject: [PATCH] 调整项目结构/规格模块
---
crm-platform-feign/src/main/java/com/hz/crm/dto/OrderRefundDto.java | 2
crm-platform-feign/src/main/java/com/hz/crm/feign/FOderRefundService.java | 5 +-
crm-platform-feign/src/main/java/com/hz/crm/dto/UserDto.java | 2
crm-platform-feign/src/main/java/com/hz/crm/feign/FSmsSendService.java | 4 +-
/dev/null | 20 ----------
crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java | 5 +-
crm-platform-feign/src/main/java/com/hz/crm/dto/PageDto.java | 2
crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsService.java | 11 ++---
crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSkuDto.java | 21 ++++++++++
crm-platform-feign/src/main/java/com/hz/crm/dto/SmsSendDto.java | 2
crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java | 5 +-
crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSpecDto.java | 30 +++++++++++++++
12 files changed, 68 insertions(+), 41 deletions(-)
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSkuDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSkuDto.java
new file mode 100644
index 0000000..ba495d4
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSkuDto.java
@@ -0,0 +1,21 @@
+package com.hz.crm.dto;
+
+
+import lombok.Data;
+
+/**
+ * 鍟嗗搧sku鎵╁睍
+ * */
+@Data
+public class GoodsSkuDto extends PageDto{
+
+ /**缂栧彿*/
+ private String codeNo;
+ /**鎼滅储*/
+ private String keyWord;
+ /**鍟嗗搧绫诲瀷*/
+ private Integer goodsType;
+ /**鏄惁杩囨护鍥㈣喘鍟嗗搧:1杩囨护(涓嶈繑鍥�)鍥㈣喘鍟嗗搧,0杩斿洖*/
+ private Integer isFilterGroup;
+
+}
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSpecDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSpecDto.java
new file mode 100644
index 0000000..ea366fb
--- /dev/null
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSpecDto.java
@@ -0,0 +1,30 @@
+package com.hz.crm.dto;
+
+
+/**
+ * 鍟嗗搧瑙勬牸鎵╁睍
+ * @author fwq
+ */
+public class GoodsSpecDto {
+
+ /**鎿嶄綔瀵硅薄 0:瑙勬牸,1:瑙勬牸鍊�*/
+ private Integer commonType;
+ /**鎿嶄綔瀵硅薄鏍囪瘑*/
+ private String commonId;
+
+ public Integer getCommonType() {
+ return commonType;
+ }
+
+ public void setCommonType(Integer commonType) {
+ this.commonType = commonType;
+ }
+
+ public String getCommonId() {
+ return commonId;
+ }
+
+ public void setCommonId(String commonId) {
+ this.commonId = commonId;
+ }
+}
diff --git a/crm-platform-feign/src/main/java/com/hz/sms/dto/OrderRefundDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/OrderRefundDto.java
similarity index 95%
rename from crm-platform-feign/src/main/java/com/hz/sms/dto/OrderRefundDto.java
rename to crm-platform-feign/src/main/java/com/hz/crm/dto/OrderRefundDto.java
index 9210777..ec359ab 100644
--- a/crm-platform-feign/src/main/java/com/hz/sms/dto/OrderRefundDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/OrderRefundDto.java
@@ -1,4 +1,4 @@
-package com.hz.sms.dto;
+package com.hz.crm.dto;
import lombok.Data;
diff --git a/crm-platform-feign/src/main/java/com/hz/sms/dto/PageDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/PageDto.java
similarity index 98%
rename from crm-platform-feign/src/main/java/com/hz/sms/dto/PageDto.java
rename to crm-platform-feign/src/main/java/com/hz/crm/dto/PageDto.java
index 14ef66b..81e8ba2 100644
--- a/crm-platform-feign/src/main/java/com/hz/sms/dto/PageDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/PageDto.java
@@ -1,4 +1,4 @@
-package com.hz.sms.dto;
+package com.hz.crm.dto;
/**
diff --git a/crm-platform-feign/src/main/java/com/hz/sms/dto/SmsSendDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/SmsSendDto.java
similarity index 85%
rename from crm-platform-feign/src/main/java/com/hz/sms/dto/SmsSendDto.java
rename to crm-platform-feign/src/main/java/com/hz/crm/dto/SmsSendDto.java
index 0b3c654..39652f5 100644
--- a/crm-platform-feign/src/main/java/com/hz/sms/dto/SmsSendDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/SmsSendDto.java
@@ -1,4 +1,4 @@
-package com.hz.sms.dto;
+package com.hz.crm.dto;
import lombok.Data;
diff --git a/crm-platform-feign/src/main/java/com/hz/sms/dto/UserDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/UserDto.java
similarity index 89%
rename from crm-platform-feign/src/main/java/com/hz/sms/dto/UserDto.java
rename to crm-platform-feign/src/main/java/com/hz/crm/dto/UserDto.java
index a20a481..5366863 100644
--- a/crm-platform-feign/src/main/java/com/hz/sms/dto/UserDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/UserDto.java
@@ -1,4 +1,4 @@
-package com.hz.sms.dto;
+package com.hz.crm.dto;
import lombok.Data;
diff --git a/crm-platform-feign/src/main/java/com/hz/sms/feign/FGoodsSkuService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsService.java
similarity index 71%
copy from crm-platform-feign/src/main/java/com/hz/sms/feign/FGoodsSkuService.java
copy to crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsService.java
index 68256dd..8746215 100644
--- a/crm-platform-feign/src/main/java/com/hz/sms/feign/FGoodsSkuService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsService.java
@@ -1,8 +1,7 @@
-package com.hz.sms.feign;
+package com.hz.crm.feign;
import com.hx.resultTool.Result;
-import com.hz.sms.dto.GoodsSkuDto;
-import com.hz.sms.dto.UserDto;
+import com.hz.crm.dto.GoodsSkuDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -10,10 +9,10 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="crm-platform-service",path = "/crmp",contextId = "crm-goods-sku")
-public interface FGoodsSkuService {
+@FeignClient(name="crm-platform-service",path = "/crmp",contextId = "crm-goods")
+public interface FGoodsService {
- @PostMapping(value = "/goods/sku/list")
+ @PostMapping(value = "/goods/spec/check")
Result list( @RequestBody(required = false) GoodsSkuDto goodsSkuDto);
}
diff --git a/crm-platform-feign/src/main/java/com/hz/sms/feign/FGoodsSkuService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java
similarity index 86%
rename from crm-platform-feign/src/main/java/com/hz/sms/feign/FGoodsSkuService.java
rename to crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java
index 68256dd..98f6847 100644
--- a/crm-platform-feign/src/main/java/com/hz/sms/feign/FGoodsSkuService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java
@@ -1,8 +1,7 @@
-package com.hz.sms.feign;
+package com.hz.crm.feign;
import com.hx.resultTool.Result;
-import com.hz.sms.dto.GoodsSkuDto;
-import com.hz.sms.dto.UserDto;
+import com.hz.crm.dto.GoodsSkuDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/crm-platform-feign/src/main/java/com/hz/sms/feign/FOderRefundService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderRefundService.java
similarity index 85%
rename from crm-platform-feign/src/main/java/com/hz/sms/feign/FOderRefundService.java
rename to crm-platform-feign/src/main/java/com/hz/crm/feign/FOderRefundService.java
index 2d71afa..78986ed 100644
--- a/crm-platform-feign/src/main/java/com/hz/sms/feign/FOderRefundService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderRefundService.java
@@ -1,8 +1,7 @@
-package com.hz.sms.feign;
+package com.hz.crm.feign;
import com.hx.resultTool.Result;
-import com.hz.sms.dto.GoodsSkuDto;
-import com.hz.sms.dto.OrderRefundDto;
+import com.hz.crm.dto.OrderRefundDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/crm-platform-feign/src/main/java/com/hz/sms/feign/FSmsSendService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FSmsSendService.java
similarity index 90%
rename from crm-platform-feign/src/main/java/com/hz/sms/feign/FSmsSendService.java
rename to crm-platform-feign/src/main/java/com/hz/crm/feign/FSmsSendService.java
index 50cad60..a7683da 100644
--- a/crm-platform-feign/src/main/java/com/hz/sms/feign/FSmsSendService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FSmsSendService.java
@@ -1,7 +1,7 @@
-package com.hz.sms.feign;
+package com.hz.crm.feign;
import com.hx.resultTool.Result;
-import com.hz.sms.dto.SmsSendDto;
+import com.hz.crm.dto.SmsSendDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/crm-platform-feign/src/main/java/com/hz/sms/feign/FUserService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java
similarity index 86%
rename from crm-platform-feign/src/main/java/com/hz/sms/feign/FUserService.java
rename to crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java
index c1c5108..a1371d1 100644
--- a/crm-platform-feign/src/main/java/com/hz/sms/feign/FUserService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java
@@ -1,8 +1,7 @@
-package com.hz.sms.feign;
+package com.hz.crm.feign;
import com.hx.resultTool.Result;
-import com.hz.sms.dto.SmsSendDto;
-import com.hz.sms.dto.UserDto;
+import com.hz.crm.dto.UserDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/crm-platform-feign/src/main/java/com/hz/sms/dto/GoodsSkuDto.java b/crm-platform-feign/src/main/java/com/hz/sms/dto/GoodsSkuDto.java
deleted file mode 100644
index d3818a6..0000000
--- a/crm-platform-feign/src/main/java/com/hz/sms/dto/GoodsSkuDto.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.hz.sms.dto;
-
-
-import lombok.Data;
-
-/**
- * 鍟嗗搧sku
- * */
-@Data
-public class GoodsSkuDto extends PageDto{
-
- /**缂栧彿*/
- private String codeNo;
- /**鎼滅储*/
- private String keyWord;
- /**鍟嗗搧绫诲瀷*/
- private Integer goodsType;
-
-
-}
--
Gitblit v1.8.0