Просмотр исходного кода

//update

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
387762d52c
5 измененных файлов: 53 добавлений и 15 удалений
  1. +11
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java
  2. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/TtMerchantPoiService.java
  4. +36
    -13
      mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java
  5. +4
    -0
      mallinkService/src/main/resources/mapper/TtMerchantPoiMapper.xml

+ 11
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java Просмотреть файл

@@ -126,6 +126,17 @@ public class TtMerchantPoiController extends BaseController {
return ttMerchantPoiService.merchantSync(getTenantInfo(),id);
}

@ApiOperation("商铺同步结果")
@GetMapping("merchantQuery")
@SystemControllerLog(description = "商铺同步")
public ResultData merchantQuery(Long id) {
logger.debug("[" + getIpAddr() + "] TtMerchantPoiController::merchantQuery");
if(id == null){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
return ttMerchantPoiService.supplierQuery(getTenantInfo(),id);
}

@ApiOperation("获取商品可用的POI")
@GetMapping("/findPoi")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java Просмотреть файл

@@ -42,7 +42,7 @@ public class TtMerchantReciverSchedule {
/**
* 每两小时
*/
@Scheduled(cron = "0 0 */1 * * ?")
@Scheduled(cron = "0 */30 * * * ?")
// @Scheduled(cron = "0 */5 * * * *?") //测试五分钟执行
public void updateMerchantReciverSchedule() {
WxMall mallQ = new WxMall();


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

@@ -39,7 +39,7 @@ public interface TtMerchantPoiService {

List<Long> findIdList(TtMerchantPoi merchantPoiQ);

void supplierQuery(Long id);
ResultData supplierQuery(TenantEntity tenantInfo,Long id);

TtWebService getTtWebService(TenantEntity tenantInfo);



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

@@ -269,12 +269,14 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService {
// if(StringUtils.isBlank(supplierId)){
// return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"同步失败");
// }
TtMerchantPoi updPoi = new TtMerchantPoi();
updPoi.setId(id);
updPoi.setSupplierId(supplierId);
updPoi.setLastSyncStatus(EnumSupplierSyncStatus.sync_success.getCode());
updPoi.setUpdateDate(new Date());
ttMerchantPoiMapper.updateById(merchantPoi);
if(!EnumSupplierSyncStatus.sync_success.getCode().equals(merchantPoi.getSyncStatus())){
TtMerchantPoi updPoi = new TtMerchantPoi();
updPoi.setId(id);
updPoi.setSupplierId(supplierId);
updPoi.setLastSyncStatus(EnumSupplierSyncStatus.sync_wait.getCode());
updPoi.setUpdateDate(new Date());
ttMerchantPoiMapper.updateById(merchantPoi);
}
return new ResultData();
}

@@ -426,15 +428,15 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService {
}

@Override
public void supplierQuery(Long id) {
public ResultData supplierQuery(TenantEntity tenantEntity, Long id) {
TtMerchantPoi merchantPoi = ttMerchantPoiMapper.selectById(id);
if(merchantPoi == null){
logger.error("未找到数据");
return;
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"未找到数据");
}
if(!EnumSupplierSyncStatus.sync_wait.getCode().equals(merchantPoi.getLastSyncStatus())){
logger.error("该店铺暂未申请同步或已知同步结果");
return;
if(merchantPoi.getLastSyncStatus() == null){
logger.error("该店铺暂未申请同步");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"该店铺暂未申请同步");
}
try {
TtSupplierSyncQuery syncQuery = getTtWebService(merchantPoi).getProductService().supplierQuery(merchantPoi.getSupplierExtId());
@@ -448,12 +450,33 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService {
poiUpd.setFailReason(syncQuery.getSyncStatus().getFailReason());
poiUpd.setUpdateDate(new Date());
ttMerchantPoiMapper.updateById(poiUpd);
}else{
logger.error("请求接口返回为空");
}
return new ResultData(handSupplieSync(syncQuery));
} catch (WxErrorException e) {
logger.error("查询匹配任务error"+e.getMessage());
return new ResultData(ErrorCode.MSG_METHOD_REQUEST_ERROR.getCode(),e.getMessage());
} catch (Exception e){
logger.error("查询匹配任务error"+e.getMessage());
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage());
}

}

private Map<String,Object> handSupplieSync(TtSupplierSyncQuery syncQuery){
Map<String,Object> map = new HashMap<>();
if(syncQuery != null){
if(syncQuery.getDataDetail() != null){
map.put("data_detail",syncQuery.getDataDetail().toJson());
}
if(syncQuery.getSyncStatus() != null){
Map<String,Object> statusMap = new HashMap<>();
statusMap.put("last_sync_status",syncQuery.getSyncStatus().getLastSyncStatus());
statusMap.put("fail_reason",syncQuery.getSyncStatus().getFailReason());
map.put("sync_status",syncQuery.getSyncStatus());
}

}
return map;
}




+ 4
- 0
mallinkService/src/main/resources/mapper/TtMerchantPoiMapper.xml Просмотреть файл

@@ -80,6 +80,10 @@
and `poi_id` = #{poiId}
</if>

<if test=" null != poiName and ''!= poiName ">
and `poi_name` like concat('%', #{poiName},'%')
</if>

<if test=" null != merchantName and ''!= merchantName ">
and `merchant_name` like concat('%', #{merchantName},'%')
</if>


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