Просмотр исходного кода

Merge branch 'release_toaliyun_real_offline_activity' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_offline_activity

release_toaliyun_real
winter 1 год назад
Родитель
Сommit
e0c794d0cd
3 измененных файлов: 20 добавлений и 0 удалений
  1. +9
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxOfflineActivityRecordService.java
  3. +9
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java

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

@@ -56,6 +56,15 @@ public class WxOfflineActivityRecordController extends BaseController {
return new ResultData(page);
}

@ApiOperation("获取待审批数量")
@GetMapping("waitAudiCount")
public ResultData waitAudiCount() {
Integer waitAudiCount = wxOfflineActivityRecordService.getWaitAudiCount(getTenantInfo());
return new ResultData(waitAudiCount);
}



@ApiOperation("导出")
@GetMapping("/export")
public void export(@ModelAttribute WxOfflineActivityRecord wxOfflineActivityRecord, HttpServletRequest request, HttpServletResponse response) {


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxOfflineActivityRecordService.java Просмотреть файл

@@ -31,4 +31,6 @@ public interface WxOfflineActivityRecordService {
Map<String, Object> orderStatistics(TenantEntity tenantInfo);

void exportData(HttpServletRequest request, HttpServletResponse response, WxOfflineActivityRecord wxOfflineActivityRecord);

Integer getWaitAudiCount(TenantEntity tenantInfo);
}

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

@@ -130,6 +130,7 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco
wxOfflineActivityRecordMapper.insert(wxOfflineActivityRecord);
}
else{
wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode());
wxOfflineActivityRecord.setUpdateDate(now);
wxOfflineActivityRecordMapper.updateById(wxOfflineActivityRecord);
}
@@ -236,6 +237,14 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco
handlerRecordList(record,list);
excelService.exportExcel(list, null, "活动订单列表", WxOfflineActivityRecord.class, "活动订单列表.xlsx", response, false);
}

@Override
public Integer getWaitAudiCount(TenantEntity tenantInfo) {
WxOfflineActivityRecord record = new WxOfflineActivityRecord();
record.updateTenantInfo(tenantInfo);
record.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode());
return wxOfflineActivityRecordMapper.getCount(record);
}
}




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