Merge branch 'feature/0712_vip' into test

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VipCardRecordServiceImpl.java

@@ -797,10 +797,11 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
                     newRecord.setStartTime(new Date(newRecord.getStartTime().getTime() - deductMills));
                     giveFlag = true;
                 } else {
-                    endDeductMills = vipCardRecord.getStartTime().getTime() - lastEndUnPereutalDate.getTime();
+                    endDeductMills = vipCardRecord.getStartTime().getTime() - (lastEndUnPereutalDate.getTime() +1000);
                     newRecord.setStartTime(new Date(newRecord.getStartTime().getTime() - endDeductMills));
                 }
                 newRecord.setEndTime(new Date(newRecord.getEndTime().getTime() - endDeductMills));
+                lastEndUnPereutalDate = newRecord.getEndTime();
                 save(newRecord);
                 Long refId = newRecord.getId();