From 9546646b1a4157da6acb396f786541ca5dd0e3a2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 19 八月 2025 11:31:47 +0800
Subject: [PATCH] 合并代码
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java | 18 ++---
/dev/null | 46 ---------------
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html | 10 +-
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tSystemConfigExtractionRules.html | 10 +-
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 12 ++--
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 12 ++--
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java | 1
management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html | 3 -
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java | 22 +++---
11 files changed, 44 insertions(+), 94 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/config/RedisConfig.java b/management/guns-admin/src/main/java/com/stylefeng/guns/config/RedisConfig.java
deleted file mode 100644
index d459612..0000000
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/config/RedisConfig.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.stylefeng.guns.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.JedisPoolConfig;
-
-@Configuration
-@PropertySource("classpath:redis.properties")
-public class RedisConfig {
- @Value("${spring.redis.host}")
- private String host;
-
- @Value("${spring.redis.port}")
- private int port;
-
- @Value("${spring.redis.timeout}")
- private int timeout;
-
- @Value("${spring.redis.jedis.pool.max-idle}")
- private int maxIdle;
-
- @Value("${spring.redis.jedis.pool.max-wait}")
- private long maxWaitMillis;
-
- @Value("${spring.redis.password}")
- private String password;
-
- @Value("${spring.redis.block-when-exhausted}")
- private boolean blockWhenExhausted;
-
- @Bean
- public JedisPool redisPoolFactory() throws Exception{
- JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
- jedisPoolConfig.setMaxIdle(maxIdle);
- jedisPoolConfig.setMaxWaitMillis(maxWaitMillis);
- // 连接耗尽时是否阻塞, false报异常,ture阻塞直到超时, 默认true
- jedisPoolConfig.setBlockWhenExhausted(blockWhenExhausted);
- // 是否启用pool的jmx管理功能, 默认true
- jedisPoolConfig.setJmxEnabled(true);
- JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, password);
- return jedisPool;
- }
-}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
index 406ea88..42807a3 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
+++ b/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";
}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
index e1e332e..89f521e 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
@@ -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;
/**
* 用户端协议管理控制器
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
index ace4df5..ecda26f 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
+++ b/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()));
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
index 1131d17..4cebcf5 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
+++ b/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";
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html
index 0b857d5..da235c3 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUser.html
+++ b/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>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tSystemConfigExtractionRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tSystemConfigExtractionRules.html
index d9ff515..3db9474 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tSystemConfigExtractionRules.html
+++ b/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" >
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
index db41a0d..9235d14 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
+++ b/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>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
index 298ff3b..2d8b635 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -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>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html
index 51cf4fa..915c0a7 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tRechargeRecord/tRechargeRecordAgent.html
@@ -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">
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html
index 6f3b1b8..dd0fc68 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html
+++ b/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" >
--
Gitblit v1.7.1