Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

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,

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -312,7 +312,7 @@
 				</div>
 				<div class="auth-btncard">
 					<div class="btn-unok"><u-button  :customStyle="customStyleUnOk" @click="showAuthorizePhone=false"> 拒绝</u-button></div>
-					<div class="btn-ok"><u-button  :customStyle="customStyleOk" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"> 允许</u-button></div>
+					<div class="btn-ok"><u-button  :customStyle="customStyleOk" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"> 立即登录</u-button></div>
 				</div>
 			</view>
 		</u-modal>
@@ -362,7 +362,7 @@
 		},
 		data() {
 			return {
-				userInfo: {avatarUrl:'',nickName:''},
+				userInfo: {head:'',nickname:''},
 				downOption: {
 					auto: false,
 				},
@@ -370,6 +370,7 @@
 					page: {
 						size: 10 // 每页数据的数量,默认10
 					},
+					auto: false,
 					noMoreSize: 1,
 					empty: {
 						tip: '暂无相关数据'
@@ -419,9 +420,6 @@
 					color:'#157DFB'
 				},
 			};
-		},
-		onShow() {
-			
 		},
 		mounted() {
 
@@ -432,9 +430,10 @@
 				this.userInfo = uni.getStorageSync("userInfo")
 				this.$nextTick(function() {
 					this.mescroll.resetUpScroll()
-					// this.canReset && this.mescroll.resetUpScroll() // 重置列表数据为第一页  
-					// this.canReset && this.mescroll.scrollTo(0, 0) // 重置列表数据为第一页时,建议把滚动条也重置到顶部,避免无法再次翻页的问题  
-					// this.canReset = true // 过滤第一次的onShow事件,避免初始化界面时重复触发upCallback, 无需配置auto:false
+					wx.showShareMenu({
+						withShareTicket: true,
+						menus: ["shareAppMessage", "shareTimeline"]
+					})
 				});
 				this.searchVal = uni.getStorageSync("search_val") ? uni.getStorageSync("search_val") : ''
 			} else {
@@ -450,12 +449,7 @@
 					icon: 'none',
 					duration: 10000
 				});
