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

//update

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
c0950d10b5
4 измененных файлов: 42 добавлений и 4 удалений
  1. +0
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java
  2. +8
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  3. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java
  4. +23
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 0
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java Просмотреть файл

@@ -1,6 +1,5 @@
package com.iformall.controller;

import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.domain.dto.WxMerchantDto;
@@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.HashMap;
import java.util.List;

/**
* @author Stormeye


+ 8
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Просмотреть файл

@@ -341,4 +341,12 @@ public class WxMerchant extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor")
@TableField(exist = false)
private Long floor;

@io.swagger.annotations.ApiModelProperty(value="经度",name="longitude")
@TableField(exist = false)
private Float longitude;

@io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude")
@TableField(exist = false)
private Float latitude;
}

+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.base.TenantEntity;
@@ -98,6 +99,14 @@ public class WxMerchantVo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "置顶时间", name = "topTime")
private Date topTime;

@io.swagger.annotations.ApiModelProperty(value="经度",name="longitude")
@TableField(exist = false)
private Float longitude;

@io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude")
@TableField(exist = false)
private Float latitude;
public void initByMerchant(WxMerchant m) {
this.id = m.getId();
@@ -117,5 +126,7 @@ public class WxMerchantVo extends TenantEntity {
this.actionDesc = m.getActionDesc();
this.linkLinePhone = m.getLinkLinePhone();
this.topTime = m.getTopTime();
this.longitude = m.getLongitude();
this.latitude = m.getLatitude();
}
}

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

@@ -1225,7 +1225,21 @@ public class WxMerchantServiceImpl implements WxMerchantService {
}
List<Long> merchantIds = wxCouponMerchantMapper.findMerchantByProductIds(tenantEntity.getTenantId(), couponIds);
if(null != merchantIds && merchantIds.size() > 0 ) {
WxMerchant merchantQ = new WxMerchant();
TtMerchantPoi poiQ = new TtMerchantPoi();
poiQ.updateTenantInfo(tenantEntity);
poiQ.setIds(merchantIds);
List<TtMerchantPoi> poiList = ttMerchantPoiMapper.findList(poiQ);
Map<Long,TtMerchantPoi> poiMap = new HashMap<Long,TtMerchantPoi>();
if(null != poiList){
for (int i = 0 ; i < poiList.size() ; i++) {
TtMerchantPoi p = poiList.get(i);
if (null != p) {
poiMap.put(p.getId(), p);
}
}
}

WxMerchant merchantQ = new WxMerchant();
merchantQ.updateTenantInfo(tenantEntity);
merchantQ.setIds(merchantIds);
List<WxMerchant> merchantList = wxMerchantMapper.findList(merchantQ);
@@ -1234,7 +1248,12 @@ public class WxMerchantServiceImpl implements WxMerchantService {
for (int i = 0 ; i < merchantList.size() ; i++) {
WxMerchant m = merchantList.get(i);
if (null != m) {
merchantMap.put(m.getId(), m);
TtMerchantPoi poi = poiMap.get(m.getId());
if(null != poi){
m.setLongitude(poi.getLongitude());
m.setLatitude(poi.getLatitude());
}
merchantMap.put(m.getId(), m);
}
}
}
@@ -1297,6 +1316,8 @@ public class WxMerchantServiceImpl implements WxMerchantService {
if (hasShop && null != merchantShopVoList) {
vo.setShopVoList(merchantShopVoList.get(vo.getId()));
}
vo.setLongitude(m.getLongitude());
vo.setLatitude(m.getLatitude());
return vo;
}


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