Browse Source

新增会员日志列表

anderx 3 years ago
parent
commit
a8d90c3439

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

@@ -110,5 +110,6 @@
            b.name aname,date_format(a.create_time,'%Y-%m-%d %H:%i:%s' )createTimes
     from member_log a left join admin b on a.aid =b.id
     where pid= #{id}
+    order by a.create_time
   </select>
 </mapper>

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

@@ -221,9 +221,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public int addMemberProject(TOrderTask t){
 		TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
+		addOrderTask( t);
 		orderProjectService.addMemberLog(t.getId(),0,"新增会员项目");
 		addNoticMember(NoticeStatus.MENBER_START.getCode(),tn,null,0);
-		return addOrderTask( t);
+		return 1;
 	}
 
 	public void checkOrder(TOrderNew order,TOrderTask t){

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

@@ -1081,6 +1081,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				if(task.getProcessStatus()!=1)throw  new BusinessException("审核状态错误");
 				if (task.getMemberType()==1||task.getMemberType()==2){
 					nt.setProcessStatus(2);
+					status=3;
 				}else if (task.getMemberType()==0){
 					nt.setProcessStatus(3);
 					status=3;