-			} else {
-				wx.showShareMenu({
-					withShareTicket: true,
-					menus: ["shareAppMessage", "shareTimeline"]
-				})
-			}
+			} 
 
 		},
 		onShareAppMessage(res) {
@@ -485,15 +479,17 @@
 				userNameInput(e){
 					this.userInfo.nickname = e.detail.value
 				},
-				onChooseAvatar(e) {
-					  console.log(e.detail.avatarUrl)
-					 pathToBase64( e.detail.avatarUrl).then(path => {
-					  this.userInfo.head = path
-					  console.log(path)
-					}).catch(error => {
-					  console.log(error)
+				async onChooseAvatar(e) {
+					this.$set(this.userInfo,"head",await this.toBase64(e.detail.avatarUrl))
+				},
+				toBase64(url){
+					return new Promise(resolve => {
+						pathToBase64(url).then(path => {
+						  resolve(path);
+						}).catch(error => {
+						  console.log(error)
+						})
 					})
-					// this.userInfo.head = e.detail.avatarUrl;
 				},
 				authUser(){
 					if(this.userInfo.nickname==''){
@@ -1055,79 +1051,82 @@
 					});
 				} else {
 					var that = this
-					uni.showLoading({
-						title: '数据加载中'
-					})
-					await this.$request.baseRequest('admin.unimall.cardHolderInfo', 'list', {
-						page: page.num,
-						limit: page.size,
-						commonId: uni.getStorageSync("userInfo").id,
-						searchContent: this.searchVal,
-						classify:this.typeName
-					}, failres => {
-						console.log('res+++++', failres.errmsg)
-						this.$refs.uToast.show({
-							type: 'error',
-							message: failres.errmsg,
+					if(uni.getStorageSync("userInfo").id){
+						uni.showLoading({
+							title: '数据加载中'
 						})
-						uni.hideLoading()
-					}).then(res => {
-						console.log(res)
-						if (page.num == 1) this.cardHolderList = [];
-						let curPageLen = res.data.items.length;
-						let totalPage = res.data.total;
-						for (var i = 0; i < res.data.items.length; i++) {
-							res.data.items[i].checked = false
-							if (res.data.items[i].classify) {
-								res.data.items[i].classifyName = res.data.items[i].classify[0]
+						await this.$request.baseRequest('admin.unimall.cardHolderInfo', 'list', {
+							page: page.num,
+							limit: page.size,
+							commonId: uni.getStorageSync("userInfo").id,
+							searchContent: this.searchVal,
+							classify:this.typeName
+						}, failres => {
+							console.log('res+++++', failres.errmsg)
+							this.$refs.uToast.show({
+								type: 'error',
+								message: failres.errmsg,
+							})
+							uni.hideLoading()
+						}).then(res => {
+							console.log(res)
+							if (page.num == 1) this.cardHolderList = [];
+							let curPageLen = res.data.items.length;
+							let totalPage = res.data.total;
+							for (var i = 0; i < res.data.items.length; i++) {
+								res.data.items[i].checked = false
+								if (res.data.items[i].classify) {
+									res.data.items[i].classifyName = res.data.items[i].classify[0]
+								}
 							}
-						}
-						this.cardHolderList = res.data.items
-						this.loading = false
-						this.$nextTick(() => {
-							that.mescroll.endBySize(curPageLen, totalPage)
-						});
-
-						uni.hideLoading()
-					})
-
-					await this.$request.baseRequest('admin.unimall.cardClassifyInfo', 'list', {
-						page: 1,
-						limit: 9999,
-						commonId: uni.getStorageSync("userInfo").id
-					}, failres => {
-						console.log('res+++++', failres.errmsg)
-						this.$refs.uToast.show({
-							type: 'error',
-							message: failres.errmsg,
-						})
-					}).then(res => {
-						res.data.items.unshift({
-							circleName:'全部分类'
+							this.cardHolderList = res.data.items
+							this.loading = false
+							this.$nextTick(() => {
+								that.mescroll.endBySize(curPageLen, totalPage)
+							});
+						
+							uni.hideLoading()
 						})
-						this.typeColumns = [res.data.items]
 						
-						console.log(this.typeColumns)
-					})
-
-					await this.$request.baseRequest('admin.unimall.cardNewsInfo', 'list', {
-						receiveId: uni.getStorageSync("userInfo").id,
-					}, failres => {
-						console.log('res+++++', failres.errmsg)
-						this.$refs.uToast.show({
-							type: 'error',
-							message: failres.errmsg,
+						await this.$request.baseRequest('admin.unimall.cardClassifyInfo', 'list', {
+							page: 1,
+							limit: 9999,
+							commonId: uni.getStorageSync("userInfo").id
+						}, failres => {
+							console.log('res+++++', failres.errmsg)
+							this.$refs.uToast.show({
+								type: 'error',
+								message: failres.errmsg,
+							})
+						}).then(res => {
+							res.data.items.unshift({
+								circleName:'全部分类'
+							})
+							this.typeColumns = [res.data.items]
+							
+							console.log(this.typeColumns)
 						})
-					}).then(res => {
-						this.noticeList = res.data.items
-						if (this.noticeList.length > 0) {
-							var data = this.noticeList.filter((item) => {
-								return item.newsFlag == 0
+						
+						await this.$request.baseRequest('admin.unimall.cardNewsInfo', 'list', {
+							receiveId: uni.getStorageSync("userInfo").id,
+						}, failres => {
+							console.log('res+++++', failres.errmsg)
+							this.$refs.uToast.show({
+								type: 'error',
+								message: failres.errmsg,
 							})
-							this.unread = data ? data.length : 0
-						}
-						console.log(this.unread)
-					})
+						}).then(res => {
+							this.noticeList = res.data.items
+							if (this.noticeList.length > 0) {
+								var data = this.noticeList.filter((item) => {
+									return item.newsFlag == 0
+								})
+								this.unread = data ? data.length : 0
+							}
+							console.log(this.unread)
+						})
+					}
+					
 				}
 			},
 			login() {