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

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

gitadmin лет назад: 4
Родитель
Сommit
489e149126

+ 4 - 0
src/main/java/com/goafanti/order/bo/OrderOutsourceDtails.java

@@ -3,6 +3,10 @@ package com.goafanti.order.bo;
 import com.goafanti.common.model.TOrderOutsource;
 
 public class OrderOutsourceDtails extends TOrderOutsource {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	private String createTimes;
 	private String auditTimes;
 	public String getCreateTimes() {

+ 2 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1405,8 +1405,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public boolean checkOfficialType(TOrderOutsource o) {
 		TOrderTask t=tOrderTaskMapper.selectByPrimaryKey(o.getTid());
+		
 		OfficialFeePrice of=officialFeePriceMapper.selectBytype(o.getPatentNameType(), t.getPatentType());
-		if (of==null) {
+		if (o.getStartType()==1&&of==null) {
 			return true;
 		}
 		return false;

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

@@ -345,6 +345,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		Integer type=tp.getChooseType();
 		outOrderPayment op=tOrderPaymentMapper.selectByidGetDetails(id);
 		op.setChooseType(type);
+		op.setProcessStatus(tp.getProcessStatus());
 		ThirdPartyCompany tpc=thirdPartyCompanyMapper.selectByPrimaryKey(tp.getTpcId());
 		if(tp.getChooseType()!=2&&tpc!=null&&!op.getCompanyName().equals(tpc.getCompanyName()))op.setCompanyName(op.getCompanyName()+"("+tpc.getCompanyName()+")");
 		if (type==0&&tp.getStatus()!=4) {//支付种类 0第三方 1催款 2官费

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

@@ -70,7 +70,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.78
+static.host=//static.jishutao.com/1.1.80
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7

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

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