From 2a3d0885c11a73d41fb03c985f0032086cd8fa07 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 三月 2024 17:42:58 +0800
Subject: [PATCH] 合并代码
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 109 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 73 insertions(+), 36 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index c1ba97c..d4259cd 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.*;
+import com.dsh.other.feignclient.CourseRecordClient;
import com.dsh.other.feignclient.account.CityManagerClient;
import com.dsh.other.feignclient.activity.UserCouponClient;
import com.dsh.other.feignclient.activity.model.QueryUserCouponByIdAndUserId;
@@ -64,6 +65,15 @@
@Autowired
private CityManagerClient cityManagerClient;
+ /**
+ * 通过运营商id查询运营商对应的支付宝商户号
+ */
+ @RequestMapping("/base/getSMIDByOperatorId")
+ @ResponseBody
+ public String getSMIDByOperatorId(Integer id) {
+ // 获取运营商的管理员
+ return siteService.getSMIDByOperatorId(id);
+ }
/**
* 获取所有场地
*/
@@ -128,7 +138,16 @@
}
}
-
+ /**
+ * 添加场地管理
+ *
+ * @return
+ */
+ @RequestMapping("/base/site/addSite1")
+ public Integer addSite1(@RequestBody Site site) {
+ boolean save = siteService.save(site);
+ return site.getId();
+ }
/**
* 添加场地管理
*
@@ -145,14 +164,14 @@
}
@RequestMapping("/base/site/listById")
- public Site listById(@RequestParam("id") Integer id) {
+ public Site listById(@RequestBody Integer id) {
Site byId = siteService.getById(id);
return byId;
}
@RequestMapping("/base/site/listBooks")
- public List<SiteBooking> listBooks(@RequestParam("id") Integer id) {
+ public List<SiteBooking> listBooks(@RequestBody Integer id) {
List<SiteBooking> siteId = siteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id));
return siteId;
}
@@ -229,20 +248,8 @@
}
}
-// public ResultUtil<List<QuerySiteTimes>> querySiteTimes(Integer id, String day, String halfName, String siteName) throws Exception {
-//
-// if (redisUtil.acquireLock(day,day)) {
-// try {
-// List<QuerySiteTimes> list = siteService.querySiteTimes(id, day,halfName,siteName);
-// return ResultUtil.success(list);
-// } finally {
-// redisUtil.releaseLock(day);
-// }
-// } else {
-// return ResultUtil.error("系统繁忙,请稍后再试！");
-// }
-//
-// }
+
+
/**
@@ -330,7 +337,6 @@
}
}
-
/**
* 预约场地支付宝回调
*
@@ -346,7 +352,8 @@
if (null != map) {
String code = map.get("out_trade_no");
String trade_no = map.get("trade_no");
- SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>().eq("orderNo", code).eq("state", 1));
+ SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>()
+ .eq("orderNo", code).eq("state", 1));
if (siteBooking.getStatus() == 0) {
siteBooking.setPayTime(new Date());
siteBooking.setStatus(1);
@@ -363,7 +370,13 @@
}
}
+ @Autowired
+ private TGameConfigService gameConfigService;
+ @Autowired
+ private TGameRecordService gameRecordService;
+ @Resource
+ private CourseRecordClient courseRecordClient;
/**
* 启动游戏支付宝回调
*
@@ -379,17 +392,26 @@
if (null != map) {
String code = map.get("passback_params");
-// String trade_no = map.get("trade_no");
-// SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>().eq("orderNo", code).eq("state", 1));
-// if(siteBooking.getStatus() == 0){
-// siteBooking.setPayTime(new Date());
-// siteBooking.setStatus(1);
-// siteBooking.setPayOrderNo(trade_no);
-// siteBookingService.updateById(siteBooking);
-// }
-
+ String trade_no = map.get("trade_no");
String[] s = code.split("_");
Integer i = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3]));
+ List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("number", s[4]).eq("payType", 2));
+ TGameRecord one = list.get(0);
+ TGameConfig config = gameConfigService.getById(s[5]);
+ for (TGameRecord coursePackagePayment : list) {
+ coursePackagePayment.setStatus(1);
+ coursePackagePayment.setMoney(config.getCash());
+ coursePackagePayment.setOrderNo(trade_no);
+
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setChangeType(3);
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("智慧球场;" + config.getCash());
+ courseCounsum.setAppUserId(Integer.valueOf(s[0]));
+ courseRecordClient.save(courseCounsum);
+ }
+ gameRecordService.updateBatchById(list);
+
System.err.println("===========游戏回调游戏回调=========" + i);
PrintWriter out = response.getWriter();
out.write("success");
@@ -414,6 +436,7 @@
JSONObject jsonObject = JSONObject.parseObject(s);
Object code = jsonObject.get("code");
if (String.valueOf(code) != null && "200".equals(String.valueOf(code))) {
+ System.err.println("启动了一次游戏");
return 200;
} else {
return 500;
@@ -446,7 +469,7 @@
@ResponseBody
@PostMapping("/api/site/queryMySiteById")
- @ApiOperation(value = "获取我的预约场地列表详情2.0", tags = {"用户—预约场地"})
+ @ApiOperation(value = "获取我的预约场地列表详情", tags = {"用户—预约场地"})
@ApiImplicitParams({
@ApiImplicitParam(value = "id", name = "id", dataType = "int", required = true),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@@ -474,21 +497,22 @@
Date startTime = byId.getStartTime();
Date endTime = byId.getEndTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-
String startTimeString = sdf.format(startTime);
String endTimeString = sdf.format(endTime);
-
String result = startTimeString + "-" + endTimeString.substring(11);
byId.setTimes(result);
byId.setSid(Arrays.asList(storeId));
- List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getStoreId, storeId).eq(Site::getSign, 1));
- List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
- byId.setRid(collect);
+// List<Site> list = siteService.list(new LambdaQueryWrapper<Site>()
+// .eq(Site::getStoreId, storeId)
+// .eq(Site::getSign, 1));
+// List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
+ Integer siteId = byId.getSiteId();
+ ArrayList<Integer> list1 = new ArrayList<>();
+ list1.add(siteId);
+ byId.setRid(list1);
map.put("data", byId);
-
-
map.put("ids", ids);
return ResultUtil.success(map);
} catch (Exception e) {
@@ -682,6 +706,19 @@
}
+ @Autowired
+ private IUserService userService;
+
+
+ @ResponseBody
+ @PostMapping("/base/site/queryUserName")
+ public User queryUserName(@RequestBody Integer coachId){
+ User byId = userService.getById(coachId);
+
+ return byId;
+
+ }
+
@ResponseBody
@PostMapping("/base/site/queryOperator")
public OperatorUser queryOperator(@RequestBody List<Integer> stores) {
--
Gitblit v1.7.1