Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
O
oms
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
oms
Commits
de306dc9
提交
de306dc9
authored
6月 15, 2023
作者:
panda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
删除多余System.out.println
上级
35d1f051
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
4 行增加
和
46 行删除
+4
-46
JsonUtil.java
src/main/java/com/mmc/oms/common/json/JsonUtil.java
+0
-6
KdnExpressUtil.java
src/main/java/com/mmc/oms/common/util/KdnExpressUtil.java
+0
-10
GlobalFormDateConvert.java
src/main/java/com/mmc/oms/config/GlobalFormDateConvert.java
+0
-3
WxSendMsgVO.java
src/main/java/com/mmc/oms/model/vo/wx/WxSendMsgVO.java
+0
-1
CouponUserServiceImpl.java
.../java/com/mmc/oms/service/Impl/CouponUserServiceImpl.java
+1
-2
OrderRefundServiceImpl.java
...java/com/mmc/oms/service/Impl/OrderRefundServiceImpl.java
+0
-2
AppMallOrderServiceImpl.java
...om/mmc/oms/service/mall/impl/AppMallOrderServiceImpl.java
+3
-13
SnowFlake.java
src/main/java/com/mmc/oms/util/SnowFlake.java
+0
-9
没有找到文件。
src/main/java/com/mmc/oms/common/json/JsonUtil.java
浏览文件 @
de306dc9
...
@@ -15,12 +15,6 @@ import java.util.List;
...
@@ -15,12 +15,6 @@ import java.util.List;
*/
*/
public
class
JsonUtil
{
public
class
JsonUtil
{
public
static
void
main
(
String
[]
args
)
{
String
array
=
"[1,24,23]"
;
List
<
Integer
>
list
=
JSONArray
.
parseArray
(
array
,
Integer
.
class
);
System
.
out
.
println
(
list
.
get
(
2
));
}
/**
/**
* 把Java对象转换成json字符串
* 把Java对象转换成json字符串
*
*
...
...
src/main/java/com/mmc/oms/common/util/KdnExpressUtil.java
浏览文件 @
de306dc9
...
@@ -27,14 +27,6 @@ public class KdnExpressUtil {
...
@@ -27,14 +27,6 @@ public class KdnExpressUtil {
//订阅推送请求url, 正式环境地址
//订阅推送请求url, 正式环境地址
private
static
String
KdApiSearchMonitorPushReqURL
=
"https://api.kdniao.com/api/dist"
;
private
static
String
KdApiSearchMonitorPushReqURL
=
"https://api.kdniao.com/api/dist"
;
public
static
void
main
(
String
[]
args
)
{
try
{
System
.
out
.
println
(
KdnExpressUtil
.
SF
(
"15858341767"
,
"SF11319617182224329"
));
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
/**
/**
* https://www.kdniao.com/api-trackexpress
* https://www.kdniao.com/api-trackexpress
*
*
...
@@ -222,9 +214,7 @@ public class KdnExpressUtil {
...
@@ -222,9 +214,7 @@ public class KdnExpressUtil {
param
.
append
(
entry
.
getKey
());
param
.
append
(
entry
.
getKey
());
param
.
append
(
"="
);
param
.
append
(
"="
);
param
.
append
(
entry
.
getValue
());
param
.
append
(
entry
.
getValue
());
System
.
out
.
println
(
entry
.
getKey
()
+
":"
+
entry
.
getValue
());
}
}
System
.
out
.
println
(
"param:"
+
param
.
toString
());
out
.
write
(
param
.
toString
());
out
.
write
(
param
.
toString
());
}
}
// flush输出流的缓冲
// flush输出流的缓冲
...
...
src/main/java/com/mmc/oms/config/GlobalFormDateConvert.java
浏览文件 @
de306dc9
...
@@ -33,7 +33,6 @@ public class GlobalFormDateConvert implements Converter<String, Date> {
...
@@ -33,7 +33,6 @@ public class GlobalFormDateConvert implements Converter<String, Date> {
// 自定义函数,将字符串转Date 参1:传入的日期字符串 参2:格式参数
// 自定义函数,将字符串转Date 参1:传入的日期字符串 参2:格式参数
public
Date
parseDate
(
String
source
,
String
format
)
{
public
Date
parseDate
(
String
source
,
String
format
)
{
System
.
out
.
println
(
"parseDate转换日期"
);
Date
date
=
null
;
Date
date
=
null
;
try
{
try
{
// 日期格式转换器
// 日期格式转换器
...
@@ -48,8 +47,6 @@ public class GlobalFormDateConvert implements Converter<String, Date> {
...
@@ -48,8 +47,6 @@ public class GlobalFormDateConvert implements Converter<String, Date> {
// convert转换方法 ,s是将会传递过来的日期的字符串
// convert转换方法 ,s是将会传递过来的日期的字符串
@Override
@Override
public
Date
convert
(
String
source
)
{
public
Date
convert
(
String
source
)
{
System
.
out
.
println
(
"convert日期格式转换器"
);
if
(
StringUtils
.
isEmpty
(
source
))
{
if
(
StringUtils
.
isEmpty
(
source
))
{
return
null
;
return
null
;
}
}
...
...
src/main/java/com/mmc/oms/model/vo/wx/WxSendMsgVO.java
浏览文件 @
de306dc9
...
@@ -113,6 +113,5 @@ public class WxSendMsgVO implements Serializable {
...
@@ -113,6 +113,5 @@ public class WxSendMsgVO implements Serializable {
ws
.
setTitle
(
title
);
ws
.
setTitle
(
title
);
String
json
=
ws
.
buildMsgJson
();
String
json
=
ws
.
buildMsgJson
();
System
.
out
.
println
(
json
);
}
}
}
}
src/main/java/com/mmc/oms/service/Impl/CouponUserServiceImpl.java
浏览文件 @
de306dc9
...
@@ -128,7 +128,7 @@ public class CouponUserServiceImpl extends ServiceImpl<CouponUserDao, CouponUser
...
@@ -128,7 +128,7 @@ public class CouponUserServiceImpl extends ServiceImpl<CouponUserDao, CouponUser
// if (couponDO.getUserTag() != null){
// if (couponDO.getUserTag() != null){
// Integer useTag = couponDO.getUserTag();
// Integer useTag = couponDO.getUserTag();
// MallUserDTO mallUserDTO = mallUserClient.feignGetSimpleUserInfo(currentAccount.getId());
// MallUserDTO mallUserDTO = mallUserClient.feignGetSimpleUserInfo(currentAccount.getId());
//
System.out.println("mallUserDTO-----------------------"+ mallUserDTO);
//
// if (CouponConstants.USER_LABEL_REAL_NAME_AUTHENTICATION.equals(useTag) && mallUserDTO.getRealAuthStatus() != 1 ){
// if (CouponConstants.USER_LABEL_REAL_NAME_AUTHENTICATION.equals(useTag) && mallUserDTO.getRealAuthStatus() != 1 ){
// return ResultBody.error("该用户实名认证未通过");
// return ResultBody.error("该用户实名认证未通过");
// }
// }
...
@@ -348,7 +348,6 @@ public class CouponUserServiceImpl extends ServiceImpl<CouponUserDao, CouponUser
...
@@ -348,7 +348,6 @@ public class CouponUserServiceImpl extends ServiceImpl<CouponUserDao, CouponUser
}
}
return
true
;
return
true
;
}).
collect
(
Collectors
.
toList
());
}).
collect
(
Collectors
.
toList
());
System
.
out
.
println
(
collect
);
log
.
info
(
"消息发送成功"
+
collect
);
log
.
info
(
"消息发送成功"
+
collect
);
collect
.
stream
().
forEach
(
t
->
{
collect
.
stream
().
forEach
(
t
->
{
asynSendUserAppletMsgList
(
currentAccount
.
getUserAccountId
(),
t
);
asynSendUserAppletMsgList
(
currentAccount
.
getUserAccountId
(),
t
);
...
...
src/main/java/com/mmc/oms/service/Impl/OrderRefundServiceImpl.java
浏览文件 @
de306dc9
...
@@ -136,8 +136,6 @@ public class OrderRefundServiceImpl implements OrderRefundService {
...
@@ -136,8 +136,6 @@ public class OrderRefundServiceImpl implements OrderRefundService {
+
"&repoAccountId="
+
userAccountId
+
"&repoAccountId="
+
userAccountId
+
"&refundNo="
+
refundNo
,
+
"&refundNo="
+
refundNo
,
HttpMethod
.
GET
,
formEntity
,
String
.
class
);
HttpMethod
.
GET
,
formEntity
,
String
.
class
);
System
.
out
.
println
(
exchange
);
}
}
...
...
src/main/java/com/mmc/oms/service/mall/impl/AppMallOrderServiceImpl.java
浏览文件 @
de306dc9
...
@@ -318,19 +318,13 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
...
@@ -318,19 +318,13 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
brandIds
.
add
(
orderGoodsProdDetailDO
.
getBrandInfoId
());
brandIds
.
add
(
orderGoodsProdDetailDO
.
getBrandInfoId
());
//计算各品牌总价格
//计算各品牌总价格
if
(
brandPriceMap
.
get
(
orderGoodsProdDetailDO
.
getBrandInfoId
())
==
null
){
if
(
brandPriceMap
.
get
(
orderGoodsProdDetailDO
.
getBrandInfoId
())
==
null
){
System
.
out
.
println
(
"brandPrice1----->"
+
JSONObject
.
toJSON
(
orderGoodsProdDetailDO
.
getSkuSpecAmount
()));
brandPriceMap
.
put
(
orderGoodsProdDetailDO
.
getBrandInfoId
(),
orderGoodsProdDetailDO
.
getSkuSpecAmount
());
brandPriceMap
.
put
(
orderGoodsProdDetailDO
.
getBrandInfoId
(),
orderGoodsProdDetailDO
.
getSkuSpecAmount
());
}
else
{
}
else
{
System
.
out
.
println
(
"brandPrice2----->"
+
JSONObject
.
toJSON
(
orderGoodsProdDetailDO
.
getSkuSpecAmount
()));
brandPriceMap
.
put
(
orderGoodsProdDetailDO
.
getBrandInfoId
(),
brandPriceMap
.
get
(
orderGoodsProdDetailDO
.
getBrandInfoId
()).
add
(
orderGoodsProdDetailDO
.
getSkuSpecAmount
()));
brandPriceMap
.
put
(
orderGoodsProdDetailDO
.
getBrandInfoId
(),
brandPriceMap
.
get
(
orderGoodsProdDetailDO
.
getBrandInfoId
()).
add
(
orderGoodsProdDetailDO
.
getSkuSpecAmount
()));
//brandPriceMap.get(orderGoodsProdDetailDO.getBrandInfoId()).add(orderGoodsProdDetailDO.getSkuSpecAmount());
//brandPriceMap.get(orderGoodsProdDetailDO.getBrandInfoId()).add(orderGoodsProdDetailDO.getSkuSpecAmount());
}
}
}
}
}
}
System
.
out
.
println
(
"brandPriceMap----->"
+
JSONObject
.
toJSON
(
brandPriceMap
));
System
.
out
.
println
(
"brandIds----->"
+
JSONObject
.
toJSON
(
brandIds
));
List
<
Integer
>
listBrandIds
=
new
ArrayList
<>(
brandIds
);
List
<
Integer
>
listBrandIds
=
new
ArrayList
<>(
brandIds
);
//获取用户所有优惠券
//获取用户所有优惠券
// List<CouponUserOrderDTO> couponUserOrderDTOList = mallUserPayClient.feignCoupons(listBrandIds, userAccountId);
// List<CouponUserOrderDTO> couponUserOrderDTOList = mallUserPayClient.feignCoupons(listBrandIds, userAccountId);
...
@@ -339,22 +333,19 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
...
@@ -339,22 +333,19 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
//遍历每张可用的优惠券
//遍历每张可用的优惠券
for
(
CouponUserOrderDTO
couponUserOrderDTO
:
couponUserOrderDTOList
)
{
for
(
CouponUserOrderDTO
couponUserOrderDTO
:
couponUserOrderDTOList
)
{
couponUserOrderDTO
.
setMinPrice
(
couponUserOrderDTO
.
getMinPrice
()
==
null
?
BigDecimal
.
ZERO
:
couponUserOrderDTO
.
getMinPrice
());
couponUserOrderDTO
.
setMinPrice
(
couponUserOrderDTO
.
getMinPrice
()
==
null
?
BigDecimal
.
ZERO
:
couponUserOrderDTO
.
getMinPrice
());
System
.
out
.
println
(
couponUserOrderDTO
.
toString
());
if
(
couponUserOrderDTO
.
getValidStr
().
equals
(
"usable"
)){
if
(
couponUserOrderDTO
.
getValidStr
().
equals
(
"usable"
)){
//处理品牌券
//处理品牌券
if
(
couponUserOrderDTO
.
getPrimaryKey
()
!=
null
&&
couponUserOrderDTO
.
getPrimaryKey
().
length
()
>
0
){
if
(
couponUserOrderDTO
.
getPrimaryKey
()
!=
null
&&
couponUserOrderDTO
.
getPrimaryKey
().
length
()
>
0
){
System
.
out
.
println
(
"PrimaryKey:"
+
couponUserOrderDTO
.
getPrimaryKey
());
couponUserOrderDTO
.
setBrandIds
(
Arrays
.
asList
(
couponUserOrderDTO
.
getPrimaryKey
().
split
(
","
)));
couponUserOrderDTO
.
setBrandIds
(
Arrays
.
asList
(
couponUserOrderDTO
.
getPrimaryKey
().
split
(
","
)));
System
.
out
.
println
(
"setBrandIds:"
+
couponUserOrderDTO
.
getBrandIds
());
BigDecimal
discountPrice
=
BigDecimal
.
ZERO
;
BigDecimal
discountPrice
=
BigDecimal
.
ZERO
;
//判断有效的
//判断有效的
//按照优惠券包含的品牌,计算这个优惠券可以打折多少(这个券可以打折的金额)
//按照优惠券包含的品牌,计算这个优惠券可以打折多少(这个券可以打折的金额)
// brandPriceMap.forEach((key, value)->{
// brandPriceMap.forEach((key, value)->{
//
System.out.println("key:" + key);
//
// if(couponUserOrderDTO.getBrandIds().contains(key.toString()) && couponUserOrderDTO.getUseType().equals(2)){
// if(couponUserOrderDTO.getBrandIds().contains(key.toString()) && couponUserOrderDTO.getUseType().equals(2)){
//
System.out.println("add value:" + value);
//
// discountPrice.add(value);
// discountPrice.add(value);
//
System.out.println("discountPrice:" + discountPrice);
//
// }
// }
// });
// });
for
(
Integer
key
:
brandPriceMap
.
keySet
()){
for
(
Integer
key
:
brandPriceMap
.
keySet
()){
...
@@ -365,7 +356,6 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
...
@@ -365,7 +356,6 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
discountPrice
=
discountPrice
.
add
(
brandPriceMap
.
get
(
key
));
discountPrice
=
discountPrice
.
add
(
brandPriceMap
.
get
(
key
));
}
}
}
}
System
.
out
.
println
(
"discountPrice:"
+
discountPrice
);
//说明这个券是品牌券(这张券可以对多少金额进行打折)
//说明这个券是品牌券(这张券可以对多少金额进行打折)
if
(
discountPrice
.
compareTo
(
BigDecimal
.
ZERO
)
>
0
){
if
(
discountPrice
.
compareTo
(
BigDecimal
.
ZERO
)
>
0
){
...
...
src/main/java/com/mmc/oms/util/SnowFlake.java
浏览文件 @
de306dc9
...
@@ -92,14 +92,5 @@ public class SnowFlake {
...
@@ -92,14 +92,5 @@ public class SnowFlake {
private
long
getNewstmp
()
{
private
long
getNewstmp
()
{
return
System
.
currentTimeMillis
();
return
System
.
currentTimeMillis
();
}
}
public
static
void
main
(
String
[]
args
)
{
SnowFlake
snowFlake
=
new
SnowFlake
(
2
,
3
);
for
(
int
i
=
0
;
i
<
(
1
<<
12
);
i
++)
{
System
.
out
.
println
(
snowFlake
.
nextId
());
}
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论