From f64b88b574afb759e264c66e03adf8e5ef9d8a83 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Tue, 22 Nov 2022 11:17:44 +0800 Subject: [PATCH] fix bug --- .../controller/market/WxCouponController.java | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 6ad68d4c7..55f8e51b8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -571,34 +571,41 @@ public class WxCouponController extends BaseController { return new ResultData(wxCouponMallService.list(wxCouponMall,true)); } - @ApiOperation("商场查询:平台券商场列表") - @GetMapping("/couponMalls") + @ApiOperation("平台券商场列表") + @GetMapping("/getCouponMall") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "ids[]", dataType = "Long", paramType = "query", required = true)}) - public ResultData getMallList(Long[] ids) { - if (null == ids || ids.length <= 0 ) { - return new ResultData(ResultData.ERROR, "缺少参数ids"); - } + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)}) + public ResultData getCouponMall(Long id) { + //如果是集团查询,则查询所有的,如果是商场查询,则只查询商场的 WxCouponMall wxCouponMall = new WxCouponMall(); TenantEntity tenantEntity = getTenantInfo(); if (null == tenantEntity.getParentTenantId()) { wxCouponMall.updateTenantInfo(tenantEntity); + wxCouponMall.setProductId(id); }else { wxCouponMall.setTenantId(tenantEntity.getParentTenantId()); + //一个商场,每个平台券只有一条记录 + wxCouponMall.setMallTenantId(tenantEntity.getTenantId()); + wxCouponMall.setProductId(id); } - //一个商场,每个平台券只有一条记录 - wxCouponMall.setMallTenantId(tenantEntity.getTenantId()); - wxCouponMall.setProductIds(Arrays.asList(ids)); List mallList= wxCouponMallService.list(wxCouponMall,false); - if (null == mallList || mallList.size() <= 0 ) { - return new ResultData(); + if (null != mallList && mallList.size() > 0 ) { + boolean isComplete = true; + for (int i = 0 ; i < mallList.size(); i ++) { + WxCouponMall cm = mallList.get(i); + if (EnumCouponMallStatus.UNFINISED.getCode() == cm.getStatus()) { + isComplete = false; + break; + } + } + if (isComplete) { + return new ResultData("{\"isCompleted\":1}"); + }else { + return new ResultData("{\"isCompleted\":0}"); + } + }else { + return new ResultData("{\"isCompleted\":0}"); } - Map productMallMap = new HashMap(); - for (int i = 0 ; i < mallList.size(); i ++) { - WxCouponMall cm = mallList.get(i); - productMallMap.put(cm.getProductId(), cm); - } - return new ResultData(productMallMap); } @ApiOperation("商场设置平台券商户")