Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
sibu-v-mall
/
sibu-v-mall-third-api
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
构建
提交
问题看板
文件
提交
网络
比较
分支
标签
70b11a17
由
刘嘉
编写于
2018-04-08 13:41:26 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
菠萝派接口修改
1 个父辈
872263c8
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
7 行增加
和
7 行删除
com.sibu.orderHelper.integralMall/src/main/resources/mapper/PineappleMapper.xml
com.sibu.orderHelper.model/src/main/java/com/sibu/orderHelper/enums/DownloadProductStatusEnum.java
com.sibu.orderHelper.service/src/main/java/com/sibu/orderHelper/integral/service/pineapple/impl/DownloadProductBizServiceImpl.java
com.sibu.orderHelper.service/src/main/java/com/sibu/orderHelper/integral/service/pineapple/impl/GetRefundBizServiceImpl.java
com.sibu.orderHelper.integralMall/src/main/resources/mapper/PineappleMapper.xml
查看文件 @
70b11a1
...
...
@@ -364,7 +364,7 @@
express_code = concat(IFNULL(concat(express_code,','),''),#{expressCode}),
</if>
<if
test=
"buyerPhone !=null and buyerPhone !=''"
>
buyer_phone = #{buyerPhone}
buyer_phone = #{buyerPhone}
,
</if>
<if
test=
"address!=null and address!='' "
>
address =#{address},
...
...
com.sibu.orderHelper.model/src/main/java/com/sibu/orderHelper/enums/DownloadProductStatusEnum.java
查看文件 @
70b11a1
...
...
@@ -14,8 +14,8 @@ import java.util.List;
*/
public
enum
DownloadProductStatusEnum
{
PUTAWAY
(
"JH_01"
,
"已上架商品"
,
PineappleEnum
.
MALL_PRODUCT_PUTAWAY__STATUS
),
SOLDIOUT
(
"JH_02"
,
"已下架商品"
,
PineappleEnum
.
MALL_PRODUCT_SOLDIOUT__STATUS
),
ALL
(
"JH_99"
,
"所有商品"
);
JH_01
(
"JH_01"
,
"已上架商品"
,
PineappleEnum
.
MALL_PRODUCT_PUTAWAY__STATUS
),
JH_02
(
"JH_02"
,
"已下架商品"
,
PineappleEnum
.
MALL_PRODUCT_SOLDIOUT__STATUS
),
JH_99
(
"JH_99"
,
"所有商品"
,-
1
);
private
String
code
;
// 错误代码
private
String
msg
;
// 错误消息
...
...
@@ -27,8 +27,8 @@ public enum DownloadProductStatusEnum {
DownloadProductStatusEnum
result
=
enums
.
stream
()
.
filter
(
p
->
StringUtils
.
equalsIgnoreCase
(
p
.
getCode
(),
code
))
.
findFirst
()
.
orElse
(
DownloadProductStatusEnum
.
ALL
);
return
result
.
status
==
null
?-
1
:
result
.
status
;
.
orElse
(
DownloadProductStatusEnum
.
JH_99
);
return
result
.
status
;
}
...
...
com.sibu.orderHelper.service/src/main/java/com/sibu/orderHelper/integral/service/pineapple/impl/DownloadProductBizServiceImpl.java
查看文件 @
70b11a1
...
...
@@ -70,10 +70,10 @@ public class DownloadProductBizServiceImpl extends AbstractBizService<DownloadP
product
.
setSkus
(
downloadProductSkuBeanList
);
};
downloadProductResponse
.
setTotalcount
(
downloadProductBeanList
.
size
());
downloadProductResponse
.
setGoodslist
(
downloadProductBeanList
);
}
else
{
downloadProductResponse
.
setTotalcount
(
0
);
}
downloadProductResponse
.
setGoodslist
(
downloadProductBeanList
);
downloadProductResponse
.
setCode
(
PineappleEnum
.
SUCCESS
.
getCode
());
downloadProductResponse
.
setMessage
(
PineappleEnum
.
SUCCESS
.
getMsg
());
return
downloadProductResponse
;
...
...
com.sibu.orderHelper.service/src/main/java/com/sibu/orderHelper/integral/service/pineapple/impl/GetRefundBizServiceImpl.java
查看文件 @
70b11a1
...
...
@@ -76,7 +76,7 @@ public class GetRefundBizServiceImpl extends AbstractBizService<GetRefundReques
}
getRefundResponse
.
set
Refunds
(
refundBeanList
);
getRefundResponse
.
set
Totalcount
(
refundBeanList
.
size
()
);
}
else
{
getRefundResponse
.
setTotalcount
(
0
);
}
...
...
请
注册
或
登录
后发表评论