Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
O
oms-ci-test
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
test-ci
oms-ci-test
Commits
0ecf0b7d
提交
0ecf0b7d
authored
8月 19, 2023
作者:
xiaowang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
地址管理根据id查询
上级
fd47bc61
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
15 行增加
和
60 行删除
+15
-60
OmsApplication.java
src/main/java/com/mmc/oms/OmsApplication.java
+2
-0
PmsAppApi.java
src/main/java/com/mmc/oms/feign/PmsAppApi.java
+3
-22
FeignConfiguration.java
...ain/java/com/mmc/oms/feign/config/FeignConfiguration.java
+1
-1
PmsAppApiHystrix.java
...main/java/com/mmc/oms/feign/hystrix/PmsAppApiHystrix.java
+3
-35
UserAddressServiceImpl.java
...java/com/mmc/oms/service/Impl/UserAddressServiceImpl.java
+6
-2
没有找到文件。
src/main/java/com/mmc/oms/OmsApplication.java
浏览文件 @
0ecf0b7d
...
@@ -2,8 +2,10 @@ package com.mmc.oms;
...
@@ -2,8 +2,10 @@ package com.mmc.oms;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.cloud.openfeign.EnableFeignClients
;
@SpringBootApplication
@SpringBootApplication
@EnableFeignClients
(
basePackages
=
"com.mmc.oms.feign"
)
public
class
OmsApplication
{
public
class
OmsApplication
{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
...
...
src/main/java/com/mmc/oms/feign/PmsAppApi.java
浏览文件 @
0ecf0b7d
package
com
.
mmc
.
oms
.
feign
;
package
com
.
mmc
.
oms
.
feign
;
import
com.mmc.oms.common.result.ResultBody
;
import
com.mmc.oms.feign.hystrix.PmsAppApiHystrix
;
import
com.mmc.oms.feign.hystrix.PmsAppApiHystrix
;
import
com.mmc.oms.model.dto.mall.*
;
import
com.mmc.oms.model.qo.mall.MallOrderGoodsInfoQO
;
import
com.mmc.oms.model.qo.mall.ProductSpecPriceQO
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
/**
/**
* @author: zj
* @author: zj
* @Date: 2023/6/5 15:18
* @Date: 2023/6/5 15:18
*/
*/
@FeignClient
(
url
=
"${pms.url}"
,
name
=
"pms-svc"
,
fallback
=
PmsAppApiHystrix
.
class
)
@FeignClient
(
url
=
"${pms.url}"
,
name
=
"pms-svc"
,
fallback
=
PmsAppApiHystrix
.
class
)
public
interface
PmsAppApi
{
public
interface
PmsAppApi
{
@PostMapping
(
"/pms/goods/fillGoodsInfo"
)
@GetMapping
(
"lease/goods/feignLeaseGoodsInfoByAddressId"
)
List
<
MallGoodsShopCarDTO
>
fillGoodsInfo
(
@RequestBody
List
<
MallGoodsShopCarDTO
>
param
,
@RequestHeader
(
"token"
)
String
token
);
public
ResultBody
feignLeaseGoodsInfoByAddressId
(
@RequestParam
Integer
id
);
@PostMapping
(
"/pms/goods/feignListProdGoodsSkuInfo"
)
List
<
OrderGoodsProdDTO
>
feignListProdGoodsSkuInfo
(
@RequestBody
MallOrderGoodsInfoQO
mallOrderGoodsInfoQO
,
@RequestHeader
(
"token"
)
String
token
);
@PostMapping
(
"/pms/goods/feignListIndstGoodsSkuInfo"
)
List
<
OrderGoodsIndstDTO
>
feignListIndstGoodsSkuInfo
(
@RequestBody
MallOrderGoodsInfoQO
mallOrderGoodsInfoQO
,
@RequestHeader
(
"token"
)
String
token
);
@PostMapping
(
"/pms/goods/feignListProductSpecPrice"
)
List
<
MallProductSpecPriceDTO
>
feignListProductSpecPrice
(
@RequestBody
ProductSpecPriceQO
productSpecPriceQO
,
@RequestHeader
(
"token"
)
String
token
);
@GetMapping
(
"/pms/goods/feignGetUnitPriceByTag"
)
public
ProductSpecPriceDTO
feignGetUnitPriceByTag
(
@RequestParam
(
value
=
"specId"
)
Integer
specId
,
@RequestParam
(
value
=
"tagId"
)
Integer
tagId
,
@RequestHeader
(
"token"
)
String
token
);
@GetMapping
(
"/pms/lease/goods/feignLeaseGoodsInfoByAddressId"
)
public
Integer
feignLeaseGoodsInfoByAddressId
(
@RequestParam
Integer
id
);
}
}
src/main/java/com/mmc/oms/feign/config/FeignConfiguration.java
浏览文件 @
0ecf0b7d
...
@@ -14,7 +14,7 @@ import org.springframework.context.annotation.Configuration;
...
@@ -14,7 +14,7 @@ import org.springframework.context.annotation.Configuration;
public
class
FeignConfiguration
{
public
class
FeignConfiguration
{
@Bean
(
name
=
"pmsAppApiHystrix"
)
@Bean
(
name
=
"pmsAppApiHystrix"
)
public
PmsAppApiHystrix
workServiceHystrix
Api
()
{
public
PmsAppApiHystrix
PmsApp
Api
()
{
return
new
PmsAppApiHystrix
();
return
new
PmsAppApiHystrix
();
}
}
...
...
src/main/java/com/mmc/oms/feign/hystrix/PmsAppApiHystrix.java
浏览文件 @
0ecf0b7d
package
com
.
mmc
.
oms
.
feign
.
hystrix
;
package
com
.
mmc
.
oms
.
feign
.
hystrix
;
import
com.
alibaba.fastjson.JSONObject
;
import
com.
mmc.oms.common.result.ResultBody
;
import
com.mmc.oms.feign.PmsAppApi
;
import
com.mmc.oms.feign.PmsAppApi
;
import
com.mmc.oms.model.dto.mall.*
;
import
com.mmc.oms.model.qo.mall.MallOrderGoodsInfoQO
;
import
com.mmc.oms.model.qo.mall.ProductSpecPriceQO
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
java.util.List
;
import
java.util.List
;
...
@@ -16,37 +14,7 @@ import java.util.List;
...
@@ -16,37 +14,7 @@ import java.util.List;
@Slf4j
@Slf4j
public
class
PmsAppApiHystrix
implements
PmsAppApi
{
public
class
PmsAppApiHystrix
implements
PmsAppApi
{
@Override
@Override
public
List
<
MallGoodsShopCarDTO
>
fillGoodsInfo
(
List
<
MallGoodsShopCarDTO
>
param
,
String
token
)
{
public
ResultBody
feignLeaseGoodsInfoByAddressId
(
Integer
id
)
{
log
.
info
(
"熔断:MallGoodsClientHystrix.fillGoodsInfo==error==>param:{}"
,
JSONObject
.
toJSONString
(
param
));
return
null
;
}
@Override
public
List
<
OrderGoodsProdDTO
>
feignListProdGoodsSkuInfo
(
MallOrderGoodsInfoQO
mallOrderGoodsInfoQO
,
String
token
)
{
log
.
info
(
"熔断:MallGoodsClientHystrix.feignListProdGoodsSkuInfo==error==>param:{}"
,
JSONObject
.
toJSONString
(
mallOrderGoodsInfoQO
));
return
null
;
}
@Override
public
List
<
OrderGoodsIndstDTO
>
feignListIndstGoodsSkuInfo
(
MallOrderGoodsInfoQO
mallOrderGoodsInfoQO
,
String
token
)
{
log
.
info
(
"熔断:MallGoodsClientHystrix.feignListIndstGoodsSkuInfo==error==>param:{}"
,
JSONObject
.
toJSONString
(
mallOrderGoodsInfoQO
));
return
null
;
}
@Override
public
List
<
MallProductSpecPriceDTO
>
feignListProductSpecPrice
(
ProductSpecPriceQO
productSpecPriceQO
,
String
token
)
{
log
.
info
(
"熔断:MallGoodsClientHystrix.feignListProductSpecPrice==error==>param:{}"
,
JSONObject
.
toJSONString
(
productSpecPriceQO
));
return
null
;
}
@Override
public
ProductSpecPriceDTO
feignGetUnitPriceByTag
(
Integer
specId
,
Integer
tagId
,
String
token
)
{
log
.
info
(
"熔断:MallGoodsClientHystrix.feignGetUnitPriceByTag==error==>param:{}"
,
specId
,
tagId
);
return
null
;
}
@Override
public
Integer
feignLeaseGoodsInfoByAddressId
(
Integer
id
)
{
log
.
info
(
"熔断:PmsAppApiHystrix.feignLeaseGoodsInfoByAddressId==error==>param:{}"
,
id
);
log
.
info
(
"熔断:PmsAppApiHystrix.feignLeaseGoodsInfoByAddressId==error==>param:{}"
,
id
);
return
null
;
return
null
;
}
}
...
...
src/main/java/com/mmc/oms/service/Impl/UserAddressServiceImpl.java
浏览文件 @
0ecf0b7d
...
@@ -10,6 +10,7 @@ import com.mmc.oms.model.qo.mall.UserAddressQO;
...
@@ -10,6 +10,7 @@ import com.mmc.oms.model.qo.mall.UserAddressQO;
import
com.mmc.oms.model.vo.mall.UserAddressVO
;
import
com.mmc.oms.model.vo.mall.UserAddressVO
;
import
com.mmc.oms.service.UserAddressService
;
import
com.mmc.oms.service.UserAddressService
;
import
com.mmc.oms.util.BeanCopyUtils
;
import
com.mmc.oms.util.BeanCopyUtils
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -22,6 +23,7 @@ import java.util.stream.Collectors;
...
@@ -22,6 +23,7 @@ import java.util.stream.Collectors;
* @Date: 2023/6/7 10:15
* @Date: 2023/6/7 10:15
*/
*/
@Service
@Service
@Slf4j
public
class
UserAddressServiceImpl
implements
UserAddressService
{
public
class
UserAddressServiceImpl
implements
UserAddressService
{
@Autowired
@Autowired
private
UserAddressDao
userAddressDao
;
private
UserAddressDao
userAddressDao
;
...
@@ -57,10 +59,12 @@ public class UserAddressServiceImpl implements UserAddressService {
...
@@ -57,10 +59,12 @@ public class UserAddressServiceImpl implements UserAddressService {
@Override
@Override
public
ResultBody
deleteById
(
Integer
id
)
{
public
ResultBody
deleteById
(
Integer
id
)
{
Integer
count
=
pmsAppApi
.
feignLeaseGoodsInfoByAddressId
(
id
);
ResultBody
resultBody
=
pmsAppApi
.
feignLeaseGoodsInfoByAddressId
(
id
);
if
(
count
==
null
)
{
if
(
resultBody
==
null
||
!
resultBody
.
getCode
().
equals
(
"200"
))
{
log
.
error
(
"远程调用失败:返回数据为null=====>UserAddressServiceImpl.deleteById=====>param{}"
,
id
);
return
ResultBody
.
error
(
"服务器异常,请稍后重试!"
);
return
ResultBody
.
error
(
"服务器异常,请稍后重试!"
);
}
}
int
count
=
(
int
)
resultBody
.
getResult
();
if
(
count
>
0
)
{
if
(
count
>
0
)
{
return
ResultBody
.
error
(
"有商品绑定该地址,不可删除!"
);
return
ResultBody
.
error
(
"有商品绑定该地址,不可删除!"
);
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论