Commit de020a70 by guojuxing

发票管理-开票驳回、取消、邮寄

parent 56cb9953
......@@ -21,4 +21,38 @@ public interface InvoiceManageApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


 */
ServiceResponse<Void> applyInvoice(InvoiceManageDTO invoiceManageDTO);
/**
* 开票。待邮寄/邮寄
* @Title: invoice

* @Description:

 * @author guojuxing
* @param invoiceManageId
* @param expressMailName
* @param expressMailNumber

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


 */
ServiceResponse<Void> invoice(Integer invoiceManageId, String expressMailName, String expressMailNumber);
/**
* 驳回
* @Title: rejectInvoice

* @Description:

 * @author guojuxing
* @param invoiceManageId
* @param rejectReason
 驳回理由
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


 */
ServiceResponse<Void> rejectInvoice(Integer invoiceManageId, String rejectReason);
/**
* 取消
* @Title: cancelInvoice

* @Description:

 * @author guojuxing
* @param invoiceManageId

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


 */
ServiceResponse<Void> cancelInvoice(Integer invoiceManageId);
}
package com.gic.finance.service;
import com.gic.finance.dto.InvoiceManageDTO;
import com.gic.finance.entity.TabInvoiceManage;
/**
* 发票管理
......@@ -19,4 +20,24 @@ public interface InvoiceManageService {
* @return void


 */
void save(InvoiceManageDTO invoiceManageDTO);
/**
* 查询单条
* @Title: getById

* @Description:

 * @author guojuxing
* @param invoiceManageId

* @return com.gic.finance.entity.TabInvoiceManage


 */
TabInvoiceManage getById(Integer invoiceManageId);
/**
* update
* @Title: update

* @Description:

 * @author guojuxing
* @param invoiceManageDTO

* @return void


 */
