From a21fb4f7363f41a35d4422043a2d6ccff7959c38 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 20 May 2023 16:25:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=8F=91=E7=A5=A8=E6=8A=AC?= =?UTF-8?q?=E5=A4=B4=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/MemberService.java | 5 +- .../pile/domain/MemberInvoiceTitle.java | 258 +++++++++--------- .../pile/mapper/MemberInvoiceTitleMapper.java | 3 + .../service/IMemberInvoiceTitleService.java | 4 +- .../impl/MemberInvoiceTitleServiceImpl.java | 24 +- .../pile/vo/uniapp/InvoiceTitleVO.java | 2 + .../mapper/pile/MemberInvoiceTitleMapper.xml | 14 +- .../generate/AdapayCallbackRecordMapper.java | 17 -- 8 files changed, 177 insertions(+), 150 deletions(-) delete mode 100644 src/main/java/generate/AdapayCallbackRecordMapper.java diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index d3a1effce..3bf572411 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -367,9 +367,7 @@ public class MemberService { public List queryMemberInvoiceTitles(String memberId) { List resultList = Lists.newArrayList(); - MemberInvoiceTitle queryEntity = new MemberInvoiceTitle(); - queryEntity.setMemberId(memberId); - List memberInvoiceTitles = memberInvoiceTitleService.selectMemberInvoiceTitleList(queryEntity); + List memberInvoiceTitles = memberInvoiceTitleService.selectMemberInvoiceTitleList(memberId); 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() ); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberInvoiceTitle.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberInvoiceTitle.java index 9665e7202..4071381dd 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberInvoiceTitle.java +++ b/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 - */ - @Excel(name = "会员id") - private String memberId; + /** + * 会员id + */ + @Excel(name = "会员id") + private String memberId; - /** - * 抬头类型（1-单位；2-个人） - */ - @Excel(name = "抬头类型", readConverterExp = "1=-单位；2-个人") - private String titleType; + /** + * 抬头类型（1-单位；2-个人） + */ + @Excel(name = "抬头类型", readConverterExp = "1=-单位；2-个人") + private String titleType; - /** - * 单位名称 - */ - @Excel(name = "单位名称") - private String name; + /** + * 单位名称 + */ + @Excel(name = "单位名称") + private String name; - /** - * 税号 - */ - @Excel(name = "税号") - private String taxId; + /** + * 税号 + */ + @Excel(name = "税号") + private String taxId; - /** - * 单位地址 - */ - @Excel(name = "单位地址") - private String unitAddress; + /** + * 单位地址 + */ + @Excel(name = "单位地址") + private String unitAddress; - /** - * 电话号码 - */ - @Excel(name = "电话号码") - private String phoneNumber; + /** + * 电话号码 + */ + @Excel(name = "电话号码") + private String phoneNumber; - /** - * 开户银行 - */ - @Excel(name = "开户银行") - private String bankName; + /** + * 开户银行 + */ + @Excel(name = "开户银行") + private String bankName; - /** - * 银行账户 - */ - @Excel(name = "银行账户") - private String bankAccountNumber; + /** + * 银行账户 + */ + @Excel(name = "银行账户") + private String bankAccountNumber; - /** - * 删除标识（0-正常；1-删除） - */ - private String delFlag; + private String defaultFlag; + + /** + * 删除标识（0-正常；1-删除） + */ + private String delFlag; public void setId(Long id) { - this.id = id; - } + this.id = id; + } - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setMemberId(String memberId) { - this.memberId = memberId; - } + public void setMemberId(String memberId) { + this.memberId = memberId; + } - public String getMemberId() { - return memberId; - } + public String getMemberId() { + return memberId; + } - public void setTitleType(String titleType) { - this.titleType = titleType; - } + public void setTitleType(String titleType) { + this.titleType = titleType; + } - public String getTitleType() { - return titleType; - } + public String getTitleType() { + return titleType; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setTaxId(String taxId) { - this.taxId = taxId; - } + public void setTaxId(String taxId) { + this.taxId = taxId; + } - public String getTaxId() { - return taxId; - } + public String getTaxId() { + return taxId; + } - public void setUnitAddress(String unitAddress) { - this.unitAddress = unitAddress; - } + public void setUnitAddress(String unitAddress) { + this.unitAddress = unitAddress; + } - public String getUnitAddress() { - return unitAddress; - } + public String getUnitAddress() { + return unitAddress; + } - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } - public String getPhoneNumber() { - return phoneNumber; - } + public String getPhoneNumber() { + return phoneNumber; + } - public void setBankName(String bankName) { - this.bankName = bankName; - } + public void setBankName(String bankName) { + this.bankName = bankName; + } - public String getBankName() { - return bankName; - } + public String getBankName() { + return bankName; + } - public void setBankAccountNumber(String bankAccountNumber) { - this.bankAccountNumber = bankAccountNumber; - } + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } - public String getBankAccountNumber() { - return bankAccountNumber; - } + public String getBankAccountNumber() { + return bankAccountNumber; + } - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } - public String getDelFlag() { - return delFlag; - } + public String getDelFlag() { + return delFlag; + } - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) - .append("id", getId()) - .append("memberId", getMemberId()) - .append("titleType", getTitleType()) - .append("name", getName()) - .append("taxId", getTaxId()) - .append("unitAddress", getUnitAddress()) - .append("phoneNumber", getPhoneNumber()) - .append("bankName", getBankName()) - .append("bankAccountNumber", getBankAccountNumber()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .append("delFlag", getDelFlag()) - .toString(); - } + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) + .append("id", getId()) + .append("memberId", getMemberId()) + .append("titleType", getTitleType()) + .append("name", getName()) + .append("taxId", getTaxId()) + .append("unitAddress", getUnitAddress()) + .append("phoneNumber", getPhoneNumber()) + .append("bankName", getBankName()) + .append("bankAccountNumber", getBankAccountNumber()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) + .append("delFlag", getDelFlag()) + .toString(); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberInvoiceTitleMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberInvoiceTitleMapper.java index bb4189990..525a9110b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberInvoiceTitleMapper.java +++ b/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 titleIdList); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberInvoiceTitleService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberInvoiceTitleService.java index 7fc7ef304..28de9254c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberInvoiceTitleService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberInvoiceTitleService.java @@ -22,7 +22,9 @@ public interface IMemberInvoiceTitleService { */ public MemberInvoiceTitle selectMemberInvoiceTitleById(Long id); - /** + List selectMemberInvoiceTitleList(String memberId); + + /** * 查询会员发票抬头列表 * * @param memberInvoiceTitle 会员发票抬头 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java index ee4fd8185..8bd4122fc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java +++ b/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 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 memberInvoiceTitles = selectMemberInvoiceTitleList(memberInvoiceTitle.getMemberId()); + // 排除刚刚新增的抬头数据 + List collect = memberInvoiceTitles.stream() + .map(MemberInvoiceTitle::getId) + .filter(x -> !Objects.equals(x, memberInvoiceTitle.getId())) + .collect(Collectors.toList()); + memberInvoiceTitleMapper.batchUpdateDefaultFlag(collect); + } + return i; } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceTitleVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceTitleVO.java index 9f542c530..82ab92385 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceTitleVO.java +++ b/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; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberInvoiceTitleMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberInvoiceTitleMapper.xml index 8837010ae..36b867dc0 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberInvoiceTitleMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberInvoiceTitleMapper.xml @@ -14,6 +14,7 @@ + @@ -23,7 +24,7 @@ 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 @@ -62,6 +63,7 @@ phone_number, bank_name, bank_account_number, + default_flag, create_time, create_by, update_time, @@ -77,6 +79,7 @@ #{phoneNumber}, #{bankName}, #{bankAccountNumber}, + #{defaultFlag}, #{createTime}, #{createBy}, #{updateTime}, @@ -96,6 +99,7 @@ phone_number = #{phoneNumber}, bank_name = #{bankName}, bank_account_number = #{bankAccountNumber}, + default_flag = #{defaultFlag}, create_time = #{createTime}, create_by = #{createBy}, update_time = #{updateTime}, @@ -104,6 +108,14 @@ where id = #{id} + + update member_invoice_title + set del_flag = '0' + where id in + + #{item} + + delete from member_invoice_title where id = #{id} diff --git a/src/main/java/generate/AdapayCallbackRecordMapper.java b/src/main/java/generate/AdapayCallbackRecordMapper.java deleted file mode 100644 index eb9152778..000000000 --- a/src/main/java/generate/AdapayCallbackRecordMapper.java +++ /dev/null @@ -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); -} \ No newline at end of file