mirror of https://github.com/jeecgboot/jeecg-boot
cleanup
parent
daf958f84f
commit
f90e02666b
|
@ -422,7 +422,6 @@ public class SkuController {
|
||||||
@GetMapping("/searchExistingSkuByKeywords")
|
@GetMapping("/searchExistingSkuByKeywords")
|
||||||
public Result<?> searchExistingSkuByKeywords(@RequestParam("keywords") String keywords) {
|
public Result<?> searchExistingSkuByKeywords(@RequestParam("keywords") String keywords) {
|
||||||
String parsedKeywords = keywords.trim().replaceAll("[{}=$]", "");
|
String parsedKeywords = keywords.trim().replaceAll("[{}=$]", "");
|
||||||
System.out.println("keywords : " + parsedKeywords);
|
|
||||||
if(parsedKeywords.isEmpty()) {
|
if(parsedKeywords.isEmpty()) {
|
||||||
return Result.OK(new ArrayList<>());
|
return Result.OK(new ArrayList<>());
|
||||||
}
|
}
|
||||||
|
@ -431,13 +430,11 @@ public class SkuController {
|
||||||
|
|
||||||
@PostMapping("/createMabangSku")
|
@PostMapping("/createMabangSku")
|
||||||
public Result<?> createMabangSku(@RequestBody List<SkuOrderPage> skuList) {
|
public Result<?> createMabangSku(@RequestBody List<SkuOrderPage> skuList) {
|
||||||
System.out.println(skuList);
|
|
||||||
skuList.forEach(sku -> sku.setStatus(3));
|
skuList.forEach(sku -> sku.setStatus(3));
|
||||||
return Result.OK(skuListMabangService.publishSkuToMabang(skuList));
|
return Result.OK(skuListMabangService.publishSkuToMabang(skuList));
|
||||||
}
|
}
|
||||||
@PostMapping("syncSkus")
|
@PostMapping("syncSkus")
|
||||||
public Result<?> syncSkus(@RequestBody List<String> erpCodes) {
|
public Result<?> syncSkus(@RequestBody List<String> erpCodes) {
|
||||||
System.out.println("syncSkus : " + erpCodes);
|
|
||||||
Map<Sku, String> newSkusNeedTreatmentMap;
|
Map<Sku, String> newSkusNeedTreatmentMap;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -411,7 +411,6 @@ public class SkuListMabangServiceImpl extends ServiceImpl<SkuListMabangMapper, S
|
||||||
return skuMap;
|
return skuMap;
|
||||||
}
|
}
|
||||||
public String createSkuWeight(Sku sku, String salesRemark) {
|
public String createSkuWeight(Sku sku, String salesRemark) {
|
||||||
System.out.println("salesRemark : " + salesRemark);
|
|
||||||
String remark = "";
|
String remark = "";
|
||||||
SkuWeight sw = new SkuWeight();
|
SkuWeight sw = new SkuWeight();
|
||||||
sw.setSkuId(sku.getId());
|
sw.setSkuId(sku.getId());
|
||||||
|
@ -504,7 +503,6 @@ public class SkuListMabangServiceImpl extends ServiceImpl<SkuListMabangMapper, S
|
||||||
if (!skusFromMabang.isEmpty()) {
|
if (!skusFromMabang.isEmpty()) {
|
||||||
// we save the skuDatas in DB
|
// we save the skuDatas in DB
|
||||||
// and store skus that need manual treatment
|
// and store skus that need manual treatment
|
||||||
System.out.println("skusFromMabang : " + skusFromMabang);
|
|
||||||
Map<Sku, String> newSkusMap = new HashMap<>(saveSkuFromMabang(skusFromMabang));
|
Map<Sku, String> newSkusMap = new HashMap<>(saveSkuFromMabang(skusFromMabang));
|
||||||
newSkusNeedTreatmentMap = new HashMap<>(newSkusMap);
|
newSkusNeedTreatmentMap = new HashMap<>(newSkusMap);
|
||||||
Map<Sku, String> finalNewSkusNeedTreatmentMap = newSkusNeedTreatmentMap;
|
Map<Sku, String> finalNewSkusNeedTreatmentMap = newSkusNeedTreatmentMap;
|
||||||
|
|
Loading…
Reference in New Issue