github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #70 from LQYBill/release 

Release 1.11.1
pull/6221/head
Qiuyi LI 2024-04-03 17:04:41 +02:00 committed by GitHub
parent 6876b91a27 c2ba2e6c05
commit 09217a4dc7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuListRequestBody.java
View File

@ -15,22 +15,22 @@ public class SkuListRequestBody implements RequestBody {
private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
private String stockSku = "";
private String stockSku = null;
// 50 skus max
private String stockSkuList = "";
private String stockSkuList = null;
private DateType datetimeType;
private LocalDateTime startDate;
private LocalDateTime endDate;
private Integer page = 1;
private Integer total;
private String cursor = "";
private Integer maxRows = 10;
private Integer showVirtualSku = 0;
private Integer showProvider = 0;
private Integer showWarehouse = 0;
private Integer showLabel = 0;
private Integer showAttributes = 0;
private Integer showMachining = 0;
private String cursor = "1";
private Integer maxRows = null;
private Integer showVirtualSku = null;
private Integer showProvider = null;
private Integer showWarehouse = null;
private Integer showLabel = null;
private Integer showAttributes = null;
private Integer showMachining = null;
@Override
public String api() {

8
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangSkuJob.java
View File

@ -106,7 +106,7 @@ public class MabangSkuJob implements Job {
log.info("{} skus from {} to {} ({})to be inserted.", skusFromMabang.size(),
dayBeforeEndDateTime, endDateTime, dateType);
if (skusFromMabang.size() > 0) {
if (!skusFromMabang.isEmpty()) {
// we save the skuDatas in DB
newSkusMap.putAll(skuListMabangService.saveSkuFromMabang(skusFromMabang));
}
@ -120,7 +120,7 @@ public class MabangSkuJob implements Job {
log.info("SKU codes replaced by new created SKU IDs");
// here we send system notification with the number and list of new skus saved in DB
if (newSkusMap.size() == 0) {
if (newSkusMap.isEmpty()) {
return;
}
List<String> messageContentList = new ArrayList<>();
@ -177,13 +177,11 @@ public class MabangSkuJob implements Job {
Map<String, String> param = new HashMap<>();
param.put("nb_of_entries", String.valueOf(newSkusMap.size()));
param.put("sku_list", msg);
param.put("need_treatment", needTreatmentSkuMap.size() > 0 ? needTreatmentSku : "None");
param.put("need_treatment", !needTreatmentSkuMap.isEmpty() ? needTreatmentSku : "None");
param.put("current_page", String.valueOf(page));
param.put("total_page", String.valueOf(messageContentList.size()));
TemplateMessageDTO message = new TemplateMessageDTO("admin", "admin", "SKU导入任务", param, "sku_mabang_job_result");
ISysBaseApi.sendTemplateAnnouncement(message);
// message = new TemplateMessageDTO("admin", "Alice", "SKU导入任务", param, "sku_mabang_job_result");
ISysBaseApi.sendTemplateAnnouncement(message);
message = new TemplateMessageDTO("admin", "Jessyca", "SKU导入任务", param, "sku_mabang_job_result");
ISysBaseApi.sendTemplateAnnouncement(message);
log.info("Page {} of recap sent through system announcement", page);

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-parent</artifactId>
<version>1.11.0</version>
<version>1.11.1</version>
<packaging>pom</packaging>
<name>WIA APP ${project.version} </name>