lin 2 лет назад
Родитель
Сommit
38c037c2dc
4 измененных файлов: 26 добавлений и 7 удалений
  1. +13
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  3. +6
    -4
      mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 13
- 3
mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java Просмотреть файл

@@ -437,18 +437,28 @@ public class AsyncTask {
@Async
public void importMerchantInit(File file, MallUserInfo user, String importKey,HttpServletRequest request, HttpServletResponse response) {
// 需要验证
String[] needFields = new String[]{"门店ID","富茂系统商户ID","富茂系统省份", "富茂系统城市", "富茂系统地址","富茂系统经度", "富茂系统纬度"};
String[] needFields = new String[]{"门店名称", "门店ID", "城市", "详细地址"};
ExcelImportResult<MerchantPoiTNew> datalist = handleImportFile(null,file,MerchantPoiTNew.class,poiImportFields,needFields,new AsyncTask.PoiNewExcelHandler());
if (null == datalist) {
return ;
}

//查询所有匹配了poi的
TtMerchantPoi poiQ = new TtMerchantPoi();
poiQ.updateTenantInfo(user);
Map<String,TtMerchantPoi> poiMerchantMap = ttMerchantPoiService.queryPoiMerchantMap(poiQ);
List<MerchantPoiTNew> successList = datalist.getList();
if(successList.size() > 0) {
try {
successList.parallelStream().forEach(poiBase -> {
try {
ttMerchantPoiService.importOnePoiNew(user, poiBase);
if (null != poiMerchantMap) {
TtMerchantPoi tp = poiMerchantMap.get(poiBase.getPoiId());
if (null != tp && ) {
}
}
wxMerchantService.initMerchantByPoi(poiBase.getPoiName(), poiBase.getPoiId());
} catch (UnknownSessionException ue) {
logger.error("session :"+ue.getMessage(),ue);
}


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java Просмотреть файл

@@ -219,5 +219,7 @@ public interface WxMerchantService {
List<WxMerchant> relationList(Long regionId);

PageInfo<WxMerchant> subMerchantList(WxMerchant wxMerchant, Integer pageNum, Integer pageSize);
void initMerchantByPoi(String poiName,String poiId);

}

+ 6
- 4
mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java Просмотреть файл

@@ -610,12 +610,14 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService {
poiBase.setImportRemark("导入失败.门店ID为空");
return;
}
if (StringUtils.isBlank(poiBase.getMerchantId())) {
poiBase.setImportRemark("导入失败.富茂系统商户ID为空");
return;
}

try {
TtMerchantPoi merchantPoi = null;
if (StringUtils.isNotBlank(poiBase.getMerchantId())) {
merchantPoi = ttMerchantPoiMapper.selectById(Long.parseLong(poiBase.getMerchantId()));
}
TtMerchantPoi merchantPoi = ttMerchantPoiMapper.selectById(Long.parseLong(poiBase.getMerchantId()));
Date now = new Date();
if(merchantPoi == null){
merchantPoi = new TtMerchantPoi();


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -2132,4 +2132,9 @@ public class WxMerchantServiceImpl implements WxMerchantService {
PageInfo<WxMerchant> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(wxMerchant));
return pageInfo;
}

@Override
public void initMerchantByPoi(String poiName, String poiId) {
}
}

Загрузка…
Отмена
Сохранить