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

Old SKU data become Triple, adding erpOrderItemId as differentiator in parameters in case of multiple SKU of same quantity

pull/8040/head
Qiuyi LI 2024-09-04 17:16:23 +02:00
parent 36c0df4e3d
commit d17769cff3
3 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/dochangeorder/ChangeOrderRequestBody.java
View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
import org.jeecg.modules.business.domain.api.mabang.RequestBody;
import java.util.HashSet;
@ -18,9 +19,9 @@ public class ChangeOrderRequestBody implements RequestBody {
private String orderStatus;
private String remark;
private final HashSet<Pair<String, Integer>> oldSkuData;
private HashSet<Triple<String, String, Integer>> oldSkuData;
private final HashSet<Pair<String, Integer>> newSkuData;
private HashSet<Pair<String, Integer>> newSkuData;
private final static String DEFAULT_WAREHOUSE_NAME = "SZBA宝安仓";
@ -36,7 +37,25 @@ public class ChangeOrderRequestBody implements RequestBody {
}
}
public ChangeOrderRequestBody(String platformOrderId, String orderStatus, HashSet<Pair<String, Integer>> oldSkuData,
public ChangeOrderRequestBody() {
}
public static ChangeOrderRequestBody buildChangeOrderRequestBody(String platformOrderId, String orderStatus,
HashSet<Pair<String, Integer>> oldSkuData,
HashSet<Pair<String, Integer>> newSkuData, String remark) {
ChangeOrderRequestBody body = new ChangeOrderRequestBody();
body.platformOrderId = platformOrderId;
body.orderStatus = orderStatus;
body.oldSkuData = new HashSet<>();
if (oldSkuData != null) {
oldSkuData.forEach(pair -> body.oldSkuData.add(Triple.of(pair.getLeft(), null, pair.getRight())));
}
body.newSkuData = newSkuData;
body.remark = remark;
return body;
}
public ChangeOrderRequestBody(String platformOrderId, String orderStatus, HashSet<Triple<String, String, Integer>> oldSkuData,
HashSet<Pair<String, Integer>> newSkuData, String remark) {
this.platformOrderId = platformOrderId;
this.oldSkuData = oldSkuData;
@ -58,17 +77,20 @@ public class ChangeOrderRequestBody implements RequestBody {
putNonNull(json, "remark", remark);
JSONArray stockDataArray = new JSONArray();
if (oldSkuData != null && !oldSkuData.isEmpty()) {
for (Pair<String, Integer> oldSkuDatum : oldSkuData) {
for (Triple<String, String, Integer> oldSkuDatum : oldSkuData) {
JSONObject stockData = new JSONObject();
stockData.put("warehouseName", DEFAULT_WAREHOUSE_NAME);
stockData.put("stockSku", oldSkuDatum.getKey());
stockData.put("quantity", oldSkuDatum.getValue());
stockData.put("stockSku", oldSkuDatum.getLeft());
if (oldSkuDatum.getMiddle() != null) {
stockData.put("erpOrderItemId", oldSkuDatum.getMiddle());
}
stockData.put("quantity", oldSkuDatum.getRight());
stockData.put("type", OperationType.REMOVE.code);
stockDataArray.add(stockData);
}
}
if(newSkuData != null) {
if (newSkuData != null) {
for (Pair<String, Integer> newSkuDatum : newSkuData) {
JSONObject stockData = new JSONObject();
stockData.put("warehouseName", DEFAULT_WAREHOUSE_NAME);
@ -78,7 +100,7 @@ public class ChangeOrderRequestBody implements RequestBody {
stockDataArray.add(stockData);
}
}
putNonNull(json,"stockData", stockDataArray.toJSONString());
putNonNull(json, "stockData", stockDataArray.toJSONString());
return json;
}

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

@ -123,8 +123,8 @@ public class AddCardJob implements Job {
// Still no card in order, add one
HashSet<Pair<String, Integer>> card = new HashSet<>();
card.add(Pair.of(CARD_SKU, 1));
ChangeOrderRequestBody changeOrderRequestBody = new ChangeOrderRequestBody(mabangOrder.getPlatformOrderId(), null,
null, card, null);
ChangeOrderRequestBody changeOrderRequestBody = ChangeOrderRequestBody.buildChangeOrderRequestBody(
mabangOrder.getPlatformOrderId(), null, null, card, null);
changeOrderRequests.add(changeOrderRequestBody);
}
}

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

@ -142,8 +142,8 @@ public class AddPortraitTubeJob implements Job {
HashSet<Pair<String, Integer>> adequateTubes = currentAndAdequateTubes.getRight();
// Do nothing if current tubes are the adequate tubes
if (!currentTubes.containsAll(adequateTubes) || !adequateTubes.containsAll(currentTubes)) {
ChangeOrderRequestBody changeOrderRequestBody = new ChangeOrderRequestBody(mabangOrder.getPlatformOrderId(), null,
currentTubes, adequateTubes, null);
ChangeOrderRequestBody changeOrderRequestBody = ChangeOrderRequestBody.buildChangeOrderRequestBody(
mabangOrder.getPlatformOrderId(), null, currentTubes, adequateTubes, null);
changeOrderRequests.add(changeOrderRequestBody);
}
}