会员发票抬头设置默认

jsowell-admin/src/main/java/com/jsowell/service/MemberService.java

@@ -367,9 +367,7 @@ public class MemberService {
 
 	public List<InvoiceTitleVO> queryMemberInvoiceTitles(String memberId) {
 		List<InvoiceTitleVO> resultList = Lists.newArrayList();
-		MemberInvoiceTitle queryEntity = new MemberInvoiceTitle();
+		List<MemberInvoiceTitle> memberInvoiceTitles = memberInvoiceTitleService.selectMemberInvoiceTitleList(memberId);
-		queryEntity.setMemberId(memberId);
-		List<MemberInvoiceTitle> memberInvoiceTitles = memberInvoiceTitleService.selectMemberInvoiceTitleList(queryEntity);
 		if (CollectionUtils.isEmpty(memberInvoiceTitles)) {
 			return resultList;
 		}
@@ -384,6 +382,7 @@ public class MemberService {
 							.phoneNumber(memberInvoiceTitle.getPhoneNumber())
 							.bankName(memberInvoiceTitle.getBankName())
 							.bankAccountNumber(memberInvoiceTitle.getBankAccountNumber())
+							.defaultFlag(memberInvoiceTitle.getDefaultFlag())
 							.build()
 			);
 		}

jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberInvoiceTitle.java

@@ -2,6 +2,7 @@ package com.jsowell.pile.domain;
 
 import com.jsowell.common.annotation.Excel;
 import com.jsowell.common.core.domain.BaseEntity;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,164 +12,167 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author jsowell
  * @date 2023-04-13
  */
+@Data
 public class MemberInvoiceTitle extends BaseEntity {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
+    /**
-	 * 主键
+     * 主键
-	 */
+     */
-	private Long id;
+    private Long id;
 
-	/**
+    /**
-	 * 会员id
+     * 会员id
-	 */
+     */
-	@Excel(name = "会员id")
+    @Excel(name = "会员id")
-	private String memberId;
+    private String memberId;
 
-	/**
+    /**
-	 * 抬头类型（1-单位；2-个人）
+     * 抬头类型（1-单位；2-个人）
-	 */
+     */
-	@Excel(name = "抬头类型", readConverterExp = "1=-单位；2-个人")
+    @Excel(name = "抬头类型", readConverterExp = "1=-单位；2-个人")
-	private String titleType;
+    private String titleType;
 
-	/**
+    /**
-	 * 单位名称
+     * 单位名称
-	 */
+     */
-	@Excel(name = "单位名称")
+    @Excel(name = "单位名称")
-	private String name;
+    private String name;
 
-	/**
+    /**
-	 * 税号
+     * 税号
-	 */
+     */
-	@Excel(name = "税号")
+    @Excel(name = "税号")
-	private String taxId;
+    private String taxId;
 
-	/**
+    /**
-	 * 单位地址
+     * 单位地址
-	 */
+     */
-	@Excel(name = "单位地址")
+    @Excel(name = "单位地址")
-	private String unitAddress;
+    private String unitAddress;
 
-	/**
+    /**
-	 * 电话号码
+     * 电话号码
-	 */
+     */
-	@Excel(name = "电话号码")
+    @Excel(name = "电话号码")
-	private String phoneNumber;
+    private String phoneNumber;
 
-	/**
+    /**
-	 * 开户银行
+     * 开户银行
-	 */
+     */
-	@Excel(name = "开户银行")
+    @Excel(name = "开户银行")
-	private String bankName;
+    private String bankName;
 
-	/**
+    /**
-	 * 银行账户
+     * 银行账户
-	 */
+     */
-	@Excel(name = "银行账户")
+    @Excel(name = "银行账户")
-	private String bankAccountNumber;
+    private String bankAccountNumber;
 
-	/**
+    private String defaultFlag;
-	 * 删除标识（0-正常；1-删除）
+
-	 */
+    /**
-	private String delFlag;
+     * 删除标识（0-正常；1-删除）
+     */
+    private String delFlag;
 
 	public void setId(Long id) {
-		this.id = id;
+        this.id = id;
-	}
+    }
 
-	public Long getId() {
+    public Long getId() {
-		return id;
+        return id;
-	}
+    }
 
-	public void setMemberId(String memberId) {
+    public void setMemberId(String memberId) {
-		this.memberId = memberId;
+        this.memberId = memberId;
-	}
+    }
 
-	public String getMemberId() {
+    public String getMemberId() {
-		return memberId;
+        return memberId;
-	}
+    }
 
-	public void setTitleType(String titleType) {
+    public void setTitleType(String titleType) {
-		this.titleType = titleType;
+        this.titleType = titleType;
-	}
+    }
 
-	public String getTitleType() {
+    public String getTitleType() {
-		return titleType;
+        return titleType;
-	}
+    }
 
-	public void setName(String name) {
+    public void setName(String name) {
-		this.name = name;
+        this.name = name;
-	}
+    }
 
-	public String getName() {
+    public String getName() {
-		return name;
+        return name;
-	}
+    }
 
-	public void setTaxId(String taxId) {
+    public void setTaxId(String taxId) {
-		this.taxId = taxId;
+        this.taxId = taxId;
-	}
+    }
 
-	public String getTaxId() {
+    public String getTaxId() {
-		return taxId;
+        return taxId;
-	}
+    }
 
-	public void setUnitAddress(String unitAddress) {
+    public void setUnitAddress(String unitAddress) {
-		this.unitAddress = unitAddress;
+        this.unitAddress = unitAddress;
-	}
+    }
 
-	public String getUnitAddress() {
+    public String getUnitAddress() {
-		return unitAddress;
+        return unitAddress;
-	}
+    }
 
-	public void setPhoneNumber(String phoneNumber) {
+    public void setPhoneNumber(String phoneNumber) {
-		this.phoneNumber = phoneNumber;
+        this.phoneNumber = phoneNumber;
-	}
+    }
 
-	public String getPhoneNumber() {
+    public String getPhoneNumber() {
-		return phoneNumber;
+        return phoneNumber;
-	}
+    }
 
-	public void setBankName(String bankName) {
+    public void setBankName(String bankName) {
-		this.bankName = bankName;
+        this.bankName = bankName;
-	}
+    }
 
-	public String getBankName() {
+    public String getBankName() {
-		return bankName;
+        return bankName;
-	}
+    }
 
-	public void setBankAccountNumber(String bankAccountNumber) {
+    public void setBankAccountNumber(String bankAccountNumber) {
-		this.bankAccountNumber = bankAccountNumber;
+        this.bankAccountNumber = bankAccountNumber;
-	}
+    }
 
-	public String getBankAccountNumber() {
+    public String getBankAccountNumber() {
-		return bankAccountNumber;
+        return bankAccountNumber;
-	}
+    }
 
-	public void setDelFlag(String delFlag) {
+    public void setDelFlag(String delFlag) {
-		this.delFlag = delFlag;
+        this.delFlag = delFlag;
-	}
+    }
 
-	public String getDelFlag() {
+    public String getDelFlag() {
-		return delFlag;
+        return delFlag;
-	}
+    }
 
-	@Override
+    @Override
-	public String toString() {
+    public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
-				.append("id", getId())
+                .append("id", getId())
-				.append("memberId", getMemberId())
+                .append("memberId", getMemberId())
-				.append("titleType", getTitleType())
+                .append("titleType", getTitleType())
-				.append("name", getName())
+                .append("name", getName())
-				.append("taxId", getTaxId())
+                .append("taxId", getTaxId())
-				.append("unitAddress", getUnitAddress())
+                .append("unitAddress", getUnitAddress())
-				.append("phoneNumber", getPhoneNumber())
+                .append("phoneNumber", getPhoneNumber())
-				.append("bankName", getBankName())
+                .append("bankName", getBankName())
-				.append("bankAccountNumber", getBankAccountNumber())
+                .append("bankAccountNumber", getBankAccountNumber())
-				.append("createTime", getCreateTime())
+                .append("createTime", getCreateTime())
-				.append("createBy", getCreateBy())
+                .append("createBy", getCreateBy())
-				.append("updateTime", getUpdateTime())
+                .append("updateTime", getUpdateTime())
-				.append("updateBy", getUpdateBy())
+                .append("updateBy", getUpdateBy())
-				.append("delFlag", getDelFlag())
+                .append("delFlag", getDelFlag())
-				.toString();
+                .toString();
-	}
+    }
 }

jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberInvoiceTitleMapper.java

@@ -1,6 +1,7 @@
 package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.MemberInvoiceTitle;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -60,4 +61,6 @@ public interface MemberInvoiceTitleMapper {
 	 * @return 结果
 	 */
 	public int deleteMemberInvoiceTitleByIds(Long[] ids);
+
+	void batchUpdateDefaultFlag(@Param("titleIdList") List<Long> titleIdList);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberInvoiceTitleService.java

@@ -22,7 +22,9 @@ public interface IMemberInvoiceTitleService {
 	 */
 	public MemberInvoiceTitle selectMemberInvoiceTitleById(Long id);
 
-	/**
+    List<MemberInvoiceTitle> selectMemberInvoiceTitleList(String memberId);
+
+    /**
 	 * 查询会员发票抬头列表
 	 *
 	 * @param memberInvoiceTitle 会员发票抬头

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java

@@ -2,14 +2,18 @@ package com.jsowell.pile.service.impl;
 
 import com.jsowell.common.enums.TitleTypeEnum;
 import com.jsowell.common.util.DateUtils;
+import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.MemberInvoiceTitle;
 import com.jsowell.pile.mapper.MemberInvoiceTitleMapper;
 import com.jsowell.pile.service.IMemberInvoiceTitleService;
 import com.jsowell.pile.vo.uniapp.InvoiceTitleVO;
+import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 会员发票抬头Service业务层处理
@@ -51,6 +55,13 @@ public class MemberInvoiceTitleServiceImpl implements IMemberInvoiceTitleService
 		return memberInvoiceTitleMapper.selectMemberInvoiceTitleById(id);
 	}
 
+	@Override
+	public List<MemberInvoiceTitle> selectMemberInvoiceTitleList(String memberId) {
+		MemberInvoiceTitle queryEntity = new MemberInvoiceTitle();
+		queryEntity.setMemberId(memberId);
+		return selectMemberInvoiceTitleList(queryEntity);
+	}
+
 	/**
 	 * 查询会员发票抬头列表
 	 *
@@ -70,7 +81,18 @@ public class MemberInvoiceTitleServiceImpl implements IMemberInvoiceTitleService
 	 */
 	@Override
 	public int insertMemberInvoiceTitle(MemberInvoiceTitle memberInvoiceTitle) {
-		return memberInvoiceTitleMapper.insertMemberInvoiceTitle(memberInvoiceTitle);
+		val i = memberInvoiceTitleMapper.insertMemberInvoiceTitle(memberInvoiceTitle);
+		if (StringUtils.equals(memberInvoiceTitle.getDefaultFlag(), "1")) {
+			// 如果新增这条是默认的，那么就把这个会员下所有的其他抬头的默认取消
+			List<MemberInvoiceTitle> memberInvoiceTitles = selectMemberInvoiceTitleList(memberInvoiceTitle.getMemberId());
+			// 排除刚刚新增的抬头数据
+			List<Long> collect = memberInvoiceTitles.stream()
+					.map(MemberInvoiceTitle::getId)
+					.filter(x -> !Objects.equals(x, memberInvoiceTitle.getId()))
+					.collect(Collectors.toList());
+			memberInvoiceTitleMapper.batchUpdateDefaultFlag(collect);
+		}
+		return i;
 	}
 
 	/**

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceTitleVO.java

@@ -43,4 +43,6 @@ public class InvoiceTitleVO {
 	 * 银行账户
 	 */
 	private String bankAccountNumber;
+
+	private String defaultFlag;
 }

jsowell-pile/src/main/resources/mapper/pile/MemberInvoiceTitleMapper.xml

@@ -14,6 +14,7 @@
         <result property="phoneNumber"    column="phone_number"    />
         <result property="bankName"    column="bank_name"    />
         <result property="bankAccountNumber"    column="bank_account_number"    />
+        <result property="defaultFlag"    column="default_flag"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateTime"    column="update_time"    />
@@ -23,7 +24,7 @@
 
     <sql id="Base_Column_List">
         id, member_id, title_type, name, tax_id, unit_address, phone_number, bank_name, bank_account_number,
-        create_time, create_by, update_time, update_by, del_flag
+        default_flag, create_time, create_by, update_time, update_by, del_flag
     </sql>
 
     <sql id="selectMemberInvoiceTitleVo">
@@ -62,6 +63,7 @@
             <if test="phoneNumber != null">phone_number,</if>
             <if test="bankName != null">bank_name,</if>
             <if test="bankAccountNumber != null">bank_account_number,</if>
+            <if test="defaultFlag != null">default_flag,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateTime != null">update_time,</if>
@@ -77,6 +79,7 @@
             <if test="phoneNumber != null">#{phoneNumber},</if>
             <if test="bankName != null">#{bankName},</if>
             <if test="bankAccountNumber != null">#{bankAccountNumber},</if>
+            <if test="defaultFlag != null">#{defaultFlag},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -96,6 +99,7 @@
             <if test="phoneNumber != null">phone_number = #{phoneNumber},</if>
             <if test="bankName != null">bank_name = #{bankName},</if>
             <if test="bankAccountNumber != null">bank_account_number = #{bankAccountNumber},</if>
+            <if test="defaultFlag != null">default_flag = #{defaultFlag},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
@@ -104,6 +108,14 @@
         </trim>
         where id = #{id}
     </update>
+    <update id="batchUpdateDefaultFlag">
+        update member_invoice_title 
+        set del_flag = '0' 
+        where id in 
+        <foreach collection="titleIdList" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 
     <delete id="deleteMemberInvoiceTitleById" parameterType="Long">
         delete from member_invoice_title where id = #{id}

src/main/java/generate/AdapayCallbackRecordMapper.java

@@ -1,17 +0,0 @@
-package generate;
-
-import generate.AdapayCallbackRecord;
-
-public interface AdapayCallbackRecordMapper {
-    int deleteByPrimaryKey(String id);
-
-    int insert(AdapayCallbackRecord record);
-
-    int insertSelective(AdapayCallbackRecord record);
-
-    AdapayCallbackRecord selectByPrimaryKey(String id);
-
-    int updateByPrimaryKeySelective(AdapayCallbackRecord record);
-
-    int updateByPrimaryKey(AdapayCallbackRecord record);
-}