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

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

@@ -42,6 +42,9 @@ public interface ICircleManagementInfoService{
 	@HttpMethod(description = "修改",  permissionName = "圈子管理管理")
 	public Boolean update(@NotNull @HttpParam(name = "circleManagementInfo", type = HttpParamType.COMMON, description = "圈子管理") CircleManagementInfo circleManagementInfo)throws ServiceException;
 
+	@HttpMethod(description = "圈子审核",  permissionName = "圈子管理管理")
+	public Boolean handle(@NotNull @HttpParam(name = "circleManagementInfo", type = HttpParamType.COMMON, description = "圈子管理") CircleManagementInfo circleManagementInfo)throws ServiceException;
+
 	@HttpMethod(description = "查询",  permissionName = "圈子管理管理")
 	public CircleManagementInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id,
 									@HttpParam(name = "commonId", type = HttpParamType.COMMON, description = "个人id") Long commonId)throws ServiceException;

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

@@ -32,12 +32,6 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
     private CircleCardInfoMapper circleCardInfoMapper;
     @Autowired
     private CardManagementInfoMapper cardManagementInfoMapper;
-    @Autowired
-    private CommonUserInfoMapper commonUserInfoMapper;
-    @Autowired
-    private CardHolderInfoMapper cardHolderInfoMapper;
-    @Autowired
-    private CardExchangeInfoMapper cardExchangeInfoMapper;
 
     @Override
     public Boolean add(CircleManagementInfo circleManagementInfo) throws ServiceException {
@@ -121,6 +115,24 @@ public class CircleManagementInfoServiceImpl implements ICircleManagementInfoSer
         return circleManagementInfoMapper.updateById(circleManagementInfo) > 0;
     }
 
+    @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);
+        }
+
+        return circleManagementInfoMapper.updateById(circleManagementInfo) > 0;
+    }
+
     @Override
     public CircleManagementInfo get(Long id, Long commonId) throws ServiceException {
         CircleManagementInfo circleManagementInfo = circleManagementInfoMapper.selectById(id);

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

@@ -110,6 +110,12 @@ public class CardHolderInfo extends SuperDO {
     /** 主页id */
     @TableField(exist = false)
     private Long personalHomeId;
+    /** 当前背景图 */
+    @TableField(exist = false)
+    private String currentBackground;
+    /** 当前模板 */
+    @TableField(exist = false)
+    private String cuttentTemplate;
 
     @Override
     public String toString() {

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

@@ -95,6 +95,16 @@ public class CardManagementInfo extends SuperDO {
     @TableField("qr_code_myself")
     private String qrCodeMyself;
 
+    /** 当前背景图 */
+    @Excel(name = "当前背景图")
+    @TableField("current_background")
+    private String currentBackground;
+
+    /** 当前模板 */
+    @Excel(name = "当前模板")
+    @TableField("cuttent_template")
+    private String cuttentTemplate;
+
     /** 置顶标识 */
     @Excel(name = "置顶标识")
     @TableField("top_marking")

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

@@ -34,6 +34,11 @@ public class CircleManagementInfo extends SuperDO {
     @TableField("common_id")
     private Long commonId;
 
+    /** 名片id */
+    @Excel(name = "名片id")
+    @TableField("card_id")
+    private Long cardId;
+
     /** 圈子名称 */
     @Excel(name = "圈子名称")
     @TableField("circle_name")

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

@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cmi.detailed_address AS detailedAddress,
         cmi.phone AS phone,
         cmi.qr_code as qrCode,
+        cmi.current_background as currentBackground,
+        cmi.cuttent_template as cuttentTemplate,
         phi.id as personalHomeId,
         cui.share_card as shareCard,
         chi.gmt_update AS gmtUpdate,

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

@@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cmi.name AS name,
         cmi.post AS post,
         cmi.company_name as companyName,
+        cmi.current_background as currentBackground,
+        cmi.cuttent_template as cuttentTemplate,
         phi.scope_of_business AS scopeOfBusiness,
         cui.look_page AS lookPage,
         case when (cmi.common_id=#{commonId})  then 1