management/guns-admin/src/main/java/com/stylefeng/guns/config/RedisConfig.java
File was deleted management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
@@ -750,20 +750,20 @@ List<SettlementRecord> settlementRecords = settlementRecordService.selectList(settlementRecordWrapper.isNotNull("arrivalTime").orderBy("insertTime desc")); model.addAttribute("settlementRecords", settlementRecords); QueryBalance queryBalance = new QueryBalance(); queryBalance.setUserId(tAgent.getMerchantNumber()); // QueryBalance queryBalance = new QueryBalance(); // queryBalance.setUserId(tAgent.getMerchantNumber()); TrhRequest<QueryBalance> request = new TrhRequest(); InterfaceResponse execute = request.execute(queryBalance, QueryBalance.SERVICE_CODE); // InterfaceResponse execute = request.execute(queryBalance, QueryBalance.SERVICE_CODE); model.addAttribute("balance", 0); model.addAttribute("marketingAmount", 0); if("0000".equals(execute.getCode())){ JSONObject jsonObject = JSON.parseObject(execute.getResult()); model.addAttribute("balance", jsonObject.getDoubleValue("settledAmount") / 100); if(roleType == 1){ Double amount = rechargeRecordService.querSumSurplusDividedAmount(4); model.addAttribute("marketingAmount", amount); } } // if("0000".equals(execute.getCode())){ // JSONObject jsonObject = JSON.parseObject(execute.getResult()); // model.addAttribute("balance", jsonObject.getDoubleValue("settledAmount") / 100); // if(roleType == 1){ // Double amount = rechargeRecordService.querSumSurplusDividedAmount(4); // model.addAttribute("marketingAmount", amount); // } // } return PREFIX + "enterprisePage.html"; }
@@ -2,21 +2,19 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.shiro.ShiroKit; import com.stylefeng.guns.modular.system.util.AddAdminLogUtil; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.beans.factory.annotation.Autowired; import com.stylefeng.guns.core.log.LogObjectHolder; import org.springframework.web.bind.annotation.RequestParam; import com.stylefeng.guns.core.shiro.ShiroKit; import com.stylefeng.guns.modular.system.model.TAgreement; import com.stylefeng.guns.modular.system.service.ITAgreementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; import java.util.List; /** * 用户端协议管理控制器 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
@@ -674,6 +674,7 @@ if (SinataUtil.isNotEmpty(tBranchOffice.getAccount()) && SinataUtil.isNotEmpty(tBranchOffice.getPassword())){ if(Objects.isNull(user)){ //添加User对象 user = new User(); user.setAccount(tBranchOffice.getAccount()); user.setSalt(ShiroKit.getRandomSalt(5)); user.setPassword(ShiroKit.md5(tBranchOffice.getPassword(), user.getSalt())); management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
@@ -1,7 +1,7 @@ package com.stylefeng.guns.modular.system.util; public class PushURL { public static String zull_user_url = "http://127.0.0.1:443"; public static String zull_user_url = "http://192.168.110.106:3002"; public static String order_push_url = zull_user_url + "/driver/base/order/pushOrderInfo"; public static String driver_auth_url = zull_user_url + "/driver/base/driver/sendsms"; public static String withdraw_auth_url = zull_user_url + "/driver/base/withdrawal/withdrawalAudit"; management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html
@@ -40,9 +40,6 @@ @if(shiro.hasPermission("/tAppUser/tAppUser_exception")){ <#button name="异常" icon="" clickFun="TAppUserException.tAppUserException()"/> @} @if(shiro.hasPermission("/tAppUser/sendCoupon")){ <#button name="赠送优惠劵" icon="" clickFun="TAppUser.searchCoupon()"/> @} </div> <#table id="TAppUserTable"/> </div> management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tSystemConfigExtractionRules.html
@@ -55,11 +55,11 @@ </div> </div> @} <div class="initialLevel col-sm-12 control-label form-group" > <div class="initialLevel col-sm-3 control-label form-group" > <label class="control-label" >代检车抽成设置:</label> </div> </div> <!-- <div class="initialLevel col-sm-12 control-label form-group" >--> <!-- <div class="initialLevel col-sm-3 control-label form-group" >--> <!-- <label class="control-label" >代检车抽成设置:</label>--> <!-- </div>--> <!-- </div>--> @if(roleType == 1){ <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" > <div class="initialLevel col-sm-3 control-label form-group" > management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -61,12 +61,12 @@ <label class="control-label" >服务区域:</label> <input id="area" onclick="TDriver.areaAdd()" name="area" placeholder="请选择" style="height: 30px" readonly required> </div> <div class="initialLevel form-group"> <div class="col-sm-3" style="text-align: left; margin-left: 105px;"> <label class="control-label" for="checkServer">代检车业务:</label> <input type="checkbox" class="js-switch" id="checkServer"/> </div> </div> <!-- <div class="initialLevel form-group">--> <!-- <div class="col-sm-3" style="text-align: left; margin-left: 105px;">--> <!-- <label class="control-label" for="checkServer">代检车业务:</label>--> <!-- <input type="checkbox" class="js-switch" id="checkServer"/>--> <!-- </div>--> <!-- </div>--> </div> </div>
@@ -61,12 +61,12 @@ <label class="control-label" >服务区域:</label> <input id="area" onclick="TDriver.areaAdd()" name="area" value="${item.area}" placeholder="请选择" style="height: 30px" readonly required> </div> <div class="initialLevel form-group"> <div class="col-sm-3" style="text-align: left; margin-left: 105px;"> <label class="control-label" for="checkServer">代检车业务:</label> <input type="checkbox" class="js-switch" id="checkServer" ${driver.checkServer == 1 ? 'checked':''}/> </div> </div> <!-- <div class="initialLevel form-group">--> <!-- <div class="col-sm-3" style="text-align: left; margin-left: 105px;">--> <!-- <label class="control-label" for="checkServer">代检车业务:</label>--> <!-- <input type="checkbox" class="js-switch" id="checkServer" ${driver.checkServer == 1 ? 'checked':''}/>--> <!-- </div>--> <!-- </div>--> </div> </div>
@@ -3,7 +3,7 @@ <div class="col-sm-12"> <div class="ibox float-e-margins"> <div class="ibox-title"> <h5>代理商充值记录</h5> <h5>分公司充值记录</h5> </div> <div class="ibox-content"> <div class="row row-lg"> management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html
@@ -65,11 +65,11 @@ </div> </div> @} <div class="initialLevel col-sm-12 control-label form-group" > <div class="initialLevel col-sm-3 control-label form-group" > <label class="control-label" >代检车抽成设置:</label> </div> </div> <!-- <div class="initialLevel col-sm-12 control-label form-group" >--> <!-- <div class="initialLevel col-sm-3 control-label form-group" >--> <!-- <label class="control-label" >代检车抽成设置:</label>--> <!-- </div>--> <!-- </div>--> @if(roleType == 1){ <div id="monad" class="initialLevel col-sm-12 control-label form-group month" style="text-align: left" > <div class="initialLevel col-sm-3 control-label form-group" >
