|
|
@@ -325,19 +325,17 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
|
|
|
.last("limit 1"))).orElse(new VipUser());
|
|
|
vipUser.setUserId(userId);
|
|
|
//发放会员
|
|
|
- if (vipUser.getStartTime() == null) {
|
|
|
- vipUser.setStartTime(DateTime.now());
|
|
|
- }
|
|
|
- if (vipUser.getExpiryTime() == null) {
|
|
|
- vipUser.setExpiryTime(vipUser.getStartTime());
|
|
|
- }
|
|
|
- vipUser.setExpiryTime(DateUtil.offsetMonth(vipUser.getExpiryTime(), 1));
|
|
|
if (vipUser.getId() == null) {
|
|
|
try {
|
|
|
+ vipUser.setStartTime(DateTime.now());
|
|
|
+ vipUser.setExpiryTime(DateUtil.offsetMonth(vipUser.getStartTime(), 1));
|
|
|
vipUserMapper.insert(vipUser);
|
|
|
} catch (DuplicateKeyException e) {
|
|
|
}
|
|
|
- } else vipUserMapper.updateById(vipUser);
|
|
|
+ } else {
|
|
|
+ vipUser.setExpiryTime(DateUtil.offsetMonth(vipUser.getExpiryTime(), 1));
|
|
|
+ vipUserMapper.updateById(vipUser);
|
|
|
+ }
|
|
|
//发放会员车票
|
|
|
if (orderDon.getOrderType() == 1) {
|
|
|
sendVipTicketToUser(userId);
|