mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-14 04:09:50 +08:00
update 申请开票
This commit is contained in:
@@ -115,6 +115,9 @@ public class OrderService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private AdapayCallbackRecordService adapayCallbackRecordService;
|
private AdapayCallbackRecordService adapayCallbackRecordService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IMemberInvoiceTitleService memberInvoiceTitleService;
|
||||||
|
|
||||||
private List<String> stationIdList = Lists.newArrayList("1", "2");
|
private List<String> stationIdList = Lists.newArrayList("1", "2");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1169,6 +1172,24 @@ public class OrderService {
|
|||||||
totalServiceAmount = totalServiceAmount.add(orderVO.getTotalServiceAmount());
|
totalServiceAmount = totalServiceAmount.add(orderVO.getTotalServiceAmount());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 查抬头信息
|
||||||
|
MemberInvoiceTitle invoiceTitle = memberInvoiceTitleService.selectMemberInvoiceTitleById(Long.parseLong(dto.getTitleId()));
|
||||||
|
if (StringUtils.isNotEmpty(dto.getReception())) {
|
||||||
|
boolean b = false;
|
||||||
|
if (StringUtils.isEmail(dto.getReception()) && !StringUtils.equals(dto.getReception(), invoiceTitle.getEmail())) {
|
||||||
|
invoiceTitle.setEmail(dto.getReception());
|
||||||
|
b = true;
|
||||||
|
}
|
||||||
|
if (StringUtils.isPhoneNumber(dto.getReception()) && !StringUtils.equals(dto.getReception(), invoiceTitle.getPhoneNumber())) {
|
||||||
|
invoiceTitle.setPhoneNumber(dto.getReception());
|
||||||
|
b = true;
|
||||||
|
}
|
||||||
|
if (b) {
|
||||||
|
memberInvoiceTitleService.updateMemberInvoiceTitle(invoiceTitle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// 入库
|
// 入库
|
||||||
OrderInvoiceRecord orderInvoiceRecord = new OrderInvoiceRecord();
|
OrderInvoiceRecord orderInvoiceRecord = new OrderInvoiceRecord();
|
||||||
orderInvoiceRecord.setStatus("0");
|
orderInvoiceRecord.setStatus("0");
|
||||||
|
|||||||
@@ -20,4 +20,9 @@ public class ApplyOrderInvoiceDTO {
|
|||||||
|
|
||||||
// 抬头id
|
// 抬头id
|
||||||
private String titleId;
|
private String titleId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 接收方式
|
||||||
|
*/
|
||||||
|
private String reception;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ public class MemberInvoiceTitleServiceImpl implements IMemberInvoiceTitleService
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public InvoiceTitleVO selectByTitleId(String titleId) {
|
public InvoiceTitleVO selectByTitleId(String titleId) {
|
||||||
MemberInvoiceTitle memberInvoiceTitle = memberInvoiceTitleMapper.selectMemberInvoiceTitleById(Long.parseLong(titleId));
|
MemberInvoiceTitle memberInvoiceTitle = selectMemberInvoiceTitleById(Long.parseLong(titleId));
|
||||||
if (memberInvoiceTitle == null) {
|
if (memberInvoiceTitle == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -36,6 +36,7 @@ public class MemberInvoiceTitleServiceImpl implements IMemberInvoiceTitleService
|
|||||||
.titleType(TitleTypeEnum.getLabel(memberInvoiceTitle.getTitleType()))
|
.titleType(TitleTypeEnum.getLabel(memberInvoiceTitle.getTitleType()))
|
||||||
.taxId(memberInvoiceTitle.getTaxId())
|
.taxId(memberInvoiceTitle.getTaxId())
|
||||||
.unitAddress(memberInvoiceTitle.getUnitAddress())
|
.unitAddress(memberInvoiceTitle.getUnitAddress())
|
||||||
|
.email(memberInvoiceTitle.getEmail())
|
||||||
.phoneNumber(memberInvoiceTitle.getPhoneNumber())
|
.phoneNumber(memberInvoiceTitle.getPhoneNumber())
|
||||||
.bankName(memberInvoiceTitle.getBankName())
|
.bankName(memberInvoiceTitle.getBankName())
|
||||||
.bankAccountNumber(memberInvoiceTitle.getBankAccountNumber())
|
.bankAccountNumber(memberInvoiceTitle.getBankAccountNumber())
|
||||||
@@ -101,7 +102,6 @@ public class MemberInvoiceTitleServiceImpl implements IMemberInvoiceTitleService
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public int updateMemberInvoiceTitle(MemberInvoiceTitle memberInvoiceTitle) {
|
public int updateMemberInvoiceTitle(MemberInvoiceTitle memberInvoiceTitle) {
|
||||||
// memberInvoiceTitle.setUpdateTime(DateUtils.getNowDate());
|
|
||||||
if (StringUtils.equals(memberInvoiceTitle.getDefaultFlag(), "1")) {
|
if (StringUtils.equals(memberInvoiceTitle.getDefaultFlag(), "1")) {
|
||||||
// 如果新增这条是默认的,那么就把这个会员下所有的其他抬头的默认取消
|
// 如果新增这条是默认的,那么就把这个会员下所有的其他抬头的默认取消
|
||||||
List<MemberInvoiceTitle> memberInvoiceTitles = selectMemberInvoiceTitleList(memberInvoiceTitle.getMemberId());
|
List<MemberInvoiceTitle> memberInvoiceTitles = selectMemberInvoiceTitleList(memberInvoiceTitle.getMemberId());
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ public class InvoiceTitleVO {
|
|||||||
*/
|
*/
|
||||||
private String unitAddress;
|
private String unitAddress;
|
||||||
|
|
||||||
|
private String email;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 电话号码
|
* 电话号码
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user