From e7bd68a65e0ca7cea2d6689e3aa23212bc0ba9a8 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Thu, 16 Jun 2022 17:22:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0b=E7=AB=AF=E6=A0=B8=E9=94=80?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxCouponOrderController.java | 2 +- .../controller/WxCouponOrderController.java | 31 ++++++++++++ .../iformall/domain/vo/WxCouponOrderBVo.java | 2 + .../service/WxCouponOrderService.java | 2 +- .../impl/WxCouponOrderServiceImpl.java | 47 ++++++++++++------- 5 files changed, 64 insertions(+), 20 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java index fc4a16334..e32a132ef 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java @@ -123,7 +123,7 @@ public class WxCouponOrderController extends BaseController { wxCouponOrder.getMerchantName().isEmpty()) { wxCouponOrder.setMerchantName(null); } - wxCouponOrderService.exportData(wxCouponOrder, request, response); + wxCouponOrderService.exportData(false,wxCouponOrder, request, response); } } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 037b100e9..7d1c47292 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -2,6 +2,7 @@ package com.iformall.controller; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; +import com.iformall.annotation.AuthIgnore; import com.iformall.annotation.RedisCache; import com.iformall.common.ErrorCode; import com.iformall.common.Result; @@ -35,6 +36,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + @RestController @RequestMapping("/api/couponOrder") @Api(description = "卡券相关接口") @@ -463,4 +467,31 @@ public class WxCouponOrderController extends BaseController { } return new ResultData(); } + + @ApiOperation(value = "B端核销列表链接") + @GetMapping("/getVerifiedExportUrl") + public ResultData getVerifiedExportUrl(@ModelAttribute WxCouponOrderBVo wxCouponOrder) { + if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); + wxCouponOrder.updateTenantInfo(getTenantInfo()); + StringBuffer sb = new StringBuffer("/api/couponOrder/unLogin/verifiedExport?verifyMerchantId=").append(this.getLoginBUser().getMerchantId()); + if (null != wxCouponOrder.getVerifyStartDate()) { + sb.append("&verifyStartDate=").append(wxCouponOrder.getVerifyStartDate()); + } + if (null != wxCouponOrder.getVerifyEndDate()) { + sb.append("&verifyEndDate=").append(wxCouponOrder.getVerifyEndDate()); + } + return new ResultData(sb.toString()); + + } + + @GetMapping("/unLogin/verifiedExport") + @AuthIgnore + public void verifiedExport(@ModelAttribute WxCouponOrderBVo wxCouponOrder, HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] WxCouponOrderController::exportData"); + if (wxCouponOrder == null) { + return; + } + wxCouponOrderService.exportData(true,wxCouponOrder, request, response); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index 34f65d7cc..ab0343d1d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -220,6 +220,8 @@ public class WxCouponOrderBVo extends WxCouponOrder { @Excel(name = "核销商户", width = 50, orderNum = "4") @TableField(exist = false) private String verifyMerchantName; + @TableField(exist = false) + private Long verifyMerchantId; @TableField(exist = false) private Long floor; diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 554abc34f..5ee0ce87e 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -196,7 +196,7 @@ public interface WxCouponOrderService { ResultData queryCardStatus(WxCouponOrder wxCouponOrder); - void exportData(WxCouponOrderBVo wxCouponOrder, HttpServletRequest request, HttpServletResponse response); + void exportData(boolean cUserEntry,WxCouponOrderBVo wxCouponOrder, HttpServletRequest request, HttpServletResponse response); /** * B端-收银台-支持优惠券 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 41ba881d9..eb962d93d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -832,12 +832,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { retPageInfo.setPageSize(pageSize); retPageInfo.setPages(pageInfo.getPages()); retPageInfo.setTotal(pageInfo.getTotal()); - retPageInfo.setList(handleQueryResult(pageInfo.getList(), wxCouponOrderBVo)); + retPageInfo.setList(handleQueryResult(false,pageInfo.getList(), wxCouponOrderBVo)); return new ResultData(retPageInfo); } - private List handleQueryResult(List list,TenantEntity tenantEntity) { + private List handleQueryResult(boolean cUserEntry,List list,TenantEntity tenantEntity) { if (null != list && list.size() > 0) { @@ -984,8 +984,13 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { WxCUserBasicInfo basicInfo = cUserMap.get(co.getCUserId()); if (null != basicInfo) { - co.setcuserPhone(basicInfo.getPhone()); - co.setUserNickName(basicInfo.getNickName()); + if (!cUserEntry) { + co.setcuserPhone(basicInfo.getPhone()); + co.setUserNickName(basicInfo.getNickName()); + }else { + co.setcuserPhone("保密"); + co.setUserNickName("保密"); + } } Long bMechantId = co.getBMerchantId(); @@ -1155,18 +1160,24 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } //核销商户 - String verifyMerchantName = StringUtils.trimToNull(wxCouponOrder.getVerifyMerchantName()); - if (null != verifyMerchantName) { - WxMerchant merchantQ2 = new WxMerchant(); - merchantQ2.updateTenantInfo(wxCouponOrder); - merchantQ2.setName(verifyMerchantName); - List merchantIds = wxMerchantMapper.findIdList(merchantQ2); - if (null == merchantIds || merchantIds.size() <= 0 ){ - //throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"核销商户名称查询不到商户记录."); - wxCouponOrder.setId(-999L); - return; - } + if (null != wxCouponOrder.getVerifyMerchantId()) { + List merchantIds = new ArrayList(); + merchantIds.add(wxCouponOrder.getVerifyMerchantId()) ; wxCouponOrder.setBMerchantIdList(merchantIds); + }else { + String verifyMerchantName = StringUtils.trimToNull(wxCouponOrder.getVerifyMerchantName()); + if (null != verifyMerchantName) { + WxMerchant merchantQ2 = new WxMerchant(); + merchantQ2.updateTenantInfo(wxCouponOrder); + merchantQ2.setName(verifyMerchantName); + List merchantIds = wxMerchantMapper.findIdList(merchantQ2); + if (null == merchantIds || merchantIds.size() <= 0 ){ + //throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"核销商户名称查询不到商户记录."); + wxCouponOrder.setId(-999L); + return; + } + wxCouponOrder.setBMerchantIdList(merchantIds); + } } } @@ -1188,14 +1199,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } @Override - public void exportData(WxCouponOrderBVo wxCouponOrder, HttpServletRequest request, HttpServletResponse response) { + public void exportData(boolean cUserEntry,WxCouponOrderBVo wxCouponOrder, HttpServletRequest request, HttpServletResponse response) { String filename = "券订单"; if(EnumCouponType.COUPON_DISTRIBUTION.getCode().equals(wxCouponOrder.getCouponType())){ filename = "商品订单"; } handleWxCouponOrderBVoQueryParam(wxCouponOrder); List list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder); - List bolist = handleQueryResult(list,wxCouponOrder); + List bolist = handleQueryResult(cUserEntry,list,wxCouponOrder); excelService.exportCsv(bolist, null, filename, WxCouponOrderBVo.class, filename + ".csv", response, false); } @@ -2823,7 +2834,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { retPageInfo.setPageSize(pageSize); retPageInfo.setPages(pageInfo.getPages()); retPageInfo.setTotal(pageInfo.getTotal()); - retPageInfo.setList(handleQueryResult(pageInfo.getList(), record)); + retPageInfo.setList(handleQueryResult(false,pageInfo.getList(), record)); return retPageInfo; }