1

src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -185,7 +185,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
             throw new BusinessException(ResultCode.INCREMENT_TYPE_EMPTY);
         }
         IncrementOrderMg incrementOrderMg = iIncrementOrderMgService.addOrder(param, incrementType);
-        DateTime dateTime = this.getDateTime(incrementType, param.getId(), param.getCount());
+
 
         for (int i = 0 ; i<param.getCount() ;i++) {
             UserIncrement userIncrement = new UserIncrement();
@@ -195,12 +195,15 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
             userIncrement.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
             userIncrement.setIsExpired(0);
             userIncrement.setUpdateTime(date);
-            userIncrement.setIncrementEndTime(DateUtil.date2String(dateTime.toDate(),"yyyy-MM-dd HH:mm:ss"));
+            userIncrement.setIncrementEndTime(param.getIncrementEndTime() +" 23:59:59");
             userIncrement.setIncrementTypeId(param.getIncrementTypeId());
             if(userIncrement.getId()== null){
                 userIncrement.setIncrementStartTime(date);
                 userIncrement.setCreateTime(date);
                 userIncrement.setOrderSn(incrementOrderMg.getOrderSn());
+            }else {
+                DateTime dateTime = this.getDateTime(incrementType, param.getId(), param.getCount());
+                userIncrement.setIncrementEndTime(DateUtil.date2String(dateTime.toDate(),"yyyy-MM-dd HH:mm:ss"));
             }
             if(incrementType.getValidTimeType() == 0){
                 userIncrement.setMemberLevels("PR");