ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
@@ -177,41 +177,29 @@ Wrapper<TOrderPrivateCar> between = new EntityWrapper<TOrderPrivateCar>() .isNotNull("activityId") .isNotNull("discountMoney") .between("insertTime", start, end); // 小件物流wrapper Wrapper<TOrderLogistics> between1 = new EntityWrapper<TOrderLogistics>() .isNotNull("activityId") .isNotNull("discountMoney") .between("insertTime", start, end); // 已使用优惠券记录wrapper Wrapper<TOrderPrivateCar> between2 = new EntityWrapper<TOrderPrivateCar>() .isNotNull("couponId") .isNotNull("couponMoney") .between("insertTime", start, end); Wrapper<TOrderLogistics> between22 = new EntityWrapper<TOrderLogistics>() .isNotNull("couponId") .isNotNull("couponMoney") .between("insertTime", start, end); // 已使用红包记录wrapper Wrapper<TOrderPrivateCar> between3 = new EntityWrapper<TOrderPrivateCar>() .isNotNull("redPacketId") .isNotNull("redPacketMoney") .between("insertTime", start, end); Wrapper<TOrderLogistics> between33 = new EntityWrapper<TOrderLogistics>() .isNotNull("redPacketId") .isNotNull("redPacketMoney") .between("insertTime", start, end); // 司机已消费金额 Wrapper<BalanceUsageRecord> between4 = new EntityWrapper<BalanceUsageRecord>() @@ -280,9 +268,6 @@ BigDecimal driverWithdrawal1 = new BigDecimal("0"); // 查询已使用折扣总额 for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) { if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){ continue; } discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString())); GrantVO grantVO = new GrantVO(); grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime())); @@ -296,9 +281,6 @@ } for (TOrderLogistics tOrderPrivateCar : tOrderLogistics) { if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){ continue; } discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString())); GrantVO grantVO = new GrantVO(); grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime())); @@ -312,9 +294,6 @@ } // 查询已领取红包总额 for (TOrderPrivateCar userRedPacketRecord : userRedPacketRecords) { if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){ continue; } GrantVO grantVO = new GrantVO(); grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime())); grantVO.setType("红包"); @@ -328,9 +307,6 @@ redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString())); } for (TOrderLogistics userRedPacketRecord : userRedPacketRecords1) { if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){ continue; } GrantVO grantVO = new GrantVO(); grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime())); grantVO.setType("红包"); @@ -345,9 +321,6 @@ } // 查询已领取优惠券总额 for (TOrderPrivateCar userCouponRecord : userCouponRecords) { if (userCouponRecord.getState() != 9 &&userCouponRecord.getState() != 8){ continue; } GrantVO grantVO = new GrantVO(); grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime())); grantVO.setType("优惠券"); @@ -361,9 +334,6 @@ res.add(grantVO); } for (TOrderLogistics userCouponRecord : userCouponRecords1) { if (userCouponRecord.getState() != 9 &&userCouponRecord.getState() != 8){ continue; } GrantVO grantVO = new GrantVO(); grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime())); grantVO.setType("优惠券"); @@ -532,15 +502,12 @@ .isNotNull("activityId") .isNotNull("discountMoney") .between("insertTime", start, end) ; // 已使用优惠券记录wrapper Wrapper<TOrderPrivateCar> between2 = new EntityWrapper<TOrderPrivateCar>() .isNotNull("couponId") .isNotNull("couponMoney") .between("insertTime", start, end) ; Wrapper<TOrderLogistics> between22 = new EntityWrapper<TOrderLogistics>() .isNotNull("couponId") ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -136,6 +136,8 @@ model.addAttribute("zcModelList",zcModelList); List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1)); model.addAttribute("kcModelList",kcModelList); List<TServerCarmodel> xjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1)); model.addAttribute("xjModelList",xjModelList); List<TCarColor> state = carColorService.selectList(new EntityWrapper<TCarColor>().eq("state", 1)); model.addAttribute("color", state); return PREFIX + "tCar_add.html"; @@ -198,6 +200,7 @@ Integer six = 1; Integer zcModel = 0; Integer kcModel = 0; Integer xjModel = 0; for (TCarService obj : serviceList){ if (obj.getType() == 1){ one = 2; @@ -211,7 +214,8 @@ kcModel = obj.getServerCarModelId(); } if (obj.getType() == 4){ four = 2; four = 4; xjModel = obj.getServerCarModelId(); } if (obj.getType() == 5){ five = 2; @@ -228,11 +232,14 @@ model.addAttribute("six",six); model.addAttribute("zcModel",zcModel); model.addAttribute("kcModel",kcModel); model.addAttribute("xjModel",xjModel); List<TServerCarmodel> zcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1)); model.addAttribute("zcModelList",zcModelList); List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1)); model.addAttribute("kcModelList",kcModelList); List<TServerCarmodel> xjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1)); model.addAttribute("xjModelList",xjModelList); //车辆品牌 List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1)); @@ -258,6 +265,7 @@ Integer six = 1; Integer zcModel = 0; Integer kcModel = 0; Integer xjModel = 0; for (TCarService obj : serviceList){ if (obj.getType() == 1){ one = 2; @@ -267,12 +275,19 @@ four = 2; zcModel = obj.getServerCarModelId(); } if (obj.getType() == 4){ four = 4; xjModel = obj.getServerCarModelId(); } } model.addAttribute("one",one); model.addAttribute("four",four); model.addAttribute("zcModel",zcModel); model.addAttribute("xjModel",xjModel); List<TServerCarmodel> zcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1)); model.addAttribute("zcModelList",zcModelList); List<TServerCarmodel> xjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1)); model.addAttribute("xjModelList",xjModelList); LogObjectHolder.me().set(tCar); return PREFIX + "tCar_auth.html"; } @@ -441,7 +456,7 @@ */ @RequestMapping(value = "/add") @ResponseBody public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) throws Exception { public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String xjModel) throws Exception { TCar tCar1 = tCarService.selectOne(new EntityWrapper<TCar>().eq("state", 1).ne("authState", 4).eq("carLicensePlate", tCar.getCarLicensePlate())); if(null != tCar1){ throw new Exception("车牌号重复"); @@ -497,8 +512,8 @@ service.setType(Integer.valueOf(serverArray[i])); if (1 == service.getType()){ service.setServerCarModelId(Integer.valueOf(zcModel)); }else if (3 == service.getType()){ service.setServerCarModelId(Integer.valueOf(kcModel)); }else if (4 == service.getType()){ service.setServerCarModelId(Integer.valueOf(xjModel)); } tCarServiceService.insert(service); } @@ -529,7 +544,7 @@ */ @RequestMapping(value = "/update") @ResponseBody public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel)throws Exception { public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String xjModel)throws Exception { TCar tCar1 = tCarService.selectOne(new EntityWrapper<TCar>().eq("state", 1).ne("authState", 4).eq("carLicensePlate", tCar.getCarLicensePlate())); if(null != tCar1 && tCar.getId().compareTo(tCar1.getId()) != 0){ throw new Exception("车牌号重复"); @@ -576,8 +591,8 @@ service.setType(Integer.valueOf(serverArray[i])); if (1 == service.getType()){ service.setServerCarModelId(Integer.valueOf(zcModel)); }else if (3 == service.getType()){ service.setServerCarModelId(Integer.valueOf(kcModel)); }else if (4 == service.getType()){ service.setServerCarModelId(Integer.valueOf(xjModel)); } tCarServiceService.insert(service); } ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
@@ -58,7 +58,7 @@ <label for="serverBox3"> 跨城出行 </label> </div>--> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox4" value="4"> <input type="checkbox" name="serverBox" id="serverBox4" value="4" onclick="TCarInfoDlg.xjServerClick()"> <label for="serverBox4"> 市内小件物流 </label> </div><!-- <div class="checkbox checkbox-success checkbox-inline"> @@ -83,6 +83,17 @@ </select> </div> </div> <div class="form-group" style="display: none;" id="xjModelDiv"> <label class="col-sm-3 control-label">市内小件物流车型：</label> <div class="col-sm-9"> <select class="form-control" id="xjModel" name="xjModel"> <option value="">选择车型</option> @for(obj in xjModelList){ <option value="${obj.id}">${obj.name}</option> @} </select> </div> </div> <!-- <div class="form-group" style="display: none;" id="kcModelDiv"> <label class="col-sm-3 control-label">跨城出行车型：</label> ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_auth.html
@@ -12,7 +12,7 @@ <label for="serverBox1"> 专车 </label> </div> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}> <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${4 == four ? 'checked=checked' : ''} onclick="TCarInfoDlg.xjServerClick()"> <label for="serverBox4"> 市内小件物流 </label> </div> </div> @@ -25,6 +25,17 @@ <option value="">选择车型</option> @for(obj in zcModelList){ <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option> @} </select> </div> </div> <div class="form-group" style="display: none;" id="xjModelDiv"> <label class="col-sm-3 control-label">市内小件物流车型：</label> <div class="col-sm-9"> <select class="form-control" id="xjModel" name="xjModel"> <option value="">选择车型</option> @for(obj in xjModelList){ <option value="${obj.id}"${obj.id == xjModel ? 'selected=selected' : ''}>${obj.name}</option> @} </select> </div> @@ -94,6 +105,7 @@ TCarInfoDlg.zcServerClick(); TCarInfoDlg.kcServerClick(); TCarInfoDlg.xjServerClick(); }); </script> ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
@@ -60,7 +60,7 @@ <label for="serverBox3"> 跨城出行 </label> </div>--> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}> <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${4 == four ? 'checked=checked' : ''} onclick="TCarInfoDlg.xjServerClick()"> <label for="serverBox4"> 市内小件物流 </label> </div><!-- <div class="checkbox checkbox-success checkbox-inline"> @@ -81,6 +81,17 @@ <option value="">选择车型</option> @for(obj in zcModelList){ <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option> @} </select> </div> </div> <div class="form-group" style="display: none;" id="xjModelDiv"> <label class="col-sm-3 control-label">市内小件物流车型：</label> <div class="col-sm-9"> <select class="form-control" id="xjModel" name="xjModel"> <option value="">选择车型</option> @for(obj in xjModelList){ <option value="${obj.id}" ${obj.id == xjModel ? 'selected=selected' : ''}>${obj.name}</option> @} </select> </div> @@ -209,7 +220,7 @@ } TCarInfoDlg.zcServerClick(); TCarInfoDlg.kcServerClick(); TCarInfoDlg.xjServerClick(); }); </script> ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -77,8 +77,8 @@ <fieldset> <label class="col-sm-3 control-label">经营业务：</label> <div class="col-sm-9"> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox1" value="1"> <div class="checkbox checkbox-success checkbox-inline" > <input type="checkbox" checked name="serverBox" disabled id="serverBox1" value="1"> <label for="serverBox1"> 专车 </label> </div><!-- <div class="checkbox checkbox-success checkbox-inline"> @@ -89,8 +89,8 @@ <input type="checkbox" name="serverBox" id="serverBox3" value="3" onclick="YesDriverInfoDlg.checkBox()" > <label for="serverBox3"> 跨城出行 </label> </div>--> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox4" value="4"> <div class="checkbox checkbox-success checkbox-inline" > <input type="checkbox" checked name="serverBox" disabled id="serverBox4" value="4"> <label for="serverBox4"> 市内小件物流 </label> </div><!-- <div class="checkbox checkbox-success checkbox-inline"> ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js
@@ -374,6 +374,7 @@ ajax.set(this.tCarInfoData); ajax.set("serverBox",serverBox.toString()); ajax.set("zcModel",$("#zcModel").val()); ajax.set("xjModel",$("#xjModel").val()); ajax.set("kcModel",$("#kcModel").val()); ajax.set("roleType",roleType); if (1 == roleType){ @@ -446,6 +447,7 @@ ajax.set("serverBox",serverBox.toString()); ajax.set("zcModel",$("#zcModel").val()); ajax.set("kcModel",$("#kcModel").val()); ajax.set("xjModel",$("#xjModel").val()); ajax.set("roleType",roleType); if (1 == roleType){ ajax.set("companyType",companyType); @@ -566,6 +568,17 @@ $("#zcModelDiv").hide(); } } /** * 小件物流服务被点击 */ TCarInfoDlg.xjServerClick = function () { var serverBox1 = $('#serverBox4').prop('checked'); if (serverBox1){ $("#xjModelDiv").show(); } else { $("#xjModelDiv").hide(); } } /** * 跨城服务被点击
