|
@@ -185,6 +185,9 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
|
|
|
|
|
|
for (int i = 0 ; i<param.getCount() ;i++) {
|
|
|
UserIncrement userIncrement = new UserIncrement();
|
|
|
+ if(param.getId() != null){ //续费
|
|
|
+ userIncrement = this.getById(param.getId());
|
|
|
+ }
|
|
|
String date = DateUtil.date2String(new Date(), DateUtil.DEFAULT_DATE_FORMAT);
|
|
|
userIncrement.setId(param.getId());
|
|
|
userIncrement.setUserId(param.getUserId());
|
|
@@ -195,7 +198,11 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
|
|
|
userIncrement.setIncrementStartTime(date);
|
|
|
userIncrement.setIncrementEndTime(param.getIncrementEndTime());
|
|
|
userIncrement.setIncrementTypeId(param.getIncrementTypeId());
|
|
|
- userIncrement.setOrderSn(incrementOrderMg.getOrderSn());
|
|
|
+ if(userIncrement.getId()!= null){
|
|
|
+ userIncrement.setOrderSn(userIncrement.getOrderSn() +","+incrementOrderMg.getOrderSn());
|
|
|
+ }else {
|
|
|
+ userIncrement.setOrderSn(incrementOrderMg.getOrderSn());
|
|
|
+ }
|
|
|
if(incrementType.getValidTimeType() == 0){
|
|
|
userIncrement.setMemberLevels("PR");
|
|
|
}
|