void update(InvoiceManageDTO invoiceManageDTO);
}
......@@ -9,6 +9,8 @@ import com.gic.finance.dto.InvoiceManageDTO;
import com.gic.finance.entity.TabInvoiceManage;
import com.gic.finance.service.InvoiceManageService;
import java.util.Date;
@Service("invoiceManageService")
public class InvoiceManageServiceImpl implements InvoiceManageService{
@Autowired
......@@ -18,4 +20,16 @@ public class InvoiceManageServiceImpl implements InvoiceManageService{
TabInvoiceManage tabInvoiceManage = EntityUtil.changeEntityNew(TabInvoiceManage.class, invoiceManageDTO);
tabInvoiceManageMapper.insertSelective(tabInvoiceManage);
}
@Override
public TabInvoiceManage getById(Integer invoiceManageId) {
return tabInvoiceManageMapper.selectByPrimaryKey(invoiceManageId);
}
@Override
public void update(InvoiceManageDTO invoiceManageDTO) {
invoiceManageDTO.setUpdateTime(new Date());
TabInvoiceManage tabInvoiceManage = EntityUtil.changeEntityNew(TabInvoiceManage.class, invoiceManageDTO);
tabInvoiceManageMapper.updateByPrimaryKeySelective(tabInvoiceManage);
}
}
package com.gic.finance.service.outer.impl;
import java.util.Date;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.error.ErrorCode;
import com.gic.finance.constant.InvoiceStatusEnum;
import com.gic.finance.dto.InvoiceManageDTO;
import com.gic.finance.entity.TabInvoiceManage;
import com.gic.finance.service.InvoiceManageApiService;
import com.gic.finance.service.InvoiceManageService;
import com.gic.store.utils.CreateSerialNumberUtils;
import com.gic.store.utils.valid.ValidUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
@Service("invoiceManageApiService")
public class InvoiceManageApiServiceImpl implements InvoiceManageApiService{
......@@ -27,6 +31,56 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService{
invoiceManageDTO.setInvoiceStatus(InvoiceStatusEnum.TO_BE_ISSUED.getCode());
invoiceManageDTO.setInvoiceApplySerial(CreateSerialNumberUtils.createSerialNumber());
invoiceManageService.save(invoiceManageDTO);
return ServiceResponse.success();
}
@Override
public ServiceResponse<Void> invoice(Integer invoiceManageId, String expressMailName, String expressMailNumber) {
TabInvoiceManage tabInvoiceManage = invoiceManageService.getById(invoiceManageId);
if (tabInvoiceManage == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "发票管理主键有误");
}
InvoiceManageDTO invoiceManageDTO = new InvoiceManageDTO();
invoiceManageDTO.setInvoiceManageId(invoiceManageId);
if (StringUtils.isBlank(expressMailName)) {
//待邮寄
invoiceManageDTO.setInvoiceStatus(InvoiceStatusEnum.TO_BE_MAILED.getCode());
} else {
invoiceManageDTO.setInvoiceStatus(InvoiceStatusEnum.MAILED.getCode());
}
//todo 操作人相关信息
invoiceManageService.update(invoiceManageDTO);
return ServiceResponse.success();
}
@Override
public ServiceResponse<Void> rejectInvoice(Integer invoiceManageId, String rejectReason) {
TabInvoiceManage tabInvoiceManage = invoiceManageService.getById(invoiceManageId);
if (tabInvoiceManage == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "发票管理主键有误");
}
InvoiceManageDTO invoiceManageDTO = new InvoiceManageDTO();
invoiceManageDTO.setInvoiceManageId(invoiceManageId);
invoiceManageDTO.setInvoiceStatus(InvoiceStatusEnum.REJECT.getCode());
if (StringUtils.isBlank(rejectReason)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "驳回理由不能为空");
}
//todo 操作人相关信息
invoiceManageService.update(invoiceManageDTO);
return ServiceResponse.success();
}
@Override
public ServiceResponse<Void> cancelInvoice(Integer invoiceManageId) {
TabInvoiceManage tabInvoiceManage = invoiceManageService.getById(invoiceManageId);
if (tabInvoiceManage == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "发票管理主键有误");
}
InvoiceManageDTO invoiceManageDTO = new InvoiceManageDTO();
invoiceManageDTO.setInvoiceManageId(invoiceManageId);
invoiceManageDTO.setInvoiceStatus(InvoiceStatusEnum.CANCEL.getCode());
invoiceManageService.update(invoiceManageDTO);
return ServiceResponse.success();
}
}
......@@ -10,6 +10,7 @@ import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.finance.dto.InvoiceManageDTO;
import com.gic.finance.service.InvoiceManageApiService;
import com.gic.finance.web.utils.ResultControllerUtils;
/**
* 发票管理
* @ClassName: InvoiceManageController

......@@ -34,4 +35,36 @@ public class InvoiceManageController {
return ResultControllerUtils.commonResult(invoiceManageApiService.applyInvoice(dto));
}
/**
* 发起审批
* @param dto
* @return
*/
@RequestMapping("/invoice")
public RestResponse invoice(InvoiceManageDTO dto) {
return ResultControllerUtils.commonResult(invoiceManageApiService.invoice(dto.getInvoiceManageId(),
dto.getExpressMailName(), dto.getExpressMailNumber()));
}
/**
* 发起审批
* @param dto
* @return
*/
@RequestMapping("/reject-invoice")
public RestResponse rejectInvoice(InvoiceManageDTO dto) {
return ResultControllerUtils
.commonResult(invoiceManageApiService.rejectInvoice(dto.getInvoiceManageId(), dto.getRejectReason()));
}
/**
* 发起审批
* @param dto
* @return
*/
@RequestMapping("/cancel-invoice")
public RestResponse cancelInvoice(InvoiceManageDTO dto) {
return ResultControllerUtils.commonResult(invoiceManageApiService.cancelInvoice(dto.getInvoiceManageId()));
}
}
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