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

[商户商铺][修改]:商户列表显示租期

release_toaliyun_real
gongbiao 7 лет назад
committed by Stormeye.Wu
Родитель
Сommit
97687f35ba
3 измененных файлов: 24 добавлений и 4 удалений
  1. +4
    -2
      mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java
  2. +1
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxShop.java
  3. +19
    -1
      mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java

+ 4
- 2
mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java Просмотреть файл

@@ -23,8 +23,8 @@ public class WxShopController extends BaseController
private WxShopService wxShopService;

private Logger logger = Logger.getLogger(WxShopController.class);
@ApiOperation("分页列表接口")
@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@@ -32,6 +32,8 @@ public class WxShopController extends BaseController
public ResultData list(@ModelAttribute WxShop wxShop,Integer pageNum, Integer pageSize) {
if (null == wxShop) wxShop = new WxShop();
wxShop.setTenantId(getTenantId());
wxShop.setSortColumns(WxShop.Field.Id_DESC);

final PageInfo<Map<String,Object>> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 1
mallinkService/src/main/java/com/simple/domain/po/WxShop.java Просмотреть файл

@@ -239,7 +239,7 @@ public class WxShop implements Serializable {
sb.append(",");
sb.append(fields[k].toString());
}
this.sortColumns=sb.toString();
}
public void setSortColumns(String sortColumns)


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

@@ -15,6 +15,8 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Service
public class WxMerchantServiceImpl implements WxMerchantService {
@@ -36,7 +38,23 @@ public class WxMerchantServiceImpl implements WxMerchantService {

@Override
public PageInfo<WxMerchant> listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record));

WxMerchantShop merchantShop = new WxMerchantShop();
merchantShop.setTenantId(record.getTenantId());
merchantShop.setIsDel(0);
List<WxMerchantShop> merchantShops = wxMerchantShopMapper.findList(merchantShop);

PageHelper.startPage(pageIndex, pageSize);
List<WxMerchant> merchants = wxMerchantMapper.findList(record);
for(WxMerchant merchant:merchants){
List<WxMerchantShop> collect = merchantShops.stream().filter(ms -> ms.getMerchantId().equals(merchant.getId())).collect(Collectors.toList());
if(collect!=null && collect.size()>0){
merchant.setRentalStartDate(collect.get(0).getRentalStartDate());
merchant.setRentalEndDate(collect.get(0).getRentalEndDate());
}
}
PageInfo<WxMerchant> pageInfo = new PageInfo<>(merchants);
return pageInfo;
}

@Override


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