From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-acct/src/main/java/com/java110/acct/cmd/couponUser/ListCouponUserCmd.java | 73 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 14 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/cmd/couponUser/ListCouponUserCmd.java b/service-acct/src/main/java/com/java110/acct/cmd/couponUser/ListCouponUserCmd.java
index aa4845e..97a10a2 100644
--- a/service-acct/src/main/java/com/java110/acct/cmd/couponUser/ListCouponUserCmd.java
+++ b/service-acct/src/main/java/com/java110/acct/cmd/couponUser/ListCouponUserCmd.java
@@ -17,27 +17,27 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.CommunityMemberDto;
+import com.java110.dto.couponUser.CouponUserDto;
+import com.java110.dto.owner.OwnerDto;
import com.java110.intf.acct.ICouponUserV1InnerServiceSMO;
-import com.java110.po.couponUser.CouponUserPo;
+import com.java110.intf.community.ICommunityMemberV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.java110.dto.couponUser.CouponUserDto;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.HttpStatus;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
/**
@@ -51,15 +51,23 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "couponUser.listCouponUser")
-public class ListCouponUserCmd extends AbstractServiceCmdListener {
+public class ListCouponUserCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(ListCouponUserCmd.class);
@Autowired
private ICouponUserV1InnerServiceSMO couponUserV1InnerServiceSMOImpl;
+ @Autowired
+ private ICommunityMemberV1InnerServiceSMO communityMemberV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
+ Assert.hasKeyAndValue(reqJson, "tel", "鏈寘鍚墜鏈哄彿");
+ Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖�");
}
@Override
@@ -67,6 +75,43 @@
CouponUserDto couponUserDto = BeanConvertUtil.covertBean(reqJson, CouponUserDto.class);
+ //鏄惁鍖呭惈灏忓尯ID
+ CommunityMemberDto communityMemberDto = new CommunityMemberDto();
+ communityMemberDto.setCommunityId(reqJson.getString("communityId"));
+ communityMemberDto.setMemberTypeCd(CommunityMemberDto.MEMBER_TYPE_PROPERTY);
+ communityMemberDto.setPage(1);
+ communityMemberDto.setRow(1);
+ List<CommunityMemberDto> communityMemberDtos = communityMemberV1InnerServiceSMOImpl.queryCommunityMembers(communityMemberDto);
+
+ Assert.listOnlyOne(communityMemberDtos, "灏忓尯鐗╀笟涓嶅瓨鍦�");
+
+ //鏌ヨ鎵�鏈夊搴垚鍛�
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setLink(reqJson.getString("tel"));
+ ownerDto.setCommunityId(reqJson.getString("communityId"));
+ ownerDto.setPage(1);
+ ownerDto.setRow(1);
+ List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
+
+ if (ownerDtos == null || ownerDtos.size() < 1) {
+ return;
+ }
+
+ ownerDto = new OwnerDto();
+ ownerDto.setOwnerId(ownerDtos.get(0).getOwnerId());
+ ownerDto.setCommunityId(reqJson.getString("communityId"));
+ ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
+ if (ownerDtos == null || ownerDtos.size() < 1) {
+ return;
+ }
+ List<String> tels = new ArrayList<>();
+ for (OwnerDto tmpOwnerDto : ownerDtos) {
+ tels.add(tmpOwnerDto.getLink());
+ }
+
+ couponUserDto.setTel("");
+ couponUserDto.setTels(tels.toArray(new String[tels.size()]));
+
int count = couponUserV1InnerServiceSMOImpl.queryCouponUsersCount(couponUserDto);
List<CouponUserDto> couponUserDtos = null;
--
Gitblit v1.8.0