Browse Source

Merge branch 'test'

anderx 2 years ago
parent
commit
ffafdc3a12

+ 5 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -729,7 +729,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		//处理中间表
 		UserMid um =new UserMid();
 		um.setUid(userFollow.getUid());
-		um.setLastFollowTime(userFollow.getCreateTime());
+		//检查客户,修改小程序打卡,如果负责人和跟进人是同一个,则刷新最后跟进时间
+		User user = userMapper.selectByPrimaryKey(fbb.getUid());
+		if (aid.equals(user.getAid())){
+			um.setLastFollowTime(userFollow.getCreateTime());
+		}
 		um.setFollowNumber(followCount);
 		um.setFollowExplain(userFollow.getResult());
 		um.setFollowDep(userFollow.getFollowDep());

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

@@ -1577,9 +1577,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public int updatetechnicianBackOrder(String orderNo,String reason) {
 		TOrderNew t = checkDeleteSign(orderNo);
-		if (t.getSettlementAmount().compareTo(new BigDecimal(0))!=0) {
-			return -1;
-		}
+
 		t.setOrderStatus(OrderNewState.YBH.getCode());
 		t.setProcessStatus(ProcessStatus.YPYXY.getCode());
 		t.setFinanceId("");

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

@@ -52,7 +52,7 @@ yxjl_max=100
 amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.69
+static.host=//static.jishutao.com/1.2.70
 rd.static.host=//static.jishutao.com/RD/1.0.00
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62

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

@@ -49,7 +49,7 @@ yxjl_max=100
 
 amb.maxLvl=6
 
-static.host=//static.jishutao.com/1.2.69
+static.host=//static.jishutao.com/1.2.70
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 rd.static.host=//static.jishutao.com/RD/1.0.00