From 4742874ad840d7e1e3ac79dc288b38e9a642319d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 02 六月 2025 19:11:00 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/THuiminCardController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/THuiminCardController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/THuiminCardController.java
index bf65325..7e8c2c2 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/THuiminCardController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/THuiminCardController.java
@@ -1,5 +1,6 @@
package com.dsh.activity.controller;
+import cn.hutool.core.collection.CollUtil;
import cn.mb.cloud.common.data.controller.BaseController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,12 +8,18 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.activity.entity.THuiminCard;
import com.dsh.activity.entity.TPayHuimin;
+import com.dsh.activity.entity.TStudent;
+import com.dsh.activity.feignclient.account.StudentClient;
import com.dsh.activity.service.HuiminCardService;
import com.dsh.activity.service.PayHuiminService;
+import com.dsh.activity.util.UUIDUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -25,6 +32,8 @@
private HuiminCardService tHuiminCardService;
@Autowired
private PayHuiminService payHuiminService;
+ @Autowired
+ private StudentClient studentClient;
@PostMapping("/queryPage")
@@ -155,4 +164,51 @@
tHuiminCardService.updateById(tHuiminCard);
return "success";
}
+ @GetMapping("/getCards")
+
+ public List<THuiminCard> getCards(@RequestParam("storeId")String storeId){
+ List<THuiminCard> list = tHuiminCardService.lambdaQuery().apply("FIND_IN_SET(" + storeId + ",storeIds)").list();
+ return list;
+ }
+ @GetMapping("/addPayHuiMing")
+ public void addPayHuiMing(@RequestParam("studentId")Integer studentId, @RequestParam("cardId")Integer cardId){
+ TPayHuimin tPayHuimin = new TPayHuimin();
+
+ THuiminCard byId = tHuiminCardService.getById(cardId);
+ List<TStudent> studentByIds = studentClient.getStudentByIds(studentId + "");
+ if (CollUtil.isNotEmpty(studentByIds)){
+ tPayHuimin.setAppUserId(studentByIds.get(0).getAppUserId());
+ }
+ tPayHuimin.setSalesMoney(byId.getSalesMoney());
+ tPayHuimin.setStudentId(studentId+"");
+ switch (byId.getHuiMinType()) {
+ case 1:
+ // 年度卡
+ LocalDateTime localDateTime = LocalDateTime.now().plusDays(365);
+ // 将LocalDateTime转换为Date类型
+ Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+ tPayHuimin.setEndTime(date);
+ break;
+ case 2:
+ // 年内卡
+ Date date1 = new Date();
+ date1.setMonth(11);
+ date1.setDate(31);
+ date1.setHours(23);
+ date1.setMinutes(59);
+ date1.setSeconds(57);
+ tPayHuimin.setEndTime(date1);
+ break;
+ }
+ tPayHuimin.setInsertTime(new Date());
+ tPayHuimin.setPaymentType(3);
+ tPayHuimin.setRefundStatus(1);
+ tPayHuimin.setCardId(byId.getId());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ tPayHuimin.setCode(sdf.format(new Date()) + UUIDUtil.getNumberRandom(5));
+ System.err.println("支付数据" + tPayHuimin);
+ tPayHuimin.setPaymentTime(new Date());
+ tPayHuimin.setStatus(2);
+ payHuiminService.save(tPayHuimin);
+ }
}
--
Gitblit v1.7.1