zhangyuewww 2 anos atrás
pai
commit
224b3013a5

+ 64 - 0
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/card/ICardExchangeInfoService.java

@@ -0,0 +1,64 @@
+package com.iotechn.unimall.admin.api.unimall;
+
+
+import com.iotechn.unimall.data.domain.unimall.CardExchangeInfo;
+import com.iotechn.unimall.core.annotation.HttpMethod;
+import com.iotechn.unimall.core.annotation.HttpOpenApi;
+import com.iotechn.unimall.core.annotation.HttpParam;
+import com.iotechn.unimall.core.annotation.HttpParamType;
+import com.iotechn.unimall.core.annotation.param.NotNull;
+import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.data.model.Page;
+import java.util.Date;
+
+/**
+ * 名片交换Service接口
+ * 
+ * @author jlb
+ * @date 2023-04-12
+ */
+@HttpOpenApi(group = "admin.unimall.cardExchangeInfo", description = "名片交换")
+public interface ICardExchangeInfoService{
+	@HttpMethod(description = "新增", permission = "admin:unimall:cardExchangeInfo:add", permissionParentName = "宠物管理", permissionName = "名片交换管理")
+	public Boolean add(@NotNull @HttpParam(name = "cardExchangeInfo", type = HttpParamType.COMMON, description = "名片交换") CardExchangeInfo cardExchangeInfo)throws ServiceException;
+
+	@HttpMethod(description = "列表", permission = "admin:unimall:cardExchangeInfo:list",permissionParentName = "宠物管理", permissionName = "名片交换管理")
+	public Page<CardExchangeInfo> list(
+								@HttpParam(name = "sendId", type = HttpParamType.COMMON, description = "发起人id") Long sendId,
+							@HttpParam(name = "receiveId", type = HttpParamType.COMMON, description = "接收人id") Long receiveId,
+							@HttpParam(name = "sendCardId", type = HttpParamType.COMMON, description = "发起人名片id") Long sendCardId,
+							@HttpParam(name = "receiveCardId", type = HttpParamType.COMMON, description = "接收人名片id") Long receiveCardId,
+							@HttpParam(name = "circleName", type = HttpParamType.COMMON, description = "圈子名称") String circleName,
+							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态(1已接受3已拒绝5已过期)") String status,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,
+					@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+		@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
+		throws ServiceException;
+
+	@HttpMethod(description = "删除", permission = "admin:unimall:cardExchangeInfo:delete",permissionParentName = "宠物管理", permissionName = "名片交换管理")
+	public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")String id)throws ServiceException;
+
+	@HttpMethod(description = "修改", permission = "admin:unimall:cardExchangeInfo:update",permissionParentName = "宠物管理", permissionName = "名片交换管理")
+	public Boolean update(@NotNull @HttpParam(name = "cardExchangeInfo", type = HttpParamType.COMMON, description = "名片交换") CardExchangeInfo cardExchangeInfo,
+						  @HttpParam(name = "updateFlag", type = HttpParamType.COMMON, description = "updateFlag") String updateFlag)throws ServiceException;
+
+	@HttpMethod(description = "查询", permission = "admin:unimall:cardExchangeInfo:get",permissionParentName = "宠物管理", permissionName = "名片交换管理")
+	public CardExchangeInfo get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "")Long id)throws ServiceException;
+	
+	@HttpMethod(description = "导出excl表", permission = "admin:unimall:cardExchangeInfo:export",permissionParentName = "宠物管理", permissionName = "名片交换管理")
+	public String export(
+								@HttpParam(name = "sendId", type = HttpParamType.COMMON, description = "发起人id") Long sendId,
+							@HttpParam(name = "receiveId", type = HttpParamType.COMMON, description = "接收人id") Long receiveId,
+							@HttpParam(name = "sendCardId", type = HttpParamType.COMMON, description = "发起人名片id") Long sendCardId,
+							@HttpParam(name = "receiveCardId", type = HttpParamType.COMMON, description = "接收人名片id") Long receiveCardId,
+							@HttpParam(name = "circleName", type = HttpParamType.COMMON, description = "圈子名称") String circleName,
+							@HttpParam(name = "status", type = HttpParamType.COMMON, description = "状态(1已接受3已拒绝5已过期)") String status,
+							@HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
+							@HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
+							@HttpParam(name = "deleteFlag", type = HttpParamType.COMMON, description = "删除标识") Long deleteFlag,
+				@HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+	@HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)throws ServiceException;
+	
+}

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

