ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
@@ -170,7 +170,7 @@ */ @RequestMapping(value = "/add") @ResponseBody public Object add(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar,@RequestParam Integer isPackage ) { public Object add(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar) { int count = tServerCarmodelService.selectCount(new EntityWrapper<TServerCarmodel>().eq("type", 1) .eq("name", tServerCarmodel.getName()).last(" and not FIND_IN_SET(state,'3')")); if (count > 0){ @@ -178,9 +178,8 @@ } tServerCarmodel.setInsertTime(new Date()); tServerCarmodel.setState(1); tServerCarmodel.setType(1); tServerCarmodel.setIsPackage(isPackage); tServerCarmodel.setIsPrivateCar(isPrivateCar); tServerCarmodel.setType(isPrivateCar); tServerCarmodelService.insert(tServerCarmodel); return SUCCESS_TIP; } @@ -190,12 +189,10 @@ */ @RequestMapping(value = "/update") @ResponseBody public Object update(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar,@RequestParam Integer isPackage) { public Object update(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar) { tServerCarmodel.setInsertTime(new Date()); tServerCarmodel.setState(1); tServerCarmodel.setType(1); tServerCarmodel.setIsPackage(isPackage); tServerCarmodel.setIsPrivateCar(isPrivateCar); tServerCarmodel.setType(isPrivateCar); tServerCarmodelService.updateById(tServerCarmodel); return SUCCESS_TIP; } ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml
@@ -21,13 +21,13 @@ <select id="getServerCarModelList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page"> SELECT * FROM t_server_carmodel as o <where> o.type = #{type} and not FIND_IN_SET(o.state,'3') <if test="name != null and name != ''"> and o.name LIKE CONCAT('%',#{name},'%') </if> <if test="state != null and state != ''"> and o.state = #{state} </if> and (o.type =1 or o.type =4) </where> order by o.id desc </select> ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
@@ -51,11 +51,7 @@ /** * 是否勾选了专车 0否1是 */ private Integer isPrivateCar; /** * 是否勾选了包裹 0否1是 */ private Integer isPackage; /** * 添加时间 */ ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/commission.html
@@ -88,13 +88,13 @@ <h2 id="text1">佣金总额</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/=.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/dengyu.png."> <div class="rectangle2"> <h1 id="num2">0</h1> <br> <h2 id="text2">司机已结算</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png."> <div class="rectangle3"> <h1 id="num3">0</h1> ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html
@@ -18,7 +18,7 @@ margin-right: 40px; /* 设置矩形框之间的间距 */ } .rectangle2 { width: 200px; /* 设置框的宽度 */ width: 150px; /* 设置框的宽度 */ height: 130px; /* 自适应高度 */ background-color: #cecece; /* 设置底色为灰色 */ border-radius: 30px; /* 设置圆角半径为10px */ @@ -31,7 +31,7 @@ margin-top: 15px; } .rectangle3 { width: 200px; /* 设置框的宽度 */ width: 150px; /* 设置框的宽度 */ height: 130px; /* 自适应高度 */ background-color: #cecece; /* 设置底色为灰色 */ border-radius: 30px; /* 设置圆角半径为10px */ @@ -99,31 +99,31 @@ <h2 id="text1">第三方流水余额合计</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/=.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/dengyu.png."> <div class="rectangle2"> <h1 id="num2">0</h1> <br> <h2 id="text2">用户订单消费</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png."> <div class="rectangle3"> <h1 id="num3">0</h1> <br> <h2 id="text3">用户充值总额</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png."> <div class="rectangle3"> <h1 id="num4">0</h1> <br> <h2 id="text4">司机结算总额</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/-.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jianhao.png."> <div class="rectangle3"> <h1 id="num5">0</h1> <br> <h2 id="text5">司机提现总额</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/-.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jianhao.png."> <div class="rectangle3"> <h1 id="num6">0</h1> <br> ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html
@@ -91,25 +91,25 @@ <h2 id="text1">已发放补贴总额</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/=.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/dengyu.png."> <div class="rectangle2"> <h1 id="num2">0</h1> <br> <h2 id="text2">已使用折扣总额(用户端)</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png."> <div class="rectangle3"> <h1 id="num3">0</h1> <br> <h2 id="text3">已领取红包总额(用户端)</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png."> <div class="rectangle3"> <h1 id="num4">0</h1> <br> <h2 id="text4">已领取优惠券总额(用户端)</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png."> <div class="rectangle3"> <h1 id="num5">0</h1> <br> ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html
@@ -103,25 +103,25 @@ <h2 id="text1">已使用补贴总额</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/=.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/dengyu.png."> <div class="rectangle2"> <h1 id="num2">0</h1> <br> <h2 id="text2">已使用折扣总额(用户端)</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png."> <div class="rectangle3"> <h1 id="num3">0</h1> <br> <h2 id="text3">已使用红包总额(用户端)</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/+.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png."> <div class="rectangle3"> <h1 id="num4">0</h1> <br> <h2 id="text4">已使用优惠券总额(用户端)</h2> </div> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/-.png."> <img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jianhao.png."> <div class="rectangle4"> <h1 id="num5">0</h1> <br> ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html
@@ -15,14 +15,14 @@ <div class="col-sm-9"> <fieldset> <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox1" type="checkbox" value="1" > <input name="radio1" id="checkbox1" type="radio" value="4" > <label for="checkbox1"> 包裹 </label> </div> <div class="checkbox checkbox-info"> <input name="checkbox" id="checkbox4" type="checkbox" value="4" > <input name="radio1" checked id="checkbox4" type="radio" value="1" > <label for="checkbox4"> 专车 </label> ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html
@@ -15,14 +15,14 @@ <div class="col-sm-9"> <fieldset> <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == data.isPackage ? 'checked=checked' : ''} > <input name="radio1" id="checkbox1" type="radio" value="4" ${4 == data.type ? 'checked=checked' : ''} > <label for="checkbox1"> 包裹 </label> </div> <div class="checkbox checkbox-info"> <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == data.isPrivateCar ? 'checked=checked' : ''} > <input name="radio1" id="checkbox4" type="radio" value="1" ${1 == data.type ? 'checked=checked' : ''} > <label for="checkbox4"> 专车 </label> ManagementIGOTravel/guns-admin/src/main/webapp/static/img/dengyu.pngManagementIGOTravel/guns-admin/src/main/webapp/static/img/jiahao.pngManagementIGOTravel/guns-admin/src/main/webapp/static/img/jianhao.pngManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel_info.js
@@ -85,15 +85,18 @@ if(!this.validate()){ return ; } var checkbox1 = $('#checkbox1').prop('checked'); var checkbox4 = $('#checkbox4').prop('checked'); var temp = 0; var temp1 = 0; if (checkbox1){ temp = 1; var temp =1; var radioButtons = document.getElementsByName('radio1'); // 遍历单选按钮 for (var i = 0; i < radioButtons.length; i++) { // 检查哪个单选按钮被选中 if (radioButtons[i].checked) { // 输出选中的单选按钮的值 console.log("选中的值是: " + radioButtons[i].value); // 或者做其他处理，比如将选中的值赋给一个变量 var selectedValue = radioButtons[i].value; temp = radioButtons[i].value; } if (checkbox4){ temp1 = 1; } //提交信息 var ajax = new $ax(Feng.ctxPath + "/tServerCarmodel/add", function(data){ @@ -109,8 +112,8 @@ Feng.error("添加失败!" + data.responseJSON.message + "!"); }); ajax.set(this.tServerCarmodelInfoData); ajax.set("isPrivateCar",temp1); ajax.set("isPackage",temp); ajax.set("isPrivateCar",temp); ajax.start(); } @@ -121,15 +124,18 @@ this.clearData(); this.collectData(); var checkbox1 = $('#checkbox1').prop('checked'); var checkbox4 = $('#checkbox4').prop('checked'); var temp = 0; var temp1 = 0; if (checkbox1){ temp = 1; var temp =1; var radioButtons = document.getElementsByName('radio1'); // 遍历单选按钮 for (var i = 0; i < radioButtons.length; i++) { // 检查哪个单选按钮被选中 if (radioButtons[i].checked) { // 输出选中的单选按钮的值 console.log("选中的值是: " + radioButtons[i].value); // 或者做其他处理，比如将选中的值赋给一个变量 var selectedValue = radioButtons[i].value; temp = radioButtons[i].value; } if (checkbox4){ temp1 = 1; } //提交信息 var ajax = new $ax(Feng.ctxPath + "/tServerCarmodel/update", function(data){ @@ -140,8 +146,8 @@ Feng.error("修改失败!" + data.responseJSON.message + "!"); }); ajax.set(this.tServerCarmodelInfoData); ajax.set("isPrivateCar",temp1); ajax.set("isPackage",temp); ajax.set("isPrivateCar",temp); ajax.start(); }
