From 130a52f59500889530be3786a72e8cfaca74c8ce Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期三, 30 六月 2021 11:26:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java b/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java
index a6cfd42..41ec606 100755
--- a/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java
@@ -116,7 +116,7 @@
repairUserDto.setState(RepairUserDto.STATE_DOING);
repairUserDto.setStaffId(userId);
List<RepairUserDto> repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
- if (repairUserDtos.size() != 1) {
+ if (repairUserDtos == null || repairUserDtos.size() != 1) {
ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "褰撳墠鐢ㄦ埛娌℃湁闇�瑕佸鐞嗚鍗曪紒");
context.setResponseEntity(responseEntity);
return;
@@ -126,7 +126,7 @@
String repairMaterial = "";
//璐圭敤鏄庣粏(鍗曚环 * 鏁伴噺 = 鎬讳环)
String repairFee = "";
- if (json != null && json.size() > 0 && (maintenanceType.equals("1001") || maintenanceType.equals("1003") )) {
+ if (json != null && json.size() > 0 && ("1001".equals(maintenanceType) || "1003".equals(maintenanceType))) {
Object[] objects = json.toArray();
//鏁版嵁鍓嶆湡鏍￠獙
for (int i = 0; i < objects.length; i++) {
@@ -158,7 +158,7 @@
//鏌ヨ涓汉鐗╁搧淇℃伅
userStorehouseDtoList = userStorehouseInnerServiceSMO.queryUserStorehouses(userStorehouseDto);
if (userStorehouseDtoList == null || userStorehouseDtoList.size() < 1) {
- ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "缁翠慨鐗╂枡"+ userStorehouseDtoList.get(0).getResName()+"搴撳瓨涓嶈冻锛岃鎮ㄥ厛鐢抽鐗╁搧锛�");
+ ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "缁翠慨鐗╂枡" + userStorehouseDtoList.get(0).getResName() + "搴撳瓨涓嶈冻锛岃鎮ㄥ厛鐢抽鐗╁搧锛�");
context.setResponseEntity(responseEntity);
return;
}
@@ -166,7 +166,7 @@
nowStock = userStorehouseDtoList.get(0).getStock();
}
if (Integer.parseInt(nowStock) < Integer.parseInt(useNumber)) {
- ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "缁翠慨鐗╂枡"+ userStorehouseDtoList.get(0).getResName()+"搴撳瓨涓嶈冻锛岃鎮ㄥ厛鐢抽鐗╁搧锛�");
+ ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "缁翠慨鐗╂枡" + userStorehouseDtoList.get(0).getResName() + "搴撳瓨涓嶈冻锛岃鎮ㄥ厛鐢抽鐗╁搧锛�");
context.setResponseEntity(responseEntity);
return;
}
@@ -178,7 +178,7 @@
Double outHighPrices = Double.parseDouble(outHighPrice);//鏈�楂樹环
//鐗╁搧浠锋牸搴旇鍦ㄦ渶浣庝环鍜屾渶楂樹环涔嬮棿
if (price < outLowPrices || price > outHighPrices) {
- ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "杈撳叆鐨勭淮淇墿鏂�"+userStorehouseDtoList.get(0).getResName()+"鍗曚环涓嶆纭紝璇烽噸鏂拌緭鍏ワ紒");
+ ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "杈撳叆鐨勭淮淇墿鏂�" + userStorehouseDtoList.get(0).getResName() + "鍗曚环涓嶆纭紝璇烽噸鏂拌緭鍏ワ紒");
context.setResponseEntity(responseEntity);
return;
}
@@ -223,7 +223,7 @@
resourceStorePoList = resourceStoreServiceSMO.getResourceStores(resourceStorePo);
//鐢ㄦ枡
repairMaterials = resourceStorePoList.get(0).getResName() + "*" + useNumber;
- }else{
+ } else {
//鐢ㄦ枡
repairMaterials = paramIn.getString("customGoodsName") + "*" + useNumber;
}
@@ -254,8 +254,8 @@
resourceStoreUseRecordPo.setRsurId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_rsurId));
resourceStoreUseRecordPo.setRepairId(reqJson.getString("repairId"));
resourceStoreUseRecordPo.setResourceStoreName(paramIn.getString("resName"));
- if(!StringUtil.isEmpty(isCustom) && isCustom.equals("true")){
- resId="666666";
+ if (!StringUtil.isEmpty(isCustom) && isCustom.equals("true")) {
+ resId = "666666";
resourceStoreUseRecordPo.setResourceStoreName(paramIn.getString("customGoodsName"));
}
resourceStoreUseRecordPo.setResId(resId);
@@ -288,7 +288,8 @@
repairUserPo.setContext(reqJson.getString("context"));
repairUserPo.setCommunityId(reqJson.getString("communityId"));
super.update(context, repairUserPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR_USER);
- if (repairChannel.equals("Z") || (!StringUtil.isEmpty(maintenanceType) && maintenanceType.equals("1001"))) { //濡傛灉鏄笟涓绘姤淇垨鑰呮槸鏈夊伩鐨勫氨鐢熸垚涓�鏉℃柊鐘舵�侊紝鍚﹀垯涓嶅彉
+ if ((!StringUtil.isEmpty(repairChannel) && "Z".equals(repairChannel))
+ || (!StringUtil.isEmpty(maintenanceType) && "1001".equals(maintenanceType))) { //濡傛灉鏄笟涓绘姤淇垨鑰呮槸鏈夊伩鐨勫氨鐢熸垚涓�鏉℃柊鐘舵�侊紝鍚﹀垯涓嶅彉
//2.0 缁欏紑濮嬭妭鐐规淳鏀粯鍗�
repairUserDto = new RepairUserDto();
repairUserDto.setRepairId(reqJson.getString("repairId"));
@@ -303,7 +304,7 @@
repairUserPo = new RepairUserPo();
repairUserPo.setRuId("-1");
repairUserPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- if (maintenanceType.equals("1001")) { //濡傛灉鏄湁鍋跨殑灏辫蛋涓嬮潰(涓氫富鎶ヤ慨鏈夊伩鎴栬�呯數璇濈敵璇锋湁鍋挎垨鑰呭憳宸ユ姤淇湁鍋�)
+ if ("1001".equals(maintenanceType)) { //濡傛灉鏄湁鍋跨殑灏辫蛋涓嬮潰(涓氫富鎶ヤ慨鏈夊伩鎴栬�呯數璇濈敵璇锋湁鍋挎垨鑰呭憳宸ユ姤淇湁鍋�)
repairUserPo.setState(RepairUserDto.STATE_PAY_FEE);
repairUserPo.setContext("寰呮敮浠�" + reqJson.getString("totalPrice") + "鍏�");
} else {
@@ -311,7 +312,7 @@
repairUserPo.setContext("寰呰瘎浠�");
}
repairUserPo.setRepairId(reqJson.getString("repairId"));
- if (repairChannel.equals("Z")) { //濡傛灉鏄笟涓荤鎶ヤ慨鐨勮蛋涓嬮潰鐨勬柟娉�
+ if ("Z".equals(repairChannel)) { //濡傛灉鏄笟涓荤鎶ヤ慨鐨勮蛋涓嬮潰鐨勬柟娉�
repairUserPo.setStaffId(repairUserDtos.get(0).getStaffId());
repairUserPo.setStaffName(repairUserDtos.get(0).getStaffName());
} else { //濡傛灉涓嶆槸涓氫富鎶ヤ慨锛屽苟涓旀湁鍋�
@@ -405,7 +406,7 @@
super.insert(context, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
}
}
- if (publicArea.equals("F") && "1002".equals(reqJson.getString("maintenanceType"))) { //濡傛灉涓嶆槸鍏叡鍖哄煙涓旀槸鏃犲伩鐨勮蛋涓嬮潰
+ if ("F".equals(publicArea) && "1002".equals(reqJson.getString("maintenanceType"))) { //濡傛灉涓嶆槸鍏叡鍖哄煙涓旀槸鏃犲伩鐨勮蛋涓嬮潰
//鏀瑰彉r_repair_pool琛╩aintenance_type缁翠慨绫诲瀷
RepairPoolPo repairPoolPo = new RepairPoolPo();
repairPoolPo.setRepairId(reqJson.getString("repairId"));
@@ -416,7 +417,7 @@
} else if (repairChannel.equals("Z")) { //濡傛灉鏄笟涓昏嚜涓绘姤淇粨鍗曞悗鐘舵�佸彉涓哄緟璇勪环
ownerRepairBMOImpl.modifyBusinessRepairDispatch(reqJson, context, RepairDto.STATE_APPRAISE);
}
- } else if (publicArea.equals("F") && "1001".equals(reqJson.getString("maintenanceType"))) { //濡傛灉涓嶆槸鍏叡鍖哄煙涓旀槸鏈夊伩鐨勮蛋涓嬮潰
+ } else if ("F".equals(publicArea) && "1001".equals(reqJson.getString("maintenanceType"))) { //濡傛灉涓嶆槸鍏叡鍖哄煙涓旀槸鏈夊伩鐨勮蛋涓嬮潰
//3.0 鐢熸垚鏀粯璐圭敤
//鏌ヨ榛樿璐圭敤椤�
FeeConfigDto feeConfigDto = new FeeConfigDto();
@@ -472,9 +473,9 @@
repairPoolPo.setRepairFee(repairFee.substring(0, repairFee.length() - 1));
super.update(context, repairPoolPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR);
ownerRepairBMOImpl.modifyBusinessRepairDispatch(reqJson, context, RepairDto.STATE_PAY);
- } else if (publicArea.equals("T")) { //鍏叡鍖哄煙璧拌繖閲�
+ } else if ("T".equals(publicArea)) { //鍏叡鍖哄煙璧拌繖閲�
//鍏叡鍖哄煙鐢ㄦ枡鏃朵慨鏀圭淮淇被鍨嬪拰鐢ㄦ枡
- if (maintenanceType.equals("1003")) {
+ if ("1003".equals(maintenanceType)) {
//鏀瑰彉r_repair_pool琛╩aintenance_type缁翠慨绫诲瀷
RepairPoolPo repairPoolPo = new RepairPoolPo();
repairPoolPo.setRepairId(reqJson.getString("repairId"));
@@ -484,9 +485,9 @@
repairPoolPo.setRepairMaterials(repairMaterial.substring(0, repairMaterial.length() - 1));
super.update(context, repairPoolPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_REPAIR);
}
- if (repairChannel.equals("T") || repairChannel.equals("D")) { //濡傛灉鏄數璇濇姤淇拰鍛樺伐浠ｅ鎶ヤ慨缁撳崟鍚庣姸鎬佸彉涓哄緟鍥炶
+ if ("T".equals(repairChannel) || "D".equals(repairChannel)) { //濡傛灉鏄數璇濇姤淇拰鍛樺伐浠ｅ鎶ヤ慨缁撳崟鍚庣姸鎬佸彉涓哄緟鍥炶
ownerRepairBMOImpl.modifyBusinessRepairDispatch(reqJson, context, RepairDto.STATE_RETURN_VISIT);
- } else if (repairChannel.equals("Z")) { //濡傛灉鏄笟涓昏嚜涓绘姤淇粨鍗曞悗鐘舵�佸彉涓哄緟璇勪环
+ } else if ("Z".equals(repairChannel)) { //濡傛灉鏄笟涓昏嚜涓绘姤淇粨鍗曞悗鐘舵�佸彉涓哄緟璇勪环
ownerRepairBMOImpl.modifyBusinessRepairDispatch(reqJson, context, RepairDto.STATE_APPRAISE);
}
}
--
Gitblit v1.8.0