Browse Source

版本更换

anderx 4 years ago
parent
commit
0a6fb66867

+ 0 - 1
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -269,7 +269,6 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
             		ThirdPartyError.getValueByCode(bindingResult.getFieldError().getField())));
             return res;
         }
-		thirdPartyCompanyService.checkGetAmount(p);
 		if (null==p.getTid()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
 			return res;

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

@@ -479,6 +479,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 
 	@Override
 	public boolean checkPayment(TOrderPayment p) {
+		//没有填写申请金额的情况下计算金额
+		checkGetAmount(p);
 		BigDecimal total=new BigDecimal(0);
 		BigDecimal a=p.getApplicationAmount()==null?new BigDecimal(0):p.getApplicationAmount();
 		List<outOrderPayment> list=new ArrayList<>();

+ 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.67
+static.host=//static.jishutao.com/1.1.69
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

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

@@ -59,7 +59,7 @@ user.private.max=1000
 #客户释放提醒
 user_remind_days=15
 
-static.host=//static.jishutao.com/1.1.65
+static.host=//static.jishutao.com/1.1.69
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload