Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
Z
zion
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
zhengfg
zion
Commits
7d8251b2
提交
7d8251b2
authored
11月 23, 2019
作者:
luojie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改查看订单物流信息
上级
3440d128
显示空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
40 行增加
和
5 行删除
+40
-5
TbCfItemDetailDao.java
...va/com/diaoyun/zion/chinafrica/dao/TbCfItemDetailDao.java
+1
-0
TbCfOrderDao.java
...in/java/com/diaoyun/zion/chinafrica/dao/TbCfOrderDao.java
+7
-0
TbCfOrderServiceImpl.java
...un/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java
+2
-1
TbCfCartItemDetailVo.java
.../com/diaoyun/zion/chinafrica/vo/TbCfCartItemDetailVo.java
+13
-1
TbCfOrderVo.java
...main/java/com/diaoyun/zion/chinafrica/vo/TbCfOrderVo.java
+14
-1
TbCfItemDetailDao.xml
src/main/resources/mapper/TbCfItemDetailDao.xml
+0
-1
TbCfOrderDao.xml
src/main/resources/mapper/TbCfOrderDao.xml
+3
-1
没有找到文件。
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfItemDetailDao.java
浏览文件 @
7d8251b2
...
@@ -29,4 +29,5 @@ public interface TbCfItemDetailDao extends BaseDao<TbCfItemDetailEntity> {
...
@@ -29,4 +29,5 @@ public interface TbCfItemDetailDao extends BaseDao<TbCfItemDetailEntity> {
* @return
* @return
*/
*/
int
changeItemState
(
String
cartRecordId
,
Integer
checkFlag
);
int
changeItemState
(
String
cartRecordId
,
Integer
checkFlag
);
}
}
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfOrderDao.java
浏览文件 @
7d8251b2
...
@@ -51,4 +51,11 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
...
@@ -51,4 +51,11 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
TbCfCouponEntity
queryCouponPrice
(
String
toitableId
);
TbCfCouponEntity
queryCouponPrice
(
String
toitableId
);
/**
* 根据订单id和商品id查询订单记录id //后续根据此id 查询物流信息
* @param orderId
* @param itemId
* @return
*/
String
getOrdersId
(
String
orderId
,
String
itemId
);
}
}
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java
浏览文件 @
7d8251b2
...
@@ -228,6 +228,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
...
@@ -228,6 +228,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
for
(
TbCfItemDetailEntity
tbCfItemDetail
:
tbCfItemDetailList
)
{
for
(
TbCfItemDetailEntity
tbCfItemDetail
:
tbCfItemDetailList
)
{
TbCfCartItemDetailVo
tbCfCartItemDetailVo
=
new
TbCfCartItemDetailVo
();
TbCfCartItemDetailVo
tbCfCartItemDetailVo
=
new
TbCfCartItemDetailVo
();
BeanUtils
.
copyProperties
(
tbCfItemDetail
,
tbCfCartItemDetailVo
);
BeanUtils
.
copyProperties
(
tbCfItemDetail
,
tbCfCartItemDetailVo
);
tbCfCartItemDetailVo
.
setOrdersId
(
tbCfOrderDao
.
getOrdersId
(
orderVo
.
getOrderId
(),
tbCfItemDetail
.
getItemId
()));
itemDetailVoList
.
add
(
tbCfCartItemDetailVo
);
itemDetailVoList
.
add
(
tbCfCartItemDetailVo
);
}
}
orderVo
.
setItemDetailList
(
itemDetailVoList
);
orderVo
.
setItemDetailList
(
itemDetailVoList
);
...
@@ -433,6 +434,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
...
@@ -433,6 +434,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
for
(
TbCfItemDetailEntity
tbCfItemDetail
:
tbCfItemDetailList
)
{
for
(
TbCfItemDetailEntity
tbCfItemDetail
:
tbCfItemDetailList
)
{
TbCfCartItemDetailVo
tbCfCartItemDetailVo
=
new
TbCfCartItemDetailVo
();
TbCfCartItemDetailVo
tbCfCartItemDetailVo
=
new
TbCfCartItemDetailVo
();
BeanUtils
.
copyProperties
(
tbCfItemDetail
,
tbCfCartItemDetailVo
);
BeanUtils
.
copyProperties
(
tbCfItemDetail
,
tbCfCartItemDetailVo
);
tbCfCartItemDetailVo
.
setOrdersId
(
tbCfOrderDao
.
getOrdersId
(
orderId
,
tbCfItemDetail
.
getItemId
()));
itemDetailVoList
.
add
(
tbCfCartItemDetailVo
);
itemDetailVoList
.
add
(
tbCfCartItemDetailVo
);
}
}
tbCfOrderVo
.
setItemDetailList
(
itemDetailVoList
);
tbCfOrderVo
.
setItemDetailList
(
itemDetailVoList
);
...
@@ -657,7 +659,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
...
@@ -657,7 +659,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
* @return
* @return
*/
*/
private
TbCfOrderVo
getGenericOrder
(
List
<
TbCfCartItemDetailVo
>
itemDetailList
)
{
private
TbCfOrderVo
getGenericOrder
(
List
<
TbCfCartItemDetailVo
>
itemDetailList
)
{
TbCfOrderVo
genericOrder
=
new
TbCfOrderVo
();
TbCfOrderVo
genericOrder
=
new
TbCfOrderVo
();
genericOrder
.
setItemDetailList
(
itemDetailList
);
genericOrder
.
setItemDetailList
(
itemDetailList
);
//初始商品总价
//初始商品总价
...
...
src/main/java/com/diaoyun/zion/chinafrica/vo/TbCfCartItemDetailVo.java
浏览文件 @
7d8251b2
...
@@ -17,7 +17,11 @@ import java.util.Date;
...
@@ -17,7 +17,11 @@ import java.util.Date;
@ApiModel
@ApiModel
public
class
TbCfCartItemDetailVo
implements
Serializable
{
public
class
TbCfCartItemDetailVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/**
* 购物车记录id
*/
@ApiModelProperty
(
"订单记录id"
)
private
String
ordersId
;
/**
/**
* 购物车记录id
* 购物车记录id
*/
*/
...
@@ -102,6 +106,14 @@ public class TbCfCartItemDetailVo implements Serializable {
...
@@ -102,6 +106,14 @@ public class TbCfCartItemDetailVo implements Serializable {
@ApiModelProperty
(
"商品品名"
)
@ApiModelProperty
(
"商品品名"
)
private
String
descripitionName
;
private
String
descripitionName
;
public
String
getOrdersId
()
{
return
ordersId
;
}
public
void
setOrdersId
(
String
ordersId
)
{
this
.
ordersId
=
ordersId
;
}
public
String
getDescripitionName
()
{
public
String
getDescripitionName
()
{
return
descripitionName
;
return
descripitionName
;
}
}
...
...
src/main/java/com/diaoyun/zion/chinafrica/vo/TbCfOrderVo.java
浏览文件 @
7d8251b2
...
@@ -19,7 +19,11 @@ import java.util.List;
...
@@ -19,7 +19,11 @@ import java.util.List;
@ApiModel
@ApiModel
public
class
TbCfOrderVo
implements
Serializable
{
public
class
TbCfOrderVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/**
* 订单id
*/
@ApiModelProperty
(
"订单表id"
)
private
String
ordersId
;
/**
/**
* 订单id
* 订单id
*/
*/
...
@@ -176,6 +180,15 @@ public class TbCfOrderVo implements Serializable {
...
@@ -176,6 +180,15 @@ public class TbCfOrderVo implements Serializable {
*/
*/
private
Integer
enableFlag
;
private
Integer
enableFlag
;
public
String
getOrdersId
()
{
return
ordersId
;
}
public
void
setOrdersId
(
String
ordersId
)
{
this
.
ordersId
=
ordersId
;
}
/**
/**
* 设置:订单id
* 设置:订单id
*/
*/
...
...
src/main/resources/mapper/TbCfItemDetailDao.xml
浏览文件 @
7d8251b2
...
@@ -81,7 +81,6 @@
...
@@ -81,7 +81,6 @@
AND name LIKE concat('%',#{name},'%')
AND name LIKE concat('%',#{name},'%')
</if>
</if>
</select>
</select>
<insert
id=
"save"
parameterType=
"com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity"
>
<insert
id=
"save"
parameterType=
"com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity"
>
insert into tb_cf_item_detail(
insert into tb_cf_item_detail(
`item_id`,
`item_id`,
...
...
src/main/resources/mapper/TbCfOrderDao.xml
浏览文件 @
7d8251b2
...
@@ -255,7 +255,9 @@
...
@@ -255,7 +255,9 @@
<if
test=
"orderStatus != null"
>
and order_status = #{orderStatus}
</if>
<if
test=
"orderStatus != null"
>
and order_status = #{orderStatus}
</if>
order by order_time desc
order by order_time desc
</select>
</select>
<select
id=
"getOrdersId"
resultType=
"String"
>
select r.order_item_id ordersId from tb_cf_item_order_r r where r.order_id=#{orderId} and r.item_id=#{itemId}
</select>
<!--根据订单id,获取订单内商品详情-->
<!--根据订单id,获取订单内商品详情-->
<select
id=
"getOrderItemList"
resultType=
"com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity"
>
<select
id=
"getOrderItemList"
resultType=
"com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity"
>
SELECT
SELECT
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论