From f22c8d5fa51c333c5a6e356d4161d5ed4a05a479 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Fri, 29 Apr 2022 16:14:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=81=E9=87=8F=E6=96=B9?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=B4=B9=E7=8E=87=E5=85=AC=E5=BC=8F=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/controller/XhpcClearingCheckoutController.java | 4 ---- .../controller/XhpcClearingHistoryOrderController.java | 6 ------ .../service/impl/XhpcActivityInternetServiceImpl.java | 3 +++ .../src/main/resources/mapper/XhpcActivityFormulaMapper.xml | 6 +++--- .../main/resources/mapper/XhpcActivityInternetMapper.xml | 4 ++-- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingCheckoutController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingCheckoutController.java index 3a3e570f..99e54670 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingCheckoutController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingCheckoutController.java @@ -41,10 +41,6 @@ public class XhpcClearingCheckoutController extends BaseController { String endTime) { LoginUser loginUser = logUserUtils.getLogUser(request); startPage(); - if (StringUtils.isEmpty(operatorId)) { - operatorId = loginUser.getSysUser().getOperatorId().toString(); - } - Map params = new HashMap<>(); params.put("tenantId", loginUser.getTenantId()); params.put("status", status); diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java index f831ae0c..04caa751 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java @@ -42,9 +42,6 @@ public class XhpcClearingHistoryOrderController extends BaseController { String operatorId, String stationId) { LoginUser loginUser = logUserUtils.getLogUser(request); - if(StringUtils.isEmpty(operatorId) && loginUser.getSysUser().getOperatorId() !=null){ - operatorId = loginUser.getSysUser().getOperatorId().toString(); - } startPage(); Map params = new HashMap<>(); @@ -82,9 +79,6 @@ public class XhpcClearingHistoryOrderController extends BaseController { String stationId, String orderIds) throws IOException { LoginUser loginUser = logUserUtils.getLogUser(request); - if(StringUtils.isEmpty(operatorId)){ - operatorId = loginUser.getSysUser().getOperatorId().toString(); - } Map params = new HashMap<>(); params.put("tenantId", loginUser.getTenantId()); params.put("startTime", startTime); diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java index e1bae3a6..7f257ab5 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java @@ -83,6 +83,7 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ if (formulaDomainList == null || formulaDomainList.size() < 1) { XhpcActivityFormulaDomain formulaDomain = new XhpcActivityFormulaDomain(); formulaDomain.setActivityId(domain.getActivityId()); + formulaDomain.setPowerPrice(domain.getPowerPrice()); formulaDomain.setServicePrice(domain.getServicePrice()); formulaDomain.setComputeFormula(domain.getComputeFormula()); formulaDomain.setStartTime("00:00:00"); @@ -95,6 +96,7 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ XhpcActivityFormulaDomain formulaDomain; if(index>=formulaDomainList.size()){ formulaDomain = new XhpcActivityFormulaDomain(); + formulaDomain.setPowerPrice(domain.getPowerPrice()); formulaDomain.setServicePrice(domain.getServicePrice()); formulaDomain.setComputeFormula(domain.getComputeFormula()); formulaDomain.setStartTime(startTime); @@ -102,6 +104,7 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ } else if (!startTime.equals(formulaDomainList.get(index).getStartTime())) { formulaDomain = new XhpcActivityFormulaDomain(); + formulaDomain.setPowerPrice(domain.getPowerPrice()); formulaDomain.setServicePrice(domain.getServicePrice()); formulaDomain.setComputeFormula(domain.getComputeFormula()); formulaDomain.setStartTime(startTime); diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityFormulaMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityFormulaMapper.xml index 32459f7e..2ed28fb0 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityFormulaMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityFormulaMapper.xml @@ -57,7 +57,7 @@ service_price, compute_formula, create_time, create_by, update_time, update_by) values (#{activityId,jdbcType=INTEGER}, #{startTime}, #{endTime}, #{powerPrice}, - #{servicePrice}, #{computeFormula,jdbcType=VARCHAR}, sysdate(), #{createBy,jdbcType=VARCHAR}, + #{servicePrice}, upper(#{computeFormula}), sysdate(), #{createBy,jdbcType=VARCHAR}, sysdate(), #{updateBy,jdbcType=VARCHAR}) @@ -68,7 +68,7 @@ update_time, update_by) values (#{domain.activityId}, #{domain.startTime}, #{domain.endTime},#{domain.powerPrice}, - #{domain.servicePrice}, #{domain.computeFormula}, sysdate(), #{domain.createBy}, + #{domain.servicePrice}, upper(#{domain.computeFormula}), sysdate(), #{domain.createBy}, sysdate(), #{domain.updateBy}) @@ -81,7 +81,7 @@ end_time = #{endTime}, power_price = #{powerPrice}, service_price = #{servicePrice}, - compute_formula = #{computeFormula,jdbcType=VARCHAR}, + compute_formula = upper(#{computeFormula}), update_time = sysdate(), update_by = #{updateBy,jdbcType=VARCHAR} where activity_formula_id = #{activityComputeId,jdbcType=BIGINT} diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityInternetMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityInternetMapper.xml index dfa1366e..7c0d73a8 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityInternetMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityInternetMapper.xml @@ -104,7 +104,7 @@ del_flag, create_by, create_time, update_by, update_time, check_by, check_time) values (#{activityName,jdbcType=VARCHAR}, #{internetName,jdbcType=VARCHAR}, #{computeType,jdbcType=SMALLINT}, #{powerPrice}, - #{servicePrice}, #{computeFormula,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP}, + #{servicePrice}, upper(#{computeFormula}), #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{stationList,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{status,jdbcType=SMALLINT}, 0, #{createBy,jdbcType=VARCHAR}, sysdate(), @@ -119,7 +119,7 @@ compute_type = #{computeType,jdbcType=SMALLINT}, power_price = #{powerPrice}, service_price = #{servicePrice}, - compute_formula = #{computeFormula,jdbcType=VARCHAR}, + compute_formula = upper(#{computeFormula}), start_time = #{startTime,jdbcType=TIMESTAMP}, end_time = #{endTime,jdbcType=TIMESTAMP}, station_list = #{stationList,jdbcType=VARCHAR},