yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新流量方活动费率公式强制大写

Browse Source
This commit is contained in:
panshuling321 2022-04-29 16:14:53 +08:00
parent 4d6ef150df
commit f22c8d5fa5
5 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingCheckoutController.java
View File

@ -41,10 +41,6 @@ public class XhpcClearingCheckoutController extends BaseController {
String endTime) { String endTime) {
LoginUser loginUser = logUserUtils.getLogUser(request); LoginUser loginUser = logUserUtils.getLogUser(request);
startPage(); startPage();
if (StringUtils.isEmpty(operatorId)) {
operatorId = loginUser.getSysUser().getOperatorId().toString();
}
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("tenantId", loginUser.getTenantId()); params.put("tenantId", loginUser.getTenantId());
params.put("status", status); params.put("status", status);

6
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java
View File

@ -42,9 +42,6 @@ public class XhpcClearingHistoryOrderController extends BaseController {
String operatorId, String operatorId,
String stationId) { String stationId) {
LoginUser loginUser = logUserUtils.getLogUser(request); LoginUser loginUser = logUserUtils.getLogUser(request);
if(StringUtils.isEmpty(operatorId) && loginUser.getSysUser().getOperatorId() !=null){
operatorId = loginUser.getSysUser().getOperatorId().toString();
}
startPage(); startPage();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
@ -82,9 +79,6 @@ public class XhpcClearingHistoryOrderController extends BaseController {
String stationId, String stationId,
String orderIds) throws IOException { String orderIds) throws IOException {
LoginUser loginUser = logUserUtils.getLogUser(request); LoginUser loginUser = logUserUtils.getLogUser(request);
if(StringUtils.isEmpty(operatorId)){
operatorId = loginUser.getSysUser().getOperatorId().toString();
}
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("tenantId", loginUser.getTenantId()); params.put("tenantId", loginUser.getTenantId());
params.put("startTime", startTime); params.put("startTime", startTime);

3
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java
View File

@ -83,6 +83,7 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ
if (formulaDomainList == null || formulaDomainList.size() < 1) { if (formulaDomainList == null || formulaDomainList.size() < 1) {
XhpcActivityFormulaDomain formulaDomain = new XhpcActivityFormulaDomain(); XhpcActivityFormulaDomain formulaDomain = new XhpcActivityFormulaDomain();
formulaDomain.setActivityId(domain.getActivityId()); formulaDomain.setActivityId(domain.getActivityId());
formulaDomain.setPowerPrice(domain.getPowerPrice());
formulaDomain.setServicePrice(domain.getServicePrice()); formulaDomain.setServicePrice(domain.getServicePrice());
formulaDomain.setComputeFormula(domain.getComputeFormula()); formulaDomain.setComputeFormula(domain.getComputeFormula());
formulaDomain.setStartTime("00:00:00"); formulaDomain.setStartTime("00:00:00");
@ -95,6 +96,7 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ
XhpcActivityFormulaDomain formulaDomain; XhpcActivityFormulaDomain formulaDomain;
if(index>=formulaDomainList.size()){ if(index>=formulaDomainList.size()){
formulaDomain = new XhpcActivityFormulaDomain(); formulaDomain = new XhpcActivityFormulaDomain();
formulaDomain.setPowerPrice(domain.getPowerPrice());
formulaDomain.setServicePrice(domain.getServicePrice()); formulaDomain.setServicePrice(domain.getServicePrice());
formulaDomain.setComputeFormula(domain.getComputeFormula()); formulaDomain.setComputeFormula(domain.getComputeFormula());
formulaDomain.setStartTime(startTime); formulaDomain.setStartTime(startTime);
@ -102,6 +104,7 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ
} else if (!startTime.equals(formulaDomainList.get(index).getStartTime())) { } else if (!startTime.equals(formulaDomainList.get(index).getStartTime())) {
formulaDomain = new XhpcActivityFormulaDomain(); formulaDomain = new XhpcActivityFormulaDomain();
formulaDomain.setPowerPrice(domain.getPowerPrice());
formulaDomain.setServicePrice(domain.getServicePrice()); formulaDomain.setServicePrice(domain.getServicePrice());
formulaDomain.setComputeFormula(domain.getComputeFormula()); formulaDomain.setComputeFormula(domain.getComputeFormula());
formulaDomain.setStartTime(startTime); formulaDomain.setStartTime(startTime);

6
xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityFormulaMapper.xml
View File

@ -57,7 +57,7 @@
service_price, compute_formula, create_time, create_by, service_price, compute_formula, create_time, create_by,
update_time, update_by) update_time, update_by)
values (#{activityId,jdbcType=INTEGER}, #{startTime}, #{endTime}, #{powerPrice}, 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}) sysdate(), #{updateBy,jdbcType=VARCHAR})
</insert> </insert>
@ -68,7 +68,7 @@
update_time, update_by) values update_time, update_by) values
<foreach collection="domainList" separator="," item="domain" index="index"> <foreach collection="domainList" separator="," item="domain" index="index">
(#{domain.activityId}, #{domain.startTime}, #{domain.endTime},#{domain.powerPrice}, (#{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}) sysdate(), #{domain.updateBy})
</foreach> </foreach>
</insert> </insert>
@ -81,7 +81,7 @@
end_time = #{endTime}, end_time = #{endTime},
power_price = #{powerPrice}, power_price = #{powerPrice},
service_price = #{servicePrice}, service_price = #{servicePrice},
compute_formula = #{computeFormula,jdbcType=VARCHAR}, compute_formula = upper(#{computeFormula}),
update_time = sysdate(), update_time = sysdate(),
update_by = #{updateBy,jdbcType=VARCHAR} update_by = #{updateBy,jdbcType=VARCHAR}
where activity_formula_id = #{activityComputeId,jdbcType=BIGINT} where activity_formula_id = #{activityComputeId,jdbcType=BIGINT}

4
xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityInternetMapper.xml
View File

@ -104,7 +104,7 @@
del_flag, create_by, create_time, del_flag, create_by, create_time,
update_by, update_time, check_by, check_time) update_by, update_time, check_by, check_time)
values (#{activityName,jdbcType=VARCHAR}, #{internetName,jdbcType=VARCHAR}, #{computeType,jdbcType=SMALLINT}, #{powerPrice}, 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}, #{endTime,jdbcType=TIMESTAMP},
#{stationList,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{status,jdbcType=SMALLINT}, #{stationList,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{status,jdbcType=SMALLINT},
0, #{createBy,jdbcType=VARCHAR}, sysdate(), 0, #{createBy,jdbcType=VARCHAR}, sysdate(),
@ -119,7 +119,7 @@
compute_type = #{computeType,jdbcType=SMALLINT}, compute_type = #{computeType,jdbcType=SMALLINT},
power_price = #{powerPrice}, power_price = #{powerPrice},
service_price = #{servicePrice}, service_price = #{servicePrice},
compute_formula = #{computeFormula,jdbcType=VARCHAR}, compute_formula = upper(#{computeFormula}),
start_time = #{startTime,jdbcType=TIMESTAMP}, start_time = #{startTime,jdbcType=TIMESTAMP},
end_time = #{endTime,jdbcType=TIMESTAMP}, end_time = #{endTime,jdbcType=TIMESTAMP},
station_list = #{stationList,jdbcType=VARCHAR}, station_list = #{stationList,jdbcType=VARCHAR},