Преглед изворни кода

[修改][首页列表缓存][优化代码]

release_toaliyun_real
luozukai пре 6 година
родитељ
комит
a37cb6244a
4 измењених фајлова са 8 додато и 6 уклоњено
  1. +6
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +0
    -0
      mallinkAdmin/src/main/resources/db/migration/V201909261528__G_MENU_CHANGED.sql
  3. +0
    -0
      mallinkAdmin/src/main/resources/db/migration/V201909261529__L_MENU_CHANGED.sql
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 6
- 4
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Прегледај датотеку

@@ -9,6 +9,9 @@ import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxProfitSharingReceiver; import com.iformall.domain.po.WxProfitSharingReceiver;
import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxBusinessDataVo;
import com.iformall.domain.vo.WxMerchantTradeDetailVo;
import com.iformall.domain.vo.WxMerchantTradeVo; import com.iformall.domain.vo.WxMerchantTradeVo;
import com.iformall.domain.vo.WxMerchantVo; import com.iformall.domain.vo.WxMerchantVo;
import com.iformall.service.QrCodeService; import com.iformall.service.QrCodeService;
@@ -282,16 +285,15 @@ public class WxMerchantController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); logger.debug("[" + getIpAddr() + "] WxMerchantController::list");
if (null == wxMerchant) wxMerchant = new WxMerchant(); if (null == wxMerchant) wxMerchant = new WxMerchant();
wxMerchant.setTenantId(getTenantId()); wxMerchant.setTenantId(getTenantId());
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC);
final PageInfo<WxMerchantTradeVo> page = wxMerchantService.userTradeList(wxMerchant, pageNum, pageSize);
final PageInfo<WxMerchantTradeDetailVo> page = wxMerchantService.userTradeDetailList(wxMerchant, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


@ApiOperation("导出商户会员消费分页列表") @ApiOperation("导出商户会员消费分页列表")
@GetMapping("exportUserTradeList")
@GetMapping("exportUserTradeDetailList")
@SystemControllerLog(description = "导出商户会员消费分页列表") @SystemControllerLog(description = "导出商户会员消费分页列表")
public void exportUserTradeList(@ModelAttribute WxMerchant wxMerchant,HttpServletRequest request, HttpServletResponse response) throws Exception{ public void exportUserTradeList(@ModelAttribute WxMerchant wxMerchant,HttpServletRequest request, HttpServletResponse response) throws Exception{
logger.debug("[" + getIpAddr() + "] WxBusinessController::exportUserTradeList");
logger.debug("[" + getIpAddr() + "] WxBusinessController::exportUserTradeDetailList");
wxMerchantService.exportUserTradeList(wxMerchant, request,response); wxMerchantService.exportUserTradeList(wxMerchant, request,response);
} }




mallinkAdmin/src/main/resources/db/migration/V201909261053__G_MENU_CHANGED.sql → mallinkAdmin/src/main/resources/db/migration/V201909261528__G_MENU_CHANGED.sql Прегледај датотеку


mallinkAdmin/src/main/resources/db/migration/V201909261054__L_MENU_CHANGED.sql → mallinkAdmin/src/main/resources/db/migration/V201909261529__L_MENU_CHANGED.sql Прегледај датотеку


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Прегледај датотеку

@@ -748,8 +748,8 @@ public class WxMerchantServiceImpl implements WxMerchantService {


@Override @Override
public void exportUserTradeList(WxMerchant record,HttpServletRequest request, HttpServletResponse response) { public void exportUserTradeList(WxMerchant record,HttpServletRequest request, HttpServletResponse response) {
List<WxMerchantTradeVo> datalist = wxMerchantMapper.userTradeList(record);
excelService.exportExcel(datalist, null, "商户会员消费列表", WxMerchantTradeVo.class, "商户会员消费列表.xlsx", response, false);
List<WxMerchantTradeDetailVo> datalist = wxMerchantMapper.userTradeDetailList(record);
excelService.exportExcel(datalist, null, "商户会员消费列表", WxMerchantTradeDetailVo.class, "商户会员消费列表.xlsx", response, false);
} }


@Override @Override


Loading…
Откажи
Сачувај