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

# Conflicts:
#	xiaochengxu/pages/circle/changeCard.vue
#	xiaochengxu/pages/circle/detail.vue
#	xiaochengxu/pages/mySet/mySet.vue

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

@@ -5,14 +5,13 @@ import java.util.List;
 import com.iotechn.unimall.admin.api.card.ICardExchangeInfoService;
 import com.iotechn.unimall.core.exception.AppServiceException;
 import com.iotechn.unimall.core.exception.ExceptionDefinition;
-import com.iotechn.unimall.data.domain.CardExchangeInfo;
-import com.iotechn.unimall.data.domain.CardHolderInfo;
-import com.iotechn.unimall.data.domain.CardManagementInfo;
+import com.iotechn.unimall.data.domain.*;
 import com.iotechn.unimall.data.dto.goods.GroupShopDTO;
 import com.iotechn.unimall.data.dto.order.OrderDTO;
 import com.iotechn.unimall.data.mapper.CardExchangeInfoMapper;
 import com.iotechn.unimall.data.mapper.CardHolderInfoMapper;
 import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
+import com.iotechn.unimall.data.mapper.CommonUserInfoMapper;
 import com.iotechn.unimall.data.model.Page;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -43,12 +42,46 @@ public class CardExchangeInfoServiceImpl implements ICardExchangeInfoService {
     private CardHolderInfoMapper cardHolderInfoMapper;
     @Autowired
     private CardManagementInfoMapper cardManagementInfoMapper;
+    @Autowired
+    private CommonUserInfoMapper commonUserInfoMapper;
 
     @Override
     public Boolean add(CardExchangeInfo cardExchangeInfo) throws ServiceException {
         Date now = new Date();
         cardExchangeInfo.setGmtCreate(now);
         cardExchangeInfo.setGmtUpdate(now);
+        CommonUserInfo commonUserInfo=commonUserInfoMapper.selectById(cardExchangeInfo.getReceiveId());
+        //接收人设置自动接受邀请情况
+        if (commonUserInfo!=null&&"1".equals(commonUserInfo.getAutoAccept())){
+            cardExchangeInfo.setStatus("1");
+            CardHolderInfo CardHolderInfo1 = new CardHolderInfo();
+            CardHolderInfo1.setCommonId(cardExchangeInfo.getReceiveId());
+            CardHolderInfo1.setCardId(String.valueOf(cardExchangeInfo.getSendCardId()));
+            CardHolderInfo1.setDeleteFlag(0l);
+            CardHolderInfo cardHolderInfo2 = cardHolderInfoMapper.selectOne(CardHolderInfo1);
+            //查看接收人名片夹是否存有该名片
+            if (cardHolderInfo2==null){
+                //接收人名片夹添加数据
+                CardHolderInfo cardHolderInfo = new CardHolderInfo();
+                cardHolderInfo.setCardId(String.valueOf(cardExchangeInfo.getSendCardId()));
+                CardManagementInfo cardManagementInfo = cardManagementInfoMapper.selectById(cardExchangeInfo.getSendCardId());
+                //查看发起人名片是否删除
+                if (cardManagementInfo.getCommonId() == -1) {
+                    throw new AppServiceException(ExceptionDefinition.ACCEPT_CARD_ERROR);
+                }
+                cardHolderInfo.setCommonId(cardExchangeInfo.getReceiveId());
+                cardHolderInfo.setGmtCreate(now);
+                cardHolderInfo.setGmtUpdate(now);
+                cardHolderInfoMapper.insert(cardHolderInfo);
+            }
+            //发起人名片夹添加数据
+            CardHolderInfo cardHolderInfo = new CardHolderInfo();
+            cardHolderInfo.setCardId(String.valueOf(cardExchangeInfo.getReceiveCardId()));
+            cardHolderInfo.setCommonId(cardExchangeInfo.getSendId());
+            cardHolderInfo.setGmtCreate(now);
+            cardHolderInfo.setGmtUpdate(now);
+            cardHolderInfoMapper.insert(cardHolderInfo);
+        }
         return cardExchangeInfoMapper.insert(cardExchangeInfo) > 0;
     }
 
@@ -96,29 +129,37 @@ public class CardExchangeInfoServiceImpl implements ICardExchangeInfoService {
         //接受
         else if ("3".equals(updateFlag)) {
             cardExchangeInfo.setStatus("1");
-            //接收人名片夹添加数据
-            CardHolderInfo cardHolderInfo = new CardHolderInfo();
-            cardHolderInfo.setCardId(String.valueOf(cardExchangeInfo.getSendCardId()));
-            CardManagementInfo cardManagementInfo = cardManagementInfoMapper.selectById(cardExchangeInfo.getSendCardId());
-            //查看发起人名片是否删除
-            if (cardManagementInfo.getCommonId() == -1) {
-                throw new AppServiceException(ExceptionDefinition.ACCEPT_CARD_ERROR);
+            CardHolderInfo CardHolderInfo1 = new CardHolderInfo();
+            CardHolderInfo1.setCommonId(cardExchangeInfo.getReceiveId());
+            CardHolderInfo1.setCardId(String.valueOf(cardExchangeInfo.getSendCardId()));
+            CardHolderInfo1.setDeleteFlag(0l);
+            CardHolderInfo cardHolderInfo2 = cardHolderInfoMapper.selectOne(CardHolderInfo1);
+            //查看接收人名片夹是否存有该名片
+            if (cardHolderInfo2==null) {
+                //接收人名片夹添加数据
+                CardHolderInfo cardHolderInfo = new CardHolderInfo();
+                cardHolderInfo.setCardId(String.valueOf(cardExchangeInfo.getSendCardId()));
+                CardManagementInfo cardManagementInfo = cardManagementInfoMapper.selectById(cardExchangeInfo.getSendCardId());
+                //查看发起人名片是否删除
+                if (cardManagementInfo.getCommonId() == -1) {
+                    throw new AppServiceException(ExceptionDefinition.ACCEPT_CARD_ERROR);
+                }
+                cardHolderInfo.setCommonId(cardExchangeInfo.getReceiveId());
+                cardHolderInfo.setGmtCreate(now);
+                cardHolderInfo.setGmtUpdate(now);
+                cardHolderInfoMapper.insert(cardHolderInfo);
             }
-            cardHolderInfo.setCommonId(cardExchangeInfo.getReceiveId());
-            cardHolderInfo.setGmtCreate(now);
-            cardHolderInfo.setGmtUpdate(now);
-            cardHolderInfoMapper.insert(cardHolderInfo);
             //发起人名片夹添加数据
-            cardHolderInfo = new CardHolderInfo();
+            CardHolderInfo cardHolderInfo = new CardHolderInfo();
             cardHolderInfo.setCardId(String.valueOf(cardExchangeInfo.getReceiveCardId()));
             cardHolderInfo.setCommonId(cardExchangeInfo.getSendId());
             cardHolderInfo.setGmtCreate(now);
             cardHolderInfo.setGmtUpdate(now);
             cardHolderInfoMapper.insert(cardHolderInfo);
         }
-        //移除
+        //移除还原成未交换过
         else {
-            cardExchangeInfo.setStatus("0");
+            cardExchangeInfo.setDeleteFlag(1l);
         }
         return cardExchangeInfoMapper.updateById(cardExchangeInfo) > 0;
     }

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

@@ -3,6 +3,7 @@ package com.iotechn.unimall.admin.api.card.impl;
 import java.util.List;
 
 import com.iotechn.unimall.data.domain.*;
+import com.iotechn.unimall.data.mapper.CardExchangeInfoMapper;
 import com.iotechn.unimall.data.mapper.CardManagementInfoMapper;
 import com.iotechn.unimall.data.mapper.CommonUserInfoMapper;
 import org.apache.ibatis.session.RowBounds;
@@ -37,6 +38,8 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService {
     private CardManagementInfoMapper cardManagementInfoMapper;
     @Autowired
     private CommonUserInfoMapper commonUserInfoMapper;
+    @Autowired
+    private CardExchangeInfoMapper cardExchangeInfoMapper;
 
     @Override
     public Boolean add(CardHolderInfo cardHolderInfo) throws ServiceException {
@@ -69,6 +72,29 @@ public class CardHolderInfoServiceImpl implements ICardHolderInfoService {
         for (String tt : ids) {
             CardHolderInfo tmp = cardHolderInfoMapper.selectById(Long.parseLong(tt));
             if (tmp != null) {
+                CardExchangeInfo cardExchangeInfo = new CardExchangeInfo();
+                //发送人删除名片夹内名片
+                cardExchangeInfo.setSendId(tmp.getCommonId());
+                cardExchangeInfo.setReceiveCardId(Long.parseLong(tmp.getCardId()));
+                cardExchangeInfo.setDeleteFlag(0l);
+                CardExchangeInfo cardExchangeInfo1=cardExchangeInfoMapper.selectOne(cardExchangeInfo);
+                //删除交换记录，可以重新交换
+                if (cardExchangeInfo1!=null){
+                    cardExchangeInfo1.setDeleteFlag(1l);
+                    cardExchangeInfo1.setGmtUpdate(new Date());
+                    cardExchangeInfoMapper.updateById(cardExchangeInfo1);
+                }
+                //接收人删除名片夹内名片
+                cardExchangeInfo.setReceiveId(tmp.getCommonId());
+                cardExchangeInfo.setSendCardId(Long.parseLong(tmp.getCardId()));
+                cardExchangeInfo.setDeleteFlag(0l);
+                CardExchangeInfo cardExchangeInfo2=cardExchangeInfoMapper.selectOne(cardExchangeInfo);
+                //删除交换记录，可以重新交换
+                if (cardExchangeInfo2!=null){
+                    cardExchangeInfo2.setDeleteFlag(1l);
+                    cardExchangeInfo2.setGmtUpdate(new Date());
+                    cardExchangeInfoMapper.updateById(cardExchangeInfo2);
+                }
                 tmp.setDeleteFlag(1l);
                 tmp.setGmtUpdate(new Date());
                 cardHolderInfoMapper.updateById(tmp);

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

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cmi.current_background as currentBackground,
         cmi.cuttent_template as cuttentTemplate,
         phi.scope_of_business AS scopeOfBusiness,
+        phi.id AS personalHomeId,
         cui.look_page AS lookPage,
         case when (cmi.common_id=#{commonId})  then 1
         when IFNULL((SELECT count(chi.id)

xiaochengxu/pages/circle/detail.vue

@@ -41,8 +41,10 @@
 		</view>
 
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" @up="upCallback" @down="downCallback"
-			style="position: relative;top: 272rpx;">
-			<view class="content3" v-for="(item,index) in changeCardList" :style="item.currentBackground?'background:url('+item.currentBackground+');background-size:100% 100%':''" :key="index">
+			style="position: relative;top: -80rpx;">
+			<view class="content3" v-for="(item,index) in changeCardList"
+				:style="item.currentBackground?'background:url('+item.currentBackground+');background-size:100% 100%':''"
+				:key="index">
 				<view class="flex item">
 					<view class="top flex">
 						<view class="left">
@@ -64,9 +66,12 @@
 				<view class="line">
 					<image src="../../static/imgs/cirlce/line.png" mode="widthFix" style="width: 95%;"></image>
 				</view>
-				<view class="bottom">
+				<view class="bottom" v-if="item.scopeOfBusiness">
 					{{item.scopeOfBusiness}}
 				</view>
+				<view class="bottom no-text" v-else>
+					暂无业务描述
+				</view>
 				<view class="flex btn" v-if="item.lookPage==1||item.notDisplay!=1">
 					<image @click='toHome(item)' src="../../static/imgs/cirlce/home.png" mode="widthFix" style="width: 32rpx;"
 						v-if="item.lookPage==1&&item.personalHomeId"></image>
@@ -75,7 +80,8 @@
 				</view>
 			</view>
 		</mescroll-body>
-		<u-picker  @cancel="isShowCard=false" :show="isShowCard" :columns="cardList" keyName="cardBusiness" @confirm="cardConfirm"></u-picker>
+		<u-picker @cancel="isShowCard=false" :show="isShowCard" :columns="cardList" keyName="cardBusiness"
+			@confirm="cardConfirm"></u-picker>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="show" :content='content' @confirm="$u.debounce(joinCircle, 500)" showCancelButton
 			@cancel="show=false" @close="show=false" closeOnClickOverlay></u-modal>
@@ -331,7 +337,7 @@
 				this.getCardList(page)
 			},
 			changeCard(val) {
-				
+
 				this.selectRowCard = val
 				this.swapNameCards = true
 				this.isShowCard = true
@@ -394,6 +400,10 @@
 		}
 	}
 
+	.no-text {
+		color: #969393;
+	}
+
 	.img {
 		width: 122rpx;
 		margin-right: 30rpx;
@@ -500,8 +510,9 @@
 
 		}
 	}
-	.line{
-		text-align:center;
+
+	.line {
+		text-align: center;
 	}
 	/deep/.mescroll-body{
 		height:558px !important;

xiaochengxu/pages/mySet/mySet.vue

@@ -9,7 +9,6 @@
 			</view>
 			<view class="position">
 				<image v-if='list.length>1||list.length==0' @click='selectCard' src="../../static/imgs/mySet/share.png" mode="widthFix" class="right-img">
-				</image>
 				<button v-if='list.length==1' class="shareBtn" type="default" data-name="shareBtn" open-type="share">
 					<image src="../../static/imgs/mySet/share.png" mode="widthFix" class="right-img">
 					</image>
@@ -34,7 +33,7 @@
 			</view>
 		</view>
 		<u-popup :show="isShowCode" @close="isShowCode=false" mode="center" :round='10'>
-			<image style='margin:10px;' :src="selectCode" mode="widthFix"></image>
+			<image :src="selectCode" mode="widthFix"></image>
 		</u-popup>
 		<u-picker keyName="cardBusiness" :confirmType='"share"' :confirmText='"分享"' title="选择名片" @cancel="show=false"
 			closeOnClickOverlay @change="cardChange" :show="show" :columns="cardList"></u-picker>
@@ -117,12 +116,9 @@
 				}).then(res => {
 					this.list=res.data.items
 					this.cardList = [res.data.items]
-					if(res.data.items.length>0){
-						this.cardChange({
-							value: this.cardList[[0]]
-						})
-					}
-					
+					this.cardChange({
+						value: this.cardList[[0]]
+					})
 				})
 			} else {
 				uni.switchTab({
@@ -148,12 +144,20 @@
 			}
 			if (res.from === 'menu') {
 				return {
-					title: '我的',
+					title: '商通线上商城',
 					path: '/pages/tabBarPro/index/index',
 					imageUrl: this.popupshow ? imageUrl : ''
 				};
 			}
 		},
+		// 分享到朋友圈
+		onShareTimeline() {
+			return {
+				title: '商通线上商城',
+				path: '/pages/index/index',
+				imageUrl: 'https://cdn.uviewui.com/uview/swiper/1.jpg'
+			};
+		},
 		methods: {
 			handleHiddenShare() {
 				this.popupshow = false
@@ -219,7 +223,7 @@
 						y: 50,
 						size: 24,
 						color: '#000'
-				
+
 					},
 					{
 						type: 'text',
@@ -229,7 +233,7 @@
 						y: 55,
 						size: 18,
 						color: '#666666'
-				
+
 					},
 					{
 						type: 'text',
@@ -239,7 +243,7 @@
 						y: 95,
 						size: 18,
 						color: '#000'
-				
+
 					},
 					{
 						type: 'image',
@@ -302,76 +306,49 @@
 					},
 					{
 						type: 'image',
-						path: '../../static/imgs/card/bgc1.png',
+						path: '../../static/imgs/card/bg3.png',
 						use: 'bg1',
-						x: 3,
+						x: 0,
 						y: 243,
-						width: 240,
+						width: 370,
 						height: 67
 					},
 					{
 						type: 'image',
-						path: '../../static/imgs/card/bgc2.png',
+						path: '../../static/imgs/card/bg4.png',
 						use: 'bg2',
-						x: 225,
+						x: 355,
 						y: 243,
-						width: 278,
+						width: 150,
 						height: 67
 					},
 					{
 						type: 'image',
 						path: '../../static/imgs/card/home.png',
 						use: 'home',
-						x: 30,
+						x: 65,
 						y: 260,
 						width: 33,
 						height: 33
 					},
+					{
+						type: 'text',
+						text: this.currectData.classifyName ? this.currectData.classifyName : '默',
+						use: 'classify',
+						x: 145,
+						y: 263,
+						size: 34,
+						color: '#fff'
+					},
 					{
 						type: 'image',
 						path: '../../static/imgs/card/share.png',
 						use: 'share',
-						x: 90,
+						x: 235,
 						y: 263,
 						width: 33,
 						height: 28
 					},
-					{
-						type: 'image',
-						path: '../../static/imgs/card/ewm.png',
-						use: 'code',
-						x: 150,
-						y: 263,
-						width: 32,
-						height: 32
-					},
-					{
-						type: 'text',
-						text: '置顶',
-						use: 'top',
-						x: 280,
-						y: 265,
-						size: 24,
-						color: '#fff'
-					},
-					{
-						type: 'text',
-						text: '删除',
-						use: 'del',
-						x: 350,
-						y: 265,
-						size: 24,
-						color: '#fff'
-					},
-					{
-						type: 'text',
-						text: '编辑',
-						use: 'edit',
-						x: 420,
-						y: 265,
-						size: 24,
-						color: '#fff'
-					},
 				]
 				console.log(this.currectData.cuttentTemplate, 111111)
 				for (var i = 0; i < data.length; i++) {
@@ -384,15 +361,6 @@
 								data[i].use === 'remark-icon') {
 								data[i].x = 30
 							}
-							if (data[i].use === 'address-icon') {
-								data[i].path = '../../static/imgs/card/address3.png'
-							}
-							if (data[i].use === 'phone-icon') {
-								data[i].path = '../../static/imgs/card/phone3.png'
-							}
-							if (data[i].use === 'remark-icon') {
-								data[i].path = '../../static/imgs/card/remark3.png'
-							}
 							if (data[i].use === 'post') {
 								data[i].x = 100
 							}
@@ -463,15 +431,6 @@
 								data[i].x = 25
 								data[i].y = 120
 							}
-							if (data[i].use === 'address-icon') {
-								data[i].path = '../../static/imgs/card/address2.png'
-							}
-							if (data[i].use === 'phone-icon') {
-								data[i].path = '../../static/imgs/card/phone2.png'
-							}
-							if (data[i].use === 'remark-icon') {
-								data[i].path = '../../static/imgs/card/remark2.png'
-							}
 							if (data[i].use === 'address-icon' ||
 								data[i].use === 'phone-icon' ||
 								data[i].use === 'remark-icon') {
@@ -491,8 +450,7 @@
 				}
 				this.canvasData = {
 					clicknum: this.clicknum++,
-					list: data,
-					page:'myInfo'
+					list: data
 				}
 			},
 			posterError(err) {

xiaochengxu/pages/mySet/newCard.vue

@@ -4,7 +4,7 @@
 			<view class="relative">
 				<image :src="imgList[selectIndex].dictLabel" mode="widthFix" style="width: 100%;"></image>
 			</view>
-			<view class="absolute card-content style1" v-if="selectIndex==0">
+			<view class="absolute card-content style1" v-if="imgList[selectIndex].dictSort==1">
 				<view class="left">
 					<u--image :showLoading="true" :src="cardInfo.headSculpture" width="66px" height="66px" shape="circle" v-if="cardInfo.headSculpture"></u--image>
 					<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
@@ -34,7 +34,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="absolute card-content style1 flex-between" v-if="selectIndex==1">
+			<view class="absolute card-content style1 flex-between" v-if="imgList[selectIndex].dictSort==2">
 				<view class="right">
 					<view class="row1">
 						<text class="name">{{cardInfo.name}}</text>
@@ -64,7 +64,7 @@
 					<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
 				</view>
 			</view>
-			<view class="absolute card-content style2" v-if="selectIndex==2">
+			<view class="absolute card-content style2" v-if="imgList[selectIndex].dictSort==3">
 					<view class="top">
 						<u--image :showLoading="true" :src="cardInfo.headSculpture" width="66px" height="66px" shape="circle" v-if="cardInfo.headSculpture"></u--image>
 						<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
@@ -98,7 +98,7 @@
 						</view>
 					</view>
 			</view>
-			<view class="absolute card-content style2" v-if="selectIndex==3">
+			<view class="absolute card-content style2" v-if="imgList[selectIndex].dictSort==4">
 					<view class="top">
 						<view class="row1">
 							<text class="name">{{cardInfo.name}}</text>