Просмотр исходного кода

Merge branch 'test' of jishutao/kede-server into prod

anderx лет назад: 4
Родитель
Сommit
4f0afaaab1

+ 4 - 2
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -859,8 +859,10 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			if(p.getChooseType()==0) {
 				ThirdPartyCompany tpc=thirdPartyCompanyMapper.selectByPrimaryKey(p.getTpcId());
 				count=tpc.getUnitPrice().multiply(new BigDecimal(p.getQuantity()));
-			}
-			if (p.getChooseType()==2) {
+			} else if (p.getChooseType()==1) {
+				PaymentNode pn=paymentNodeMapper.selectByPrimaryKey(p.getNodeId());
+				count=pn.getUnitPrice().multiply(new BigDecimal(p.getQuantity()));
+			}else if (p.getChooseType()==2) {
 				OutThirdPartyCompany ot=thirdPartyCompanyMapper.selectByIdPuls(p.getTpcId());
 				if (ot.getCostReduction()==0) {
 					count=new BigDecimal(ot.getOfficialUnitPrice()).multiply(new BigDecimal(ot.getQuantity()));

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -69,7 +69,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.65
+static.host=//static.jishutao.com/1.1.67
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload