fix 设置代充车票时长

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -630,17 +630,20 @@ public class CmsOrderController {
 					relation.setOperator(cmsUser.getNickname());
 				}
 				relation.setSendTime(DateTime.now());
-				relation.setStartTime(DateTime.now());
-				GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
-				DateTime expiryTime;
-				if (sku.getDays() != null && sku.getDays() > 0) {
-					expiryTime = DateUtil.offsetDay(relation.getStartTime(), sku.getDays());
-				} else {
-					expiryTime = DateUtil.offsetMonth(relation.getStartTime(), sku.getMonths());
+
+				//设置车票时间
+				if (relation.getStartTime() == null) {
+					relation.setStartTime(DateTime.now());
+					GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
+					DateTime expiryTime;
+					if (sku.getDays() != null && sku.getDays() > 0) {
+						expiryTime = DateUtil.offsetDay(relation.getStartTime(), sku.getDays());
+					} else {
+						expiryTime = DateUtil.offsetMonth(relation.getStartTime(), sku.getMonths());
+					}
+					relation.setExpiryTime(expiryTime);
 				}
-				relation.setExpiryTime(expiryTime);
 				relationMapper.updateById(relation);
-
 				//GPT代充
 				if (orderDon.getGoodsId() == Constant.GPT_RECHARGE_GOODS_ID) {
 					//扣除次数

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupRelationController.java

@@ -250,15 +250,18 @@ public class CmsGroupRelationController {
 
             orderDonMapper.updateById(orderDon);
 
-            relation.setStartTime(DateTime.now());
-            GoodsDonSku sku = goodsDonSkuMapper.selectById(orderDon.getSkuId());
-            DateTime expiryTime;
-            if (sku.getDays() != null && sku.getDays() > 0) {
-                expiryTime = DateUtil.offsetDay(relation.getStartTime(), sku.getDays());
-            } else {
-                expiryTime = DateUtil.offsetMonth(relation.getStartTime(), sku.getMonths());
+            //设置车票时间
+            if (relation.getStartTime() == null) {
+                relation.setStartTime(DateTime.now());
+                GoodsDonSku sku = goodsDonSkuMapper.selectById(orderDon.getSkuId());
+                DateTime expiryTime;
+                if (sku.getDays() != null && sku.getDays() > 0) {
+                    expiryTime = DateUtil.offsetDay(relation.getStartTime(), sku.getDays());
+                } else {
+                    expiryTime = DateUtil.offsetMonth(relation.getStartTime(), sku.getMonths());
+                }
+                relation.setExpiryTime(expiryTime);
             }
-            relation.setExpiryTime(expiryTime);
         }
         groupsRelationMapper.updateById(relation);
         //GPT代充