|
|
@@ -1,18 +1,17 @@
|
|
|
package com.uas.platform.b2b.mobile.service.impl;
|
|
|
|
|
|
-import com.uas.platform.b2b.dao.CommonDao;
|
|
|
-import com.uas.platform.b2b.dao.PagingReleaseDao;
|
|
|
-import com.uas.platform.b2b.dao.PagingReleaseDetailDao;
|
|
|
+import com.uas.platform.b2b.dao.*;
|
|
|
import com.uas.platform.b2b.mobile.model.ReleaseDetail;
|
|
|
import com.uas.platform.b2b.mobile.model.ReleaseTotal;
|
|
|
import com.uas.platform.b2b.mobile.service.MobileReleaseService;
|
|
|
+import com.uas.platform.b2b.model.Enterprise;
|
|
|
import com.uas.platform.b2b.model.PagingRelease;
|
|
|
import com.uas.platform.b2b.model.PagingReleaseDetail;
|
|
|
+import com.uas.platform.b2b.model.User;
|
|
|
import com.uas.platform.core.model.Constant;
|
|
|
import com.uas.sso.common.util.HttpUtil;
|
|
|
import com.uas.sso.common.util.HttpUtil.ResponseWrap;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
@@ -33,7 +32,10 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
|
|
|
private CommonDao commonDao;
|
|
|
|
|
|
@Autowired
|
|
|
- private JdbcTemplate jdbcTemplate;
|
|
|
+ private UserDao userDao;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private EnterpriseDao enterpriseDao;
|
|
|
|
|
|
@Autowired
|
|
|
private PagingReleaseDetailDao pagingReleaseDetailDao;
|
|
|
@@ -219,12 +221,14 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
|
|
|
public void pushReleases(List<PagingReleaseDetail> pagingReleaseDetails) {
|
|
|
for (PagingReleaseDetail releaseDetail : pagingReleaseDetails) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
- if (releaseDetail.getPagingRelease().getUser().getUserIMId() != null) {
|
|
|
- params.put("master", releaseDetail.getPagingRelease().getEnterprise().getEnName());//账套 公司名称
|
|
|
- params.put("userid", String.valueOf(releaseDetail.getPagingRelease().getUser().getUserIMId()));//推送目标用户
|
|
|
+ User vendUser = userDao.findOne(releaseDetail.getVendUserUU());
|
|
|
+ Enterprise vendor = enterpriseDao.findOne(releaseDetail.getVendUU());
|
|
|
+ if (vendUser.getUserIMId() != null) {
|
|
|
+ params.put("master", vendor.getEnName());//账套 公司名称
|
|
|
+ params.put("userid", String.valueOf(vendUser.getUserIMId()));//推送目标用户
|
|
|
params.put("title", releaseDetail.getPagingRelease().getTitle());//推送标题
|
|
|
params.put("content", releaseDetail.getPagingRelease().getContext());//正文
|
|
|
- params.put("enUU", String.valueOf(releaseDetail.getPagingRelease().getEnUU()));//UU号
|
|
|
+ params.put("enUU", String.valueOf(releaseDetail.getVendUU()));//UU号
|
|
|
// params.put("masterId", masterId);//账套ID
|
|
|
params.put("url", "http://uas.ubtob.com/#/sale/order");//跳转链接地址
|
|
|
params.put("pageTitle", releaseDetail.getPagingRelease().getTitle());//页面标题
|