xhxu 3 лет назад
Родитель
Сommit
c00d77312c
3 измененных файлов: 54 добавлений и 39 удалений
  1. +6
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +20
    -14
      mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java
  3. +28
    -22
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java

+ 6
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Просмотреть файл

@@ -482,7 +482,8 @@ public class WxCouponController extends BaseController {
result.put("list", pageInfo);
return new ResultData(result);
}

@TenantIgnore
@ApiOperation("卡营销列表记录导出")
@GetMapping("/cardCountExportData")
@SystemControllerLog(description = "营销统计-卡营销数据导出")
@@ -554,7 +555,8 @@ public class WxCouponController extends BaseController {
}
return new ResultData(pageInfo);
}

@TenantIgnore
@ApiOperation("券营销列表记录导出")
@GetMapping("/couponCountExportData")
@SystemControllerLog(description = "营销统计-券营销数据导出")
@@ -612,10 +614,11 @@ public class WxCouponController extends BaseController {
TenantEntity tenantEntity = getTenantInfo();
List<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
wxCoupon.updateTenantInfo(tenantEntity);
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());

handleCouponStartDate(wxCoupon);

wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());

wxCouponService.exportPressData(wxCoupon,tenantEntitys, request, response);
}



+ 20
- 14
mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java Просмотреть файл

@@ -31,18 +31,7 @@ public class WxCardInfoServiceImpl implements WxCardInfoService {

@Override
public PageInfo<WxCardVo> listAsPage(WxCardVo record, Integer pageIndex, Integer pageSize) {
if (null != record.getCouponOnlineStartDate() || null != record.getCouponOnlineEndDate() ) {
WxCouponChannel wxCouponChannelQ = new WxCouponChannel();
wxCouponChannelQ.updateTenantInfo(record);
wxCouponChannelQ.setStartdate(record.getCouponOnlineStartDate());
wxCouponChannelQ.setEnddate(record.getCouponOnlineEndDate());
List<Long> ccIds = wxCouponChannelMapper.findCouponIdList(wxCouponChannelQ);
if (null == ccIds || ccIds.size() <= 0 ) {
record.setId(-999L);
}else {
record.setCouponIdList(ccIds);
}
}
handleCouponOnlineEndDate(record);
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardInfoMapper.findVoList(record));
}

@@ -69,9 +58,26 @@ public class WxCardInfoServiceImpl implements WxCardInfoService {
}

@Override
public void exportData(WxCardVo wxCardVo, HttpServletRequest request, HttpServletResponse response) {
List<WxCardVo> list = wxCardInfoMapper.findVoList(wxCardVo);
public void exportData(WxCardVo record, HttpServletRequest request, HttpServletResponse response) {
handleCouponOnlineEndDate(record);
List<WxCardVo> list = wxCardInfoMapper.findVoList(record);
excelService.exportExcel(list, null, "卡订单", WxCardVo.class, "卡订单.xlsx", response, false);

}

private void handleCouponOnlineEndDate(WxCardVo record){
if (null != record.getCouponOnlineStartDate() || null != record.getCouponOnlineEndDate() ) {
WxCouponChannel wxCouponChannelQ = new WxCouponChannel();
wxCouponChannelQ.updateTenantInfo(record);
wxCouponChannelQ.setStartdate(record.getCouponOnlineStartDate());
wxCouponChannelQ.setEnddate(record.getCouponOnlineEndDate());
List<Long> ccIds = wxCouponChannelMapper.findCouponIdList(wxCouponChannelQ);
if (null == ccIds || ccIds.size() <= 0 ) {
record.setId(-999L);
}else {
record.setCouponIdList(ccIds);
}
}
}

}

+ 28
- 22
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java Просмотреть файл

@@ -386,29 +386,34 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {

@Override
public PageInfo<WxCardSpendVo> listAsPage(WxCardSpendVo record, Integer pageIndex, Integer pageSize) {
if (null != record.getCouponOnlineStartDate() || null != record.getCouponOnlineEndDate() ) {
WxCouponChannel wxCouponChannelQ = new WxCouponChannel();
wxCouponChannelQ.updateTenantInfo(record);
wxCouponChannelQ.setStartdate(record.getCouponOnlineStartDate());
wxCouponChannelQ.setEnddate(record.getCouponOnlineEndDate());
List<Long> ccIds = wxCouponChannelMapper.findCouponIdList(wxCouponChannelQ);
if (null == ccIds || ccIds.size() <= 0 ) {
record.setId(-999L);
}else {
WxCardInfo cardInfo = new WxCardInfo();
cardInfo.updateTenantInfo(record);
cardInfo.setCouponIdList(ccIds);
List<Long> cardIdList = wxCardInfoMapper.findIdList(cardInfo);
if (null == cardIdList || cardIdList.size() <= 0 ) {
record.setId(-999L);
}else {
record.setCardIdList(ccIds);
}
}
}
handleCouponOnlineStartDate(record);
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardSpendMapper.findCardSpendVoList(record));
}

//处理券投放时间
private void handleCouponOnlineStartDate(WxCardSpendVo record){
if (null != record.getCouponOnlineStartDate() || null != record.getCouponOnlineEndDate() ) {
WxCouponChannel wxCouponChannelQ = new WxCouponChannel();
wxCouponChannelQ.updateTenantInfo(record);
wxCouponChannelQ.setStartdate(record.getCouponOnlineStartDate());
wxCouponChannelQ.setEnddate(record.getCouponOnlineEndDate());
List<Long> ccIds = wxCouponChannelMapper.findCouponIdList(wxCouponChannelQ);
if (null == ccIds || ccIds.size() <= 0 ) {
record.setId(-999L);
}else {
WxCardInfo cardInfo = new WxCardInfo();
cardInfo.updateTenantInfo(record);
cardInfo.setCouponIdList(ccIds);
List<Long> cardIdList = wxCardInfoMapper.findIdList(cardInfo);
if (null == cardIdList || cardIdList.size() <= 0 ) {
record.setId(-999L);
}else {
record.setCardIdList(ccIds);
}
}
}
}

@Override
public List<Map<String, Object>> sumCardSpendForMerchant(WxCardSpendVo record) {
return wxCardSpendMapper.sumCardSpendVoForMerchant(record);
@@ -651,8 +656,9 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
}

@Override
public void exportData(WxCardSpendVo wxCardSpendVo, HttpServletRequest request, HttpServletResponse response) {
List<WxCardSpendVo> list = wxCardSpendMapper.findCardSpendVoList(wxCardSpendVo);
public void exportData(WxCardSpendVo record, HttpServletRequest request, HttpServletResponse response) {
handleCouponOnlineStartDate(record);
List<WxCardSpendVo> list = wxCardSpendMapper.findCardSpendVoList(record);
excelService.exportExcel(list, null, "卡消费记录", WxCardSpendVo.class, "卡消费记录.xlsx", response, false);
}



Загрузка…
Отмена
Сохранить