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
232b5b58
Commit
232b5b58
authored
Mar 25, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
order pay
parent
959b2f5d
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
142 additions
and
5 deletions
+142
-5
RRExceptionHandler.java
src/main/java/com/gogirl/RRExceptionHandler.java
+2
-1
IOrderPayService.java
...va/com/gogirl/application/order/pay/IOrderPayService.java
+3
-1
OrderPayServiceImpl.java
...ogirl/application/order/pay/impl/OrderPayServiceImpl.java
+76
-2
ComplaintDetailedMapper.java
...cture/mapper/store/complaint/ComplaintDetailedMapper.java
+3
-0
application.yml
src/main/resources/application.yml
+1
-1
ComplaintDetailedMapper.xml
src/main/resources/mapper/store/ComplaintDetailedMapper.xml
+12
-0
Test.java
src/test/java/com/gogirl/Test.java
+45
-0
No files found.
src/main/java/com/gogirl/RRExceptionHandler.java
View file @
232b5b58
...
...
@@ -33,7 +33,8 @@ public class RRExceptionHandler {
result
.
setSuccess
(
false
);
result
.
setCode
(
e
.
getCode
());
result
.
setMessage
(
e
.
getMessage
());
if
(
e
.
getCode
()
!=
2000
&&
e
.
getCode
()
!=
2001
&&
e
.
getCode
()
!=
2005
)
{
if
(
e
.
getCode
()
!=
2000
&&
e
.
getCode
()
!=
1001
&&
e
.
getCode
()
!=
2005
)
{
log
.
error
(
"Params : {}"
,
getParamString
(
request
.
getParameterMap
())
+
"\n"
);
log
.
error
(
"URI : {}"
,
request
.
getRequestURI
()
+
"\n"
);
...
...
src/main/java/com/gogirl/application/order/pay/IOrderPayService.java
View file @
232b5b58
package
com
.
gogirl
.
application
.
order
.
pay
;
import
com.gogirl.domain.order.pay.OrderPay
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.gogirl.domain.order.pay.OrderPay
;
/**
* <p>
...
...
@@ -13,4 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public
interface
IOrderPayService
extends
IService
<
OrderPay
>
{
void
recordOrderPay
(
Integer
orderId
);
}
src/main/java/com/gogirl/application/order/pay/impl/OrderPayServiceImpl.java
View file @
232b5b58
package
com
.
gogirl
.
application
.
order
.
pay
.
impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.gogirl.application.order.pay.IOrderPayService
;
import
com.gogirl.domain.order.pay.OrderPay
;
import
com.gogirl.domain.order.serve.MultiPaymentType
;
import
com.gogirl.domain.order.serve.OrderManage
;
import
com.gogirl.infrastructure.common.util.JsonUtilByFsJson
;
import
com.gogirl.infrastructure.mapper.order.pay.OrderPayMapper
;
import
com.gogirl.
application.order.pay.IOrderPayService
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.gogirl.
infrastructure.mapper.order.serve.OrderManageMapper
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.stereotype.Service
;
import
javax.annotation.Resource
;
import
java.util.List
;
/**
* <p>
* 订单支付明细 服务实现类
...
...
@@ -15,6 +23,72 @@ import org.springframework.stereotype.Service;
* @since 2020-03-12
*/
@Service
@Slf4j
public
class
OrderPayServiceImpl
extends
ServiceImpl
<
OrderPayMapper
,
OrderPay
>
implements
IOrderPayService
{
@Resource
OrderManageMapper
orderManageMapper
;
@Resource
OrderPayMapper
orderPayMapper
;
@Override
public
void
recordOrderPay
(
Integer
orderId
)
{
OrderManage
orderManage
=
orderManageMapper
.
selectById
(
orderId
);
if
(
orderManage
.
getPaymentType
().
equals
(
1
))
{
OrderPay
orderPay
=
new
OrderPay
();
orderPay
.
setAmount
(
orderManage
.
getTotalPaymentAmount
());
orderPay
.
setOrderId
(
orderManage
.
getId
());
orderPay
.
setType
(
1
);
orderPayMapper
.
insert
(
orderPay
);
}
if
(
orderManage
.
getPaymentType
().
equals
(
2
))
{
OrderPay
orderPay
=
new
OrderPay
();
orderPay
.
setAmount
(
orderManage
.
getTotalPaymentAmount
());
orderPay
.
setOrderId
(
orderManage
.
getId
());
orderPay
.
setType
(
2
);
orderPayMapper
.
insert
(
orderPay
);
}
if
(
orderManage
.
getPaymentType
().
equals
(
5
))
{
OrderPay
orderPay
=
new
OrderPay
();
orderPay
.
setAmount
(
orderManage
.
getTotalPaymentAmount
());
orderPay
.
setOrderId
(
orderManage
.
getId
());
orderPay
.
setType
(
5
);
orderPayMapper
.
insert
(
orderPay
);
}
if
(
orderManage
.
getPaymentType
().
equals
(
12
)
||
orderManage
.
getPaymentType
().
equals
(
13
))
{
try
{
List
<
MultiPaymentType
>
multiPaymentTypeList
=
JsonUtilByFsJson
.
jsonToList
(
orderManage
.
getMultiplePaymentType
(),
MultiPaymentType
.
class
);
multiPaymentTypeList
.
forEach
(
multiPaymentType
->
{
if
(
multiPaymentType
.
getType
().
equals
(
1
))
{
OrderPay
orderPay
=
new
OrderPay
();
orderPay
.
setAmount
(
multiPaymentType
.
getPrice
());
orderPay
.
setOrderId
(
orderManage
.
getId
());
orderPay
.
setType
(
1
);
orderPayMapper
.
insert
(
orderPay
);
}
if
(
multiPaymentType
.
getType
().
equals
(
2
))
{
OrderPay
orderPay
=
new
OrderPay
();
orderPay
.
setAmount
(
multiPaymentType
.
getPrice
());
orderPay
.
setOrderId
(
orderManage
.
getId
());
orderPay
.
setType
(
2
);
orderPayMapper
.
insert
(
orderPay
);
}
if
(
multiPaymentType
.
getType
().
equals
(
5
))
{
OrderPay
orderPay
=
new
OrderPay
();
orderPay
.
setAmount
(
multiPaymentType
.
getPrice
());
orderPay
.
setOrderId
(
orderManage
.
getId
());
orderPay
.
setType
(
5
);
orderPayMapper
.
insert
(
orderPay
);
}
});
}
catch
(
Exception
e
)
{
log
.
error
(
"orderId:no multi :{}"
,
orderManage
.
getId
());
}
}
}
}
src/main/java/com/gogirl/infrastructure/mapper/store/complaint/ComplaintDetailedMapper.java
View file @
232b5b58
...
...
@@ -4,6 +4,8 @@ package com.gogirl.infrastructure.mapper.store.complaint;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.gogirl.domain.store.complaint.ComplaintDetailed
;
import
java.util.List
;
/**
* <p>
* 投诉明细 Mapper 接口
...
...
@@ -14,4 +16,5 @@ import com.gogirl.domain.store.complaint.ComplaintDetailed;
*/
public
interface
ComplaintDetailedMapper
extends
BaseMapper
<
ComplaintDetailed
>
{
List
<
ComplaintDetailed
>
complainTest
();
}
src/main/resources/application.yml
View file @
232b5b58
spring
:
profiles
:
active
:
pr
e
active
:
pr
od
servlet
:
#文件上传最大容量
multipart
:
...
...
src/main/resources/mapper/store/ComplaintDetailedMapper.xml
0 → 100644
View file @
232b5b58
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace=
"com.gogirl.infrastructure.mapper.store.complaint.ComplaintDetailedMapper"
>
<select
id=
"complainTest"
resultType=
"com.gogirl.domain.store.complaint.ComplaintDetailed"
>
SELECT *
from complaint_detailed t1
LEFT JOIN complaint_detailed_technician t2 on t1.id = t2.complaint_detailed_id
where t2.id is null
GROUP BY t1.id
</select>
</mapper>
\ No newline at end of file
src/test/java/com/gogirl/Test.java
View file @
232b5b58
...
...
@@ -7,6 +7,10 @@ import com.gogirl.domain.market.coupon.CouponCustomerRelevance;
import
com.gogirl.domain.order.pay.OrderPay
;
import
com.gogirl.domain.order.serve.MultiPaymentType
;
import
com.gogirl.domain.order.serve.OrderManage
;
import
com.gogirl.domain.order.serve.OrderServe
;
import
com.gogirl.domain.store.complaint.ComplaintDetailed
;
import
com.gogirl.domain.store.complaint.ComplaintDetailedTechnician
;
import
com.gogirl.domain.store.complaint.ComplaintMain
;
import
com.gogirl.domain.user.customer.Customer
;
import
com.gogirl.domain.xcx.GogirlToken
;
import
com.gogirl.domain.xcx.TimeNode
;
...
...
@@ -16,10 +20,15 @@ import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMap
import
com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigWeekMapper
;
import
com.gogirl.infrastructure.mapper.order.pay.OrderPayMapper
;
import
com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper
;
import
com.gogirl.infrastructure.mapper.order.serve.OrderServeMapper
;
import
com.gogirl.infrastructure.mapper.store.complaint.ComplaintDetailedMapper
;
import
com.gogirl.infrastructure.mapper.store.complaint.ComplaintDetailedTechnicianMapper
;
import
com.gogirl.infrastructure.mapper.store.complaint.ComplaintMainMapper
;
import
com.gogirl.infrastructure.mapper.user.customer.CustomerMapper
;
import
com.gogirl.infrastructure.mapper.xcx.TimeNodeMapper
;
import
com.gogirl.infrastructure.mapper.xcx.WeekConfigMapper
;
import
lombok.extern.slf4j.Slf4j
;
import
org.assertj.core.util.Lists
;
import
org.junit.runner.RunWith
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.data.redis.core.RedisTemplate
;
...
...
@@ -32,6 +41,7 @@ import java.time.LocalDate;
import
java.time.LocalTime
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.stream.Collectors
;
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
...
...
@@ -191,4 +201,39 @@ public class Test {
gogirlTokenService
.
save
(
gogirlToken
);
System
.
out
.
println
(
gogirlToken
.
getToken
());
}
@Resource
ComplaintDetailedMapper
complaintDetailedMapper
;
@Resource
OrderServeMapper
orderServeMapper
;
@Resource
ComplaintMainMapper
complaintMainMapper
;
@Resource
ComplaintDetailedTechnicianMapper
complaintDetailedTechnicianMapper
;
@org
.
junit
.
Test
public
void
complain
()
{
List
<
ComplaintDetailed
>
complaintDetailedList
=
complaintDetailedMapper
.
complainTest
();
complaintDetailedList
.
forEach
(
complaintDetailed
->
{
ComplaintMain
complaintMain
=
complaintMainMapper
.
selectById
(
complaintDetailed
.
getMainId
());
List
<
Integer
>
technicianIds
=
orderServeMapper
.
selectList
(
new
LambdaQueryWrapper
<
OrderServe
>()
.
eq
(
OrderServe:
:
getOrderId
,
complaintMain
.
getOrderId
()))
.
stream
()
.
map
(
OrderServe:
:
getTechnicianId
)
.
map
(
id
->
Lists
.
newArrayList
(
id
.
split
(
","
)))
.
flatMap
(
List:
:
stream
)
.
map
(
Integer:
:
valueOf
)
.
collect
(
Collectors
.
toList
());
technicianIds
.
forEach
(
technicianId
->
{
ComplaintDetailedTechnician
complaintDetailedTechnician
=
new
ComplaintDetailedTechnician
();
complaintDetailedTechnician
.
setTechnicianId
(
technicianId
);
complaintDetailedTechnician
.
setComplaintDetailedId
(
complaintDetailed
.
getId
());
complaintDetailedTechnicianMapper
.
insert
(
complaintDetailedTechnician
);
});
});
}
}
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