|
|
@@ -473,7 +473,7 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
|
|
|
@Override
|
|
|
public List<outOrderPayment> selectOrderPayment(Integer id) {
|
|
|
- List<outOrderPayment> list=tOrderPaymentMapper.selectByTid(id,null);
|
|
|
+ List<outOrderPayment> list=tOrderPaymentMapper.selectByTid(id,null,0);
|
|
|
// if (!TokenManager.hasRole(AFTConstants.FINANCE)&&
|
|
|
// !TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)&&
|
|
|
// !TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)&&
|
|
|
@@ -544,7 +544,7 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
checkGetAmount(p);
|
|
|
if (p.getChooseType()==2) {
|
|
|
TOrderTask tot=tOrderTaskMapper.selectByPrimaryKey(p.getTid());
|
|
|
- List<outOrderPayment> list2=tOrderPaymentMapper.selectByTid(p.getTid(),p.getChooseType());
|
|
|
+ List<outOrderPayment> list2=tOrderPaymentMapper.selectByTid(p.getTid(),p.getChooseType(),1);
|
|
|
int x=p.getQuantity();
|
|
|
for (outOrderPayment out : list2) {
|
|
|
x+=out.getQuantity();
|
|
|
@@ -1054,7 +1054,7 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
public boolean checkQuantity(TOrderPayment p) {
|
|
|
TOrderPayment tp=tOrderPaymentMapper.selectByPrimaryKey(p.getId());
|
|
|
TOrderTask tt=tOrderTaskMapper.selectByPrimaryKey(tp.getTid());
|
|
|
- List<outOrderPayment> list =tOrderPaymentMapper.selectByTid(tt.getId(), 2);
|
|
|
+ List<outOrderPayment> list =tOrderPaymentMapper.selectByTid(tt.getId(), 2,1);
|
|
|
Integer q=0;
|
|
|
for (outOrderPayment o : list) {
|
|
|
if (p.getId().equals(o.getId())) {
|
|
|
@@ -1112,7 +1112,7 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
StringBuffer src=new StringBuffer();
|
|
|
List<OutThirdPartyCompany> list=thirdPartyCompanyMapper.selectByTid(id);
|
|
|
List<OutPaymentNode> list2=paymentNodeMapper.selectByTid(id, null);
|
|
|
- List<outOrderPayment> list3=tOrderPaymentMapper.selectByTid(id, null);
|
|
|
+ List<outOrderPayment> list3=tOrderPaymentMapper.selectByTid(id, null,1);
|
|
|
if (!list.isEmpty()) {
|
|
|
src.append("第三方").append("、");
|
|
|
i++;
|
|
|
@@ -1134,7 +1134,7 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
}else if(type==1) {
|
|
|
thirdPartyCompanyMapper.deleteByTid(id);
|
|
|
paymentNodeMapper.deleteByParam(null,id);
|
|
|
- List<outOrderPayment> list=tOrderPaymentMapper.selectByTid(id,null);
|
|
|
+ List<outOrderPayment> list=tOrderPaymentMapper.selectByTid(id,null,0);
|
|
|
for (outOrderPayment o : list) {
|
|
|
TOrderPayment t=new TOrderPayment();
|
|
|
t.setId(o.getId());
|