Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-golf-service
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
1
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
eea832cf
authored
Jan 26, 2018
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add the vipmemberlog
parent
e8aebc4c
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
133 additions
and
0 deletions
src/main/java/com/ctrip/fun/golf/dao/user/VipMemberLogDao.java
src/main/java/com/ctrip/fun/golf/domain/user/VipMemberLog.java
src/main/java/com/ctrip/fun/golf/service/order/VipMemberOrderService.java
src/main/java/com/ctrip/fun/golf/service/payment/VipMemberNotifyService.java
src/main/resources/hibernate.cfg.xml
src/main/resources/order.spring.xml
src/main/resources/payment.spring.xml
src/main/resources/user.spring.xml
src/main/java/com/ctrip/fun/golf/dao/user/VipMemberLogDao.java
0 → 100644
View file @
eea832cf
package
com
.
ctrip
.
fun
.
golf
.
dao
.
user
;
import
com.ctrip.fun.golf.dao.GenericHibernateDao
;
import
com.ctrip.fun.golf.domain.user.VipMemberLog
;
public
class
VipMemberLogDao
extends
GenericHibernateDao
<
VipMemberLog
,
Integer
>{
}
src/main/java/com/ctrip/fun/golf/domain/user/VipMemberLog.java
0 → 100644
View file @
eea832cf
package
com
.
ctrip
.
fun
.
golf
.
domain
.
user
;
import
static
javax
.
persistence
.
GenerationType
.
IDENTITY
;
import
java.util.Date
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
javax.persistence.Temporal
;
import
javax.persistence.TemporalType
;
@Entity
@Table
(
name
=
"bsc_vipmemberlog"
,
catalog
=
"fundb"
)
public
class
VipMemberLog
implements
java
.
io
.
Serializable
{
/**
*
*/
private
static
final
long
serialVersionUID
=
1440863374804436905L
;
private
Integer
id
;
private
String
uid
;
private
Date
vipStartTime
;
private
Date
vipExpireTime
;
private
Integer
vipType
;
@Id
@GeneratedValue
(
strategy
=
IDENTITY
)
@Column
(
name
=
"id"
,
unique
=
true
,
nullable
=
false
)
public
Integer
getId
()
{
return
this
.
id
;
}
public
void
setId
(
Integer
id
)
{
this
.
id
=
id
;
}
@Column
(
name
=
"uid"
,
nullable
=
false
,
length
=
50
)
public
String
getUid
()
{
return
this
.
uid
;
}
public
void
setUid
(
String
uid
)
{
this
.
uid
=
uid
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"vipStartTime"
)
public
Date
getVipStartTime
()
{
return
vipStartTime
;
}
public
void
setVipStartTime
(
Date
vipStartTime
)
{
this
.
vipStartTime
=
vipStartTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"vipExpireTime"
)
public
Date
getVipExpireTime
()
{
return
vipExpireTime
;
}
public
void
setVipExpireTime
(
Date
vipExpireTime
)
{
this
.
vipExpireTime
=
vipExpireTime
;
}
@Column
(
name
=
"vipType"
,
nullable
=
false
,
length
=
4
)
public
Integer
getVipType
()
{
return
vipType
;
}
public
void
setVipType
(
Integer
vipType
)
{
this
.
vipType
=
vipType
;
}
}
src/main/java/com/ctrip/fun/golf/service/order/VipMemberOrderService.java
View file @
eea832cf
...
...
@@ -31,11 +31,13 @@ import com.ctrip.fun.common.vo.product.ProductPaymentTypeEnum;
import
com.ctrip.fun.common.vo.product.VipMemberTypeEnum
;
import
com.ctrip.fun.golf.dao.client.ClientConfigDao
;
import
com.ctrip.fun.golf.dao.order.VipMemberOrderItemDao
;
import
com.ctrip.fun.golf.dao.user.VipMemberLogDao
;
import
com.ctrip.fun.golf.domain.basic.Voucher
;
import
com.ctrip.fun.golf.domain.client.ClientConfig
;
import
com.ctrip.fun.golf.domain.order.Order
;
import
com.ctrip.fun.golf.domain.order.VipMemberOrderItem
;
import
com.ctrip.fun.golf.domain.user.UserExt
;
import
com.ctrip.fun.golf.domain.user.VipMemberLog
;
import
com.ctrip.fun.golf.exceptions.OrderException
;
import
com.ctrip.fun.golf.service.basic.OperationMessageService
;
import
com.ctrip.fun.golf.utils.JobUtil
;
...
...
@@ -66,6 +68,8 @@ public class VipMemberOrderService extends AbstractOrderService<VipMemberOrderBe
private
ClientConfigDao
clientConfigDao
;
private
VipMemberOrderItemDao
vipmemberOrderItemDao
;
private
VipMemberLogDao
vipmemberLogDao
;
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
VipMemberOrderService
.
class
);
...
...
@@ -238,6 +242,13 @@ public class VipMemberOrderService extends AbstractOrderService<VipMemberOrderBe
}
int
vipGrade
=
user
.
getVipGrade
()
|
VipGradeEnum
.
VIP4
.
getKey
();
getUserExtDao
().
updateVipMemberInfo
(
user
.
getUid
(),
expireTime
,
vipGrade
);
VipMemberLog
vipmemberLog
=
new
VipMemberLog
();
vipmemberLog
.
setUid
(
user
.
getUid
());
vipmemberLog
.
setVipStartTime
(
tmpTime
);
vipmemberLog
.
setVipExpireTime
(
expireTime
);
vipmemberLog
.
setVipType
(
vipmemberType
);
getVipmemberLogDao
().
save
(
vipmemberLog
);
}
@SuppressWarnings
(
"static-access"
)
private
void
startCancelOrderJob
(
Order
order
)
{
...
...
@@ -461,6 +472,18 @@ public class VipMemberOrderService extends AbstractOrderService<VipMemberOrderBe
public
VipMemberLogDao
getVipmemberLogDao
()
{
return
vipmemberLogDao
;
}
public
void
setVipmemberLogDao
(
VipMemberLogDao
vipmemberLogDao
)
{
this
.
vipmemberLogDao
=
vipmemberLogDao
;
}
public
JobUtil
getJobUtil
()
{
return
jobUtil
;
}
...
...
src/main/java/com/ctrip/fun/golf/service/payment/VipMemberNotifyService.java
View file @
eea832cf
...
...
@@ -12,9 +12,11 @@ import com.ctrip.fun.common.core.util.DateUtil;
import
com.ctrip.fun.common.vo.basic.VipGradeEnum
;
import
com.ctrip.fun.common.vo.product.VipMemberTypeEnum
;
import
com.ctrip.fun.golf.dao.order.VipMemberOrderItemDao
;
import
com.ctrip.fun.golf.dao.user.VipMemberLogDao
;
import
com.ctrip.fun.golf.domain.order.Order
;
import
com.ctrip.fun.golf.domain.order.VipMemberOrderItem
;
import
com.ctrip.fun.golf.domain.user.UserExt
;
import
com.ctrip.fun.golf.domain.user.VipMemberLog
;
import
com.ctrip.fun.golf.service.basic.OperationMessageService
;
import
com.ctrip.fun.golf.service.order.VipMemberOrderService
;
...
...
@@ -26,6 +28,7 @@ public class VipMemberNotifyService extends AbstractNotifyService {
private
VipMemberOrderItemDao
vipmemberOrderItemDao
=
null
;
private
VipMemberLogDao
vipmemberLogDao
;
@Override
protected
void
doPaySuccess
(
Order
order
)
{
...
...
@@ -60,6 +63,13 @@ public class VipMemberNotifyService extends AbstractNotifyService {
}
int
vipGrade
=
user
.
getVipGrade
()
|
VipGradeEnum
.
VIP4
.
getKey
();
getUserExtDao
().
updateVipMemberInfo
(
user
.
getUid
(),
expireTime
,
vipGrade
);
VipMemberLog
vipmemberLog
=
new
VipMemberLog
();
vipmemberLog
.
setUid
(
user
.
getUid
());
vipmemberLog
.
setVipStartTime
(
tmpTime
);
vipmemberLog
.
setVipExpireTime
(
expireTime
);
vipmemberLog
.
setVipType
(
vipmemberType
);
getVipmemberLogDao
().
save
(
vipmemberLog
);
}
...
...
@@ -125,4 +135,14 @@ public class VipMemberNotifyService extends AbstractNotifyService {
this
.
vipmemberOrderItemDao
=
vipmemberOrderItemDao
;
}
public
VipMemberLogDao
getVipmemberLogDao
()
{
return
vipmemberLogDao
;
}
public
void
setVipmemberLogDao
(
VipMemberLogDao
vipmemberLogDao
)
{
this
.
vipmemberLogDao
=
vipmemberLogDao
;
}
}
src/main/resources/hibernate.cfg.xml
View file @
eea832cf
...
...
@@ -132,6 +132,7 @@
<mapping
class=
"com.ctrip.fun.golf.domain.user.UserConracts"
/>
<mapping
class=
"com.ctrip.fun.golf.domain.user.UserIpBlackList"
/>
<mapping
class=
"com.ctrip.fun.golf.domain.user.IdentifyingCode"
/>
<mapping
class=
"com.ctrip.fun.golf.domain.user.VipMemberLog"
/>
<mapping
class=
"com.ctrip.fun.golf.domain.adminUser.AdminUser"
/>
<mapping
class=
"com.ctrip.fun.golf.domain.adminUser.AdminAuthority"
/>
...
...
src/main/resources/order.spring.xml
View file @
eea832cf
...
...
@@ -199,6 +199,7 @@
<bean
name=
"vipmemberOrderService"
class=
"com.ctrip.fun.golf.service.order.VipMemberOrderService"
parent=
"abstractOrderService"
>
<property
name=
"vipmemberOrderItemDao"
ref=
"vipmemberOrderItemDao"
></property>
<property
name=
"clientConfigDao"
ref=
"clientConfigDao"
></property>
<property
name=
"vipmemberLogDao"
ref=
"vipmemberLogDao"
></property>
<property
name=
"operationMessageService"
ref=
"operationMessageService"
></property>
<property
name=
"jobUtil"
ref=
"jobUtil"
></property>
<property
name=
"overTimeMinute"
value=
"${payment.longOvertime}"
></property>
...
...
src/main/resources/payment.spring.xml
View file @
eea832cf
...
...
@@ -125,6 +125,7 @@
<property
name=
"userMemberIntegralLogDao"
ref=
"userMemberIntegralLogDao"
></property>
<property
name=
"orderProcessLogDao"
ref=
"orderProcessLogDao"
></property>
<property
name=
"vipmemberOrderItemDao"
ref=
"vipmemberOrderItemDao"
></property>
<property
name=
"vipmemberLogDao"
ref=
"vipmemberLogDao"
></property>
</bean>
<bean
name=
"mallNotifyService"
class=
"com.ctrip.fun.mall.service.payment.MallNotifyService"
>
...
...
src/main/resources/user.spring.xml
View file @
eea832cf
...
...
@@ -36,6 +36,10 @@
<bean
name=
"integralConfigDao"
class=
"com.ctrip.fun.golf.dao.integral.IntegralConfigDao"
>
<property
name=
"sessionFactory"
ref=
"sessionFactory"
></property>
</bean>
<bean
name=
"vipmemberLogDao"
class=
"com.ctrip.fun.golf.dao.user.VipMemberLogDao"
>
<property
name=
"sessionFactory"
ref=
"sessionFactory"
></property>
</bean>
<bean
name=
"userService"
class=
"com.ctrip.fun.golf.service.user.UserService"
>
<property
name=
"courseDao"
ref=
"courseDao"
></property>
...
...
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