Commit 21f0318e by 陶光胜

Merge branch 'developer' into 'master'

Developer

See merge request !2
parents c7c398b6 3e32ae12
......@@ -7,7 +7,7 @@ package com.gic.finance.constant;
* @date 2019/8/14 2:30 PM

*/
public enum InvoiceStatusEnum {
TO_BE_ISSUED(1, "待开具"),
TO_BE_ISSUED(1, "待审核"),
TO_BE_MAILED(2, "待邮寄"),
MAILED(3, "已邮寄"),
REJECT(4, "已驳回"),
......
......@@ -143,13 +143,11 @@ public class CashWithdrawalDTO implements Serializable{
/**
* 物流公司
*/
@NotBlank(message = "发票物流公司名称不能为空", groups = {CashWithdrawal.class})
private String expressMailName;
/**
* 发票物流号
*/
@NotBlank(message = "发票物流单号不能为空", groups = {CashWithdrawal.class})
private String expressMailNumber;
/**
......
......@@ -35,6 +35,18 @@ public interface CashWithdrawalApiService {
ServiceResponse<String> cashWithdrawalOfSupplier(CashWithdrawalDTO dto);
/**
* 填写物流信息
* @Title: expressMail

* @Description:

* @author guojuxing
* @param serialNumber 提现申请流水号
* @param expressMailName 物流公司
* @param expressMailNumber
物流单号
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> expressMail(String serialNumber, String expressMailName, String expressMailNumber);
/**
* 审核通过
* @Title: approval

* @Description:
......
......@@ -63,4 +63,6 @@ public interface TabCashWithdrawalMapper {
* @return java.util.List<com.gic.finance.entity.TabCashWithdrawal>


 */
List<TabCashWithdrawal> listCashWithdrawal(CashWithdrawalQueryListQO params);
TabCashWithdrawal getBySerialNumber(String serialNumber);
}
\ No newline at end of file
......@@ -46,4 +46,14 @@ public interface CashWithdrawalService {
TabCashWithdrawal getById(Integer id);
/**
* 根据提现流水号获取
* @Title: getBySerialNumber

* @Description:

* @author guojuxing
* @param serialNumber

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


*/
TabCashWithdrawal getBySerialNumber(String serialNumber);
}
......@@ -41,4 +41,9 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService {
public TabCashWithdrawal getById(Integer id) {
return tabCashWithdrawalMapper.selectByPrimaryKey(id);
}
@Override
public TabCashWithdrawal getBySerialNumber(String serialNumber) {
return tabCashWithdrawalMapper.getBySerialNumber(serialNumber);
}
}
......@@ -66,6 +66,24 @@ public class CashWithdrawalApiServiceImpl implements CashWithdrawalApiService{
}
@Override
public ServiceResponse<Void> expressMail(String serialNumber, String expressMailName, String expressMailNumber) {
TabCashWithdrawal record = cashWithdrawalService.getBySerialNumber(serialNumber);
if (record == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "提现流水号错误,查无数据");
}
if (StringUtils.isBlank(expressMailName)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "物流公司不能为空");
}
if (StringUtils.isBlank(expressMailNumber)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "物流单号不能为空");
}
record.setExpressMailName(expressMailName);
record.setExpressMailNumber(expressMailNumber);
cashWithdrawalService.update(record);
return ServiceResponse.success();
}
@Override
public ServiceResponse<Void> approval(Integer id, OperationUserInfoDTO dto) {
TabCashWithdrawal record = cashWithdrawalService.getById(id);
if (record == null) {
......
......@@ -371,4 +371,10 @@
</if>
order by create_time desc
</select>
<select id="getBySerialNumber" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_cash_withdrawal
where cash_withdrawal_serial_number = #{serialNumber}
</select>
</mapper>
\ 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