@@ -70,7 +70,7 @@ public class CardClassifyInfoServiceImpl implements ICardClassifyInfoService{
 												if (!StringUtils.isEmpty(deleteFlag)) {
 					wrapper.eq("delete_flag", deleteFlag);
 				}
-							wrapper.eq("delete_flag", 0);
+							wrapper.eq("delete_flag", 0).orderBy("top_marking",false);
 		List<CardClassifyInfo> list = cardClassifyInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
 		Integer count = cardClassifyInfoMapper.selectCount(wrapper);
 		return new Page<CardClassifyInfo>(list, page, limit, count);

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

@@ -0,0 +1,165 @@
+package com.iotechn.unimall.admin.api.card.impl;
+
+import java.util.List;
+
+import com.iotechn.unimall.data.domain.CardHolderInfo;
+import com.iotechn.unimall.data.mapper.CardHolderInfoMapper;
+import org.apache.ibatis.session.RowBounds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+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.unimall.CardExchangeInfoMapper;
+import com.iotechn.unimall.data.domain.unimall.CardExchangeInfo;
+import com.iotechn.unimall.admin.api.unimall.ICardExchangeInfoService;
+import com.iotechn.unimall.data.model.Page;
+import java.util.Date;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 名片交换Service业务层处理
+ * 
+ * @author jlb
+ * @date 2023-04-12
+ */
+@Service
+public class CardExchangeInfoServiceImpl implements ICardExchangeInfoService{
+	@Autowired
+	private CardExchangeInfoMapper cardExchangeInfoMapper;
+	@Autowired
+	private CardHolderInfoMapper cardHolderInfoMapper;
+	
+	@Override
+	public Boolean add(CardExchangeInfo cardExchangeInfo) throws ServiceException {
+		Date now = new Date();
+		cardExchangeInfo.setGmtCreate(now);
+		cardExchangeInfo.setGmtUpdate(now);
+		return cardExchangeInfoMapper.insert(cardExchangeInfo)>0;
+	}
+
+	@Override
+	public Page<CardExchangeInfo> list(Long sendId,Long receiveId,Long sendCardId,Long receiveCardId,String circleName,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+		Wrapper<CardExchangeInfo> wrapper = new EntityWrapper<CardExchangeInfo>();
+														if (!StringUtils.isEmpty(sendId)) {
+					wrapper.eq("send_id", sendId);
+				}
+												if (!StringUtils.isEmpty(receiveId)) {
+					wrapper.eq("receive_id", receiveId);
+				}
+												if (!StringUtils.isEmpty(sendCardId)) {
+					wrapper.eq("send_card_id", sendCardId);
+				}
+												if (!StringUtils.isEmpty(receiveCardId)) {
+					wrapper.eq("receive_card_id", receiveCardId);
+				}
+												if (!StringUtils.isEmpty(circleName)) {
+					wrapper.eq("circle_name", circleName);
+				}
+												if (!StringUtils.isEmpty(status)) {
+					wrapper.eq("status", status);
+				}
+												if (!StringUtils.isEmpty(gmtCreate)) {
+					wrapper.eq("gmt_create", gmtCreate);
+				}
+												if (!StringUtils.isEmpty(gmtUpdate)) {
+					wrapper.eq("gmt_update", gmtUpdate);
+				}
+												if (!StringUtils.isEmpty(deleteFlag)) {
+					wrapper.eq("delete_flag", deleteFlag);
+				}
+							wrapper.eq("delete_flag", 0);
+		List<CardExchangeInfo> list = cardExchangeInfoMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+		Integer count = cardExchangeInfoMapper.selectCount(wrapper);
+		return new Page<CardExchangeInfo>(list, page, limit, count);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public Boolean delete(String id) {
+		String[] ids = String.valueOf(id).split(",");
+		for (String tt:ids) {
+			CardExchangeInfo tmp =  cardExchangeInfoMapper.selectById(Long.parseLong(tt));
+			if(tmp != null){
+				tmp.setDeleteFlag(1L);
+				cardExchangeInfoMapper.updateById(tmp);
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public Boolean update(CardExchangeInfo cardExchangeInfo,String updateFlag) throws ServiceException {
+		Date now = new Date();
+		cardExchangeInfo.setGmtUpdate(now);
+		//拉黑
+		if ("1".equals(updateFlag)){
+		}
+		//拒绝
+		else if ("2".equals(updateFlag)){
+			cardExchangeInfo.setStatus("3");
+		}
+		//接受
+		else{
+			cardExchangeInfo.setStatus("1");
+			//发起人名片夹添加数据
+			CardHolderInfo cardHolderInfo=new CardHolderInfo();
+			cardHolderInfo.setCardId(String.valueOf(cardExchangeInfo.getReceiveCardId()));
+			cardHolderInfo.setCommonId(cardExchangeInfo.getSendId());
+			cardHolderInfo.setGmtCreate(now);
+			cardHolderInfo.setGmtUpdate(now);
+			cardHolderInfoMapper.insert(cardHolderInfo);
+			//接收人名片夹添加数据
+			cardHolderInfo=new CardHolderInfo();
+			cardHolderInfo.setCardId(String.valueOf(cardExchangeInfo.getSendCardId()));
+			cardHolderInfo.setCommonId(cardExchangeInfo.getReceiveId());
+			cardHolderInfo.setGmtCreate(now);
+			cardHolderInfo.setGmtUpdate(now);
+			cardHolderInfoMapper.insert(cardHolderInfo);
+		}
+		return cardExchangeInfoMapper.updateById(cardExchangeInfo)>0;
+	}
+
+	@Override
+	public CardExchangeInfo get(Long id) throws ServiceException {
+		return cardExchangeInfoMapper.selectById(id);
+	}
+	
+	@Override
+	public String export(Long sendId,Long receiveId,Long sendCardId,Long receiveCardId,String circleName,String status,Date gmtCreate,Date gmtUpdate,Long deleteFlag, Integer page, Integer limit)throws ServiceException {
+		Wrapper<CardExchangeInfo> wrapper = new EntityWrapper<CardExchangeInfo>();
+														if (!StringUtils.isEmpty(sendId)) {
+					wrapper.eq("send_id", sendId);
+				}
+												if (!StringUtils.isEmpty(receiveId)) {
+					wrapper.eq("receive_id", receiveId);
+				}
+												if (!StringUtils.isEmpty(sendCardId)) {
+					wrapper.eq("send_card_id", sendCardId);
+				}
+												if (!StringUtils.isEmpty(receiveCardId)) {
+					wrapper.eq("receive_card_id", receiveCardId);
+				}
+												if (!StringUtils.isEmpty(circleName)) {
+					wrapper.eq("circle_name", circleName);
+				}
+												if (!StringUtils.isEmpty(status)) {
+					wrapper.eq("status", status);
+				}
+												if (!StringUtils.isEmpty(gmtCreate)) {
+					wrapper.eq("gmt_create", gmtCreate);
+				}
+												if (!StringUtils.isEmpty(gmtUpdate)) {
+					wrapper.eq("gmt_update", gmtUpdate);
+				}
+												if (!StringUtils.isEmpty(deleteFlag)) {
+					wrapper.eq("delete_flag", deleteFlag);
+				}
+							List<CardExchangeInfo> list = cardExchangeInfoMapper.selectList(wrapper);
+		ExcelUtil<CardExchangeInfo> util = new ExcelUtil<CardExchangeInfo>(CardExchangeInfo.class);
+		return util.exportExcel(list, "操作日志");
+	}
+}

+ 96 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardExchangeInfo.java

@@ -0,0 +1,96 @@
+package com.iotechn.unimall.data.domain.unimall;
+
+import com.iotechn.unimall.data.domain.SuperDO;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel;
+import com.iotechn.unimall.core.framework.aspectj.lang.annotaion.Excel.ColumnType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.iotechn.unimall.core.util.StringUtils;
+import java.util.Date;
+
+/**
+ * 名片交换对象 card_exchange_info
+ * 
+ * @author jlb
+ * @date 2023-04-12
+ */
+@Data
+@TableName("card_exchange_info")
+public class CardExchangeInfo extends SuperDO {
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    @TableId("id")
+    private Long id;
+
+    /** 发起人id */
+    @Excel(name = "发起人id")
+    @TableField("send_id")
+    private Long sendId;
+
+    /** 接收人id */
+    @Excel(name = "接收人id")
+    @TableField("receive_id")
+    private Long receiveId;
+
+    /** 发起人名片id */
+    @Excel(name = "发起人名片id")
+    @TableField("send_card_id")
+    private Long sendCardId;
+
+    /** 接收人名片id */
+    @Excel(name = "接收人名片id")
+    @TableField("receive_card_id")
+    private Long receiveCardId;
+
+    /** 圈子名称 */
+    @Excel(name = "圈子名称")
+    @TableField("circle_name")
+    private String circleName;
+
+    /** 状态(1已接受3已拒绝5已过期) */
+    @Excel(name = "状态(1已接受3已拒绝5已过期)")
+    @TableField("status")
+    private String status;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**  */
+    @Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("gmt_update")
+    private Date gmtUpdate;
+
+    /** 删除标识 */
+    @Excel(name = "删除标识")
+    @TableField("delete_flag")
+    private Long deleteFlag;
+    /**
+     * 修改标识 1拉黑2拒绝3接受
+     */
+    @TableField(exist = false)
+    private String updateFlag;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("sendId", getSendId())
+            .append("receiveId", getReceiveId())
+            .append("sendCarId", getSendCarId())
+            .append("receiveCarId", getReceiveCarId())
+            .append("circleName", getCircleName())
+            .append("status", getStatus())
+            .append("gmtCreate", getGmtCreate())
+            .append("gmtUpdate", getGmtUpdate())
+            .append("deleteFlag", getDeleteFlag())
+            .toString();
+    }
+}

+ 13 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/mapper/CardExchangeInfoMapper.java

@@ -0,0 +1,13 @@
+package com.iotechn.unimall.data.mapper.unimall;
+
+import com.iotechn.unimall.data.domain.unimall.CardExchangeInfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+/**
+ * 名片交换Mapper接口
+ * 
+ * @author jlb
+ * @date 2023-04-12
+ */
+public interface CardExchangeInfoMapper extends BaseMapper<CardExchangeInfo>{
+
+}

+ 9 - 0
unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CardExchangeInfoMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iotechn.unimall.data.mapper.unimall.CardExchangeInfoMapper">
+    
+
+
+</mapper>