.idea/workspace.xml
@@ -27,6 +27,19 @@ <component name="ChangeListManager"> <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="10.12"> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_info.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_info.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/ball_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/ball_info.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -87,6 +100,7 @@ "RequestMappingsPanelWidth1": "75", "WebServerToolWindowFactoryState": "false", "git-widget-placeholder": "master", "ignore.virus.scanning.warn.message": "true", "node.js.detected.package.eslint": "true", "node.js.selected.package.eslint": "(autodetect)", "node.js.selected.package.tslint": "(autodetect)", @@ -128,7 +142,7 @@ </set> </option> </component> <component name="RunManager" selected="Spring Boot.GatewayApplication"> <component name="RunManager" selected="Spring Boot.ManagementApplication"> <configuration name="BigDecimalToChineseWords" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <option name="MAIN_CLASS_NAME" value="com.dsh.guns.modular.system.util.BigDecimalToChineseWords" /> <module name="mb-cloud-management" /> @@ -350,7 +364,9 @@ <workItem from="1697004175378" duration="3253000" /> <workItem from="1697007526233" duration="1089000" /> <workItem from="1697008680148" duration="240000" /> <workItem from="1697009049694" duration="2170000" /> <workItem from="1697009049694" duration="7913000" /> <workItem from="1697017354280" duration="2337000" /> <workItem from="1697020450777" duration="4036000" /> </task> <task id="LOCAL-00001" summary="后台代码删除"> <created>1690249807612</created> @@ -707,7 +723,15 @@ <option name="project" value="LOCAL" /> <updated>1697009748275</updated> </task> <option name="localTasksCounter" value="47" /> <task id="LOCAL-00047" summary="10.12"> <option name="closed" value="true" /> <created>1697011234286</created> <option name="number" value="00047" /> <option name="presentableId" value="LOCAL-00047" /> <option name="project" value="LOCAL" /> <updated>1697011234286</updated> </task> <option name="localTasksCounter" value="48" /> <servers /> </component> <component name="TypeScriptGeneratedFilesManager"> @@ -772,12 +796,12 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java</url> <line>1365</line> <line>1373</line> <option name="timeStamp" value="14" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java</url> <line>472</line> <line>471</line> <option name="timeStamp" value="26" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> @@ -787,7 +811,7 @@ </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java</url> <line>261</line> <line>277</line> <option name="timeStamp" value="50" /> </line-breakpoint> </breakpoints> cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
@@ -403,6 +403,10 @@ if("SUCCESS".equals(result_code)){ String type = map1.get("trade_type"); String prepay_id = map1.get("prepay_id"); switch (type){ case "JSAPI": //重新进行签名后返回给前端 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -9,9 +9,11 @@ import com.dsh.guns.core.common.constant.factory.PageFactory; import com.dsh.guns.core.util.ToolUtil; import com.dsh.guns.modular.system.model.TCity; import com.dsh.guns.modular.system.model.TOperator; import com.dsh.guns.modular.system.model.TStore; import com.dsh.guns.modular.system.service.ICityService; import com.dsh.guns.modular.system.service.IStoreService; import com.dsh.guns.modular.system.service.TOperatorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -58,6 +60,9 @@ return PREFIX + "TCompetition.html"; } @Autowired private TOperatorService tOperatorService; /** * 跳转到添加车辆管理 */ @@ -65,6 +70,9 @@ public String tCompetitionAdd(Model model) { List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0)); model.addAttribute("list",list); List<TOperator> list1 = tOperatorService.list(); model.addAttribute("yysList",list1); return PREFIX + "TCompetition_add.html"; }
@@ -418,7 +418,7 @@ } /** * 跳转到优惠卷选择表页 * 跳转到优惠券选择表页 * @param model * @param id * @return cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -3,6 +3,7 @@ import cn.hutool.crypto.SecureUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dsh.course.feignClient.account.CityClient; import com.dsh.course.feignClient.account.model.CityListQuery; @@ -101,6 +102,13 @@ String roleid = UserExt.getUser().getRoleid(); model.addAttribute("role",roleid); List<TOperator> list1 = tOperatorService.list(); // if (!roleid.equals("1")){ TOperator operator1 = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("userId", UserExt.getUser().getId())); model.addAttribute("operator",operator1.getId()); // } model.addAttribute("yysList",list1); return PREFIX + "tShop_add.html"; } cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html
@@ -240,7 +240,7 @@ 玩湃币支付：<input class="paiCoin" type="number" value="${obj.playPaiCoin}" min="0" placeholder="请输入金额" style="width: 110px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> 币 @} </span> <input type="hidden" id="counpons${obj.id}" value="${obj.couponIds}" class="counpons"> <#button btnCss="info" name="优惠卷" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.openDia(${obj.id})"/> <input type="hidden" id="counpons${obj.id}" value="${obj.couponIds}" class="counpons"> <#button btnCss="info" name="优惠券" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.openDia(${obj.id})"/> <i class="fa fa-trash-o" style="font-size:24px" onclick="removePrice(this)"></i> </div> </div> cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_info.html
@@ -221,7 +221,7 @@ @} </span> <input type="hidden" id="counpons1" value="${couponIds}" class="counpons"> <#button btnCss="info" name="优惠卷" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.openDia1(1)"/> <#button btnCss="info" name="优惠券" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.openDia1(1)"/> <i class="fa fa-plus-circle" style="font-size:24px" onclick="addPrice(${type})" disabled></i> </div> </div> @@ -240,7 +240,7 @@ 玩湃币支付：<input class="paiCoin" type="number" value="${obj.playPaiCoin}" min="0" placeholder="请输入金额" style="width: 110px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> 币 @} </span> <input type="hidden" id="counpons${obj.id}" value="${obj.couponIds}" class="counpons"> <#button btnCss="info" name="优惠卷" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.openDia1(${obj.id})"/> <input type="hidden" id="counpons${obj.id}" value="${obj.couponIds}" class="counpons"> <#button btnCss="info" name="优惠券" id="ensure" icon="fa-check" clickFun="CoursePackageInfo.openDia1(${obj.id})"/> <i class="fa fa-trash-o" style="font-size:24px" onclick="removePrice(4, this)" disabled></i> </div> </div> cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
@@ -48,17 +48,31 @@ <div class="form-horizontal" id="carInfoForm"> <div class="form-group" id="provinceCode"> <label class="col-sm-3 control-label">举办省：</label> <div class="form-group" > <label class="col-sm-3 control-label">所属运营商：</label> <div class="col-sm-9"> <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange(this)"> <option value="">选择省</option> @for(obj in list){ <option value="${obj.code}">${obj.name}</option> <select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange1(this)"> <option value="">选择运营商</option> @for(i in yysList){ <option value="${i.id}">${i.name}</option> @} </select> </div> </div> <div class="form-group" id="provinceCode"> <label class="col-sm-3 control-label">所在省：</label> <div class="col-sm-9"> <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange2(this)"> </select> </div> </div> <div class="form-group" id="cityCode"> <label class="col-sm-3 control-label">举办市：</label> <div class="col-sm-9"> cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html
@@ -47,8 +47,8 @@ <div class="form-group"> <label class="col-sm-3 control-label">门店类型：</label> <div class="col-sm-9"> <input type="radio" name="type" value="1" checked onclick="updateType(1)"> 平台门店 <input type="radio" name="type" value="2" onclick="updateType(2)"> 运营商门店 <input type="radio" name="type" value="1" onclick="updateType(1)"> 平台门店 <input type="radio" name="type" value="2" onclick="updateType(2)" id="radio1" checked > 运营商门店 </div> </div> @if(role=='1'){ @@ -56,10 +56,10 @@ <div class="form-group" > <label class="col-sm-3 control-label">所属运营商：</label> <div class="col-sm-9"> <select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange1(this)"> <select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange1(this)" > <option value="">选择运营商</option> @for(i in yysList){ <option value="${i.id}">${i.name}</option> <option value="${i.id}" ${i.id == operator ? 'selected' : ''}>${i.name}</option> @} </select> </div> @@ -81,6 +81,7 @@ </div> </div> @} <div id="yys1" > <div class="form-group" id="provinceCode1"> @@ -104,7 +105,6 @@ </div> </div> @} <#input id="name" name="门店名称" type="text"/> <#input id="phone" name="联系电话" type="text"/> <div class="form-group"> @@ -174,6 +174,21 @@ <script src="${ctxPath}/js/elementui/index.js"></script> <link rel="stylesheet" href="${ctxPath}/js/elementui/index.css"> <script> document.addEventListener("DOMContentLoaded", function() { var selectElement = document.getElementById("account"); selectElement.dispatchEvent(new Event("change")); var radioElement = document.getElementById("radio1"); radioElement.click(); }); laydate.render({ elem: '#time' ,type: 'time',format: "HH:mm" cloud-server-management/src/main/webapp/static/modular/system/ball/ball_info.js
@@ -453,7 +453,7 @@ htmlStr += '玩湃币支付：<input class="paiCoin" type="number" min="0" placeholder="请输入金额" style="width: 110px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> 币 \n'; } htmlStr += '<button type="button" class="btn btn-info " onclick="CoursePackageInfo.openDia('+i+')" id="ensure">\n' + ' <i class="fa fa-check"></i> 优惠卷\n' + ' <i class="fa fa-check"></i> 优惠券\n' + '</button>'; htmlStr += '</span> <i class="fa fa-trash-o" style="font-size:24px" onclick="removePrice(this)"></i>\n' + cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js
@@ -650,7 +650,7 @@ htmlStr += '玩湃币支付：<input class="paiCoin" type="number" min="0" placeholder="请输入金额" style="width: 110px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> 币 \n'; } htmlStr += '<button type="button" class="btn btn-info " onclick="CoursePackageInfo.openDia('+i+')" id="ensure">\n' + ' <i class="fa fa-check"></i> 优惠卷\n' + ' <i class="fa fa-check"></i> 优惠券\n' + '</button>'; htmlStr += '</span> <i class="fa fa-trash-o" style="font-size:24px" onclick="removePrice(this)"></i>\n' + cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js
@@ -451,7 +451,7 @@ htmlStr += '玩湃币支付：<input class="paiCoin" type="number" min="0" placeholder="请输入金额" style="width: 110px;background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"> 币 \n'; } htmlStr += '<button type="button" class="btn btn-info " onclick="CoursePackageInfo.openDia('+i+')" id="ensure">\n' + ' <i class="fa fa-check"></i> 优惠卷\n' + ' <i class="fa fa-check"></i> 优惠券\n' + '</button>'; htmlStr += '</span> <i class="fa fa-trash-o" style="font-size:24px" onclick="removePrice(this)"></i>\n' + cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
@@ -450,6 +450,30 @@ ajax.set("oneId",oneId); ajax.start(); } TCarInfoDlg.oneChange2 = function (e) { console.log(111) var oneId=$(e).val(); var ajax = new $ax(Feng.ctxPath + "/tShop/onChange2", function(data){ if(data!=null){ if(language==1){ var content='<option value="">选择市</option>'; }else if(language==2){ var content='<option value="">Choose your franchisee</option>'; }else { var content='<option value="">Pilih franchisee Anda</option>'; } $.each(data, function(k,v) { content += "<option value='"+v.code+"'>"+v.name+"</option>"; }); $("#cCode").empty().append(content); } }); ajax.set("oneId",oneId); ajax.start(); } TCarInfoDlg.oneChange = function (e) { var oneId=$(e).val(); var ajax = new $ax(Feng.ctxPath + "/tCompetition/onChange", function(data){ @@ -471,6 +495,30 @@ ajax.start(); } TCarInfoDlg.oneChange1 = function (e) { console.log(111) var oneId=$(e).val(); var ajax = new $ax(Feng.ctxPath + "/tShop/onChange1", function(data){ if(data!=null){ if(language==1){ var content='<option value="">选择省</option>'; }else if(language==2){ var content='<option value="">Choose your franchisee</option>'; }else { var content='<option value="">Pilih franchisee Anda</option>'; } $.each(data, function(k,v) { content += "<option value='"+v.id+"'>"+v.name+"</option>"; }); $("#pCode").empty().append(content); } }); ajax.set("oneId",oneId); ajax.start(); } TCarInfoDlg.oneChangeNext = function (e) { var oneId=$(e).val(); var ajax = new $ax(Feng.ctxPath + "/tCompetition/oneChangeNext", function(data){ cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
@@ -815,3 +815,50 @@ ajax.set("oneId",oneId); ajax.start(); } TCarInfoDlg.oneChangeNext1 = function (e) { var oneId=$(e).val(); var ajax = new $ax(Feng.ctxPath + "/tCompetition/oneChangeNext", function(data){ if(data!=null){ if(language==1){ var content='<option value="">选择门店</option>'; }else if(language==2){ var content='<option value="">Choose your franchisee</option>'; }else { var content='<option value="">Pilih franchisee Anda</option>'; } $.each(data, function(k,v) { content += "<option value='"+v.id+"'>"+v.name+"</option>"; }); $("#shopId").empty().append(content); } }); ajax.set("oneId",oneId); ajax.start(); } TCarInfoDlg.oneChangeNext3 = function (e) { var oneId=$(e).val(); var ajax = new $ax(Feng.ctxPath + "/tCompetition/oneChangeNext", function(data){ if(data!=null){ if(language==1){ var content='<option value="">选择门店</option>'; }else if(language==2){ var content='<option value="">Choose your franchisee</option>'; }else { var content='<option value="">Pilih franchisee Anda</option>'; } $.each(data, function(k,v) { content += "<option value='"+v.code+"'>"+v.name+"</option>"; }); $("#shopId").empty().append(content); } }); ajax.set("oneId",oneId); ajax.start(); }
