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

[商户积分][修改][查询商户列表添加业态字段]

release_toaliyun_real
gongbiao 6 лет назад
Родитель
Сommit
e420eece86
3 измененных файлов: 14 добавлений и 5 удалений
  1. +3
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java
  3. +8
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 3
- 3
mallinkBApi/src/main/java/com/iformall/controller/WxTagController.java Просмотреть файл

@@ -26,9 +26,9 @@ public class WxTagController extends BaseController {
private WxTagsService wxTagsService; private WxTagsService wxTagsService;


@ApiOperation("获取标签") @ApiOperation("获取标签")
@GetMapping("getData")
public ResultData getTags() {
log.debug("[" + getIpAddr() + "] WxCreditHistoryController::getTagsByBussiness");
@GetMapping("/getData")
public ResultData getData() {
log.debug("[" + getIpAddr() + "] WxTagController::getData");
WxTags wxTags = new WxTags(); WxTags wxTags = new WxTags();
wxTags.setTypeId(EnumTagType.ID_27.getCode()); wxTags.setTypeId(EnumTagType.ID_27.getCode());
List<WxTags> listA = wxTagsService.findList(wxTags); List<WxTags> listA = wxTagsService.findList(wxTags);


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

@@ -11,4 +11,7 @@ public class WxMerchantSimpleVo {


@ApiModelProperty(value="商户名",name="merchantName") @ApiModelProperty(value="商户名",name="merchantName")
private String merchantName; private String merchantName;

@ApiModelProperty(value = "业态", name = "businessId")
private Integer businessId;
} }

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

@@ -19,7 +19,6 @@ import com.iformall.enums.*;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.utils.BeanMapping;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;
import com.iformall.utils.EventUtil; import com.iformall.utils.EventUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -140,7 +139,14 @@ public class WxMerchantServiceImpl implements WxMerchantService {
wxMerchant.setTenantId(tenantId); wxMerchant.setTenantId(tenantId);
wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode());
List<WxMerchant> wxMerchantList = wxMerchantMapper.findList(wxMerchant); List<WxMerchant> wxMerchantList = wxMerchantMapper.findList(wxMerchant);
return BeanMapping.mapList(wxMerchantList,WxMerchantSimpleVo.class,(s, t)->t.setMerchantName(s.getName()));
WxMerchantSimpleVo wxMerchantSimpleVo = new WxMerchantSimpleVo();
List<WxMerchantSimpleVo> collect = wxMerchantList.stream().map(x -> {
wxMerchantSimpleVo.setId(x.getId());
wxMerchantSimpleVo.setMerchantName(x.getName());
wxMerchantSimpleVo.setBusinessId(x.getBusinessId());
return wxMerchantSimpleVo;
}).collect(Collectors.toList());
return collect;
} }


@Override @Override


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