Merge branch 'feature/0722-kf' into test

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

@@ -700,7 +700,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
                     newRecord.setId(null);
                     newRecord.setDisplayFlag(false);
                     newRecord.setEfficientFlag(true);
-                    if (!giveFlag) {
+                    if (!vipCardRecord.getVipType().equals(vipType) && !giveFlag) {
                         newRecord.setStartTime(new Date(newRecord.getStartTime().getTime() - deductMills));
                         giveFlag = true;
                     } else {
@@ -762,7 +762,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
                 newRecord.setId(null);
                 newRecord.setDisplayFlag(false);
                 newRecord.setEfficientFlag(true);
-                if (!giveFlag) {
+                if (vipCardRecord.getVipType().equals(addVipCardRecord.getVipType()) && !giveFlag) {
                     deductMills = vipCardRecord.getStartTime().getTime() - lastUnPereutalDate.getTime();
                     endDeductMills = vipCardRecord.getStartTime().getTime() - lastEndUnPereutalDate.getTime();
                     newRecord.setStartTime(new Date(newRecord.getStartTime().getTime() - deductMills));