From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/fee/SaveTempCarFeeConfigCmd.java | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveTempCarFeeConfigCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveTempCarFeeConfigCmd.java
index d64faf1..40ca568 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveTempCarFeeConfigCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveTempCarFeeConfigCmd.java
@@ -16,8 +16,8 @@
import com.java110.intf.fee.ITempCarFeeConfigAttrV1InnerServiceSMO;
import com.java110.intf.fee.ITempCarFeeConfigV1InnerServiceSMO;
import com.java110.po.fee.PayFeeConfigPo;
-import com.java110.po.tempCarFeeConfig.TempCarFeeConfigPo;
-import com.java110.po.tempCarFeeConfigAttr.TempCarFeeConfigAttrPo;
+import com.java110.po.tempCarFee.TempCarFeeConfigPo;
+import com.java110.po.tempCarFee.TempCarFeeConfigAttrPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -28,12 +28,12 @@
@Java110Cmd(serviceCode = "fee.saveTempCarFeeConfig")
public class SaveTempCarFeeConfigCmd extends Cmd {
-
@Autowired
private IParkingAreaInnerServiceSMO parkingAreaInnerServiceSMOImpl;
@Autowired
private IPayFeeConfigV1InnerServiceSMO payFeeConfigV1InnerServiceSMOImpl;
+
@Autowired
private ITempCarFeeConfigV1InnerServiceSMO tempCarFeeConfigV1InnerServiceSMOImpl;
@@ -49,13 +49,11 @@
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
-
//鏌ヨ鍋滆溅鍦虹紪鍙�
ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
parkingAreaDto.setPaId(reqJson.getString("paId"));
parkingAreaDto.setCommunityId(reqJson.getString("communityId"));
List<ParkingAreaDto> parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
-
Assert.listOnlyOne(parkingAreaDtos, "鍋滆溅鍦轰笉瀛樺湪");
reqJson.put("areaNum", parkingAreaDtos.get(0).getNum());
}
@@ -66,22 +64,18 @@
reqJson.put("feeConfigId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
reqJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
TempCarFeeConfigPo tempCarFeeConfigPo = BeanConvertUtil.covertBean(reqJson, TempCarFeeConfigPo.class);
-
//澶勭悊鎴垮眿灞炴��
dealAttr(reqJson, context);
-
int flag = tempCarFeeConfigV1InnerServiceSMOImpl.saveTempCarFeeConfig(tempCarFeeConfigPo);
if (flag < 1) {
throw new CmdException("淇濆瓨涓存椂鏀惰垂澶辫触");
}
-
-
//琛ヨ垂鐢ㄩ」鏁版嵁
PayFeeConfigPo payFeeConfigPo = new PayFeeConfigPo();
payFeeConfigPo.setAdditionalAmount("0");
payFeeConfigPo.setBillType(FeeConfigDto.BILL_TYPE_YEAR);
payFeeConfigPo.setCommunityId(reqJson.getString("communityId"));
- payFeeConfigPo.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_TEMP_CAR);
+ payFeeConfigPo.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
payFeeConfigPo.setComputingFormulaText("");
payFeeConfigPo.setConfigId(reqJson.getString("feeConfigId"));
payFeeConfigPo.setEndTime(reqJson.getString("endTime"));
@@ -94,25 +88,24 @@
payFeeConfigPo.setPaymentCycle("1");
payFeeConfigPo.setSquarePrice("0");
payFeeConfigPo.setDeductFrom(FeeConfigDto.DEDUCT_FROM_N);
+ payFeeConfigPo.setDecimalPlace("2");
+ payFeeConfigPo.setScale("1");
+ payFeeConfigPo.setUnits("鍏�");
+ payFeeConfigPo.setPayOnline("Y");
flag = payFeeConfigV1InnerServiceSMOImpl.savePayFeeConfig(payFeeConfigPo);
if (flag < 1) {
throw new CmdException("淇濆瓨涓存椂鏀惰垂澶辫触");
}
-
}
private void dealAttr(JSONObject reqJson, ICmdDataFlowContext context) {
-
if (!reqJson.containsKey("attrs")) {
return;
}
-
JSONArray attrs = reqJson.getJSONArray("attrs");
if (attrs == null || attrs.size() < 1) {
return;
}
-
-
JSONObject attr = null;
int flag = 0;
for (int attrIndex = 0; attrIndex < attrs.size(); attrIndex++) {
@@ -126,6 +119,5 @@
throw new CmdException("淇濆瓨涓存椂鏀惰垂澶辫触");
}
}
-
}
}
--
Gitblit v1.8.0