From d69fbfff2ee6383b79b4cf80a0a31e50f9f73d86 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 04 十二月 2020 09:15:18 +0800
Subject: [PATCH] 手机支付加入 优惠金额
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java
index 2977497..361ca6a 100644
--- a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java
@@ -96,29 +96,29 @@
throw new IllegalArgumentException("娌℃湁鏁版嵁闇�瑕佸鐞�");
}
+ JSONObject paramOut = new JSONObject();
+ paramOut.put("successCount", 0);
+ paramOut.put("errorCount", 0);
+
JSONObject data = JSONObject.parseObject(pd.getReqData());
- data.put("importFeeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
data.put("storeId", result.getStoreId());
+ data.put("importFeeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
data.put("userId", result.getUserId());
data.put("communityId", result.getCommunityId());
-
List<ImportRoomFee> tmpImportRoomFees = new ArrayList<>();
for (int roomIndex = 0; roomIndex < roomFees.size(); roomIndex++) {
-
tmpImportRoomFees.add(roomFees.get(roomIndex));
-
if (roomIndex % DEFAULT_ADD_FEE_COUNT == 0 && roomIndex != 0) {
-
- createRoomFee(pd, tmpImportRoomFees, data);
+ createRoomFee(pd, tmpImportRoomFees, data, paramOut);
tmpImportRoomFees = new ArrayList<>();
}
}
if (tmpImportRoomFees != null && tmpImportRoomFees.size() > 0) {
- createRoomFee(pd, tmpImportRoomFees, data);
+ createRoomFee(pd, tmpImportRoomFees, data, paramOut);
}
- return ResultVo.success();
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, "鎴愬姛锛�" + paramOut.getString("successCount") + ",澶辫触锛�" + paramOut.getString("errorCount"));
}
/**
@@ -127,14 +127,39 @@
* @param pd
* @param tmpImportRoomFee
*/
- private void createRoomFee(IPageData pd, List<ImportRoomFee> tmpImportRoomFee, JSONObject data) {
+ private void createRoomFee(IPageData pd, List<ImportRoomFee> tmpImportRoomFee, JSONObject data, JSONObject paramOut) {
+
+ int successCount = paramOut.getInteger("successCount");
+ int errorCount = paramOut.getInteger("errorCount");
JSONArray importRoomFees = JSONArray.parseArray(JSONObject.toJSONString(tmpImportRoomFee));
data.put("importRoomFees", importRoomFees);
String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeApi/importRoomFees";
- this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
+ ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
+
+ if (HttpStatus.OK != responseEntity.getStatusCode()) {
+ errorCount += tmpImportRoomFee.size();
+ paramOut.put("errorCount", errorCount);
+ return;
+ }
+
+ JSONObject resOut = JSONObject.parseObject(responseEntity.getBody());
+
+ if (ResultVo.CODE_OK != resOut.getInteger("code")) {
+ errorCount += tmpImportRoomFee.size();
+ paramOut.put("errorCount", errorCount);
+ return;
+ }
+
+ JSONObject resData = resOut.getJSONObject("data");
+
+ successCount += resData.getInteger("successCount");
+ errorCount += resData.getInteger("errorCount");
+
+ paramOut.put("successCount", successCount);
+ paramOut.put("errorCount", errorCount);
}
--
Gitblit v1.8.0