|
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.fdkankan.agent.common.PageInfo;
|
|
import com.fdkankan.agent.common.PageInfo;
|
|
import com.fdkankan.agent.common.ResultCode;
|
|
import com.fdkankan.agent.common.ResultCode;
|
|
import com.fdkankan.agent.common.util.IncrementUtil;
|
|
import com.fdkankan.agent.common.util.IncrementUtil;
|
|
|
|
+import com.fdkankan.agent.entity.IncrementOrderMg;
|
|
import com.fdkankan.agent.entity.IncrementType;
|
|
import com.fdkankan.agent.entity.IncrementType;
|
|
import com.fdkankan.agent.entity.User;
|
|
import com.fdkankan.agent.entity.User;
|
|
import com.fdkankan.agent.entity.UserIncrement;
|
|
import com.fdkankan.agent.entity.UserIncrement;
|
|
@@ -101,7 +102,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
|
|
if(incrementType.getValidTimeType() == 1){
|
|
if(incrementType.getValidTimeType() == 1){
|
|
param.setMemberLevels("SE");
|
|
param.setMemberLevels("SE");
|
|
}
|
|
}
|
|
- incrementOrderMgService.addOrder(user,param,agentNewVo);
|
|
|
|
|
|
+ IncrementOrderMg orderMg = incrementOrderMgService.addOrder(user, param, agentNewVo);
|
|
|
|
|
|
List<UserIncrement> userIncrementList = new ArrayList<>();
|
|
List<UserIncrement> userIncrementList = new ArrayList<>();
|
|
for (int i = 0 ; i<param.getCount() ;i++) {
|
|
for (int i = 0 ; i<param.getCount() ;i++) {
|
|
@@ -109,6 +110,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
|
|
String date = DateUtil.date2String(new Date(), DateUtil.DEFAULT_DATE_FORMAT);
|
|
String date = DateUtil.date2String(new Date(), DateUtil.DEFAULT_DATE_FORMAT);
|
|
userIncrement.setUserId(user.getId());
|
|
userIncrement.setUserId(user.getId());
|
|
userIncrement.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
|
|
userIncrement.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
|
|
|
|
+ userIncrement.setOrderSn(orderMg.getOrderSn());
|
|
userIncrement.setIsExpired(0);
|
|
userIncrement.setIsExpired(0);
|
|
userIncrement.setCreateTime(date);
|
|
userIncrement.setCreateTime(date);
|
|
userIncrement.setUpdateTime(date);
|
|
userIncrement.setUpdateTime(date);
|