cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GateDataController.java
@@ -22,6 +22,7 @@ import com.dsh.guns.modular.system.model.*; import com.dsh.guns.modular.system.service.ICityService; import com.dsh.guns.modular.system.service.IRegionService; import com.dsh.guns.modular.system.service.IStoreService; import com.dsh.guns.modular.system.service.TOperatorService; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; @@ -56,6 +57,12 @@ private String PREFIX = "/system/gateData/"; @Autowired private TOperatorService operatorService; @Autowired private IStoreService storeService; /** * 跳转到充值记录页面 */ @@ -63,6 +70,9 @@ public String index(Model model) { List<TOperator> list = operatorService.list(new QueryWrapper<TOperator>().ne("state", 3)); model.addAttribute("list",list); model.addAttribute("objectType", UserExt.getUser().getObjectType()); TStore tStore = storeService.getById(UserExt.getUser().getObjectId()); model.addAttribute("tStore", tStore); return PREFIX + "GateData.html"; } /** cloud-server-management/src/main/webapp/WEB-INF/view/system/gateData/GateData.html
@@ -9,33 +9,50 @@ <div class="ibox-content"> <div class="row row-lg"> <div class="col-sm-12"> <input type="hidden" id="objectType" value="${objectType}"> <div class="row"> <div class="col-sm-3"> <div class="input-group"> <div class="input-group-btn open"> <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true"> 运营商 </button> </div> <select class="form-control" id="operator" onchange="TSite.getStores(this)"> <option value="0">平台</option> @for(obj in list){ <option value="${obj.id}">${obj.name}</option> @} </select> </div> </div> <div class="col-sm-3"> <div class="input-group"> <div class="input-group-btn open"> <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true"> 门店 </button> </div> <select class="form-control" id="store"> </select> </div> </div> @if(objectType == 3){ <div class="col-sm-3"> <div class="input-group"> <div class="input-group-btn open"> <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true"> 门店 </button> </div> <select class="form-control" id="store"> <option value="${tStore.id}">${tStore.name}</option> </select> </div> </div> @}else{ <div class="col-sm-3"> <div class="input-group"> <div class="input-group-btn open"> <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true"> 运营商 </button> </div> <select class="form-control" id="operator" onchange="TSite.getStores(this)"> <option value="0">平台</option> @for(obj in list){ <option value="${obj.id}">${obj.name}</option> @} </select> </div> </div> <div class="col-sm-3"> <div class="input-group"> <div class="input-group-btn open"> <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true"> 门店 </button> </div> <select class="form-control" id="store"> </select> </div> </div> @} <div class="col-sm-3"> <#button name="搜索" icon="fa-search" clickFun="TSite.search()"/> </div> @@ -66,18 +83,20 @@ ,lang:"en" }); $(function(){ var oneId=$("#operator").val(); var ajax = new $ax(Feng.ctxPath + "/operator/getStores", function(data){ if(data!=null){ var content='<option value="">选择门店</option>'; $.each(data, function(k,v) { content += "<option value='"+v.id+"'>"+v.name+"</option>"; }); $("#store").empty().append(content); } }); ajax.set("id",oneId); ajax.start(); if($('#objectType').val() != 3){ var oneId=$("#operator").val(); var ajax = new $ax(Feng.ctxPath + "/operator/getStores", function(data){ if(data!=null){ var content='<option value="">选择门店</option>'; $.each(data, function(k,v) { content += "<option value='"+v.id+"'>"+v.name+"</option>"; }); $("#store").empty().append(content); } }); ajax.set("id",oneId); ajax.start(); } }); </script> cloud-server-management/src/main/webapp/static/modular/system/gateData/gateData.js
@@ -37,14 +37,14 @@ * 查询跨城站点管理列表 */ TSite.search = function () { if ($("#operator").val()==""){ Feng.error("请选择运营商和门店"); return; } if ($("#store").val()==""){ Feng.error("请选择门店"); return; } // if ($("#operator").val()==""){ // Feng.error("请选择运营商和门店"); // return; // } // if ($("#store").val()==""){ // Feng.error("请选择门店"); // return; // } var ajax = new $ax(Feng.ctxPath + "/gateData/totalNum", function(data){ var totalNumber= document.getElementById("totalNumber"); totalNumber.innerText = "场地总人次： " + data +"次"; @@ -71,5 +71,4 @@ table.setPaginationType("client"); TSite.table = table.init(); TSite.search(); Feng.info("请选择门店") }); cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
@@ -438,8 +438,11 @@ Integer code1 = jsonObject.getInteger("code"); String message = jsonObject.getString("message"); if (200 == code1) { System.err.println("--------------启动了世界杯游戏"); System.err.println(s); return 200; } else { System.err.println(message); return 500; } } @@ -468,7 +471,8 @@ String out_trade_no = map.get("out_trade_no"); String transaction_id = map.get("transaction_id"); String result = map.get("result"); //String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId; //String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId + "_" + gameType; //Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId); String attach = map.get("attach"); List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("number", out_trade_no).eq("payType", 1)); @@ -487,7 +491,7 @@ } gameRecordService.updateBatchById(list); String[] s = attach.split("_"); Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[4]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3])); Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[6]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3])); PrintWriter out = null; try { @@ -508,7 +512,8 @@ if(null != map){ String out_trade_no = map.get("out_trade_no"); String transaction_id = map.get("trade_no"); //String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+configId; //String params = uid + "_" + gameId + "_" + spaceId + "_" + sutuId+"_"+code+"_"+ configId + "_" + gameType; //Integer integer = startGame(uid, gameType, gameId, spaceId, sutuId); String attach = map.get("passback_params"); List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().eq("number", out_trade_no).eq("payType", 2)); @@ -527,7 +532,7 @@ } gameRecordService.updateBatchById(list); String[] s = attach.split("_"); Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[4]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3])); Integer integer = startGame(Integer.valueOf(s[0]), Integer.valueOf(s[6]), Integer.valueOf(s[1]), Integer.valueOf(s[2]), Integer.valueOf(s[3])); PrintWriter out = null; try {
