Преглед изворни кода

订单变更、项目任务指派BUG修复

anderx пре 7 година
родитељ
комит
357b93b172

+ 0 - 1
src/main/java/com/goafanti/common/mapper/RoleResourcesMapper.xml

@@ -288,7 +288,6 @@ where a.id= #{aid,jdbcType=VARCHAR}
         update  user 
 	 set aid=#{transferId,jdbcType=VARCHAR}
 	 where aid = #{aid,jdbcType=VARCHAR}
-	and type = 1
 	and share_type = 0
 	and status != 1
       </if>

+ 4 - 2
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -88,6 +88,7 @@
 				dg1.name as province,
 				dg2.name as city, 
 				dg3.name as area,
+				ifnull(t1.last_follow_time,t0.transfer_time) as orderTime,
 				c.name as industry,
 				d.name as adminName
 		from 
@@ -121,7 +122,7 @@
 		<if test="area != null">
 			and b.area = #{area,jdbcType=INTEGER}
 		</if>
-		 order by t0.transfer_time desc
+		 order by orderTime 
 		 <if test="page_sql != null">
     		${page_sql}
    		 </if>
@@ -416,6 +417,7 @@
 				dg2.name as city, 
 				dg3.name as area,
 				c.name as industry,
+				ifnull(t1.last_follow_time,t0.transfer_time) as orderTime,
 				d.name as adminName
 		from 
 			(select id,aid,type,share_type,transfer_time,create_time,identify_name,society_tag from user where aid = #{aid} and type = 1 and share_type = 0 and status != 1)t0
@@ -451,7 +453,7 @@
 		<if test="area != null">
 			and b.location_area = #{area,jdbcType=INTEGER}
 		</if>
-		 order by t1.last_follow_time desc
+		 order by orderTime 
 		 <if test="page_sql != null">
     		${page_sql}
    		 </if>

+ 1 - 0
src/main/java/com/goafanti/common/utils/MobileMessageUtils.java

@@ -42,6 +42,7 @@ public class MobileMessageUtils {
 			// request.setOutId("yourOutId");
 			// 请求失败这里会抛ClientException异常
 			SendSmsResponse sendSmsResponse = acsClient.getAcsResponse(request);
+			System.out.println(sendSmsResponse.getMessage()+"=========================");
 		} catch (ClientException e) {
 			LoggerUtils.fmtError(MobileMessageUtils.class, e, CLIENT_EXCEPTION, e.getMessage());
 			e.printStackTrace();

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

@@ -66,7 +66,7 @@ aesSecretKey=aft1234567890123
 template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
-mobileRemindCodeTemplate=SMS_137416381
+mobileRemindCodeTemplate=SMS_137421819
 
 portal.host=//afts.hnzhiming.com/portal/2.0.0
 

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

@@ -67,7 +67,7 @@ accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
 aesSecretKey=aft1234567890123
 
 mobileCodeTemplate=SMS_37845022
-mobileRemindCodeTemplate=SMS_137416381
+mobileRemindCodeTemplate=SMS_137421819
 patentTemplate=SMS_72005286
 
 easemob.client.url=https://a1.easemob.com/1117170814115609/jitao

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

@@ -56,7 +56,7 @@ static.host=//s.jishutao.com/1.0.41
 template.cacheable=true
 
 mobileCodeTemplate=SMS_37845022
-mobileRemindCodeTemplate=SMS_137416381
+mobileRemindCodeTemplate=SMS_137421819
 
 portal.host=//s.jishutao.com/portal/1.0.11
 

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

@@ -68,7 +68,7 @@ aesSecretKey=aft1234567890123
 
 mobileCodeTemplate=SMS_37845022
 patentTemplate=SMS_72005286
-mobileRemindCodeTemplate=SMS_137416381
+mobileRemindCodeTemplate=SMS_137421819
 
 easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
 easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA