From a8a034bfb4a898662a8624a8e33e4c152cd22975 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期五, 01 三月 2024 14:49:33 +0800
Subject: [PATCH] 1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java | 158 +++++++++++++++++++++++++++-------------------------
1 files changed, 83 insertions(+), 75 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java
index 19a01d9..0632612 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java
@@ -58,10 +58,18 @@
private IMallTimeConfigService mallTimeConfigService;
@Resource
private ISysConfigService configService;
-// @Resource
+ // @Resource
// private OrderDelayService delayService;
@Autowired
private TaskService taskService;
+
+ @GetMapping("/isStartYy")
+ @ApiOperation(value = "鏌ヨ棰勭害鍔熻兘鏄惁寮�鍚�")
+ public AjaxResult isStartYy() {
+ String isStartYy = configService.selectConfigByKey("is_start_yy");
+ return AjaxResult.success(isStartYy);
+ }
+
@PostMapping
@ApiOperation(value = "涓汉棰勭害")
@@ -75,12 +83,12 @@
if (!(MatchUtils.isMobileNO(tjReservation.getPhoe())))
return AjaxResult.error("鎵嬫満鍙烽敊璇�");
- if(tjReservation.getIdCard().length()==18){
+ if (tjReservation.getIdCard().length() == 18) {
if (!MatchUtils.isIdCard(tjReservation.getIdCard())) {
return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
}
}
- if(tjReservation.getIdCard().length()==9){
+ if (tjReservation.getIdCard().length() == 9) {
if (!MatchUtils.cardValidates(tjReservation.getIdCard())) {
return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
}
@@ -105,22 +113,22 @@
tjReservation.setUpdateTime(new Date());
tjReservation.setWechat(String.valueOf(wxuser.getOpenid()));
tjReservation.setConnect(String.valueOf(wxuser.getId()));
- if(null !=tjReservation.getProIdList() && tjReservation.getProIdList().size()>0){
+ if (null != tjReservation.getProIdList() && tjReservation.getProIdList().size() > 0) {
String join = Joiner.on(",").join(tjReservation.getProIdList());
tjReservation.setProIds(join);
}
if (reservationService.save(tjReservation)) {
taskService.addTask(new TjReservationTask(tjReservation.getId(),
- DateUtil.between(new Date(),DateUtil.endOfDay(tjReservation.getReservationTime()), DateUnit.MS)));
+ DateUtil.between(new Date(), DateUtil.endOfDay(tjReservation.getReservationTime()), DateUnit.MS)));
- TjCustomer one = customerService.getOne(new LambdaQueryWrapper<TjCustomer>().eq(TjCustomer::getCusIdcard,tjReservation.getIdCard()));
- if(null !=one){
+ TjCustomer one = customerService.getOne(new LambdaQueryWrapper<TjCustomer>().eq(TjCustomer::getCusIdcard, tjReservation.getIdCard()));
+ if (null != one) {
one.setWechat(String.valueOf(wxuser.getId()));
one.setConnect(wxuser.getOpenid());
customerService.updateById(one);
- }else {
- TjCustomer customer=new TjCustomer();
+ } else {
+ TjCustomer customer = new TjCustomer();
customer.setCusName(tjReservation.getName());
customer.setCusSex(Long.valueOf(tjReservation.getSex()));
customer.setCusBrithday(tjReservation.getBirthday());
@@ -140,37 +148,37 @@
if ((null == tjReservation.getProIdList() || tjReservation.getProIdList().size() == 0) && (null == tjReservation.getPacId())) {
transitionService.deletedTbTransitionByCusId(tjReservation.getIdCard());
}
- if(null !=tjReservation.getPacId()){
- asyncService.addRedisTransitionPac(tjReservation.getIdCard(), Long.valueOf(tjReservation.getPacId()),ppservice.getTjPackageProjectListByPacId(tjReservation.getPacId()));
+ if (null != tjReservation.getPacId()) {
+ asyncService.addRedisTransitionPac(tjReservation.getIdCard(), Long.valueOf(tjReservation.getPacId()), ppservice.getTjPackageProjectListByPacId(tjReservation.getPacId()));
}
- if(null !=tjReservation.getProIdList() && tjReservation.getProIdList().size()>0){
- asyncService.addRedisTransitionPro(tjReservation.getIdCard(),tjReservation.getProIdList());
+ if (null != tjReservation.getProIdList() && tjReservation.getProIdList().size() > 0) {
+ asyncService.addRedisTransitionPro(tjReservation.getIdCard(), tjReservation.getProIdList());
}
String isPays = configService.selectConfigByKey("isPay");
- if(null !=isPays && isPays.equals("true") ){
+ if (null != isPays && isPays.equals("true")) {
//瀵瑰簲棰勭害鏃堕棿鏁伴噺鍑�1
final TjReservation byId = reservationService.getById(tjReservation.getId());
final Date reservationTime = byId.getReservationTime();
- LambdaQueryWrapper<MallTimeConfig> wq111=new LambdaQueryWrapper<>();
- wq111.eq(MallTimeConfig::getTime,reservationTime);
+ LambdaQueryWrapper<MallTimeConfig> wq111 = new LambdaQueryWrapper<>();
+ wq111.eq(MallTimeConfig::getTime, reservationTime);
final MallTimeConfig config = mallTimeConfigService.getOne(wq111);
- config.setNowNum(config.getNowNum()-1);
+ config.setNowNum(config.getNowNum() - 1);
mallTimeConfigService.updateById(config);
}
//鍙戣鍗曚俊鎭粰wx璁㈤槄鏈嶅姟娑堟伅鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�攕tart鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
Map<String, Object> res = new HashMap<>();
- res.put("touser",wxuser.getOpenid());
- res.put("template_id","M4K_BNVG7g4hOAcrIDO18ux8KOTneHeNide5GdPW3kc");
- res.put("page","pages/mine/index");
- res.put("miniprogram_state","trial");
+ res.put("touser", wxuser.getOpenid());
+ res.put("template_id", "M4K_BNVG7g4hOAcrIDO18ux8KOTneHeNide5GdPW3kc");
+ res.put("page", "pages/mine/index");
+ res.put("miniprogram_state", "trial");
//璁㈤槄娑堟伅鍙傛暟鍊�
JSONObject data = new JSONObject();
JSONObject name1 = new JSONObject();
- name1.put("value",tjReservation.getName());
+ name1.put("value", tjReservation.getName());
data.put("thing1", name1);
JSONObject amount3 = new JSONObject();
@@ -183,13 +191,13 @@
data.put("time4", time4);
final TjPackage byId = packageService.getById(tjReservation.getPacId());
- if (byId!=null){
+ if (byId != null) {
JSONObject thing5 = new JSONObject();
- thing5.put("value",byId.getPacName());
+ thing5.put("value", byId.getPacName());
data.put("thing5", thing5);
- }else {
+ } else {
JSONObject thing5 = new JSONObject();
- thing5.put("value","鏈煡");
+ thing5.put("value", "鏈煡");
data.put("thing5", thing5);
}
@@ -197,10 +205,10 @@
JSONObject thing6 = new JSONObject();
thing6.put("value", "浣撴鍓嶄竴澶╄鎮ㄨ繘娓呮贰楗,鍕块ギ閰掞紒");
data.put("thing6", thing6);
- WxUtil.sendCommonSubscribeMessage(res,data);
+ WxUtil.sendCommonSubscribeMessage(res, data);
//鍙戣鍗曚俊鎭粰wx璁㈤槄鏈嶅姟娑堟伅鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�攅nd鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
- return AjaxResult.success("棰勭害鎴愬姛!!!",tjReservation.getId());
+ return AjaxResult.success("棰勭害鎴愬姛!!!", tjReservation.getId());
}
return AjaxResult.error("棰勭害澶辫触");
}
@@ -214,21 +222,21 @@
// wq.eq(TjReservation::getIdCard, reservation.getIdCard());
// wq.eq(TjReservation::getIsExpire, 2);
// TjReservation one = reservationService.getOne(wq);
- if (reservation.getId()==null){
+ if (reservation.getId() == null) {
return AjaxResult.success("鍑洪敊浜嗭紝璇疯仈绯诲伐浣滀汉鍛橈紒");
}
taskService.removeTask(new TjReservationTask(reservation.getId()));
TjReservation one = reservationService.getById(reservation.getId());
if (null != one) {
String isPays = configService.selectConfigByKey("isPay");
- if(null !=isPays && isPays.equals("true") ){
+ if (null != isPays && isPays.equals("true")) {
//瀵瑰簲棰勭害鏃堕棿鏁伴噺+1
final TjReservation byId = reservationService.getById(one.getId());
final Date reservationTime = byId.getReservationTime();
- LambdaQueryWrapper<MallTimeConfig> wq111=new LambdaQueryWrapper<>();
- wq111.eq(MallTimeConfig::getTime,reservationTime);
+ LambdaQueryWrapper<MallTimeConfig> wq111 = new LambdaQueryWrapper<>();
+ wq111.eq(MallTimeConfig::getTime, reservationTime);
final MallTimeConfig config = mallTimeConfigService.getOne(wq111);
- config.setNowNum(config.getNowNum()+1);
+ config.setNowNum(config.getNowNum() + 1);
mallTimeConfigService.updateById(config);
}
@@ -238,10 +246,10 @@
//鍙戣鍗曚俊鎭粰wx璁㈤槄鏈嶅姟娑堟伅鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�攕tart鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
Map<String, Object> res = new HashMap<>();
- res.put("touser",wxuser.getOpenid());
- res.put("template_id","X467Xtd8HnFDNk-IoT0ChcdoBnClLZJQQwP7DMztYQ8");
- res.put("page","pages/mine/index");
- res.put("miniprogram_state","trial");
+ res.put("touser", wxuser.getOpenid());
+ res.put("template_id", "X467Xtd8HnFDNk-IoT0ChcdoBnClLZJQQwP7DMztYQ8");
+ res.put("page", "pages/mine/index");
+ res.put("miniprogram_state", "trial");
//璁㈤槄娑堟伅鍙傛暟鍊�
JSONObject data = new JSONObject();
@@ -250,17 +258,17 @@
data.put("thing3", amount3);
JSONObject name1 = new JSONObject();
- name1.put("value",reservation.getName());
+ name1.put("value", reservation.getName());
data.put("name1", name1);
final TjPackage byId = packageService.getById(reservation.getPacId());
- if (byId!=null){
+ if (byId != null) {
JSONObject thing5 = new JSONObject();
- thing5.put("value",byId.getPacName());
+ thing5.put("value", byId.getPacName());
data.put("thing4", thing5);
- }else {
+ } else {
JSONObject thing5 = new JSONObject();
- thing5.put("value","鏈煡");
+ thing5.put("value", "鏈煡");
data.put("thing4", thing5);
}
@@ -272,7 +280,7 @@
JSONObject thing6 = new JSONObject();
thing6.put("value", "鎮ㄥ凡鎴愬姛鍙栨秷鏈棰勭害锛屾杩庡啀娆′娇鐢紒");
data.put("thing5", thing6);
- WxUtil.sendCommonSubscribeMessage(res,data);
+ WxUtil.sendCommonSubscribeMessage(res, data);
//鍙戣鍗曚俊鎭粰wx璁㈤槄鏈嶅姟娑堟伅鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�攅nd鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
return AjaxResult.success("鍙栨秷鎴愬姛");
}
@@ -286,9 +294,9 @@
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
wq.eq(TjReservation::getConnect, wxuser.getId());
// wq.eq(TjReservation::getIsExpire, 2);
- wq.eq(TjReservation::getPhoe,wxuser.getPhone());
+ wq.eq(TjReservation::getPhoe, wxuser.getPhone());
List<TjReservation> reservationList = reservationService.list(wq);
- if (null != reservationList && reservationList.size()>0) {
+ if (null != reservationList && reservationList.size() > 0) {
for (TjReservation one : reservationList) {
TjPackage tjPackage = packageService.getById(one.getPacId());
if (null != tjPackage) {
@@ -326,26 +334,26 @@
@Transactional
public AjaxResult updateReservationTime(@RequestBody @ApiParam(value = "浣撴棰勭害瀵硅薄") TjReservation tjReservation) {
TjReservation one = reservationService.getById(tjReservation.getId());
- if(null !=one && one.getIsExpire().equals(2)){
+ if (null != one && one.getIsExpire().equals(2)) {
//鍘熸椂闂存鏁板姞1
- LambdaQueryWrapper<MallTimeConfig> wq111=new LambdaQueryWrapper<>();
- wq111.eq(MallTimeConfig::getTime,one.getReservationTime());
+ LambdaQueryWrapper<MallTimeConfig> wq111 = new LambdaQueryWrapper<>();
+ wq111.eq(MallTimeConfig::getTime, one.getReservationTime());
final MallTimeConfig config = mallTimeConfigService.getOne(wq111);
- config.setNowNum(config.getNowNum()+1);
+ config.setNowNum(config.getNowNum() + 1);
mallTimeConfigService.updateById(config);
//淇敼鍚庢椂闂存鏁�-1
- LambdaQueryWrapper<MallTimeConfig> wq=new LambdaQueryWrapper<>();
- wq.eq(MallTimeConfig::getTime,tjReservation.getReservationTime());
+ LambdaQueryWrapper<MallTimeConfig> wq = new LambdaQueryWrapper<>();
+ wq.eq(MallTimeConfig::getTime, tjReservation.getReservationTime());
final MallTimeConfig config1 = mallTimeConfigService.getOne(wq);
- config1.setNowNum(config1.getNowNum()-1);
+ config1.setNowNum(config1.getNowNum() - 1);
mallTimeConfigService.updateById(config1);
one.setReservationTime(tjReservation.getReservationTime());
if (reservationService.updateById(one)) {
taskService.removeTask(new TjReservationTask(tjReservation.getId()));
taskService.addTask(new TjReservationTask(tjReservation.getId(),
- DateUtil.between(new Date(),DateUtil.endOfDay(tjReservation.getReservationTime()), DateUnit.MS)));
+ DateUtil.between(new Date(), DateUtil.endOfDay(tjReservation.getReservationTime()), DateUnit.MS)));
}
return AjaxResult.success("鎿嶄綔鎴愬姛");
@@ -360,7 +368,7 @@
Wxuser wxuser = UserHoder.getWxuser();
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
wq.eq(TjReservation::getConnect, wxuser.getId());
- wq.eq(TjReservation::getPhoe,wxuser.getPhone());
+ wq.eq(TjReservation::getPhoe, wxuser.getPhone());
wq.orderByDesc(TjReservation::getCreateTime);
List<TjReservation> reservationList = reservationService.list(wq);
if (null != reservationList && reservationList.size() > 0) {
@@ -410,35 +418,35 @@
@ApiOperation(value = "鏍规嵁韬唤璇佸彿鏌ョ湅棰勭害淇℃伅")
public AjaxResult getReservationByIdCard(@RequestParam @ApiParam(value = "韬唤璇佸彿") String idCard) {
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
- wq.eq(TjReservation::getIdCard,idCard);
+ wq.eq(TjReservation::getIdCard, idCard);
wq.orderByDesc(TjReservation::getCreateTime);
TjReservation one = reservationService.list(wq).get(0);
if (null != one) {
// for (TjReservation one : reservationList) {
- TjPackage tjPackage = packageService.getById(one.getPacId());
- if (null != tjPackage) {
- LambdaQueryWrapper<TjPackageProject> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjPackageProject::getPacId, one.getPacId());
- List<TjPackageProject> projectList = ppservice.list(wq1);
- if (null != projectList && projectList.size() > 0) {
- List<TjProject> tjProjectList = new ArrayList<>();
- for (TjPackageProject packageProject : projectList) {
- tjProjectList.add(projectService.getById(packageProject.getProId()));
- }
- tjPackage.setTjProjectList(tjProjectList);
+ TjPackage tjPackage = packageService.getById(one.getPacId());
+ if (null != tjPackage) {
+ LambdaQueryWrapper<TjPackageProject> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjPackageProject::getPacId, one.getPacId());
+ List<TjPackageProject> projectList = ppservice.list(wq1);
+ if (null != projectList && projectList.size() > 0) {
+ List<TjProject> tjProjectList = new ArrayList<>();
+ for (TjPackageProject packageProject : projectList) {
+ tjProjectList.add(projectService.getById(packageProject.getProId()));
}
- one.setTjPackage(tjPackage);
+ tjPackage.setTjProjectList(tjProjectList);
}
- if (null != one.getProIds()) {
- String[] proIds = StringUtils.split(one.getProIds(), ",");
- if (null != proIds && proIds.length > 0) {
- List<TjProject> projectList = new ArrayList<>();
- for (String proId : proIds) {
- projectList.add(projectService.getById(proId));
- }
- one.setProjectList(projectList);
+ one.setTjPackage(tjPackage);
+ }
+ if (null != one.getProIds()) {
+ String[] proIds = StringUtils.split(one.getProIds(), ",");
+ if (null != proIds && proIds.length > 0) {
+ List<TjProject> projectList = new ArrayList<>();
+ for (String proId : proIds) {
+ projectList.add(projectService.getById(proId));
}
+ one.setProjectList(projectList);
}
+ }
// }
return AjaxResult.success(one);
}
--
Gitblit v1.8.0