From 663362f91ec4e9eb06553a8c4f18ee717ebf3ff7 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 03 二月 2020 16:44:43 +0800
Subject: [PATCH] 加入费用汇总表
---
HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachine.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachine.java b/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachine.java
index 604b5bc..c9218ac 100644
--- a/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachine.java
+++ b/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachine.java
@@ -7,8 +7,8 @@
import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
import com.java110.core.smo.owner.IOwnerRoomRelInnerServiceSMO;
import com.java110.core.smo.room.IRoomInnerServiceSMO;
-import com.java110.dto.OwnerDto;
-import com.java110.dto.OwnerRoomRelDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.RoomDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.order.OrderDto;
@@ -22,10 +22,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 浠庤鍗曚腑鍚屾涓氫富淇℃伅鑷宠澶囦腑闂磋〃
@@ -87,7 +84,7 @@
OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
ownerRoomRelDto.setbId(tmpOrderDto.getbId());
List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
- Assert.listOnlyOne(ownerRoomRelDtos, "鏁版嵁閿欒 涓氫富鎴垮眿鍏崇郴鏈壘鍒帮紝鎴栨壘鍒板鏉�");
+ Assert.listOnlyOne(ownerRoomRelDtos, "鏁版嵁閿欒 涓氫富鎴垮眿鍏崇郴鏈壘鍒帮紝鎴栨壘鍒板鏉�" + JSONObject.toJSONString(tmpOrderDto));
ownerDto.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
} else {
ownerDto.setbId(tmpOrderDto.getbId());
@@ -145,11 +142,15 @@
for (OwnerDto ownerDto : ownerDtos) {
for (MachineDto tmpMachineDto : machineDtos) {
+ if("9996".equals(tmpMachineDto.getMachineTypeCd())){
+ continue;
+ }
if (BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())
- || BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_ROOM_REL.equals(tmpOrderDto.getBusinessTypeCd())) {
+ || BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_ROOM_REL.equals(tmpOrderDto.getBusinessTypeCd())
+ || BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())) {
saveMachineTranslate(tmpMachineDto, ownerDto);
- } else if (BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())) {
- updateMachineTranslate(tmpMachineDto, ownerDto);
+// } else if (BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())) {
+// updateMachineTranslate(tmpMachineDto, ownerDto);
} else if (BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())
|| BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_ROOM_REL.equals(tmpOrderDto.getBusinessTypeCd())
) {
@@ -167,6 +168,7 @@
Map paramInfo = new HashMap();
paramInfo.put("machineId", tmpMachineDto.getMachineId());
paramInfo.put("objId", ownerDto.getMemberId());
+ paramInfo.put("statusCd", "0");
int count = machineTranslateServiceDaoImpl.queryMachineTranslatesCount(paramInfo);
if (count > 0) {
@@ -195,6 +197,7 @@
info.put("objId", ownerDto.getMemberId());
info.put("state", "10000");
info.put("communityId", ownerDto.getCommunityId());
+ info.put("updateTime", new Date());
machineTranslateServiceDaoImpl.updateMachineTranslate(info);
}
--
Gitblit v1.8.0