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
6f0ca4a8
Commit
6f0ca4a8
authored
May 18, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
非组合方式 清空multiPaymentType
parent
d2db3d36
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
4 deletions
+11
-4
ChargeOrderServiceImpl.java
...application/order/member/impl/ChargeOrderServiceImpl.java
+1
-0
OrderManageServiceImpl.java
.../application/order/serve/impl/OrderManageServiceImpl.java
+3
-0
OrderManage.java
src/main/java/com/gogirl/domain/order/serve/OrderManage.java
+2
-4
OrderServe.java
src/main/java/com/gogirl/domain/order/serve/OrderServe.java
+5
-0
No files found.
src/main/java/com/gogirl/application/order/member/impl/ChargeOrderServiceImpl.java
View file @
6f0ca4a8
...
@@ -182,6 +182,7 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
...
@@ -182,6 +182,7 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
.
customerId
(
customer
.
getId
())
.
customerId
(
customer
.
getId
())
.
status
(
1
)
.
status
(
1
)
.
build
();
.
build
();
this
.
save
(
chargeOrder
);
this
.
save
(
chargeOrder
);
}
}
...
...
src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
View file @
6f0ca4a8
...
@@ -789,6 +789,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
...
@@ -789,6 +789,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderManage
.
setStatus
(
OrderManage
.
STATUS_UN_COMMENT
);
orderManage
.
setStatus
(
OrderManage
.
STATUS_UN_COMMENT
);
orderManage
.
setPaymentType
(
payType
);
orderManage
.
setPaymentType
(
payType
);
orderManage
.
setMultiplePaymentType
(
null
);
orderManageMapper
.
updateById
(
orderManage
);
orderManageMapper
.
updateById
(
orderManage
);
}
else
if
(
payType
.
equals
(
5
))
{
}
else
if
(
payType
.
equals
(
5
))
{
log
.
info
(
"**美甲师pos机收款**,订单id: {}"
,
orderId
);
log
.
info
(
"**美甲师pos机收款**,订单id: {}"
,
orderId
);
...
@@ -796,6 +797,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
...
@@ -796,6 +797,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderManage
.
setStatus
(
OrderManage
.
STATUS_UN_COMMENT
);
orderManage
.
setStatus
(
OrderManage
.
STATUS_UN_COMMENT
);
orderManage
.
setPaymentType
(
payType
);
orderManage
.
setPaymentType
(
payType
);
orderManage
.
setMultiplePaymentType
(
null
);
orderManageMapper
.
updateById
(
orderManage
);
orderManageMapper
.
updateById
(
orderManage
);
}
else
if
(
payType
.
equals
(
10
))
{
}
else
if
(
payType
.
equals
(
10
))
{
...
@@ -804,6 +806,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
...
@@ -804,6 +806,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
//状态更新为待评论
//状态更新为待评论
orderManage
.
setStatus
(
OrderManage
.
STATUS_UN_COMMENT
);
orderManage
.
setStatus
(
OrderManage
.
STATUS_UN_COMMENT
);
orderManage
.
setPaymentType
(
OrderManage
.
PAYMENT_FREE
);
orderManage
.
setPaymentType
(
OrderManage
.
PAYMENT_FREE
);
orderManage
.
setMultiplePaymentType
(
null
);
this
.
updateById
(
orderManage
);
this
.
updateById
(
orderManage
);
}
}
...
...
src/main/java/com/gogirl/domain/order/serve/OrderManage.java
View file @
6f0ca4a8
package
com
.
gogirl
.
domain
.
order
.
serve
;
package
com
.
gogirl
.
domain
.
order
.
serve
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.gogirl.domain.market.coupon.CouponCustomerRelevance
;
import
com.gogirl.domain.market.coupon.CouponCustomerRelevance
;
import
com.gogirl.domain.market.coupon.CouponOrderRelevance
;
import
com.gogirl.domain.market.coupon.CouponOrderRelevance
;
...
@@ -144,6 +141,7 @@ public class OrderManage implements Serializable {
...
@@ -144,6 +141,7 @@ public class OrderManage implements Serializable {
private
String
createUser
;
private
String
createUser
;
@ApiModelProperty
(
"多选支付方式 200-pos机 100-现金 50-微信扫码"
)
@ApiModelProperty
(
"多选支付方式 200-pos机 100-现金 50-微信扫码"
)
@TableField
(
strategy
=
FieldStrategy
.
IGNORED
)
private
String
multiplePaymentType
;
private
String
multiplePaymentType
;
@ApiModelProperty
(
"支付方式:1#微信 2#会员 3#其他4#充值5#pos机6#现金7#大众点评8#微信扫码支付9#团购10#免单11#会员帮付12#余额抵扣微信支付13#余额抵扣pos支付"
)
@ApiModelProperty
(
"支付方式:1#微信 2#会员 3#其他4#充值5#pos机6#现金7#大众点评8#微信扫码支付9#团购10#免单11#会员帮付12#余额抵扣微信支付13#余额抵扣pos支付"
)
...
...
src/main/java/com/gogirl/domain/order/serve/OrderServe.java
View file @
6f0ca4a8
...
@@ -36,14 +36,19 @@ public class OrderServe implements Serializable {
...
@@ -36,14 +36,19 @@ public class OrderServe implements Serializable {
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
@TableId
(
type
=
IdType
.
AUTO
)
@TableId
(
type
=
IdType
.
AUTO
)
private
Integer
id
;
private
Integer
id
;
@ApiModelProperty
(
"订单id"
)
@ApiModelProperty
(
"订单id"
)
private
Integer
orderId
;
private
Integer
orderId
;
@ApiModelProperty
(
"服务美甲顾问id"
)
@ApiModelProperty
(
"服务美甲顾问id"
)
private
String
technicianId
;
private
String
technicianId
;
@ApiModelProperty
(
"订单美甲师姓名"
)
@ApiModelProperty
(
"订单美甲师姓名"
)
private
String
technicianName
;
private
String
technicianName
;
@ApiModelProperty
(
"业绩"
)
@ApiModelProperty
(
"业绩"
)
private
BigDecimal
achievement
;
private
BigDecimal
achievement
;
@ApiModelProperty
(
"服务评价状态 1-未评价 2-已评价"
)
@ApiModelProperty
(
"服务评价状态 1-未评价 2-已评价"
)
private
Integer
commentStatus
;
private
Integer
commentStatus
;
...
...
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