Skip to content

G
gic-platform-finance
Commit 0609214b by guojuxing
Options

定时任务接口修改，添加参数

parent 7d7924cc
Showing with 366 additions and 9 deletions
gic-platform-finance-service/src/main/java/com/gic/finance/service/outer/impl/InvoiceManageApiServiceImpl.java
......@@ -2,6 +2,8 @@ package com.gic.finance.service.outer.impl;
import java.util.Date;
import com.gic.finance.entity.TabInvoiceAccount;
import com.gic.finance.service.InvoiceAccountService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -24,6 +26,8 @@ import com.gic.store.utils.CreateSerialNumberUtils;
public class InvoiceManageApiServiceImpl implements InvoiceManageApiService{
@Autowired
private InvoiceManageService invoiceManageService;
@Autowired
private InvoiceAccountService invoiceAccountService;
@Override
public ServiceResponse<Void> applyInvoice(InvoiceManageDTO invoiceManageDTO) {
ServiceResponse paramResponse = ValidParamsUtils.allCheckValidate(invoiceManageDTO, InvoiceManageDTO.ApplyInvoiceValid.class);
......@@ -47,14 +51,23 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService{
}
InvoiceManageDTO invoiceManageDTO = new InvoiceManageDTO();
invoiceManageDTO.setInvoiceManageId(invoiceManageId);
if (StringUtils.isBlank(expressMailName)) {
if (StringUtils.isBlank(expressMailName) || StringUtils.isBlank(expressMailNumber)) {
//待邮寄
invoiceManageDTO.setInvoiceStatus(InvoiceStatusEnum.TO_BE_MAILED.getCode());
} else {
invoiceManageDTO.setInvoiceStatus(InvoiceStatusEnum.MAILED.getCode());
//物流信息
invoiceManageDTO.setExpressMailName(expressMailName);
invoiceManageDTO.setExpressMailNumber(expressMailNumber);
}
//todo 操作人相关信息
//todo 开票户信息插入
//开票户信息插入
TabInvoiceAccount account = invoiceAccountService.getEnable();
if (account == null) {
return ServiceResponse.failure(ErrorCode.SYSTEM_ERROR.getCode(), "开票户信息未设置，请前往添加");
}
invoiceManageDTO.setInvoicerId(account.getInvoiceAccountId());
invoiceManageService.update(invoiceManageDTO);
return ServiceResponse.success();
}
......@@ -71,7 +84,9 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService{
if (StringUtils.isBlank(rejectReason)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "驳回理由不能为空");
}
invoiceManageDTO.setRejectReason(rejectReason);
//todo 操作人相关信息
invoiceManageService.update(invoiceManageDTO);
return ServiceResponse.success();
}
......
gic-platform-finance-service/src/main/java/com/gic/finance/service/outer/impl/TransferAccountsApprovalApiServiceImpl.java
......@@ -139,7 +139,7 @@ public class TransferAccountsApprovalApiServiceImpl implements TransferAccountsA
dto.setApprovalTime(new Date());
//todo 审批人等信息获取插入
callBack(tab, accountAmount, TransferAccountApprovalStatusEnum.AGREE.getCode());
//callBack(tab, accountAmount, TransferAccountApprovalStatusEnum.AGREE.getCode());
transferAccountsApprovalService.updateTransferAccountsApproval(dto);
return ServiceResponse.success();
}
......
gic-platform-finance-service/src/main/resources/dubbo-gic-platform-finance-service.xml
......@@ -16,8 +16,10 @@
<dubbo:protocol name="dubbo" port="20330"/>
<!--转账审批-->
<dubbo:service interface="com.gic.finance.service.TransferAccountsApprovalApiService" ref="transferAccountsApprovalApiService" timeout="60000" />
<dubbo:service interface="com.gic.finance.service.TransferAccountsApprovalApiService" ref="transferAccountsApprovalApiService" timeout="6000" />
<!--发票管理-->
<dubbo:service interface="com.gic.finance.service.InvoiceManageApiService" ref="invoiceManageApiService" timeout="60000" />
<dubbo:service interface="com.gic.finance.service.InvoiceManageApiService" ref="invoiceManageApiService" timeout="6000" />
<!--开票户信息-->
<dubbo:service interface="com.gic.finance.service.InvoiceAccountApiService" ref="invoiceAccountApiService" timeout="6000" />
</beans>
gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/InvoiceManageController.java
package com.gic.finance.web.controller;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.response.EnterpriseRestResponse;
import com.gic.finance.dto.InvoiceAccountDTO;
import com.gic.finance.service.InvoiceAccountApiService;
import com.gic.finance.web.vo.InvoiceManagerDetailVO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -26,6 +32,8 @@ public class InvoiceManageController {
private static Logger LOGGER = LoggerFactory.getLogger(InvoiceManageController.class);
@Autowired
private InvoiceManageApiService invoiceManageApiService;
@Autowired
private InvoiceAccountApiService invoiceAccountApiService;
/**
* 发起审批
......@@ -38,7 +46,7 @@ public class InvoiceManageController {
}
/**
* 发起审批
* 同意审批
* @param dto
* @return
*/
......@@ -49,7 +57,7 @@ public class InvoiceManageController {
}
/**
* 发起审批
* 驳回审批
* @param dto
* @return
*/
......@@ -60,7 +68,7 @@ public class InvoiceManageController {
}
/**
* 发起审批
* 取消审批
* @param dto
* @return
*/
......@@ -76,7 +84,31 @@ public class InvoiceManageController {
*/
@RequestMapping("/get-detail")
public RestResponse getDetail(Integer invoiceManageId) {
return ResultControllerUtils.commonResult(invoiceManageApiService.getById(invoiceManageId));
ServiceResponse<InvoiceManageDTO> invoiceResult = invoiceManageApiService.getById(invoiceManageId);
if (invoiceResult.isSuccess()) {
InvoiceManageDTO invoice = invoiceResult.getResult();
InvoiceManagerDetailVO vo = EntityUtil.changeEntityNew(InvoiceManagerDetailVO.class, invoice);
ServiceResponse<InvoiceAccountDTO> accountResult;
if (invoice.getInvoicerId() != null) {
accountResult = invoiceAccountApiService.getById(invoice.getInvoicerId());
} else {
accountResult = invoiceAccountApiService.getEnable();
}
if (accountResult.isSuccess()) {
InvoiceAccountDTO account = accountResult.getResult();
vo.setAccountName(account.getAccountName());
vo.setAccountPhone(account.getAccountPhone());
vo.setAddress(account.getAddress());
vo.setBank(account.getBank());
vo.setBankAccount(account.getBankAccount());
vo.setTaxNumberOfInvoice(account.getTaxNumber());
} else {
return EnterpriseRestResponse.failure(accountResult);
}
return RestResponse.success(vo);
} else {
return EnterpriseRestResponse.failure(invoiceResult);
}
}
@RequestMapping("/list-invoice")
......
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/InvoiceManagerDetailVO.java 0 → 100644
package com.gic.finance.web.vo;
import com.gic.finance.constant.InvoiceStatusEnum;
import com.gic.finance.constant.InvoiceTypeEnum;
import java.io.Serializable;
import java.util.Date;
/**
* 发票管理详情
* @ClassName: InvoiceManagerDetailVO

* @Description: 

* @author guojuxing

* @date 2019/8/29 9:44 AM

*/
public class InvoiceManagerDetailVO implements Serializable{
private static final long serialVersionUID = 3809863484337760339L;
/**
*
*/
private Integer invoiceManageId;
/**
* （发票类型）1:纸质普通发票 2: 纸质增值税专用发票
*/
private Integer invoiceType;
private String invoiceTypeStr;
/**
*
*/
private Date createTime;
/**
* 申请单流水号
*/
private String invoiceApplySerial;
/**
* 商户名称
*/
private String enterpriseName;
/**
* 公司名称
*/
private String companyName;
/**
* 开票金额
*/
private Double billingAmount;
/**
* 发票状态 1:待开具 2:待邮寄 3:已邮寄 4:已驳回 5:已取消
*/
private Integer invoiceStatus;
/**
* 发票状态名称
*/
private String invoiceStatusStr;
/**
* 操作人姓名
*/
private String operatorName;
/**
* 操作时间
*/
private Date operatorTime;
/**
* 操作人手机号码
*/
private String operatorPhone;
/**
* 操作人手机号国际区号
*/
private String operatorPhoneAreaCode;
/**
* 快递公司
*/
private String expressMailName;
/**
* 快递单号
*/
private String expressMailNumber;
/**
* 驳回理由
*/
private String rejectReason;
/**
* 纳税识别号
*/
private String taxNumber;
/**
* 开户单位名称
*/
private String accountName;
/**
* 纳税识别号-开票户
*/
private String taxNumberOfInvoice;
/**
* 地址
*/
private String address;
/**
* 开户行
*/
private String bank;
/**
* 开户电话
*/
private String accountPhone;
/**
* 开户账号
*/
private String bankAccount;
public Integer getInvoiceManageId() {
return invoiceManageId;
}
public void setInvoiceManageId(Integer invoiceManageId) {
this.invoiceManageId = invoiceManageId;
}
public void setInvoiceType(Integer invoiceType) {
this.invoiceType = invoiceType;
}
public String getInvoiceTypeStr() {
return InvoiceTypeEnum.getMessageByCode(invoiceType);
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getInvoiceApplySerial() {
return invoiceApplySerial;
}
public void setInvoiceApplySerial(String invoiceApplySerial) {
this.invoiceApplySerial = invoiceApplySerial;
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public Double getBillingAmount() {
return billingAmount;
}
public void setBillingAmount(Double billingAmount) {
this.billingAmount = billingAmount;
}
public void setInvoiceStatus(Integer invoiceStatus) {
this.invoiceStatus = invoiceStatus;
}
public String getInvoiceStatusStr() {
return InvoiceStatusEnum.getMessageByCode(invoiceStatus);
}
public String getOperatorName() {
return operatorName;
}
public void setOperatorName(String operatorName) {
this.operatorName = operatorName;
}
public Date getOperatorTime() {
return operatorTime;
}
public void setOperatorTime(Date operatorTime) {
this.operatorTime = operatorTime;
}
public String getOperatorPhone() {
return operatorPhone;
}
public void setOperatorPhone(String operatorPhone) {
this.operatorPhone = operatorPhone;
}
public String getOperatorPhoneAreaCode() {
return operatorPhoneAreaCode;
}
public void setOperatorPhoneAreaCode(String operatorPhoneAreaCode) {
this.operatorPhoneAreaCode = operatorPhoneAreaCode;
}
public String getExpressMailName() {
return expressMailName;
}
public void setExpressMailName(String expressMailName) {
this.expressMailName = expressMailName;
}
public String getExpressMailNumber() {
return expressMailNumber;
}
public void setExpressMailNumber(String expressMailNumber) {
this.expressMailNumber = expressMailNumber;
}
public String getRejectReason() {
return rejectReason;
}
public void setRejectReason(String rejectReason) {
this.rejectReason = rejectReason;
}
public String getTaxNumber() {
return taxNumber;
}
public void setTaxNumber(String taxNumber) {
this.taxNumber = taxNumber;
}
public String getAccountName() {
return accountName;
}
public void setAccountName(String accountName) {
this.accountName = accountName;
}
public String getTaxNumberOfInvoice() {
return taxNumberOfInvoice;
}
public void setTaxNumberOfInvoice(String taxNumberOfInvoice) {
this.taxNumberOfInvoice = taxNumberOfInvoice;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getBank() {
return bank;
}
public void setBank(String bank) {
this.bank = bank;
}
public String getAccountPhone() {
return accountPhone;
}
public void setAccountPhone(String accountPhone) {
this.accountPhone = accountPhone;
}
public String getBankAccount() {
return bankAccount;
}
public void setBankAccount(String bankAccount) {
this.bankAccount = bankAccount;
}
}
gic-platform-finance-web/src/main/resources/dubbo-gic-platform-finance-web.xml
......@@ -40,6 +40,8 @@
<dubbo:reference interface="com.gic.finance.service.TransferAccountsApprovalApiService" id="transferAccountsApprovalApiService" timeout="60000" />
<!--发票管理-->
<dubbo:reference interface="com.gic.finance.service.InvoiceManageApiService" id="invoiceManageApiService" timeout="60000" />
<!--开票户信息-->
<dubbo:reference interface="com.gic.finance.service.InvoiceAccountApiService" id="invoiceAccountApiService" timeout="60000" />
<dubbo:reference id="gicLogService" interface="com.gic.authcenter.api.service.GicLogService"/>
<dubbo:reference id="gicAppService" interface="com.gic.authcenter.api.service.GicAppService"/>
<dubbo:reference id="gicUserService" interface="com.gic.authcenter.api.service.GicUserService"/>
......@@ -47,4 +49,5 @@
<dubbo:reference interface="com.gic.enterprise.service.BillingOrderApiService" id="billingOrderApiService" timeout="60000" />
<dubbo:reference interface="com.gic.enterprise.service.BillingRechargeRecordApiService" id="billingRechargeRecordApiService" timeout="60000" />
</beans>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment