Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
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
huluobin
gogirl-miniapp-backend
Commits
1ce7c5ae
Commit
1ce7c5ae
authored
Sep 21, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单号加锁bug
parent
45f8fc26
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
18 deletions
+2
-18
OrderManageServiceImpl.java
.../application/order/serve/impl/OrderManageServiceImpl.java
+1
-2
PayServiceImpl.java
...m/gogirl/application/order/serve/impl/PayServiceImpl.java
+1
-0
DashboardController.java
.../com/gogirl/interfaces/dashboard/DashboardController.java
+0
-16
No files found.
src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
View file @
1ce7c5ae
...
...
@@ -959,7 +959,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderManage
.
setPayUser
(
payCustomer
.
getId
());
//是否朋友支付
orderManage
.
setIsFriendPay
(
payCustomer
.
getId
().
equals
(
orderManage
.
getOrderUser
())
?
2
:
1
);
this
.
updateById
((
orderManage
));
log
.
info
(
"扣除余额"
);
...
...
@@ -988,8 +987,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
.
build
();
customerBalanceService
.
consumer
(
consumerCmd
);
this
.
updateById
(
orderManage
);
marketService
.
calcOrderAmount
(
orderManage
.
getId
());
orderManageMapper
.
updateById
(
orderManage
);
}
@Override
...
...
src/main/java/com/gogirl/application/order/serve/impl/PayServiceImpl.java
View file @
1ce7c5ae
...
...
@@ -193,6 +193,7 @@ public class PayServiceImpl implements PayService {
.
build
();
log
.
info
(
"**微信下单参数构造**,{}"
,
wxPayUnifiedOrderRequest
.
toString
());
orderManage
.
setPayUser
(
SessionUtils
.
getCustomerId
());
orderManageMapper
.
updateById
(
orderManage
);
//微信统一下单
...
...
src/main/java/com/gogirl/interfaces/dashboard/DashboardController.java
View file @
1ce7c5ae
...
...
@@ -49,17 +49,13 @@ public class DashboardController {
GetStoreTrendApiResp
resp
=
dashboardService
.
getStoreTrendApi
(
request
);
throw
new
RRException
(
"Saas服务改造升级 预计22号升级完成"
);
// return JsonResult.success(resp);
}
@ApiOperation
(
"见doc文档getStoreListApi"
)
@PostMapping
(
"/no_getStoreListApi"
)
public
JsonResult
<
List
<
Map
<
String
,
Object
>>>
getStoreListApi
(
@RequestBody
GetStoreListApiRequest
request
)
{
List
<
Map
<
String
,
Object
>>
result
=
dashboardService
.
getStoreListApi
(
request
);
// return JsonResult.success(result);
throw
new
RRException
(
"Saas服务改造升级 预计22号升级完成"
);
}
@ApiOperation
(
"见doc文档preStorageSumApi"
)
...
...
@@ -67,7 +63,6 @@ public class DashboardController {
public
JsonResult
<
Map
<
String
,
Object
>>
preStorageSumApi
(
@RequestBody
PreStorageSumApiRequest
request
)
{
Map
<
String
,
Object
>
result
=
dashboardService
.
preStorageSumApi
(
request
);
throw
new
RRException
(
"Saas服务改造升级 预计22号升级完成"
);
}
...
...
@@ -76,7 +71,6 @@ public class DashboardController {
public
JsonResult
<
Map
<
String
,
Object
>>
revenueSumByTypeApi
(
@RequestBody
RevenueSumByTypeApiRequest
request
)
{
Map
<
String
,
Object
>
result
=
dashboardService
.
revenueSumByTypeApi
(
request
);
throw
new
RRException
(
"Saas服务改造升级 预计22号升级完成"
);
}
...
...
@@ -85,8 +79,6 @@ public class DashboardController {
public
JsonResult
<
List
<
Map
<
String
,
Object
>>>
revenueTypeListApi
(
@RequestBody
RevenueTypeListRequest
request
)
{
List
<
Map
<
String
,
Object
>>
result
=
dashboardService
.
revenueTypeListApi
(
request
);
throw
new
RRException
(
"Saas服务改造升级 预计22号升级完成"
);
}
...
...
@@ -95,8 +87,6 @@ public class DashboardController {
public
JsonResult
<
List
<
Map
<
String
,
Object
>>>
revenueSumApi
(
@RequestBody
RevenueSumApiRequest
request
)
{
List
<
Map
<
String
,
Object
>>
result
=
dashboardService
.
revenueSumApi
(
request
);
throw
new
RRException
(
"Saas服务改造升级 预计22号升级完成"
);
}
...
...
@@ -105,8 +95,6 @@ public class DashboardController {
public
JsonResult
<
AdminPage
<
AdminTechnicianScoreResp
>>
getTechnicianPage
(
@RequestBody
GetTechnicianPageRequest
request
)
{
AdminPage
<
AdminTechnicianScoreResp
>
respAdminPage
=
dashboardService
.
getTechnicianPage
(
request
);
throw
new
RRException
(
"Saas服务改造升级 预计22号升级完成"
);
}
...
...
@@ -115,8 +103,6 @@ public class DashboardController {
public
JsonResult
<
AdminPage
<
AchievementsPersonaResult
>>
achievementsPersonaResultPageApi
(
@RequestBody
AchievementsPersonaResultPageApiRequest
request
)
{
AdminPage
<
AchievementsPersonaResult
>
page
=
dashboardService
.
achievementsPersonaResultPageApi
(
request
);
throw
new
RRException
(
"Saas服务改造升级 预计22号升级完成"
);
}
...
...
@@ -125,7 +111,5 @@ public class DashboardController {
public
JsonResult
<
List
<
Map
<
String
,
Object
>>>
revenueServiceListApi
(
@RequestBody
RevenueServiceListApiRequest
request
)
{
List
<
Map
<
String
,
Object
>>
result
=
dashboardService
.
revenueServiceListApi
(
request
);
throw
new
RRException
(
"Saas服务改造升级 预计22号升级完成"
);
}
}
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