Browse Source

增加b端核销导出

release_toaliyun_real
lin 3 years ago
parent
commit
e7bd68a65e
5 changed files with 64 additions and 20 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java
  2. +31
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
  5. +29
    -18
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java View File

@@ -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);
}

}

+ 31
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java View File

@@ -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);
}
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java View File

@@ -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;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java View File

@@ -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端-收银台-支持优惠券


+ 29
- 18
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -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<WxCouponOrderBVo> handleQueryResult(List<WxCouponOrder> list,TenantEntity tenantEntity) {
private List<WxCouponOrderBVo> handleQueryResult(boolean cUserEntry,List<WxCouponOrder> 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<Long> 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<Long> merchantIds = new ArrayList<Long>();
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<Long> 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<WxCouponOrder> list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder);
List<WxCouponOrderBVo> bolist = handleQueryResult(list,wxCouponOrder);
List<WxCouponOrderBVo> 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;
}


Loading…
Cancel
Save