瀏覽代碼

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

anderx 4 年之前
父節點
當前提交
f0b292fe6a
共有 23 個文件被更改,包括 296 次插入126 次删除
  1. 10 0
      src/main/java/com/goafanti/admin/bo/InputPublicRelease.java
  2. 17 3
      src/main/java/com/goafanti/admin/bo/OutPublicDtails.java
  3. 15 1
      src/main/java/com/goafanti/admin/bo/OutPublicRelease.java
  4. 7 0
      src/main/java/com/goafanti/admin/bo/OutPublicStatistics.java
  5. 7 12
      src/main/java/com/goafanti/admin/controller/AdminReleaseApiController.java
  6. 4 5
      src/main/java/com/goafanti/admin/service/PublicReleaseService.java
  7. 63 22
      src/main/java/com/goafanti/admin/service/impl/PublicReleaseServiceImpl.java
  8. 13 7
      src/main/java/com/goafanti/common/dao/PublicReleaseLogMapper.java
  9. 4 0
      src/main/java/com/goafanti/common/dao/PublicReleaseMapper.java
  10. 0 1
      src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java
  11. 62 15
      src/main/java/com/goafanti/common/mapper/PublicReleaseLogMapper.xml
  12. 17 11
      src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml
  13. 1 1
      src/main/java/com/goafanti/common/mapper/UserChannelMapper.xml
  14. 0 4
      src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml
  15. 3 1
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  16. 42 20
      src/main/java/com/goafanti/common/model/PublicReleaseLog.java
  17. 2 0
      src/main/java/com/goafanti/common/task/OrderDunTask.java
  18. 7 13
      src/main/java/com/goafanti/common/task/ReleaseUserTask.java
  19. 18 4
      src/main/java/com/goafanti/common/utils/AsyncUtils.java
  20. 0 1
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  21. 1 2
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  22. 2 2
      src/main/resources/props/config_local.properties
  23. 1 1
      src/main/resources/props/config_test.properties

+ 10 - 0
src/main/java/com/goafanti/admin/bo/InputPublicRelease.java

@@ -14,6 +14,8 @@ public class InputPublicRelease extends PublicRelease {
 	private String releaseEnds;
 	
 	private String ocbId;
+	
+	private String reason;
 
 	public String getReleaseStarts() {
 		return releaseStarts;
@@ -39,4 +41,12 @@ public class InputPublicRelease extends PublicRelease {
 		this.ocbId = ocbId;
 	}
 
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+
 }

+ 17 - 3
src/main/java/com/goafanti/admin/bo/OutPublicDtails.java

@@ -6,9 +6,11 @@ public class OutPublicDtails {
 	private String userName;
 	private String aname;
 	private String duration;
-	private String status;
+	private Integer status;
 	private String releaseStarts;
 	private String releaseEnds;
+	private String annexUrl;
+	private String photoUrl;
 	public String getNickname() {
 		return nickname;
 	}
@@ -33,10 +35,10 @@ public class OutPublicDtails {
 	public void setDuration(String duration) {
 		this.duration = duration;
 	}
-	public String getStatus() {
+	public Integer getStatus() {
 		return status;
 	}
-	public void setStatus(String status) {
+	public void setStatus(Integer status) {
 		this.status = status;
 	}
 	public String getReleaseStarts() {
@@ -51,5 +53,17 @@ public class OutPublicDtails {
 	public void setReleaseEnds(String releaseEnds) {
 		this.releaseEnds = releaseEnds;
 	}
+	public String getAnnexUrl() {
+		return annexUrl;
+	}
+	public void setAnnexUrl(String annexUrl) {
+		this.annexUrl = annexUrl;
+	}
+	public String getPhotoUrl() {
+		return photoUrl;
+	}
+	public void setPhotoUrl(String photoUrl) {
+		this.photoUrl = photoUrl;
+	}
 
 }

+ 15 - 1
src/main/java/com/goafanti/admin/bo/OutPublicRelease.java

@@ -14,7 +14,9 @@ public class OutPublicRelease extends PublicRelease {
 	private String releaseEnds;
 	private String createTimes;
 	private Integer status;
-	
+	private String suprId;
+	/** 审核权限*/
+	private Integer permission;
 	public String getNickname() {
 		return nickname;
 	}
@@ -57,6 +59,18 @@ public class OutPublicRelease extends PublicRelease {
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
+	public String getSuprId() {
+		return suprId;
+	}
+	public void setSuprId(String suprId) {
+		this.suprId = suprId;
+	}
+	public Integer getPermission() {
+		return permission;
+	}
+	public void setPermission(Integer permission) {
+		this.permission = permission;
+	}
 	
 	
 }

+ 7 - 0
src/main/java/com/goafanti/admin/bo/OutPublicStatistics.java

@@ -3,6 +3,7 @@ package com.goafanti.admin.bo;
 public class OutPublicStatistics {
 
 	private String name;
+	private String aid;
 	private Integer tg;
 	private Integer wsh;
 	private Integer bh;
@@ -37,6 +38,12 @@ public class OutPublicStatistics {
 	public void setDuration(Double duration) {
 		this.duration = duration;
 	}
+	public String getAid() {
+		return aid;
+	}
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
 	
 	
 }

+ 7 - 12
src/main/java/com/goafanti/admin/controller/AdminReleaseApiController.java

@@ -44,6 +44,10 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"公出地点"));
 			return res;
 		}
+		if (publicReleaseService.checkTime(in)) {
+			res.getError().add(buildError("公出时段已经被使用!","公出时段已经被使用!"));
+			return res;
+		}
 		
 		res.setData(publicReleaseService.addPublicRelease(in));
 		return res;
@@ -133,22 +137,13 @@ public class AdminReleaseApiController extends CertifyApiController{
 	 * @return
 	 */
 	@RequestMapping(value = "/listPublicReleaseLog", method = RequestMethod.GET)
-	public Result listPublicReleaseLog(Integer id){
+	public Result listPublicReleaseLog(Integer id,String ufid){
 		Result res =new Result();
-		res.data(publicReleaseService.listPublicReleaseLog(id));
+		res.data(publicReleaseService.listPublicReleaseLog(id,ufid));
 		return res;
 	}
 	
-	/**
-	 * 外出审核日志列表
-	 * @return
-	 */
-	@RequestMapping(value = "/unreadPublicReleaseLog", method = RequestMethod.GET)
-	public Result unreadPublicReleaseLog(){
-		Result res =new Result();
-		res.data(publicReleaseService.unreadPublicReleaseLog());
-		return res;
-	}
+	
 	
 	/**
 	 * 公出统计

+ 4 - 5
src/main/java/com/goafanti/admin/service/PublicReleaseService.java

@@ -1,6 +1,7 @@
 package com.goafanti.admin.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.goafanti.admin.bo.InputPublicDtails;
 import com.goafanti.admin.bo.InputPublicRelease;
@@ -11,7 +12,7 @@ import com.goafanti.admin.bo.outPublicReleaseLog;
 
 public interface PublicReleaseService {
 
-	int addPublicRelease(InputPublicRelease in);
+	Map<String, Object> addPublicRelease(InputPublicRelease in);
 
 	Object listPublicRelease(InputPublicReleaseList in);
 
@@ -19,7 +20,7 @@ public interface PublicReleaseService {
 	int pushExaminePublicRelease(Integer id, Integer status, String remarks, Double duration);
 
 
-	List<outPublicReleaseLog> listPublicReleaseLog(Integer id);
+	List<outPublicReleaseLog> listPublicReleaseLog(Integer id,String ufid);
 
 	int updatePublicRelease(InputPublicRelease in);
 
@@ -33,8 +34,6 @@ public interface PublicReleaseService {
 
 	OutPublicRelease followDtails(String id);
 
-	List<outPublicReleaseLog> unreadPublicReleaseLog();
-
-
+	boolean checkTime(InputPublicRelease in);
 
 }

+ 63 - 22
src/main/java/com/goafanti/admin/service/impl/PublicReleaseServiceImpl.java

@@ -71,18 +71,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	private SystemWebSocketHandler	systemWebSocketHandler;
 	
 	@Override
-	public int addPublicRelease(InputPublicRelease in) {
+	public Map<String, Object> addPublicRelease(InputPublicRelease in) {
 		Date date =new Date();
 		in.setCreateTime(date);
 		in.setStatus(1);
 		in.setAid(TokenManager.getAdminId());
-		try {
-			in.setReleaseStart(DateUtils.parseDate(in.getReleaseStarts(), AFTConstants.YYYYMMDDHHMMSS));
-			in.setReleaseEnd(DateUtils.parseDate(in.getReleaseEnds(), AFTConstants.YYYYMMDDHHMMSS));
-		} catch (ParseException e) {
-			e.printStackTrace();
-			throw new BusinessException("转换异常");
-		}
 		publicReleaseMapper.insertSelectiveGetId(in);
 		AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 		Admin a=adminMapper.selectByPrimaryKey(my.getSuperiorId());
@@ -92,16 +85,21 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		User u=userMapper.selectByPrimaryKey(in.getUid());
 		String str="["+my.getName()+"]发起["+u.getNickname()+"]的外出申请,请及时审核。";
 		sendNoticeAndSoucket(a.getId(),NoticeStatus.PUBLIC_RELEASE_START.getCode(),str);
+		Map<String, Object>map=new HashMap<String, Object>();
+		map.put("id", in.getId());
 		if (openid!=null) {
-			Integer res= weChatUtils.addNotice(openid, in.getStatus(),date,my.getName(),str);
+			Integer res= weChatUtils.addNotice(openid, in.getStatus(),date,my.getName(),"["+my.getName()+"]发起外出申请");
 			if (res!=0) {
 				sendEmail(my, a,1);
 			}
-			return  res;
+			map.put("code", res);
+			
+			
 		}else {
 			sendEmail(my, a,1);
-			return 2;
+			map.put("code", 2);
 		}
+		return map;
 	}
 
 
@@ -159,7 +157,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			e.printStackTrace();
 			throw new BusinessException("转换异常");
 		}
-		in.setStatus(1);
+		if(in.getStatus()==null||in.getStatus()!=3) {
+			in.setStatus(1);
+		}else {
+			PublicReleaseLog log=new PublicReleaseLog(in.getId(),TokenManager.getAdminId(),4,in.getReason(),new Date());
+			publicReleaseLogMapper.insertSelective(log);
+		}
 		publicReleaseMapper.updateByPrimaryKeySelective(in);
 		return 1;
 	}
@@ -196,13 +199,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		User u=userMapper.selectByPrimaryKey(use.getUid());
 		if (status==0) {
 			type=NoticeStatus.PUBLIC_RELEASE_NO.getCode();
-			content="["+u.getNickname()+"]的外出申请,通过审核!";
+			content="["+u.getNickname()+"]的外出申请,通过审核!";
 		}else if(status==2) {
 			type=NoticeStatus.PUBLIC_RELEASE_YES.getCode();
-			content="["+u.getNickname()+"]的外出申请,通过审核!";
+			content="["+u.getNickname()+"]的外出申请,通过审核!";
 		}
 		sendNoticeAndSoucket(a.getId(),type,content);
 		if (my.getOpenId()!=null) {
+			if (remarks.length()>19) {
+				remarks=remarks.substring(0, 15)+"...";	
+			}
 			Integer res=weChatUtils.addNotice(a.getOpenId(),p.getStatus(),date,my.getName(),remarks);
 			if (res!=0) {
 				sendEmail( my,  a, status);
@@ -214,16 +220,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	}
 	
 	@Override
-	public List<outPublicReleaseLog> listPublicReleaseLog(Integer id) {
-		List<outPublicReleaseLog> list=publicReleaseLogMapper.listPublicReleaseLog(id);
+	public List<outPublicReleaseLog> listPublicReleaseLog(Integer id,String ufid) {
+		List<outPublicReleaseLog> list=publicReleaseLogMapper.listPublicReleaseLog(id,ufid);
 		return list;
 	}
 
-	@Override
-	public List<outPublicReleaseLog> unreadPublicReleaseLog() {
-		List<outPublicReleaseLog> list=publicReleaseLogMapper.unreadPublicReleaseLog(TokenManager.getAdminId());
-		return list;
-	}
+	
 	@Override
 	public int pushPublicReleaseClockIn(Integer id,String photoUrl) {
 		PublicRelease p=new PublicRelease();
@@ -232,6 +234,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		p.setClockIn(1);
 		p.setPhotoUrl(photoUrl);
 		p.setClockInTime(new Date());
+		String str="";
 		if (use.getClockIn()==0) {
 			FollowBusinessBo fbb=new FollowBusinessBo();
 			fbb.setUid(use.getUid());
@@ -241,14 +244,29 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			String ufid=UUID.randomUUID().toString();
 			p.setUfid(ufid);
 			customerService.addFollow(fbb,ufid);
+			str="公出人员打卡";
+		}else {
+			str="刷新打卡";
 		}
+		PublicReleaseLog log=new PublicReleaseLog(id,TokenManager.getAdminId(),3,str,new Date());
+		log.setPhotoUrl(photoUrl);
+		publicReleaseLogMapper.insertSelective(log);
 		publicReleaseMapper.updateByPrimaryKeySelective(p);
 		return 1;
 	}
 
 	@Override
 	public OutPublicRelease dtails(Integer id) {
-		return	publicReleaseMapper.selectDtails(id,null); 
+		OutPublicRelease out=publicReleaseMapper.selectDtails(id,null);
+		//如果不是本人和审核人员则不返回信息
+		if(out!=null&&!TokenManager.getAdminId().equals( out.getAid())&&!TokenManager.getAdminId().equals(out.getSuprId())) {
+			out=null;
+		}else if(TokenManager.getAdminId().equals(out.getSuprId())) {
+			out.setPermission(1);
+		}else {
+			out.setPermission(0);
+		}
+		return out;	 
 	}
 	
 	@Override
@@ -285,6 +303,29 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		return (Pagination<OutPublicDtails>) findPage("listPublicDtails", "countPublicDtails", map, in.getPageNo(), in.getPageSize());
 	}
 
+
+
+
+
+
+
+
+	@Override
+	public boolean checkTime(InputPublicRelease in) {
+		try {
+			in.setReleaseStart(DateUtils.parseDate(in.getReleaseStarts(), AFTConstants.YYYYMMDDHHMMSS));
+			in.setReleaseEnd(DateUtils.parseDate(in.getReleaseEnds(), AFTConstants.YYYYMMDDHHMMSS));
+		} catch (ParseException e) {
+			e.printStackTrace();
+			throw new BusinessException("转换异常");
+		}
+		int i=publicReleaseMapper.checkTime(TokenManager.getAdminId(),in.getReleaseStart(),in.getReleaseEnd());
+		if (i>0) {
+			return true;
+		}
+		return false;
+	}
+
 	
 
 	

+ 13 - 7
src/main/java/com/goafanti/common/dao/PublicReleaseLogMapper.java

@@ -11,41 +11,47 @@ public interface PublicReleaseLogMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	int insert(PublicReleaseLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	int insertSelective(PublicReleaseLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	PublicReleaseLog selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	int updateByPrimaryKeySelective(PublicReleaseLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
+	 */
+	int updateByPrimaryKeyWithBLOBs(PublicReleaseLog record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	int updateByPrimaryKey(PublicReleaseLog record);
 
-	List<outPublicReleaseLog> listPublicReleaseLog(@Param ("id")Integer id);
+	List<outPublicReleaseLog> listPublicReleaseLog(@Param ("id")Integer id,@Param ("ufid")String ufid);
 
 	void updateNoRead();
 

+ 4 - 0
src/main/java/com/goafanti/common/dao/PublicReleaseMapper.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.dao;
 
+import java.util.Date;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.goafanti.admin.bo.OutPublicRelease;
@@ -52,4 +54,6 @@ public interface PublicReleaseMapper {
 
 	OutPublicRelease selectDtails(@Param("id") Integer id,@Param("ufid")String ufid);
 
+	int checkTime(@Param("aid")String aid,@Param("start")Date start, @Param("end")Date end);
+
 }

+ 0 - 1
src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java

@@ -100,7 +100,6 @@ public interface UserLockReleaseMapper {
 
 	List<LockingReleaseBo> selectWaitReleaseBusiness(String aid);
 
-	void updateReleaseLock(@Param("time")String time);
 
 	void updatePendingReleaseLock(@Param("lockIds")String lockIds);
 

+ 62 - 15
src/main/java/com/goafanti/common/mapper/PublicReleaseLogMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="prid" jdbcType="INTEGER" property="prid" />
@@ -14,22 +14,40 @@
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.PublicReleaseLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
+    -->
+    <result column="photo_url" jdbcType="LONGVARCHAR" property="photoUrl" />
+  </resultMap>
   <sql id="Base_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     id, prid, aid, remarks, `status`, create_time
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
+    -->
+    photo_url
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from public_release_log
     where id = #{id,jdbcType=INTEGER}
   </select>
@@ -37,7 +55,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     delete from public_release_log
     where id = #{id,jdbcType=INTEGER}
@@ -46,20 +64,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     insert into public_release_log (id, prid, aid, 
-      remarks, `status`, create_time
-      )
+      remarks, `status`, create_time, 
+      photo_url)
     values (#{id,jdbcType=INTEGER}, #{prid,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
-      #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
-      )
+      #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{photoUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PublicReleaseLog">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     insert into public_release_log
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -81,6 +99,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="photoUrl != null">
+        photo_url,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -101,13 +122,16 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="photoUrl != null">
+        #{photoUrl,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicReleaseLog">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     update public_release_log
     <set>
@@ -126,14 +150,32 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="photoUrl != null">
+        photo_url = #{photoUrl,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.goafanti.common.model.PublicReleaseLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
+    -->
+    update public_release_log
+    set prid = #{prid,jdbcType=INTEGER},
+      aid = #{aid,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      photo_url = #{photoUrl,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.PublicReleaseLog">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jun 11 16:07:04 CST 2021.
+      This element was generated on Thu Jun 24 11:35:04 CST 2021.
     -->
     update public_release_log
     set prid = #{prid,jdbcType=INTEGER},
@@ -144,13 +186,18 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="listPublicReleaseLog" resultType="com.goafanti.admin.bo.outPublicReleaseLog">
-  select a.id,a.aid ,a.prid ,a.remarks ,a.status ,b.name aname,
+  select a.id,a.aid ,a.prid ,a.remarks ,a.status ,b.name aname,a.photo_url photoUrl,
 	date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes
-	from public_release_log a left join admin b on a.aid =b.id 
+	from public_release_log a left join admin b on a.aid =b.id
+	left  join public_release pr  on a.prid =pr.id
 	where 1=1
 	<if test="id !=null">
 	and a.prid = #{id}
 	</if>
+	<if test="ufid !=null">
+	and pr.ufid  = #{ufid}
+	</if>
+	order by a.create_time desc
   </select>
 
 </mapper>

+ 17 - 11
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -492,12 +492,11 @@ from public_release a left join `user` b on a.uid =b.id left join admin c on a.a
 	</if>
 	<if test="type==1">
 	and c.superior_id = #{aid}
-	and a.status=1
 	</if>
 	<if test="clockTime !=null">
 	and a.release_start &lt; #{clockTime} and a.release_end &gt; #{clockTime}
 	</if>
-	order by a.status,a.create_time 
+	ORDER BY (case when a.status=1 then 1 else 2 end),a.status ,a.create_time 
   	<if test="page_sql!=null">
 			${page_sql}
 	</if>
@@ -511,7 +510,6 @@ from public_release a left join `user` b on a.uid =b.id left join admin c on a.a
 	</if>
 	<if test="type==1">
 	and c.superior_id = #{aid}
-	and a.status=1
 	</if>
 	<if test="clockTime !=null">
 	and a.release_start &lt; #{clockTime} and a.release_end &gt; #{clockTime}
@@ -521,7 +519,7 @@ from public_release a left join `user` b on a.uid =b.id left join admin c on a.a
   <select id="selectDtails" resultType="com.goafanti.admin.bo.OutPublicRelease">
   		select  a.id,b.nickname ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.user_name userName,
 date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
-a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,a.longitude 
+a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,a.longitude ,a.aid ,c.superior_id suprId,a.uid
 	from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
 	where 1=1
 	<if test="id !=null">
@@ -534,10 +532,10 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
   </select>
   
   <select id="listPublicStatistics" resultType="com.goafanti.admin.bo.OutPublicStatistics">
-  	select if(a.status=0,1,0)bh ,if(a.status=1,1,0)wsh,if(a.status=2,1,0)tg,b.name 
-  	,sum(if(a.status=2,a.duration,0))duration
-    from  public_release a left join admin b on a.aid =b.id
-	where 1=1 
+  	select y.aid,y.bh,y.wsh,y.tg,y.duration,c.name from(select x.aid ,sum(x.bh)bh,sum(x.wsh)wsh,sum(x.tg)tg,sum(x.duration)duration 
+	from (select if(a.status=0,1,0)bh ,if(a.status=1,1,0)wsh,if(a.status=2,1,0)tg,a.aid 
+  	,if(a.status=2,a.duration,0)duration    from  public_release a  left join admin b on a.aid=b.id
+	where 1=1
 	<if test="aid != null">
 	and a.aid= #{aid}
 	</if>
@@ -550,6 +548,7 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
 	<if test="depId != null">
 	and b.department_id = #{depId}
 	</if>
+	)x  group by x.aid)y left join admin c on c.id=y.aid
 	<if test="page_sql!=null">
 			${page_sql}
 	</if>
@@ -557,8 +556,7 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
   
   
   <select id="countPublicStatistics" resultType="java.lang.Integer">
-  	select count(*)
-    from  public_release a left join admin b on a.aid =b.id
+  	select count(*) from (select aid from public_release a  left join admin b on a.aid=b.id
 	where 1=1
 	<if test="aid != null">
 	and a.aid= #{aid}
@@ -572,10 +570,11 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
 	<if test="depId != null">
 	and b.department_id = #{depId}
 	</if>
+	group by aid)x
   </select>
   
   <select id="listPublicDtails" resultType="com.goafanti.admin.bo.OutPublicDtails">
-  select b.nickname ,a.user_name userName,c.name aname,a.duration ,a.status,
+  select b.nickname ,a.user_name userName,c.name aname,a.duration ,a.status,a.annex_url annexUrl,a.photo_url photoUrl,
 	date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds
 	from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
 	where 1=1
@@ -614,4 +613,11 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
 	</if>
   </select>
   
+  <select id="checkTime" resultType="java.lang.Integer">
+ select count(*) from public_release where aid=#{aid} and status in (0,1,2)
+ and ( (release_start &gt;= #{start} and release_start &lt; #{end})
+  or  (release_start &lt; #{start} and release_end &gt; #{start})
+  or  (release_start &lt; #{end} and release_end &gt; #{end}))
+  </select>
+  
 </mapper>

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

@@ -373,6 +373,6 @@
     select 
     <include refid="Base_Column_List" />
     from user_channel
-    where uid = #{id}
+    where uid = #{id} limit 1
   </select>
 </mapper>

+ 0 - 4
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -410,9 +410,6 @@
 	where datediff(t1.last_follow_time,lock_time)>360 or datediff(now(),t0.lock_time)>900
   </select>
   
-  <update id="updateReleaseLock" parameterType="java.lang.String">
-  		update user_lock_release set status = 2,release_time =  #{time} where status=1
-  </update>
   
   <update id="updatePendingReleaseLock" parameterType="java.lang.String">
   	update user_lock_release set status = 1 where id in (${lockIds})
@@ -470,7 +467,6 @@
 	left join user u on t0.uid=u.id
 	where u.channel=0
 	and datediff(now(),if(t0.lock_time &lt; t1.last_follow_time,t1.last_follow_time,t1.t0.lock_time)) &gt; 15 
-		
 	UNION 
 	  select  t0.uid, t0.aid, u.nickname name ,u.channel ,0 type
 	from

+ 3 - 1
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -1646,7 +1646,9 @@
     </select>
     
     <update id="updateReleaseLock" parameterType="java.lang.String">
-    	update user a,user_lock_release b set a.share_type = 1,a.transfer_time =  #{time} where b.status=1 and b.`type`=0 and a.id=b.uid 
+    	update user a,user_lock_release b set a.share_type = 1,a.transfer_time =  #{time} 
+    	,b.status=2,b.release_time= #{time}
+    	where b.status=1 and b.`type`=0 and a.id=b.uid 
     </update>
     
     <select id="marketingStatistics" parameterType="java.lang.String" resultType="com.goafanti.report.bo.marketingESBo">

+ 42 - 20
src/main/java/com/goafanti/common/model/PublicReleaseLog.java

@@ -6,43 +6,48 @@ import java.util.Date;
 public class PublicReleaseLog implements Serializable {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.id
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.prid
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private Integer prid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.aid
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.remarks
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.status
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.create_time
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private Date createTime;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column public_release_log.photo_url
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
+	 */
+	private String photoUrl;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	private static final long serialVersionUID = 1L;
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.id
 	 * @return  the value of public_release_log.id
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public Integer getId() {
 		return id;
@@ -50,7 +55,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.id
 	 * @param id  the value for public_release_log.id
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -58,7 +63,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.prid
 	 * @return  the value of public_release_log.prid
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public Integer getPrid() {
 		return prid;
@@ -66,7 +71,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.prid
 	 * @param prid  the value for public_release_log.prid
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public void setPrid(Integer prid) {
 		this.prid = prid;
@@ -74,7 +79,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.aid
 	 * @return  the value of public_release_log.aid
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public String getAid() {
 		return aid;
@@ -82,7 +87,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.aid
 	 * @param aid  the value for public_release_log.aid
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public void setAid(String aid) {
 		this.aid = aid == null ? null : aid.trim();
@@ -90,7 +95,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.remarks
 	 * @return  the value of public_release_log.remarks
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -98,7 +103,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.remarks
 	 * @param remarks  the value for public_release_log.remarks
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks == null ? null : remarks.trim();
@@ -106,7 +111,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.status
 	 * @return  the value of public_release_log.status
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public Integer getStatus() {
 		return status;
@@ -114,7 +119,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.status
 	 * @param status  the value for public_release_log.status
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -122,7 +127,7 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.create_time
 	 * @return  the value of public_release_log.create_time
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -130,14 +135,30 @@ public class PublicReleaseLog implements Serializable {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.create_time
 	 * @param createTime  the value for public_release_log.create_time
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column public_release_log.photo_url
+	 * @return  the value of public_release_log.photo_url
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
+	 */
+	public String getPhotoUrl() {
+		return photoUrl;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column public_release_log.photo_url
+	 * @param photoUrl  the value for public_release_log.photo_url
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
+	 */
+	public void setPhotoUrl(String photoUrl) {
+		this.photoUrl = photoUrl == null ? null : photoUrl.trim();
+	}
+	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table public_release_log
-	 * @mbg.generated  Fri Jun 11 16:07:04 CST 2021
+	 * @mbg.generated  Thu Jun 24 11:35:04 CST 2021
 	 */
 	@Override
 	public String toString() {
@@ -151,6 +172,7 @@ public class PublicReleaseLog implements Serializable {
 		sb.append(", remarks=").append(remarks);
 		sb.append(", status=").append(status);
 		sb.append(", createTime=").append(createTime);
+		sb.append(", photoUrl=").append(photoUrl);
 		sb.append(", serialVersionUID=").append(serialVersionUID);
 		sb.append("]");
 		return sb.toString();

+ 2 - 0
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -124,7 +124,9 @@ public class OrderDunTask {
   	  	  			Thread.sleep(2000);
   				}
   			}
+  			System.out.println(o.getId()+"\n"+o.getCustomizeTime()+"\n"+o.getDunType());
   	  		if (o.getDunType()==0) {
+  	  			System.out.println("======================================");
   	  		calendar2.setTime(o.getCustomizeTime());
   	  		CalendarTimeCleared(calendar);
   	  			if (calendar.equals(calendar2)) {

+ 7 - 13
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -15,10 +15,12 @@ import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.bo.userDaysBo;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.User;
@@ -38,6 +40,9 @@ public class ReleaseUserTask {
 	private UserService userService;
 	@Autowired
 	private AsyncUtils	asyncUtils;
+	
+	@Autowired
+	private NoticeMapper	noticeMapper;
 
 	int pointsDataLimit = 50;
 
@@ -58,7 +63,7 @@ public class ReleaseUserTask {
 		}
 
 	}
-
+	@ResponseBody
 	@RequestMapping(value = "/open/remindUser", method = RequestMethod.GET)
 	private void pushUserDays() throws InterruptedException {
 		LoggerUtils.debug(getClass(), "==============客户提醒开始============");
@@ -98,18 +103,7 @@ public class ReleaseUserTask {
 						NoticeStatus.CUSTOMER_PRIVATE_REMINDER.getCode(), str,ub.getUid()));
 			}
 		}
-		List<Notice> newList = new ArrayList<>();
-		if (ln != null && ln.size() > 0) {
-			for (int i = 0; i < ln.size(); i++) {
-				newList.add(ln.get(i));
-				if (pointsDataLimit == newList.size() || i == ln.size() - 1) {
-					if (newList.size() > 0)
-						asyncUtils.addNoticeBatch(newList);
-					newList.clear();
-					Thread.sleep(2000);
-				}
-			}
-		}
+		asyncUtils.addNoticeBatch(ln);
 		LoggerUtils.debug(getClass(), "==============客户提醒结束============");
 	}
 

+ 18 - 4
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -1,6 +1,7 @@
 package com.goafanti.common.utils;
 
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.mail.MessagingException;
@@ -37,11 +38,24 @@ public class AsyncUtils {
 	}
 	
 	
-	public void addNoticeBatch(List<Notice> list){
-		for (Notice n : list) {
-			n.setType(NoticeTypes.getType(n.getNoticeType()));
+	public void addNoticeBatch(List<Notice> ln) {
+		List<Notice> newList=new ArrayList<Notice>();
+		if (ln != null && ln.size() > 0) {
+			for (int i = 0; i < ln.size(); i++) {
+				ln.get(i).setType(NoticeTypes.getType(ln.get(i).getNoticeType()));
+				newList.add(ln.get(i));
+				if (50 == newList.size() || i == ln.size() - 1) {
+					if (newList.size() > 0) noticeMapper.insertBatch(newList);
+					newList.clear();
+					try {
+						Thread.sleep(2000);
+					} catch (InterruptedException e) {
+						e.printStackTrace();
+					}
+				}
+			}
 		}
-		noticeMapper.insertBatch(list);
+			
 		
 	}
 

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

@@ -1764,7 +1764,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		String time = formatter.format(releaseTime);
 		userMapper.updateReleaseLock(time);
-		userLockReleaseMapper.updateReleaseLock(time);
 
 	}
 

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

@@ -28,7 +28,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 
@@ -1207,7 +1206,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	
 
 
-    @Async
+    
 	public  void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,String orderNo,String adminId,Integer approval) {
 		AdminListBo a = adminMapper.getDeptNameByAid(adminId);
 		String approvalType="";

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

@@ -1,7 +1,7 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft20210528?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
 #jdbc.password=123456
 #测试
@@ -73,7 +73,7 @@ wx.appSecret=081744369d42405be58fe37f892631f7
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.74
+static.host=//static.jishutao.com/1.1.75
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

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

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