diff --git a/admin/src/main/java/com/linln/admin/orders/domain/Pet.java b/admin/src/main/java/com/linln/admin/orders/domain/Pet.java index cde6bec..06c8a3d 100644 --- a/admin/src/main/java/com/linln/admin/orders/domain/Pet.java +++ b/admin/src/main/java/com/linln/admin/orders/domain/Pet.java @@ -20,7 +20,6 @@ import java.util.*; @Data @Entity @Table(name="pets") -@Where(clause = StatusUtil.NOT_DELETE) @EntityListeners(AuditingEntityListener.class) public class Pet implements Serializable { // 主键ID diff --git a/admin/src/main/java/com/linln/admin/orders/repository/PetRepository.java b/admin/src/main/java/com/linln/admin/orders/repository/PetRepository.java index f924e63..dc69e78 100644 --- a/admin/src/main/java/com/linln/admin/orders/repository/PetRepository.java +++ b/admin/src/main/java/com/linln/admin/orders/repository/PetRepository.java @@ -16,4 +16,5 @@ public interface PetRepository extends BaseRepository, JpaSpecificati List findAllByUid(long uid); Pet findFirstById(Long id); + Pet findFirstByIdAndStatusIn(Long id, List statusList); } \ No newline at end of file diff --git a/admin/src/main/java/com/linln/admin/orders/service/impl/OrderMainServiceImpl.java b/admin/src/main/java/com/linln/admin/orders/service/impl/OrderMainServiceImpl.java index de5cfac..8c00f28 100644 --- a/admin/src/main/java/com/linln/admin/orders/service/impl/OrderMainServiceImpl.java +++ b/admin/src/main/java/com/linln/admin/orders/service/impl/OrderMainServiceImpl.java @@ -148,8 +148,12 @@ public class OrderMainServiceImpl implements OrderMainService { } } Pet pet = petRepository.findFirstById(orderSub.getPetId()); - String petInfo = "宠物名称:" + pet.getNickName() + "
品种:" + InitLoadDataService.PET_BASE_INFO_MAP.get(pet.getPetId()).getAssortment() + "
体重:" + (InitLoadDataService.PET_BASE_INFO_MAP.get(pet.getPetId()).getPetType() == 1 ? DictUtil.petCatWeight(Byte.valueOf(pet.getWeight().toString())) : DictUtil.petDogWeight(Byte.valueOf(pet.getWeight().toString()))) + "
服务项目:" + orderSub.getGoods(); - orderSub.setPetInfo(petInfo); + try { + String petInfo = "宠物名称:" + pet.getNickName() + "
品种:" + InitLoadDataService.PET_BASE_INFO_MAP.get(pet.getPetId()).getAssortment() + "
体重:" + (InitLoadDataService.PET_BASE_INFO_MAP.get(pet.getPetId()).getPetType() == 1 ? DictUtil.petCatWeight(Byte.valueOf(pet.getWeight().toString())) : DictUtil.petDogWeight(Byte.valueOf(pet.getWeight().toString()))) + "
服务项目:" + orderSub.getGoods(); + orderSub.setPetInfo(petInfo); + } catch (Exception e) { + e.printStackTrace(); + } String str = ""; if (orderSubs.size() > 1) { str = "

";