fix 代充车票时间设置

netflix-dao/src/main/java/com/cyksj/model/entity/GptUserRechargeNumRecord.java

@@ -24,7 +24,9 @@ public class GptUserRechargeNumRecord extends BaseEntity{
 	private String operator;
 
 	/**
-	 * 次数 正为扣除 负为增加
+	 * 次数 正为增加 负为扣除
 	 */
 	private Integer num;
+
+	private String remark;
 }

netflix-service/src/main/java/com/cyksj/service/chatgpt/GptUserRechargeRecordService.java

@@ -8,5 +8,5 @@ package com.cyksj.service.chatgpt;
  */
 public interface GptUserRechargeRecordService {
 
-	void recordGptUserRechargeNum(Long userId, Long relationId, String account, Integer num, String operator);
+	void recordGptUserRechargeNum(Long userId, Long relationId, String account, Integer num, String operator, String remark);
 }

netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/GptUserRechargeRecordServiceImpl.java

@@ -20,7 +20,10 @@ import org.springframework.stereotype.Service;
 public class GptUserRechargeRecordServiceImpl implements GptUserRechargeRecordService {
 	private final GptUserRechargeNumRecordMapper gptUserRechargeNumRecordMapper;
 	@Override
-	public void recordGptUserRechargeNum(Long userId, Long relationId, String account, Integer num, String operator) {
+	public void recordGptUserRechargeNum(Long userId, Long relationId, String account, Integer num, String operator, String remark) {
+		if (num == 0) {
+			return;
+		}
 		//记录代充记录
 		GptUserRechargeNumRecord gptUserRechargeNumRecord = new GptUserRechargeNumRecord();
 		gptUserRechargeNumRecord.setUserId(userId);
@@ -28,6 +31,7 @@ public class GptUserRechargeRecordServiceImpl implements GptUserRechargeRecordSe
 		gptUserRechargeNumRecord.setAccount(account);
 		gptUserRechargeNumRecord.setNum(num);
 		gptUserRechargeNumRecord.setOperator(operator);
+		gptUserRechargeNumRecord.setRemark(remark);
 		gptUserRechargeNumRecordMapper.insert(gptUserRechargeNumRecord);
 	}
 }

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

@@ -88,15 +88,18 @@ public class CmsOrderController {
                     relation.setOperator(fcorpFollow.getName());
                 }
                 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代充
@@ -112,7 +115,7 @@ public class CmsOrderController {
                             throw BusinessRuntimeException.getInstance("更新用户代充剩余次数失败，请重试");
                         }
                         //记录gpt代充记录
-                        gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), 1, fcorpFollow != null ? fcorpFollow.getName() : null);
+                        gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), 1, fcorpFollow != null ? fcorpFollow.getName() : null, "客服手动充值");
                     }
                 }
             }