Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
zcq
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
zcq
Commits
f5a0b05b
提交
f5a0b05b
authored
1月 16, 2020
作者:
liupengfei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
47f1fdcc
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
5 行增加
和
5 行删除
+5
-5
EntityOrderTypeImpl.java
.../enums/interfaces/ordertype/impl/EntityOrderTypeImpl.java
+1
-1
FgShippingAddressClient.java
...ava/com/zrqx/order/fg/client/FgShippingAddressClient.java
+1
-1
FgShippingAddressClientHystric.java
...der/fg/client/hystric/FgShippingAddressClientHystric.java
+1
-1
FgOrderMapper.java
...src/main/java/com/zrqx/order/fg/mapper/FgOrderMapper.java
+1
-1
FgOrderServiceImpl.java
...in/java/com/zrqx/order/fg/service/FgOrderServiceImpl.java
+1
-1
没有找到文件。
com.zrqx.order/src/main/java/com/zrqx/order/commons/enums/interfaces/ordertype/impl/EntityOrderTypeImpl.java
浏览文件 @
f5a0b05b
...
@@ -54,7 +54,7 @@ public class EntityOrderTypeImpl extends OrderTypeAdapter{
...
@@ -54,7 +54,7 @@ public class EntityOrderTypeImpl extends OrderTypeAdapter{
@Override
@Override
public
ShippingAddress
getShippingAddress
(
Integer
id
)
{
public
ShippingAddress
getShippingAddress
(
Integer
id
)
{
Member
m
=
fgRedisManage
.
getMember
();
Member
m
=
fgRedisManage
.
getMember
();
Integer
memberId
=
m
.
getId
();
String
memberId
=
m
.
getId
();
CallBack
<
ShippingAddress
>
call
=
fgShippingAddressClient
.
getShippingAddress
(
id
,
memberId
);
CallBack
<
ShippingAddress
>
call
=
fgShippingAddressClient
.
getShippingAddress
(
id
,
memberId
);
if
(
call
.
hasEntity
())
{
if
(
call
.
hasEntity
())
{
return
call
.
getData
();
return
call
.
getData
();
...
...
com.zrqx.order/src/main/java/com/zrqx/order/fg/client/FgShippingAddressClient.java
浏览文件 @
f5a0b05b
...
@@ -21,5 +21,5 @@ public interface FgShippingAddressClient {
...
@@ -21,5 +21,5 @@ public interface FgShippingAddressClient {
*/
*/
// TODO 未实现
// TODO 未实现
@GetMapping
(
"/shippingaddress/info"
)
@GetMapping
(
"/shippingaddress/info"
)
CallBack
<
ShippingAddress
>
getShippingAddress
(
@RequestParam
(
"id"
)
Integer
id
,
@RequestParam
(
"memberId"
)
Integer
memberId
);
CallBack
<
ShippingAddress
>
getShippingAddress
(
@RequestParam
(
"id"
)
Integer
id
,
@RequestParam
(
"memberId"
)
String
memberId
);
}
}
com.zrqx.order/src/main/java/com/zrqx/order/fg/client/hystric/FgShippingAddressClientHystric.java
浏览文件 @
f5a0b05b
...
@@ -15,7 +15,7 @@ public class FgShippingAddressClientHystric implements FgShippingAddressClient{
...
@@ -15,7 +15,7 @@ public class FgShippingAddressClientHystric implements FgShippingAddressClient{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
FgShippingAddressClientHystric
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
FgShippingAddressClientHystric
.
class
);
@Override
@Override
public
CallBack
<
ShippingAddress
>
getShippingAddress
(
Integer
id
,
Integer
memberId
)
{
public
CallBack
<
ShippingAddress
>
getShippingAddress
(
Integer
id
,
String
memberId
)
{
logger
.
warn
(
"FgShippingAddressClientHystric#getShippingAddress 用户id:"
+
memberId
+
",收货地址id:"
+
id
+
";获取收货地失败"
);
logger
.
warn
(
"FgShippingAddressClientHystric#getShippingAddress 用户id:"
+
memberId
+
",收货地址id:"
+
id
+
";获取收货地失败"
);
return
CallBack
.
fail
();
return
CallBack
.
fail
();
}
}
...
...
com.zrqx.order/src/main/java/com/zrqx/order/fg/mapper/FgOrderMapper.java
浏览文件 @
f5a0b05b
...
@@ -210,6 +210,6 @@ public interface FgOrderMapper extends BaseMapper<Order>{
...
@@ -210,6 +210,6 @@ public interface FgOrderMapper extends BaseMapper<Order>{
+
" group by i.goodsid,i.type "
+
" group by i.goodsid,i.type "
+
" order by o.createTime desc "
+
" order by o.createTime desc "
+
" </script> "
)
+
" </script> "
)
List
<
GoodsForm
>
listBuyGoods
(
String
opId
);
List
<
GoodsForm
>
listBuyGoods
(
@Param
(
"memberId"
)
String
opId
);
}
}
com.zrqx.order/src/main/java/com/zrqx/order/fg/service/FgOrderServiceImpl.java
浏览文件 @
f5a0b05b
...
@@ -812,7 +812,7 @@ public class FgOrderServiceImpl extends BaseServiceImpl<Order, Integer> implemen
...
@@ -812,7 +812,7 @@ public class FgOrderServiceImpl extends BaseServiceImpl<Order, Integer> implemen
startPage
(
pageParam
);
startPage
(
pageParam
);
String
opId
=
fgRedisManage
.
getOpId
();
String
opId
=
fgRedisManage
.
getOpId
();
Order
record
=
new
Order
();
Order
record
=
new
Order
();
record
.
setCreater
(
Integer
.
valueOf
(
opId
)
);
record
.
setCreater
(
opId
);
List
<
Order
>
list
=
fgOrderMapper
.
select
(
record
);
List
<
Order
>
list
=
fgOrderMapper
.
select
(
record
);
final
OrderInfo
infoRecord
=
new
OrderInfo
();
final
OrderInfo
infoRecord
=
new
OrderInfo
();
List
<
FgInvoiceOrderPageVo
>
result
=
list
.
stream
().
map
(
v
->
{
List
<
FgInvoiceOrderPageVo
>
result
=
list
.
stream
().
map
(
v
->
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论