From ddbb38c54db9c3670e5ff53f4bf713525de1099d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 14 十一月 2023 09:12:10 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index e31e2da..7c8260e 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -183,12 +183,18 @@
@ResponseBody
public ResultUtil confirm(@PathVariable("id") Integer id) {
+ SiteBooking byId = iSiteBookingService.getById(id);
+ String money = byId.getMoney();
+ // todo 这里手动支付 默认按照现金当作支付金额 后续可能要问下产品
+ String[] split = money.split(",");
+ Double aDouble = Double.valueOf(split[0]);
System.out.println("============"+id);
SiteBooking siteBooking = new SiteBooking();
+ siteBooking.setPayMoney(aDouble);
siteBooking.setId(id);
siteBooking.setStatus(1);
siteBooking.setPayType(4);
- siteBooking.setPayUserId(UserExt.getUser().getObjectId());
+ siteBooking.setPayUserId(UserExt.getUser().getId());
iSiteBookingService.updateById(siteBooking);
return new ResultUtil<>(0,0,"手动支付成功",null,null);
@@ -408,7 +414,7 @@
-System.out.println("---------------------------"+gameConfigList);
+ System.out.println("---------------------------"+gameConfigList);
ballClient.saveConfig( gameConfigList);
return null;
}
@@ -954,14 +960,11 @@
if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 1){
vo.put("payType","微信");
- }
- if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 2){
+ }else if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 2){
vo.put("payType","支付宝");
- }
- if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 3){
+ }else if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 3){
vo.put("payType","玩湃币");
- }
- if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 4){
+ }else if (vo.get("payType")!=null && Integer.parseInt(vo.get("payType").toString()) == 4){
if (vo.get("payUserId")!=null){
User payUserId = userService.getById(Integer.parseInt(vo.get("payUserId").toString()));
if(payUserId!=null){
@@ -1134,7 +1137,6 @@
public String yuyueadd(Model model) {
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
-
String cityCode = null;
if(objectType == 2){//城市管理员
// 获取到这个运营商下面的所有门店
@@ -1204,7 +1206,8 @@
tAppUser.setInsertTime(new Date());
tAppUser.setPassword(MD5.md5("111111"));
appUserClient.addAppUser1(tAppUser);
- siteBooking.setAppUserId(tAppUser.getId());
+ TAppUser appUserByPhone1 = appUserClient.getAppUserByPhone(phone);
+ siteBooking.setAppUserId(appUserByPhone1.getId());
}else{
siteBooking.setAppUserId(appUserByPhone.getId());
}
--
Gitblit v1.7.1