From 84a0af3f334ddc7925cbf8481ea6a4093c7dbde5 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 25 十二月 2023 16:23:46 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java
index 1f79830..d70d3c7 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FGoodsSkuService.java
@@ -2,23 +2,51 @@
 
 import com.hx.resultTool.Result;
 import com.hz.crm.dto.GoodsSkuDto;
+import com.hz.crm.dto.GoodsTypeDto;
+import com.hz.crm.dto.coupon.CouponCheckDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="crm-platform-service",path = "/crmp",contextId = "crm-goods-sku")
+@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-goods-sku")
 public interface FGoodsSkuService {
 
     /**sku鍒楄〃*/
     @PostMapping(value = "/goods/sku/list")
     Result list( @RequestBody(required = false) GoodsSkuDto goodsSkuDto);
 
-    /**鍒嗙被鍒楄〃*/
+    /**sku鍒嗙被鍒楄〃*/
     @PostMapping(value = "/goods/sku/type/list")
     Result typeList( @RequestBody(required = false) GoodsSkuDto goodsSkuDto);
 
+    /**鍒嗙被鍒楄〃*/
+    @PostMapping(value = "/goods/sku/type/list/all")
+    Result typeListAll( @RequestBody(required = false) GoodsTypeDto goodsTypeDto);
 
+    /**浼樻儬鍒告牎楠屾帴鍙�*/
+    @PostMapping(value = "/goods/sku/check/coupon")
+    Result goodsCheckType( @RequestBody(required = false) CouponCheckDto couponCheckDto);
+
+    /**淇敼涓婁笅鏋�*/
+    @RequestMapping(value = "/updateUp")
+    Result updateUp(@RequestBody(required = false) GoodsSkuDto goodsSkuDto);
+
+    /**鍒嗙被鍒楄〃*/
+    @RequestMapping(value = "/goods/sku/type/select/list")
+    Result goodsSkuTypeList(@RequestBody(required = false) GoodsTypeDto goodsTypeDto);
+
+    /** 鏍规嵁phisId鏌ヨ鍟嗗搧sku */
+    @RequestMapping(value = "/goods/sku/selectGoodsSkuByHisId")
+    Result selectGoodsSkuByHisId(@RequestBody(required = false) GoodsSkuDto goodsSkuDto);
+
+    /** 鏍规嵁phisId鏌ヨ鍟嗗搧sku */
+    @RequestMapping(value = "/goods/sku/findGoodsByHisIdOne")
+    Result findGoodsByHisIdOne(@RequestBody GoodsSkuDto goodsSkuDto);
 }

--
Gitblit v1.8.0