fix

netflix-dao/src/main/java/com/cyksj/model/request/GptIndependentExportRechargeReq.java

@@ -15,4 +15,6 @@ public class GptIndependentExportRechargeReq {
 	private String orderNo;
 
 	private Integer num;
+
+	private Long adminId;
 }

netflix-service/src/main/java/com/cyksj/service/mange/gpt/impl/GptRechargeServiceImpl.java

@@ -277,7 +277,11 @@ public class GptRechargeServiceImpl implements GptRechargeService {
 		//代充账号设置
 		relation.setAccount(account.getAccount());
 		relation.setPassword(account.getPassword());
-		relation.setSubmitTime(DateTime.now());
+		relation.setSubmitTime(relation.getStartTime());
+		relation.setSendTime(relation.getSubmitTime());
+		//记录首次导入的代充次数
+		CmsUser cmsUser = cmsUserMapper.selectById(rechargeReq.getAdminId());
+		gptUserRechargeRecordService.recordGptUserRechargeNum(relation.getUserId(), relation.getId(), relation.getAccount(), num, cmsUser != null ? cmsUser.getNickname() : null, "导入GPT订单");
 		relationMapper.updateById(relation);
 	}
 

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -3136,7 +3136,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 
 		//GPT独立会员续费 若为代充类型 同步代充次数
 		if (orderDon.getGoodsId() == Constant.GPT_PLUS_GID && orderDon.getOrderType() == 2) {
-			incrGroupsRelationRechargeRemainIfRecharge(orderDon.getRelationId(), sku.getNum());
+			incrGroupsRelationRechargeRemainIfRecharge(orderDon.getRelationId(), sku.getMonths());
 		}
 	}
 

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

@@ -328,11 +328,14 @@ public class CmsGroupRelationController {
      */
     @GetMapping("/get/recharge/operate/record")
     public Result<List<GptUserRechargeNumRecord>> getGptUserRechargeNumRecord(Long relationId, Long userId) {
-        OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class).eq(OrderDon::getUserId, userId).eq(OrderDon::getRelationId, relationId).notIn(OrderDon::getStatus, Constant.noOrderAllStatus).orderByDesc(OrderDon::getId).last("limit 1"));
+        GroupsRelation relation = groupsRelationMapper.selectById(relationId);
+        if (relation.getStartTime() == null) {
+            return GatewayResponse.SUCCESS.newBuilder().toResult();
+        }
         List<GptUserRechargeNumRecord> gptUserRechargeNumRecords = beanSearcher.searchAll(GptUserRechargeNumRecord.class, MapUtils.flatBuilder(request.getParameterMap())
                 .field(GptUserRechargeNumRecord::getRelationId, relationId)
                 .field(GptUserRechargeNumRecord::getUserId, userId)
-                .field(GptUserRechargeNumRecord::getCreatedTime, orderDon.getCreatedTime()).op(Operator.GreaterThan)
+                .field(GptUserRechargeNumRecord::getCreatedTime, relation.getStartTime()).op(Operator.GreaterThan)
                 .build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(gptUserRechargeNumRecords);
     }
@@ -380,6 +383,8 @@ public class CmsGroupRelationController {
     @PostMapping("/gpt/independent/export/recharge")
     @Log(module = "账号管理/用户代充/导入GPT独立会员订单", businessType = BusinessType.POST, isSaveRequestData = true)
     public Result<String> gptIndependentExportRecharge(@RequestBody GptIndependentExportRechargeReq rechargeReq) {
+        long adminId = StpUtil.getLoginIdAsLong();
+        rechargeReq.setAdminId(adminId);
         gptRechargeService.gptIndependentExportRecharge(rechargeReq);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }