Quellcode durchsuchen

用户客户统计新增、领取客户修改

anderx vor 2 Jahren
Ursprung
Commit
2325332fbb

+ 3 - 0
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -83,4 +83,7 @@ public interface TOrderNewMapper {
     List<UserOrder>  matchingOrderNoOrUserName(@Param("orderNo") String orderNo, @Param("userName")String userName);
 
     void updateTagByListOrderNo(List<String> orderNos, Integer tag);
+
+    int selectAidAndDate(@Param("aid") String aid, @Param("startTime") String startTime,
+                         @Param("endTime")String endTime);
 }

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

@@ -2118,7 +2118,8 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     </if>
     limit 0,20
   </select>
-  <update id="updateTagByListOrderNo">
+
+    <update id="updateTagByListOrderNo">
     update t_order_new
     set tag = #{param2}
     where order_no in
@@ -2127,4 +2128,11 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     </foreach>
   </update>
 
+  <select id="selectAidAndDate" resultType="java.lang.Integer">
+    select count(*)
+    from t_order_new
+    where process_status >0
+    and salesman_id = #{aid}
+    and create_time  BETWEEN #{startTime} and  #{endTime}
+  </select>
 </mapper>

+ 2 - 0
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -221,4 +221,6 @@ public interface OrderNewService {
 	 void addTTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum, String contractTerm);
 
 	int updateTag(String orderNo, Integer tag);
+
+	void updateAdminUserCountOrder(String aid,Date transferTime);
 }

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

@@ -221,6 +221,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
 			pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),order, TokenManager.getAdminId(),t.getApproval());
 		}
+		orderNewService.updateAdminUserCountOrder(t.getSalesmanId(),t.getCreateTime());
 		return c;
 	}
 	public void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,TOrderNewBo o,String adminId,Integer approval){

+ 46 - 7
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -16,10 +16,7 @@ import com.goafanti.common.enums.OfficialPatentType;
 import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.*;
-import com.goafanti.common.utils.AsyncUtils;
-import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.common.utils.SendEmailUtil;
-import com.goafanti.common.utils.StringUtils;
+import com.goafanti.common.utils.*;
 import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
@@ -129,6 +126,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	private TOrderPaymentMapper tOrderPaymentMapper;
 	@Autowired
 	private TOrderHighTechMapper tOrderHighTechMapper;
+	@Autowired
+	private AdminUserCountMapper adminUserCountMapper;
+
 
 	@Value(value = "${upload.path}")
 	private String					uploadPath			= null;
@@ -138,8 +138,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public int createServiceOrder(String uid,Integer userType, Integer orderType,Integer salesType,String channelId,String other) {
 		BigDecimal initial = new BigDecimal(0);
+		Date date=new Date();
 		TOrderNew t=new TOrderNew();
-        Date date = new Date();
         String orderNo=idGenerator.generateId().toString();
 		t.setOrderNo(orderNo);
 		t.setOrderType(orderType);
@@ -468,6 +468,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateServiceOrder(TOrderNewWithBLOBs t, Integer isSubmit) {
+		Date date=new Date();
 		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 		//判断手机号码是否存在
 		if (StringUtils.isNotBlank(t.getContacts())&&StringUtils.isNotBlank(t.getContactMobile())&&
@@ -586,7 +587,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				t2.getApproval().equals(ApprovalNewState.DSZBH.getCode()) ||
 				t2.getOrderStatus().equals(OrderNewState.QDSHJJ.getCode()) ||
 				t2.getOrderStatus().equals(OrderNewState.YBH.getCode())) {
-			t.setCreateTime(new Date());
+			t.setCreateTime(date);
 			tOrderBackMapper.updateByOrderNoAndBackStatus(t.getOrderNo());
 		}
 		// 0 相等
@@ -603,7 +604,44 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				t.setLiquidationStatus(LiquidationNewState.WAIT_PAY_FIRST_BALANCE.getCode());
 			}
 		}
-		return tOrderNewMapper.updateByPrimaryKeySelective(t);
+		tOrderNewMapper.updateByPrimaryKeySelective(t);
+		updateAdminUserCountOrder(t2.getSalesmanId(),t2.getCreateTime());
+		return 1;
+	}
+
+	@Override
+	public void updateAdminUserCountOrder(String aid,Date transferTime) {
+		String startTime= DateUtils.formatDate(transferTime,AFTConstants.YYYYMMDD);
+		String endTime=startTime+" 23:59:59";
+		AdminUserCount adminUserCount = adminUserCountMapper.selectByaidAndDate(aid, startTime);
+		Integer orderCount = tOrderNewMapper.selectAidAndDate(aid, startTime, endTime);
+
+		if (adminUserCount==null){
+			AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
+			selectAUC.setOrderCount(orderCount);
+			adminUserCountMapper.insertSelective(selectAUC);
+		}else {
+			AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
+			AdminUserCount newAUC=new AdminUserCount();
+			newAUC.setId(adminUserCount.getId());
+			if (selectAUC==null){
+				newAUC.setPrivateCount(0);
+				newAUC.setChannelCount(0);
+				newAUC.setSignCount(0);
+				newAUC.setOrderCount(orderCount);
+			}else {
+				if (selectAUC.getPrivateCount()==null)selectAUC.setPrivateCount(0);
+				if (selectAUC.getChannelCount()==null)selectAUC.setChannelCount(0);
+				if (selectAUC.getSignCount()==null)selectAUC.setSignCount(0);
+				newAUC.setPrivateCount(selectAUC.getPrivateCount());
+				newAUC.setChannelCount(selectAUC.getChannelCount());
+				newAUC.setSignCount(selectAUC.getSignCount());
+				newAUC.setOrderCount(orderCount);
+			}
+
+			adminUserCountMapper.updateByPrimaryKeySelective(newAUC);
+		}
+
 	}
 
 	private void updateOrderMid(TOrderNew t) {
@@ -1069,6 +1107,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
 		pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
+		updateAdminUserCountOrder(t2.getSalesmanId(),t2.getCreateTime());
 		return 1;
 	}