Browse Source

开发修改

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
ba3c20f3e7

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

@@ -1293,6 +1293,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public int pushOutsourceProjectAudit(TOrderOutsource o) {
 		o.setRefundStatus(0);
 		o.setCreateTime(new Date());
+		if(o.getAmount()==null)o.setAmount(new BigDecimal(0));
 		if(o.getPatentType()==null)o.setPatentType(0);
 		if (o.getPatentType()==0) {
 			List<String> aids = new ArrayList<>();
@@ -1319,7 +1320,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				pn.setId(outPaymentNode.getId());
 				pn.setDunStatus(1);
 				paymentNodeMapper.updateByPrimaryKey(pn);
-//				orderProjectService.addNoticAndEmail(outPaymentNode, NoticeStatus.PAYMENT_DUN.getCode());
 			}
 		}
 		if (o.getId()!=null) {

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

@@ -62,12 +62,12 @@ user.private.max=1000
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.48
-#avatar.host=//sb.jishutao.com
+static.host=//sb.jishutao.com:3000/1.1.48
+avatar.host=//sb.jishutao.com
 
 #连测试
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.48
+#avatar.host=//static.jishutao.com
+#static.host=//static.jishutao.com/1.1.48
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload