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