Browse Source

tt

release_toaliyun_real
xhxu 5 years ago
parent
commit
67f8428507
3 changed files with 16 additions and 6 deletions
  1. +1
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  2. +14
    -0
      mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java
  3. +1
    -2
      mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java

+ 1
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -104,10 +104,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {

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


+ 14
- 0
mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java View File

@@ -47,6 +47,20 @@ public class WxMerchantController extends BaseController {
return new ResultData(wxMerchantService.listAsPageCVo(wxMerchantDto, pageNum, pageSize));
}

@ApiOperation("分页列表接口")
@GetMapping("listV1")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData listV1(@ModelAttribute WxMerchant merchant, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::list");
if (null == merchant) merchant = new WxMerchant();
merchant.updateTenantInfo(getTenantInfo());
merchant.setStatus(EnumMerchantStatus.VALID.getCode());
merchant.setIsPublic(EnumMerchantPublic.PUBLIC.getCode());
return new ResultData(wxMerchantService.listAsPage(merchant, pageNum, pageSize));
}

@ApiOperation("根据code查询接口")
@GetMapping("/findByCode")
@ApiImplicitParam(name = "merchantCode", value = "merchantCode", dataType = "String", paramType = "query", required = true)


+ 1
- 2
mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java View File

@@ -36,8 +36,7 @@ public class TtOrderExpiringSchedule {

@Scheduled(cron = "0 0 4 * * ?") //每天四点入账
public void orderRecordedSchedule() {
WxMerchant merchant = new WxMerchant();
wxMerchantMapper.findList(merchant);

}

}

Loading…
Cancel
Save