From a4b832562c7341709d505fc04cca0a230ac1a371 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期一, 12 四月 2021 08:41:03 +0800
Subject: [PATCH] 优化报修，优化回访数据查询
---
service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java b/service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java
index 603e12c..977f585 100644
--- a/service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java
@@ -8,6 +8,7 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
@@ -44,6 +45,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import java.text.ParseException;
import java.util.Date;
import java.util.List;
@@ -102,7 +104,7 @@
}
@Override
- public void soService(ServiceDataFlowEvent event) {
+ public void soService(ServiceDataFlowEvent event) throws ParseException {
logger.debug("ServiceDataFlowEvent : {}", event);
@@ -137,7 +139,6 @@
}
}
}
-
//涓哄仠杞﹁垂鍗曠嫭澶勭悊
if (paramObj.containsKey("carPayerObjType") && FeeDto.PAYER_OBJ_TYPE_CAR.equals(paramObj.getString("carPayerObjType"))) {
Date feeEndTime = (Date) paramObj.get("carFeeEndTime");
@@ -162,7 +163,6 @@
}
}
}
-
//鍒ゆ柇鏄惁鏈夋淳鍗曞睘鎬D
FeeAttrDto feeAttrDto = new FeeAttrDto();
feeAttrDto.setCommunityId(paramObj.getString("communityId"));
@@ -215,16 +215,37 @@
Assert.listOnlyOne(repairUserDtoList, "淇℃伅閿欒锛�");
RepairUserPo repairUserPo = new RepairUserPo();
repairUserPo.setRuId(repairUserDtoList.get(0).getRuId());
- if (repairChannel.equals("Z")) { //濡傛灉涓氫富鏄嚜涓绘姤淇紝鐘舵�佸氨鍙樻垚寰呰瘎浠�
- repairUserPo.setState(RepairUserDto.STATE_EVALUATE);
- //濡傛灉鏄緟璇勪环鐘舵�侊紝灏辨洿鏂板紑濮嬫椂闂�
- repairUserPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- repairUserPo.setContext("寰呰瘎浠�");
+ if (repairChannel.equals("Z")) { //濡傛灉涓氫富鏄嚜涓绘姤淇紝鐘舵�佸氨鍙樻垚宸叉敮浠橈紝骞舵柊澧炰竴鏉″緟璇勪环鐘舵��
+ repairUserPo.setState(RepairUserDto.STATE_FINISH_PAY_FEE);
+ //濡傛灉鏄緟璇勪环鐘舵�侊紝灏辨洿鏂扮粨鏉熸椂闂�
+ repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ repairUserPo.setContext("宸叉敮浠�" + paramObj.getString("feePrice") + "鍏�");
+ //鏂板寰呰瘎浠风姸鎬�
+ JSONObject object = JSONObject.parseObject("{\"datas\":{}}");
+ object.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_REPAIR_USER);
+ object.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 4);
+ object.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+ RepairUserPo repairUser = new RepairUserPo();
+ repairUser.setRuId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ruId));
+ repairUser.setStartTime(repairUserPo.getEndTime());
+ repairUser.setState(RepairUserDto.STATE_EVALUATE);
+ repairUser.setContext("寰呰瘎浠�");
+ repairUser.setCommunityId(paramObj.getString("communityId"));
+ repairUser.setCreateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ repairUser.setRepairId(repairUserDtoList.get(0).getRepairId());
+ repairUser.setStaffId(repairUserDtoList.get(0).getStaffId());
+ repairUser.setStaffName(repairUserDtoList.get(0).getStaffName());
+ repairUser.setPreStaffId(repairUserDtoList.get(0).getStaffId());
+ repairUser.setPreStaffName(repairUserDtoList.get(0).getStaffName());
+ repairUser.setPreRuId(repairUserDtoList.get(0).getRuId());
+ repairUser.setRepairEvent("auditUser");
+ object.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(RepairUserPo.class.getSimpleName(), BeanConvertUtil.beanCovertMap(repairUser));
+ businesses.add(object);
} else { //濡傛灉鏄憳宸ヤ唬瀹㈡姤淇垨鐢佃瘽鎶ヤ慨锛岀姸鎬佸氨鍙樻垚宸叉敮浠�
repairUserPo.setState(RepairUserDto.STATE_FINISH_PAY_FEE);
//濡傛灉鏄凡鏀粯鐘舵�侊紝灏辨洿鏂扮粨鏉熸椂闂�
repairUserPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- repairUserPo.setContext("宸叉敮浠�");
+ repairUserPo.setContext("宸叉敮浠�" + paramObj.getString("feePrice") + "鍏�");
}
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(RepairUserPo.class.getSimpleName(), BeanConvertUtil.beanCovertMap(repairUserPo));
businesses.add(business);
@@ -243,9 +264,9 @@
feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
- if(feeReceiptDetailDtos != null || feeReceiptDetailDtos.size()> 0){
+ if (feeReceiptDetailDtos != null || feeReceiptDetailDtos.size() > 0) {
dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos.get(0)));
- return ;
+ return;
}
dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailPo));
}
--
Gitblit v1.8.0