浏览代码

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

高敬炎 2 年之前
父节点
当前提交
8b06557619

+ 12 - 1
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/impl/CircleCardInfoServiceImpl.java

@@ -84,7 +84,18 @@ public class CircleCardInfoServiceImpl implements ICircleCardInfoService {
     @Override
     public Boolean update(CircleCardInfo circleCardInfo) throws ServiceException {
         Date now = new Date();
-        circleCardInfo.setGmtUpdate(now);
+        //更换圈子内名片
+        CircleCardInfo circleCardInfo1 = new CircleCardInfo();
+        circleCardInfo1.setCommonId(circleCardInfo.getCommonId());
+        circleCardInfo1.setCircleId(circleCardInfo.getCircleId());
+        circleCardInfo1.setDeleteFlag(0l);
+        CircleCardInfo circleCardInfo2 = circleCardInfoMapper.selectOne(circleCardInfo1);
+        //我加入该圈子的名片
+        if (circleCardInfo2 != null) {
+            circleCardInfo2.setCardId(circleCardInfo.getCardId());
+            circleCardInfo2.setGmtUpdate(now);
+            circleCardInfoMapper.updateById(circleCardInfo2);
+        }
         return circleCardInfoMapper.updateById(circleCardInfo) > 0;
     }
 

+ 2 - 2
unimall-launcher/src/main/resources/application.properties

@@ -86,8 +86,8 @@ oss.aliyun.oss.basekUrl=https://taohaoliang.oss-cn-beijing.aliyuncs.com/
 ########################################################
 ### 微信 小程序、APP、H5信息
 ########################################################
-com.iotechn.unimall.wx.mini.app-id=wx4505a6ea6f703e17
-com.iotechn.unimall.wx.mini.app-secret=a707ec774f069a020257317803b656ce
+com.iotechn.unimall.wx.mini.app-id=wx5d8906c2208c899f
+com.iotechn.unimall.wx.mini.app-secret=cbb2ea3ee48bb0b0f5baa9f6c51473c1
 
 com.iotechn.unimall.wx.app.app-id=wxe3c17ca92931512d
 com.iotechn.unimall.wx.app.app-secret=049151cd78f6671a27704be472832ff1