瀏覽代碼

外包审核BUG修复

Signed-off-by: anderx <312518615@qq.com>
anderx 6 年之前
父節點
當前提交
f2fbb216c0

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

@@ -541,17 +541,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					tl.setOrderNo(orderNo);
 					tl.setProcess(OrderLogProcess.FQWB.getCode());
 					addOrderLog(tl);
-					//外包
-					o.setRefundStatus(0);
-					System.out.println("==============================外包测试");
-					if(o.getId()==null) {
-						System.out.println("==============================新建外包");
-						o.setCreateTime(new Date());
-						tOrderOutsourceMapper.insertSelective(o);
-					}else {
-						System.out.println("==============================修改外包");
-						tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
-					}
+					
 					
 				}
 			}else {
@@ -566,6 +556,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			//增加日志
 			addOrderLog(tl);
 			//非特批增加催款信息
+			//外包
+			o.setRefundStatus(0);
+			if(o.getId()==null) {
+				o.setCreateTime(new Date());
+				tOrderOutsourceMapper.insertSelective(o);
+			}else {
+				tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
+			}
 			if(t2.getApproval()==0)pushOrderDun(t2);
 		}else if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
 				if (outsource==0) {//非外包

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

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-jdbc.username=dev
-jdbc.password=123456
+#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+#jdbc.username=dev
+#jdbc.password=123456
 #测试
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20191218?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=aftdev
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570