Browse Source

客户支持supplierFlag=2

v1.0
Yen 2 years ago
parent
commit
dfecee8de2
  1. 2
      src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
  2. 2
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

2
src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@ -300,7 +300,7 @@ public class TbsCostApplyController {
}
boolean contract = entity.getContractFlag()!=null&&entity.getContractFlag().equals(1);
if(contract&&!supplier.getSupplierFlag().equals(1)){
if(contract&&!(supplier.getSupplierFlag().equals(1)||supplier.getSupplierFlag().equals(2))){
return R.error("当前用户非供应商");
}
entity.setMatchType(1);

2
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@ -412,7 +412,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
}else {
Long supplierId = activityList.get(0).getSupplierId();
BmsSupplier supplier = bmsSupplierService.getById(supplierId);
if(!supplier.getSupplierFlag().equals(1)){
if(!supplier.getSupplierFlag().equals(1)&&!supplier.getSupplierFlag().equals(2)){
Assert.throwEx("协议类申请只对供应商开放");
}
BigDecimal total = activityList.get(0).getTotalAmount();

Loading…
Cancel
Save