记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
222f36ef
Commit
222f36ef
authored
Aug 24, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消费
parent
b799cdec
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
52 additions
and
128 deletions
+52
-128
application-dev.yml
liquidnet-bus-config/liquidnet-config/application-dev.yml
+2
-2
application-test.yml
liquidnet-bus-config/liquidnet-config/application-test.yml
+2
-2
liquidnet-service-order-dev.yml
...s-config/liquidnet-config/liquidnet-service-order-dev.yml
+1
-1
liquidnet-service-order-test.yml
...-config/liquidnet-config/liquidnet-service-order-test.yml
+1
-1
CandyUserCoupon.java
...a/com/liquidnet/service/candy/entity/CandyUserCoupon.java
+12
-1
OrderUtils.java
...in/java/com/liquidnet/service/order/utils/OrderUtils.java
+1
-1
PlatformCandyUserCouponService.java
...rm/service/impl/candy/PlatformCandyUserCouponService.java
+33
-0
OrderUtils.java
...java/com/liquidnet/service/platform/utils/OrderUtils.java
+0
-120
No files found.
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @
222f36ef
...
...
@@ -59,12 +59,12 @@ liquidnet:
order
:
adam
:
url
:
http://devadam.zhengzai.tv/adam
candy
:
url
:
http://devcandy.zhengzai.tv/candy
url-pay
:
pay
:
http://devdragon.zhengzai.tv/dragon/pay/dragonPay
check
:
http://devdragon.zhengzai.tv/dragon/pay/checkOrder
localUrl
:
http://devorder.zhengzai.tv/order/order/syncOrder
candy
:
url
:
http://devcandy.zhengzai.tv/candy
dragon
:
notifyUrl
:
https://devdragon.zhengzai.tv/dragon
platform
:
...
...
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @
222f36ef
...
...
@@ -56,11 +56,11 @@ liquidnet:
pay
:
http://testdragon.zhengzai.tv/dragon/pay/dragonPay
check
:
http://testdragon.zhengzai.tv/dragon/pay/checkOrder
localUrl
:
http://testkylin.zhengzai.tv/kylin/order/syncOrder
candy
:
url
:
http://testcandy.zhengzai.tv/candy
order
:
adam
:
url
:
http://testadam.zhengzai.tv/adam
candy
:
url
:
http://testcandy.zhengzai.tv/candy
url-pay
:
pay
:
http://testdragon.zhengzai.tv/dragon/pay/dragonPay
check
:
http://testdragon.zhengzai.tv/dragon/pay/checkOrder
...
...
liquidnet-bus-config/liquidnet-config/liquidnet-service-order-dev.yml
View file @
222f36ef
...
...
@@ -27,4 +27,4 @@ liquidnet:
adam
:
url:${liquidnet.service.order.adam.url}
candy
:
url:${liquidnet.service.
order.
candy.url}
url:${liquidnet.service.candy.url}
liquidnet-bus-config/liquidnet-config/liquidnet-service-order-test.yml
View file @
222f36ef
...
...
@@ -27,4 +27,4 @@ liquidnet:
adam
:
url:${liquidnet.service.order.adam.url}
candy
:
url:${liquidnet.service.order.candy.url}
\ No newline at end of file
url:${liquidnet.service.candy.url}
\ No newline at end of file
liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/entity/CandyUserCoupon.java
View file @
222f36ef
...
...
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
java.time.LocalDateTime
;
import
java.io.Serializable
;
import
com.liquidnet.service.candy.dto.CandyCouponCodeDto
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
...
...
@@ -17,7 +19,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
CandyUserCoupon
implements
Serializable
{
public
class
CandyUserCoupon
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -69,4 +71,13 @@ public class CandyUserCoupon implements Serializable {
private
String
comment
;
private
static
final
CandyUserCoupon
obj
=
new
CandyUserCoupon
();
public
static
CandyUserCoupon
getNew
()
{
try
{
return
(
CandyUserCoupon
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
CandyUserCoupon
();
}
}
}
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java
View file @
222f36ef
...
...
@@ -179,7 +179,7 @@ public class OrderUtils {
params
.
add
(
"uCouponId"
,
uCouponId
);
params
.
add
(
"content"
,
content
);
params
.
add
(
"totalPrice"
,
totalPrice
.
toString
());
String
returnData
=
HttpUtil
.
post
(
"/candy-coupon/use"
,
params
,
null
);
String
returnData
=
HttpUtil
.
post
(
candyUrl
+
"/candy-coupon/use"
,
params
,
null
);
InnerReturnVo
<
CandyUseResultVo
>
innerReturnVo
=
JsonUtils
.
fromJson
(
returnData
,
InnerReturnVo
.
class
);
CandyUseResultVo
candyUseResultVo
=
innerReturnVo
.
getData
();
Integer
type
=
candyUseResultVo
.
getCouType
();
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyUserCouponService.java
View file @
222f36ef
package
com
.
liquidnet
.
service
.
platform
.
service
.
impl
.
candy
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
import
com.liquidnet.commons.lang.util.CurrentUtil
;
import
com.liquidnet.service.base.SqlMapping
;
import
com.liquidnet.service.base.constant.MQConst
;
import
com.liquidnet.service.candy.dto.CandyUserCouponBasicDto
;
import
com.liquidnet.service.candy.entity.CandyUserCoupon
;
import
com.liquidnet.service.candy.mapper.CandyUserCouponMapper
;
import
com.liquidnet.service.kylin.entity.KylinOrderTickets
;
import
com.liquidnet.service.platform.utils.QueueUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.LinkedList
;
import
java.util.List
;
@Service
public
class
PlatformCandyUserCouponService
extends
ServiceImpl
<
CandyUserCouponMapper
,
CandyUserCoupon
>
{
@Autowired
private
PlatformCandyUserCouponService
platformCandyUserCouponService
;
@Autowired
private
QueueUtils
queueUtils
;
/**
* @param uCouponUidList 内容 uCouponId,uid List
* @param uCouponIdList 内容 uCouponId List
* @return
*/
public
Boolean
useBackCoupon
(
ArrayList
<
String
>
uCouponUidList
,
ArrayList
<
String
>
uCouponIdList
)
{
//修改数据库
CandyUserCoupon
userCoupon
=
CandyUserCoupon
.
getNew
();
userCoupon
.
setState
(
1
);
platformCandyUserCouponService
.
update
(
userCoupon
,
new
UpdateWrapper
<
CandyUserCoupon
>().
in
(
"ucoupon_id"
,
uCouponIdList
));
//sendRedis
return
true
;
}
}
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/OrderUtils.java
deleted
100644 → 0
View file @
b799cdec
package
com
.
liquidnet
.
service
.
platform
.
utils
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.service.adam.constant.AdamRedisConst
;
import
com.liquidnet.service.adam.dto.vo.AdamAddressesVo
;
import
com.liquidnet.service.adam.dto.vo.AdamEntersVo
;
import
com.liquidnet.service.adam.dto.vo.AdamUserMemberVo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.util.List
;
@Component
public
class
OrderUtils
{
@Autowired
private
DataUtils
dataUtils
;
@Autowired
private
RedisUtil
redisUtil
;
public
String
judgeOrderLimit
(
int
type
,
String
userId
,
String
idCard
,
String
performanceId
,
String
ticketId
,
int
performanceLimitCount
,
int
performanceMemberLimitCount
,
int
ticketLimitCount
,
int
ticketMemberLimitCount
,
int
performanceBuyCount
,
int
ticketBuyCount
,
int
memberType
,
int
isTrueName
)
{
Integer
[]
integers
;
if
(
101
==
type
)
{
integers
=
festivalOrderLimit
(
userId
,
idCard
,
performanceId
,
ticketId
,
performanceBuyCount
,
ticketBuyCount
,
isTrueName
);
}
else
{
integers
=
roadShowOrderLimit
(
userId
,
idCard
,
performanceId
,
ticketId
,
performanceBuyCount
,
ticketBuyCount
,
isTrueName
);
}
return
judgeMemberType
(
performanceLimitCount
,
performanceMemberLimitCount
,
ticketLimitCount
,
ticketMemberLimitCount
,
memberType
,
integers
[
0
],
integers
[
1
]);
}
public
Integer
[]
roadShowOrderLimit
(
String
userId
,
String
idCard
,
String
performanceId
,
String
ticketId
,
int
performanceBuyCount
,
int
ticketBuyCount
,
int
isTrueName
)
{
if
(
1
==
isTrueName
)
{
//实名
performanceBuyCount
+=
dataUtils
.
getIdCardPBuyCount
(
idCard
,
performanceId
);
ticketBuyCount
+=
dataUtils
.
getIdCardTBuyCount
(
idCard
,
ticketId
);
}
else
{
//非实名
performanceBuyCount
+=
dataUtils
.
getUserPBuyCount
(
userId
,
performanceId
);
ticketBuyCount
+=
dataUtils
.
getUserTBuyCount
(
userId
,
ticketId
);
}
return
new
Integer
[]{
performanceBuyCount
,
ticketBuyCount
};
}
public
Integer
[]
festivalOrderLimit
(
String
userId
,
String
idCard
,
String
performanceId
,
String
ticketId
,
int
performanceBuyCount
,
int
ticketBuyCount
,
int
isTrueName
)
{
if
(
1
==
isTrueName
)
{
//实名
performanceBuyCount
+=
dataUtils
.
getIdCardPBuyCount
(
idCard
,
performanceId
);
ticketBuyCount
+=
dataUtils
.
getIdCardTBuyCount
(
idCard
,
ticketId
);
}
else
{
//非实名
performanceBuyCount
+=
dataUtils
.
getUserPBuyCount
(
userId
,
performanceId
);
ticketBuyCount
+=
dataUtils
.
getUserTBuyCount
(
userId
,
ticketId
);
}
return
new
Integer
[]{
performanceBuyCount
,
ticketBuyCount
};
}
public
String
judgeMemberType
(
int
performanceLimitCount
,
int
performanceMemberLimitCount
,
int
ticketLimitCount
,
int
ticketMemberLimitCount
,
int
memberType
,
int
performanceBuyCount
,
int
ticketBuyCount
)
{
if
(
memberType
==
1
||
memberType
==
2
)
{
if
(
performanceBuyCount
>
performanceMemberLimitCount
&&
performanceMemberLimitCount
!=
0
)
{
return
"该演出只能购买"
+
performanceMemberLimitCount
+
"张"
;
//超过演出维度购买量
}
if
(
ticketBuyCount
>
ticketMemberLimitCount
&&
ticketMemberLimitCount
!=
0
)
{
return
"该票种只能购买"
+
ticketMemberLimitCount
+
"张"
;
//超过票维度购买量
}
}
else
{
//非会员区间
if
(
performanceBuyCount
>
performanceLimitCount
&&
performanceLimitCount
!=
0
)
{
return
"该演出只能购买"
+
performanceLimitCount
+
"张"
;
//超过演出维度购买量
}
if
(
ticketBuyCount
>
ticketLimitCount
&&
ticketLimitCount
!=
0
)
{
return
"该票种只能购买"
+
ticketLimitCount
+
"张"
;
//超过票维度购买量
}
}
return
""
;
}
public
boolean
isMember
(
String
uid
)
{
String
rk
=
AdamRedisConst
.
INFO_USER_MEMBER
.
concat
(
uid
);
AdamUserMemberVo
vo
=
(
AdamUserMemberVo
)
redisUtil
.
get
(
rk
);
return
null
!=
vo
&&
vo
.
isActive
();
}
public
AdamAddressesVo
getAddress
(
String
uid
,
String
addressesId
)
{
String
rk
=
AdamRedisConst
.
INFO_ADDRESSES
.
concat
(
uid
);
List
<
AdamAddressesVo
>
vos
=
(
List
<
AdamAddressesVo
>)
redisUtil
.
get
(
rk
);
return
vos
.
stream
().
filter
(
r
->
r
.
getAddressesId
().
equals
(
addressesId
)).
findAny
().
orElse
(
null
);
}
public
AdamEntersVo
getEnters
(
String
uid
,
String
entersId
)
{
String
rk
=
AdamRedisConst
.
INFO_ENTERS
.
concat
(
uid
);
List
<
AdamEntersVo
>
vos
=
(
List
<
AdamEntersVo
>)
redisUtil
.
get
(
rk
);
return
vos
.
stream
().
filter
(
r
->
r
.
getEntersId
().
equals
(
entersId
)).
findAny
().
orElse
(
null
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment