Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_ht
Overview
Overview
Details
Activity
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
pseer
gxpt_ht
Commits
4c27ae11
Commit
4c27ae11
authored
May 20, 2024
by
吕明尚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
计算订单金额和用户优惠券接口放开
parent
9f10457d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
WebConfig.java
...-front/src/main/java/share/web/core/config/WebConfig.java
+2
-2
OrderTask.java
share-quartz/src/main/java/share/quartz/task/OrderTask.java
+5
-3
SConsumerCouponServiceImpl.java
...share/system/service/impl/SConsumerCouponServiceImpl.java
+3
-0
No files found.
share-front/src/main/java/share/web/core/config/WebConfig.java
View file @
4c27ae11
package
share
.
web
.
core
.
config
;
package
share
.
web
.
core
.
config
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.http.HttpMethod
;
import
org.springframework.web.servlet.HandlerInterceptor
;
import
org.springframework.web.servlet.HandlerInterceptor
;
import
org.springframework.web.servlet.config.annotation.InterceptorRegistry
;
import
org.springframework.web.servlet.config.annotation.InterceptorRegistry
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurer
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurer
;
...
@@ -56,6 +54,8 @@ public class WebConfig implements WebMvcConfigurer {
...
@@ -56,6 +54,8 @@ public class WebConfig implements WebMvcConfigurer {
"/dict/type/**"
,
"/dict/type/**"
,
"/weixinpublic/**"
,
"/weixinpublic/**"
,
"/openInterface/**"
,
"/openInterface/**"
,
"/consumerCoupon/query"
,
"/order/computed/price"
,
"**"
"**"
).
addPathPatterns
(
"/**"
);
).
addPathPatterns
(
"/**"
);
}
}
...
...
share-quartz/src/main/java/share/quartz/task/OrderTask.java
View file @
4c27ae11
...
@@ -8,8 +8,6 @@ import cn.hutool.core.util.ObjectUtil;
...
@@ -8,8 +8,6 @@ import cn.hutool.core.util.ObjectUtil;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.json.JSONObject
;
import
cn.hutool.json.JSONObject
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
lombok.extern.slf4j.Slf4j
;
import
org.bouncycastle.util.Store
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -22,7 +20,6 @@ import share.common.core.redis.RedisUtil;
...
@@ -22,7 +20,6 @@ import share.common.core.redis.RedisUtil;
import
share.common.enums.*
;
import
share.common.enums.*
;
import
share.common.exception.base.BaseException
;
import
share.common.exception.base.BaseException
;
import
share.system.domain.*
;
import
share.system.domain.*
;
import
share.system.domain.vo.TemplateMessageVo
;
import
share.system.service.*
;
import
share.system.service.*
;
import
java.util.*
;
import
java.util.*
;
...
@@ -250,6 +247,11 @@ public class OrderTask {
...
@@ -250,6 +247,11 @@ public class OrderTask {
logger
.
info
(
"订单号为:"
+
jsonObject
.
getStr
(
"orderNo"
)
+
"的订单不存在"
);
logger
.
info
(
"订单号为:"
+
jsonObject
.
getStr
(
"orderNo"
)
+
"的订单不存在"
);
return
;
return
;
}
}
if
(!
byOrderNo
.
getStatus
().
equals
(
OrderStatusEnum
.
UNUSED
.
getCode
()))
{
redisUtil
.
delete
(
o
);
logger
.
info
(
"订单号为:"
+
jsonObject
.
getStr
(
"orderNo"
)
+
"的订单状态异常"
);
return
;
}
if
(
OrderStatusEnum
.
CANCEL
.
getCode
().
equals
(
byOrderNo
.
getStatus
()))
{
if
(
OrderStatusEnum
.
CANCEL
.
getCode
().
equals
(
byOrderNo
.
getStatus
()))
{
redisUtil
.
delete
(
o
);
redisUtil
.
delete
(
o
);
logger
.
info
(
"订单号为:"
+
jsonObject
.
getStr
(
"orderNo"
)
+
"的订单已取消"
);
logger
.
info
(
"订单号为:"
+
jsonObject
.
getStr
(
"orderNo"
)
+
"的订单已取消"
);
...
...
share-system/src/main/java/share/system/service/impl/SConsumerCouponServiceImpl.java
View file @
4c27ae11
...
@@ -199,6 +199,9 @@ public class SConsumerCouponServiceImpl extends ServiceImpl<SConsumerCouponMappe
...
@@ -199,6 +199,9 @@ public class SConsumerCouponServiceImpl extends ServiceImpl<SConsumerCouponMappe
@Override
@Override
public
List
<
SConsumerCouponVo
>
availableCouponList
(
CouponRequest
couponRequest
)
{
public
List
<
SConsumerCouponVo
>
availableCouponList
(
CouponRequest
couponRequest
)
{
SConsumer
user
=
FrontTokenComponent
.
getWxSConsumerEntry
();
SConsumer
user
=
FrontTokenComponent
.
getWxSConsumerEntry
();
if
(
ObjectUtils
.
isEmpty
(
user
))
{
return
new
ArrayList
<>();
}
LambdaQueryWrapper
<
SConsumerCoupon
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
SConsumerCoupon
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
queryWrapper
.
eq
(
SConsumerCoupon:
:
getConsumerId
,
user
.
getId
());
queryWrapper
.
eq
(
SConsumerCoupon:
:
getConsumerId
,
user
.
getId
());
queryWrapper
.
eq
(
SConsumerCoupon:
:
getUseStatus
,
ConsumerCouponUseStatusEnum
.
WAIT_USE
.
getCode
());
queryWrapper
.
eq
(
SConsumerCoupon:
:
getUseStatus
,
ConsumerCouponUseStatusEnum
.
WAIT_USE
.
getCode
());
...
...
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