Skip to content

GitLab

Q
qk_backend
Commit 19e9d80b authored by shiyu's avatar shiyu
Browse files
Options

寄售单列表取消原因

parent 98809f42
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ConsignSaleServiceImpl.java
View file @ 19e9d80b
...@@ -138,6 +138,9 @@ public class ConsignSaleServiceImpl implements ConsignSaleService { ...@@ -138,6 +138,9 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
if (operateType.contains(ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode())) { if (operateType.contains(ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode())) {
consignSaleVo.setCancelType(ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getDes()); consignSaleVo.setCancelType(ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getDes());
consignSaleVo.setRemark("用户主动取消"); consignSaleVo.setRemark("用户主动取消");
} else if (operateType.contains(ConsignSaleEnum.OperateTypeEnum.TIME_OUT_CANCEL.getCode())) {
consignSaleVo.setCancelType(ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getDes());
consignSaleVo.setRemark("超时未确认，取消寄售");
} else { } else {
consignSaleVo.setCancelType(ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getDes()); consignSaleVo.setCancelType(ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getDes());
List<ConsignSaleRecord> saleRecordList= consignSaleRecords.stream().filter(s->s.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getCode()).collect(Collectors.toList()); List<ConsignSaleRecord> saleRecordList= consignSaleRecords.stream().filter(s->s.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getCode()).collect(Collectors.toList());
...@@ -510,7 +513,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService { ...@@ -510,7 +513,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
consignSale.setSystemState(ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode()); consignSale.setSystemState(ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode());
consignSaleDao.update(consignSale); consignSaleDao.update(consignSale);
//用户超时未确认，取消寄售单 //用户超时未确认，取消寄售单
consignSaleRecordDao.insert(dto.getSaleId(), "超时未确认，取消寄售", ConsignSaleEnum.OperateTypeEnum.TIME_OUT_CANCEL.getCode(), "超时未确认，取消寄售"); consignSaleRecordDao.insert(dto.getSaleId(), "超时未确认，取消寄售", ConsignSaleEnum.OperateTypeEnum.TIME_OUT_CANCEL.getCode(), "");
return Result.success(); return Result.success();
} catch (Exception e) { } catch (Exception e) {
logger.error("用户超时未确认，取消寄售单 error : {}", e); logger.error("用户超时未确认，取消寄售单 error : {}", e);
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ConsignSaleServiceImpl.java
View file @ 19e9d80b
...@@ -461,7 +461,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService { ...@@ -461,7 +461,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
consignSale.setSystemState(ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode()); consignSale.setSystemState(ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode());
consignSaleDao.update(consignSale); consignSaleDao.update(consignSale);
//用户超时未确认，取消寄售单 //用户超时未确认，取消寄售单
consignSaleRecordDao.insert(dto.getSaleId(), "超时未确认，取消寄售", ConsignSaleEnum.OperateTypeEnum.TIME_OUT_CANCEL.getCode(), "超时未确认，取消寄售"); consignSaleRecordDao.insert(dto.getSaleId(), "超时未确认，取消寄售", ConsignSaleEnum.OperateTypeEnum.TIME_OUT_CANCEL.getCode(), "");
return Result.success(); return Result.success();
} catch (Exception e) { } catch (Exception e) {
logger.error("用户超时未确认，取消寄售单 error : {}", e); logger.error("用户超时未确认，取消寄售单 error : {}", e);
......
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