1

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

@@ -52,7 +52,7 @@ public class CardExchangeInfoServiceImpl implements ICardExchangeInfoService {
         cardExchangeInfo.setGmtUpdate(now);
         CommonUserInfo commonUserInfo=commonUserInfoMapper.selectById(cardExchangeInfo.getReceiveId());
         //接收人设置自动接受邀请情况
-        if (commonUserInfo!=null&&"1".equals(commonUserInfo.getAutoAccept())){
+        if (commonUserInfo!=null&&commonUserInfo.getAutoAccept()==1){
             cardExchangeInfo.setStatus("1");
             CardHolderInfo CardHolderInfo1 = new CardHolderInfo();
             CardHolderInfo1.setCommonId(cardExchangeInfo.getReceiveId());

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

@@ -3,11 +3,9 @@ package com.iotechn.unimall.admin.api.card.impl;
 import java.util.List;
 
 import com.iotechn.unimall.core.util.GeneratorUtil;
+import com.iotechn.unimall.data.mapper.*;
 import com.iotechn.unimall.data.util.QRCodeUtil;
 import com.iotechn.unimall.data.domain.*;
-import com.iotechn.unimall.data.mapper.CardHolderInfoMapper;
-import com.iotechn.unimall.data.mapper.CircleCardInfoMapper;
-import com.iotechn.unimall.data.mapper.PersonalHomepageInfoMapper;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,7 +16,6 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.util.ExcelUtil;
-import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
 import com.iotechn.unimall.admin.api.card.ICardManagementInfoService;
 import com.iotechn.unimall.data.model.Page;
 
@@ -44,6 +41,8 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
     private CardHolderInfoMapper cardHolderInfoMapper;
     @Autowired
     private PersonalHomepageInfoMapper personalHomepageInfoMapper;
+    @Autowired
+    private CommonUserInfoMapper commonUserInfoMapper;
 
     @Override
     public Boolean add(CardManagementInfo cardManagementInfo) throws ServiceException {
@@ -114,6 +113,11 @@ public class CardManagementInfoServiceImpl implements ICardManagementInfoService
                 if (personalHomepageInfo1 != null) {
                     cardManagementInfo.setPersonalHomeId(personalHomepageInfo1.getId());
                 }
+                CommonUserInfo commonUserInfo=commonUserInfoMapper.selectById(cardManagementInfo.getCommonId());
+                if (commonUserInfo!=null){
+                    cardManagementInfo.setNickname(commonUserInfo.getNickname());
+                    cardManagementInfo.setAccount(commonUserInfo.getPhone());
+                }
             }
         }
         Integer count = cardManagementInfoMapper.selectCount(wrapper);

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

@@ -104,7 +104,7 @@ public class CardNewsInfoServiceImpl implements ICardNewsInfoService {
 												if (!StringUtils.isEmpty(deleteFlag)) {
 					wrapper.eq("delete_flag", deleteFlag);
 				}
-							wrapper.eq("delete_flag", 0);
+							wrapper.eq("delete_flag", 0).orderBy("gmt_update",false);
 		List<CardNewsInfo> list = cardNewsInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
 		if (CollectionUtils.isNotEmpty(list)){
 			for (CardNewsInfo cardNewsInfo:list){

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

@@ -31,6 +31,8 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
     @Autowired
     private CircleCardInfoMapper circleCardInfoMapper;
     @Autowired
+    private CardNewsInfoMapper cardNewsInfoMapper;
+    @Autowired
     private CardManagementInfoMapper cardManagementInfoMapper;
 
     @Override
@@ -117,19 +119,37 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
 
     @Override
     public Boolean handle(CircleManagementInfo circleManagementInfo) throws ServiceException {
-        circleManagementInfo.setStatus(1l);
-        if (circleManagementInfo.getCardId() != null) {
-            //圈子审核通过，创建圈子人自动加入圈子
-            CircleCardInfo circleCardInfo=new CircleCardInfo();
-            circleCardInfo.setCircleId(circleManagementInfo.getId());
-            circleCardInfo.setCommonId(circleManagementInfo.getCommonId());
-            circleCardInfo.setCardId(circleManagementInfo.getCardId());
-            Date now = new Date();
-            circleCardInfo.setGmtCreate(now);
-            circleCardInfo.setGmtUpdate(now);
-            circleCardInfoMapper.insert(circleCardInfo);
+        Date now = new Date();
+        //驳回
+        if (circleManagementInfo.getStatus()==3){
+            CardNewsInfo cardNewsInfo=new CardNewsInfo();
+            cardNewsInfo.setNewsTitle("系统消息");
+            cardNewsInfo.setNewsContent("您创建的圈子"+circleManagementInfo.getCircleName()+"未通过审核，驳回原因："+circleManagementInfo.getReason());
+            cardNewsInfo.setReceiveId(circleManagementInfo.getCommonId());
+            cardNewsInfo.setGmtCreate(now);
+            cardNewsInfo.setGmtUpdate(now);
+            cardNewsInfoMapper.insert(cardNewsInfo);
+        }
+        else{
+            circleManagementInfo.setStatus(1l);
+            if (circleManagementInfo.getCardId() != null) {
+                //圈子审核通过，创建圈子人自动加入圈子
+                CircleCardInfo circleCardInfo=new CircleCardInfo();
+                circleCardInfo.setCircleId(circleManagementInfo.getId());
+                circleCardInfo.setCommonId(circleManagementInfo.getCommonId());
+                circleCardInfo.setCardId(circleManagementInfo.getCardId());
+                circleCardInfo.setGmtCreate(now);
+                circleCardInfo.setGmtUpdate(now);
+                circleCardInfoMapper.insert(circleCardInfo);
+            }
+            CardNewsInfo cardNewsInfo=new CardNewsInfo();
+            cardNewsInfo.setNewsTitle("系统消息");
+            cardNewsInfo.setNewsContent("您创建的圈子"+circleManagementInfo.getCircleName()+"已通过审核，快去邀请好友一起加入吧");
+            cardNewsInfo.setReceiveId(circleManagementInfo.getCommonId());
+            cardNewsInfo.setGmtCreate(now);
+            cardNewsInfo.setGmtUpdate(now);
+            cardNewsInfoMapper.insert(cardNewsInfo);
         }
-
         return circleManagementInfoMapper.updateById(circleManagementInfo) > 0;
     }
 

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

@@ -149,6 +149,12 @@ public class CardManagementInfo extends SuperDO {
     /** 接收人id */
     @TableField(exist = false)
     private Long receiveId;
+    /** 昵称 */
+    @TableField(exist = false)
+    private String nickname;
+    /** 账号 */
+    @TableField(exist = false)
+    private String account;
 
     @Override
     public String toString() {

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

@@ -84,6 +84,8 @@ public class CircleManagementInfo extends SuperDO {
     private Integer cardNum;
     @TableField(exist = false)
     private CircleCardInfo circleCardInfo;
+    @TableField(exist = false)
+    private String reason;
 
     @Override
     public String toString() {

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CardManagementInfoMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cmi.company_name as companyName,
         cmi.current_background as currentBackground,
         cmi.cuttent_template as cuttentTemplate,
+        cmi.head_sculpture as headSculpture,
         phi.scope_of_business AS scopeOfBusiness,
         phi.id AS personalHomeId,
         cui.look_page AS lookPage,