1

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CardNewsInfoServiceImpl.java

@@ -4,7 +4,9 @@ import java.util.List;
 
 import com.iotechn.unimall.admin.api.card.ICardNewsInfoService;
 import com.iotechn.unimall.data.domain.CardNewsInfo;
+import com.iotechn.unimall.data.domain.CommonUserInfo;
 import com.iotechn.unimall.data.mapper.CardNewsInfoMapper;
+import com.iotechn.unimall.data.mapper.CommonUserInfoMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,21 +31,44 @@ import org.springframework.transaction.annotation.Transactional;
 public class CardNewsInfoServiceImpl implements ICardNewsInfoService {
 	@Autowired
 	private CardNewsInfoMapper cardNewsInfoMapper;
+	@Autowired
+	private CommonUserInfoMapper commonUserInfoMapper;
 	
 	@Override
 	public String add(CardNewsInfo cardNewsInfo) throws ServiceException {
 		Date now = new Date();
-		List<CardNewsInfo> cardNewsInfoList = cardNewsInfo.getCardNewsInfoList();
-		if (CollectionUtils.isNotEmpty(cardNewsInfoList)){
-			for(CardNewsInfo cardNewsInfo1 : cardNewsInfoList){
-				cardNewsInfo1.setNewsTitle(cardNewsInfo.getNewsTitle());
-				cardNewsInfo1.setNewsContent(cardNewsInfo.getNewsContent());
-				cardNewsInfo1.setGmtCreate(now);
-				cardNewsInfo1.setGmtUpdate(now);
-				cardNewsInfoMapper.insert(cardNewsInfo1);
+		//全部发送
+		if (cardNewsInfo.getAllFlag()!=null){
+			List<CommonUserInfo> commonUserInfoList=commonUserInfoMapper.selectList(new EntityWrapper<CommonUserInfo>()
+			.eq("delete_flag","0"));
+			if (CollectionUtils.isNotEmpty(commonUserInfoList)) {
+				for (CommonUserInfo commonUserInfo : commonUserInfoList) {
+					cardNewsInfo.setNewsTitle(cardNewsInfo.getNewsTitle());
+					cardNewsInfo.setNewsContent(cardNewsInfo.getNewsContent());
+					cardNewsInfo.setReceiveId(commonUserInfo.getId());
+					cardNewsInfo.setGmtCreate(now);
+					cardNewsInfo.setGmtUpdate(now);
+					cardNewsInfoMapper.insert(cardNewsInfo);
 //				//个推
 //				geTuiUtils.initGeTui(cardNewsInfo1.getReceiveId());
 //				geTuiUtils.pushByCid(cardNewsInfo1.getNewsTitle(),cardNewsInfo1.getNewsContent(),cardNewsInfo1.getReceiveId());
+				}
+			}
+		}
+		//选择发送
+		else {
+			List<CardNewsInfo> cardNewsInfoList = cardNewsInfo.getCardNewsInfoList();
+			if (CollectionUtils.isNotEmpty(cardNewsInfoList)) {
+				for (CardNewsInfo cardNewsInfo1 : cardNewsInfoList) {
+					cardNewsInfo1.setNewsTitle(cardNewsInfo.getNewsTitle());
+					cardNewsInfo1.setNewsContent(cardNewsInfo.getNewsContent());
+					cardNewsInfo1.setGmtCreate(now);
+					cardNewsInfo1.setGmtUpdate(now);
+					cardNewsInfoMapper.insert(cardNewsInfo1);
+//				//个推
+//				geTuiUtils.initGeTui(cardNewsInfo1.getReceiveId());
+//				geTuiUtils.pushByCid(cardNewsInfo1.getNewsTitle(),cardNewsInfo1.getNewsContent(),cardNewsInfo1.getReceiveId());
+				}
 			}
 		}
 		return "ok";
@@ -81,6 +106,14 @@ public class CardNewsInfoServiceImpl implements ICardNewsInfoService {
 				}
 							wrapper.eq("delete_flag", 0);
 		List<CardNewsInfo> list = cardNewsInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+		if (CollectionUtils.isNotEmpty(list)){
+			for (CardNewsInfo cardNewsInfo:list){
+				CommonUserInfo commonUserInfo=commonUserInfoMapper.selectById(cardNewsInfo.getReceiveId());
+				if (commonUserInfo!=null){
+					cardNewsInfo.setReceiveName(commonUserInfo.getNickname());
+				}
+			}
+		}
 		Integer count = cardNewsInfoMapper.selectCount(wrapper);
 		return new Page<CardNewsInfo>(list, page, limit, count);
 	}

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardNewsInfo.java

@@ -72,6 +72,11 @@ public class CardNewsInfo extends SuperDO {
 
     @TableField(exist = false)
     private List<CardNewsInfo> cardNewsInfoList;
+    /** 全部发送标识 */
+    @TableField(exist = false)
+    private String allFlag;
+    @TableField(exist = false)
+    private String receiveName;
 
     @Override
     public String toString() {