From dadf30e76709b8bbe422dcb2490174dffae54d12 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Thu, 26 Dec 2024 11:43:49 +0100 Subject: [PATCH 01/20] Update project version --- .../jeecg-system-start/src/main/resources/banner.txt | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt index c122702dc..1a3088b8a 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt @@ -8,7 +8,7 @@ ${AnsiColor.BRIGHT_BLUE} ${AnsiColor.BRIGHT_GREEN} -WIA APP Version: 3.0.2 +WIA APP Version: 3.0.3 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version} Website: www.wia-sourcing.com ${AnsiColor.BLACK} diff --git a/pom.xml b/pom.xml index 0607d3300..eaf17512d 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ - 3.0.2 + 3.0.3 3.6.3 1.8 UTF-8 From 229263acb99d2ff49de8bfbc50d4df521f703993 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Thu, 26 Dec 2024 16:07:57 +0100 Subject: [PATCH 02/20] Split underscores in order IDs when creating shopify sync maps --- .../org/jeecg/modules/business/domain/job/ShopifySyncJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/ShopifySyncJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/ShopifySyncJob.java index 8d5666701..c0d4e3902 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/ShopifySyncJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/ShopifySyncJob.java @@ -61,7 +61,7 @@ public class ShopifySyncJob implements Job { mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); List ordersReadyForShopifySync = platformOrderService.fetchOrderInShopsReadyForShopifySync(shops); Map syncMap = ordersReadyForShopifySync.stream() - .collect(toMap(PlatformOrderShopSync::getPlatformOrderId, Function.identity())); + .collect(toMap(sync -> sync.getPlatformOrderId().split("_")[0], Function.identity())); List fulfillmentOrders = new ArrayList<>(); From e555b705bed168dbc1c7b6fca5ad7ec6296cb65e Mon Sep 17 00:00:00 2001 From: Gauthier LO Date: Thu, 26 Dec 2024 16:09:07 +0100 Subject: [PATCH 03/20] feat : import excel for sku weight batch editing --- .../controller/admin/SkuWeightController.java | 98 ++++++++++++++++++- .../shippingInvoice/InvoiceController.java | 9 +- .../ShippingInvoiceController.java | 20 ++++ .../domain/job/MongoMigrationJob.java | 37 ++++++- .../impl/SkuMongoServiceImpl.java | 10 ++ 5 files changed, 165 insertions(+), 9 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java index e004dd2bd..a6829606b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java @@ -1,9 +1,18 @@ package org.jeecg.modules.business.controller.admin; +import java.io.IOException; +import java.io.InputStream; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; @@ -24,9 +33,13 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.business.vo.Responses; import org.jeecg.modules.business.vo.SkuWeightParam; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -54,7 +67,9 @@ public class SkuWeightController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, SkuWeight.class); + public Result importExcel(HttpServletRequest request, HttpServletResponse response) throws IOException { + log.info("Importing Sku weights from Excel..."); + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + + Responses responses = new Responses(); + List skuWeights = new ArrayList<>(); + Map skuWeightMappedByErpCode = new HashMap<>(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue(); + try (InputStream inputStream = file.getInputStream()){ + Workbook workbook = new XSSFWorkbook(inputStream); + for (Sheet sheet : workbook) { + int firstRow = sheet.getFirstRowNum(); + int lastRow = sheet.getLastRowNum(); + for (int rowIndex = firstRow + 1; rowIndex <= lastRow; rowIndex++) { + Row row = sheet.getRow(rowIndex); + SkuWeight skuWeight = new SkuWeight(); + boolean hasError = false; + String erpCode = null; + for (int cellIndex = row.getFirstCellNum(); cellIndex < NUMBER_OF_SKU_EXCEL_COLUMNS; cellIndex++) { + Cell cell = row.getCell(cellIndex, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); + String cellValue = cell.getStringCellValue(); + if(hasError) continue; + if(cellValue.isEmpty()){ + responses.addFailure("Row " + rowIndex + " has empty cell at index " + cellIndex); + hasError = true; + continue; + } + switch (cellIndex) { + case 0: + Sku sku = skuService.getByErpCode(cellValue); + if(sku == null){ + responses.addFailure("Row " + rowIndex + " SKU not found : " + cellValue); + hasError = true; + continue; + } + erpCode = cellValue; + skuWeight.setSkuId(sku.getId()); + break; + case 1: + skuWeight.setWeight((int) Double.parseDouble(cellValue)); + break; + case 2: + Date effectiveDate = formatter.parse(cellValue); + skuWeight.setEffectiveDate(effectiveDate); + break; + } + } + if(hasError) continue; + skuWeights.add(skuWeight); + assert erpCode != null; + skuWeightMappedByErpCode.put(erpCode, skuWeight); + } + } + log.info("Import weights for skus: {}", skuWeightMappedByErpCode.keySet()); + Responses mabangResponses = skuListMabangService.mabangSkuWeightUpdate(skuWeights); + List skuWeightSuccesses = new ArrayList<>(); + mabangResponses.getSuccesses().forEach(skuErpCode -> skuWeightSuccesses.add(skuWeightMappedByErpCode.get(skuErpCode))); + skuWeightSuccesses.forEach(skuWeight -> skuMongoService.upsertSkuWeight(skuWeight)); + skuWeightService.saveBatch(skuWeights); + responses.setSuccesses(mabangResponses.getSuccesses()); + } catch (Exception e) { + e.printStackTrace(); + String msg = e.getMessage(); + log.error(msg, e); + return Result.error("文件导入失败:" + e.getMessage()); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.OK(responses); } /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java index f3a8ab6ed..deddbbe89 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java @@ -348,14 +348,17 @@ public class InvoiceController { InvoiceMetaData metaData; try { List skuQuantities = skuService.getSkuQuantitiesFromOrderIds(param.orderIds()); + if(skuQuantities.isEmpty()) { + return Result.error("Nothing to invoice."); + } String purchaseId = purchaseOrderService.addPurchase(skuQuantities ,param.orderIds()); metaData = purchaseOrderService.makeInvoice(purchaseId); platformOrderService.updatePurchaseInvoiceNumber(param.orderIds(), metaData.getInvoiceCode()); String clientCategory = clientCategoryService.getClientCategoryByClientId(param.clientID()); -// if(clientCategory.equals(ClientCategory.CategoryName.CONFIRMED.getName()) || clientCategory.equals(ClientCategory.CategoryName.VIP.getName())) { -// balanceService.updateBalance(param.clientID(), metaData.getCode(), "purchase"); -// } + if(clientCategory.equals(ClientCategory.CategoryName.CONFIRMED.getName()) || clientCategory.equals(ClientCategory.CategoryName.VIP.getName())) { + balanceService.updateBalance(param.clientID(), metaData.getInvoiceCode(), "purchase"); + } if(clientCategory.equals(ClientCategory.CategoryName.SELF_SERVICE.getName())) { String subject = "Self-service purchase invoice"; String destEmail = env.getProperty("spring.mail.username"); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/ShippingInvoiceController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/ShippingInvoiceController.java index ca76bfe14..ebf486c62 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/ShippingInvoiceController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/ShippingInvoiceController.java @@ -80,6 +80,8 @@ public class ShippingInvoiceController { @Autowired private IShippingInvoiceService shippingInvoiceService; @Autowired + private ISecurityService securityService; + @Autowired private FreeMarkerConfigurer freemarkerConfigurer; @Autowired private EmailService emailService; @@ -284,6 +286,24 @@ public class ShippingInvoiceController { */ @GetMapping(value = "/downloadCompleteInvoiceExcel") public ResponseEntity download(@RequestParam("invoiceNumber") String invoiceNumber, @RequestParam("filetype") String filetype) throws IOException, UserException { + boolean isEmployee = securityService.checkIsEmployee(); + Client client; + if (!isEmployee) { + client = clientService.getCurrentClient(); + if (client == null) { + log.error("Couldn't find the client for the invoice number : {}", invoiceNumber); + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .contentType(MediaType.TEXT_PLAIN) + .body(""); + } + Client invoiceClient = clientService.getClientFromInvoice(invoiceNumber); + if (invoiceClient == null || !invoiceClient.getId().equals(client.getId())) { + log.error("Client {} is trying to download invoice {} which doesn't belong to him.", client.getInternalCode(), invoiceNumber); + return ResponseEntity.status(HttpStatus.FORBIDDEN) + .contentType(MediaType.TEXT_PLAIN) + .body("You are not allowed to download this invoice."); + } + } String filename = platformOrderShippingInvoiceService.getInvoiceList(invoiceNumber, filetype); if(!filename.equals("ERROR")) { File file = new File(filename); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MongoMigrationJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MongoMigrationJob.java index c8557c11c..c1903e850 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MongoMigrationJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MongoMigrationJob.java @@ -1,24 +1,59 @@ package org.jeecg.modules.business.domain.job; import lombok.extern.slf4j.Slf4j; +import org.codehaus.jettison.json.JSONException; +import org.codehaus.jettison.json.JSONObject; +import org.jeecg.modules.business.entity.Sku; +import org.jeecg.modules.business.service.ISkuService; import org.jeecg.modules.business.service.MigrationService; import org.quartz.Job; +import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.List; + @Slf4j @Component public class MongoMigrationJob implements Job { @Autowired private MigrationService migrationService; + @Autowired + private ISkuService skuService; @Override public void execute(JobExecutionContext context) throws JobExecutionException { log.info("MongoMigrationJob start .."); - migrationService.migrateSkuData(); + List skuList = new ArrayList<>(); + JobDataMap jobDataMap = context.getMergedJobDataMap(); + String parameter = ((String) jobDataMap.get("parameter")); + if (parameter != null) { + try { + JSONObject jsonObject = new JSONObject(parameter); + if(!jsonObject.isNull("skus")) { + for (int i = 0; i < jsonObject.getJSONArray("skus").length(); i++) { + skuList.add(jsonObject.getJSONArray("skus").getString(i)); + } + } + } catch (JSONException e) { + log.error("Error while parsing parameter as JSON, falling back to default parameters."); + } + } + if(skuList.isEmpty()) { + log.info("Migrating all skus .."); + migrationService.migrateSkuData(); + } + else { + log.info("Migrating skus: {}", skuList); + for(String erpCode : skuList) { + Sku sku = skuService.getByErpCode(erpCode); + migrationService.migrateOneSku(sku); + } + } log.info("MongoMigrationJob end .."); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mongoService/impl/SkuMongoServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mongoService/impl/SkuMongoServiceImpl.java index ad950e76c..239475d41 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mongoService/impl/SkuMongoServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mongoService/impl/SkuMongoServiceImpl.java @@ -17,6 +17,7 @@ import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.*; import org.springframework.stereotype.Component; +import java.util.Date; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -125,6 +126,15 @@ public class SkuMongoServiceImpl implements SkuMongoService { @Override public void upsertSkuWeight(SkuWeight skuWeight) { + SkuDocument skuDocument = findBySkuId(skuWeight.getSkuId()); + Date latestWeightInDB = Optional.ofNullable(skuDocument.getLatestSkuWeight()) + .map(SkuDocument.LatestSkuWeight::getEffectiveDate) + .orElse(null); + if(latestWeightInDB != null && latestWeightInDB.toInstant().isAfter(skuWeight.getEffectiveDate().toInstant())) { + log.error("SKU {} weight was not updated in Mongo document, as the effective date {} is older than the one in the database {}", + skuDocument.getErpCode(), skuWeight.getEffectiveDate(), skuDocument.getLatestSkuWeight().getEffectiveDate()); + return; + } Query query = new Query(Criteria.where("skuId").is(skuWeight.getSkuId())); SkuDocument.LatestSkuWeight latestSkuWeight = SkuDocument.LatestSkuWeight.builder() .weight(skuWeight.getWeight()) From a6aaac93259440c0bab9d6ef473765e5422ea67f Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Thu, 26 Dec 2024 16:48:36 +0100 Subject: [PATCH 04/20] Add new tracking number pattern and re-order by pattern length --- .../api/shopify/CreateFulfillmentRequest.java | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java index 4ebb3f8c1..da190e01f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java @@ -13,20 +13,34 @@ public class CreateFulfillmentRequest extends ShopifyRequest { private final static String OTHER = "Other"; private enum TransportCompany { - LA_POSTE("https://www.laposte.fr/outils/suivre-vos-envois?code=%s", "La Poste", "[69][A-Z]{1}[0-9]{11}|LP[0-9]{9}FR"), + // 12 [0-9] + CJ_LOGISTICS("https://www.cjlogistics.com/ko/tool/parcel/tracking", "CJ대한통운", "57575[0-9]{7}|58476[0-9]{7}|5901[0-9]{8}|57476[0-9]{7}"), + // 14 [0-9] DPD_BE("https://www.dpdgroup.com/be/mydpd/my-parcels/track?parcelNumber=%s", "DPD", "06086316[0-9]{6}"), DPD_DE("https://www.dpd.com/de/de/", "DPD", "0150534[0-9]{7}"), DPD_AT("https://www.mydpd.at", "DPD", "06215167[0-9]{6}"), + GLS_NL_2("https://www.gls-info.nl/tracking", "GLS", "(1437|1000)[0-9]{10}"), DPD_CH("https://www.dpdgroup.com/ch/mydpd/my-parcels/incoming?parcelNumber=%s", "DPD", "06086328[0-9]{6}"), + // 16 [0-9] CANADA_POST("https://www.canadapost-postescanada.ca/track-reperage/en#/search?searchFor=%s", "Canada Post", "(201255|732131|102303)[0-9]{10}"), - SWISS_POST("https://service.post.ch/ekp-web/ui/entry/search/%s", "Swiss Post", "[0-9]{18}|LW[0-9]{9}CH"), + // 18 [0-9] + QUICKPAC("https://quickpac.ch/de/tracking", "Quickpac", "44001091[0-9]{10}"), + ECO_SCOOTING("https://www.ecoscooting.com/tracking/%s", "EcoScooting", "[0-9]{5}00000[0-9]{8}"), + // 19 [0-9] EARLY_BIRD("https://earlybird.se/", "Early Bird", "[0-9]{19}"), + // 21 [0-9] DAO("https://www.dao.as/privat/find-din-pakke?stregkode=%s", "DAO", "00057151270[0-9]{10}"), + // 20 [0-9] DHL_PACKET("https://www.dhl.de/en/privatkunden/pakete-empfangen/verfolgen.html?piececode=%s", "DHL Packet", "0034[0-9]{16}"), GLS_NL("https://www.gls-info.nl/tracking", "GLS", "[0-9]{20}"), - GLS_NL_2("https://www.gls-info.nl/tracking", "GLS", "(1437|1000)[0-9]{10}"), - USPS("https://tools.usps.com/go/TrackConfirmAction?tRef=fullpage&tLc=2&text28777=&tLabels=%s&tABt=false", "USPS", "926[0-9]{23}|420[0-9]{5}926[0-9]{23}"), + // 22 [0-9] + CTT_EXPRESS("https://www.cttexpress.com/localizador-de-envios/", "CTT Express", "0082800082909[0-9]{9}"), + // 24 [0-9] AUSTRIAN_POST("https://www.post.at/s/sendungsdetails?snr=%s", "Austrian Post", "15828030053[0-9]{13}"), + // 26/35 [0-9] + USPS("https://tools.usps.com/go/TrackConfirmAction?tRef=fullpage&tLc=2&text28777=&tLabels=%s&tABt=false", "USPS", "926[0-9]{23}|420[0-9]{5}926[0-9]{23}"), + LA_POSTE("https://www.laposte.fr/outils/suivre-vos-envois?code=%s", "La Poste", "[69][A-Z]{1}[0-9]{11}|LP[0-9]{9}FR"), + SWISS_POST("https://service.post.ch/ekp-web/ui/entry/search/%s", "Swiss Post", "[0-9]{18}|LW[0-9]{9}CH"), DHL_PACKET_WIA("https://www.dhl.de/en/privatkunden/pakete-empfangen/verfolgen.html?piececode=%s", "DHL Packet", "CD[0-9]{9}DE"), DHL_PARCEL_WIA_NL("https://my.dhlparcel.nl/home/tracktrace/%s/%s?lang=nl_NL", "DHL Parcel", "3S[A-Z]{4}[0-9]{9}"), DHL_PARCEL_NL("https://my.dhlecommerce.nl/home/tracktrace/%s/%s?lang=nl_NL", "DHL Parcel", "JVGL[0-9]{20}"), @@ -46,9 +60,6 @@ public class CreateFulfillmentRequest extends ShopifyRequest { POST_NL("https://postnl.post/", "PostNL International Mail", "LS[0-9]{9}NL"), COLI_COLI("https://www.colicoli.fr/trackings?id=%s", "Coli Coli", "CC[0-9]{14}[A-Z]*"), LUXEMBOURG_POST("https://www.post.lu/particuliers/colis-courrier/track-and-trace#/search", "Luxembourg Post", "LL[0-9]{9}LU"), - CJ_LOGISTICS("https://www.cjlogistics.com/ko/tool/parcel/tracking", "CJ대한통운", "57575[0-9]{7}|58476[0-9]{7}|5901[0-9]{8}|57476[0-9]{7}"), - QUICKPAC("https://quickpac.ch/de/tracking", "Quickpac", "44001091[0-9]{10}"), - CTT_EXPRESS("https://www.cttexpress.com/localizador-de-envios/", "CTT Express", "0082800082909[0-9]{9}"), PDN_Express("https://pdn.express/nl/track/%s", "PDN Express", "PDN0003[0-9]{6}"), UNI_EXPRESS("https://www.uniuni.com/tracking/#tracking-detail?no=%s", "Uni Express", "GV24CA[0-9A-Z]{12}"), ; From c4a2b6a0a76b7f67831db47ad2d2288e1c2eb935 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Fri, 27 Dec 2024 10:39:29 +0100 Subject: [PATCH 05/20] Update Canada Post tracking number pattern --- .../business/domain/api/shopify/CreateFulfillmentRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java index da190e01f..b63330ce2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java @@ -22,7 +22,7 @@ public class CreateFulfillmentRequest extends ShopifyRequest { GLS_NL_2("https://www.gls-info.nl/tracking", "GLS", "(1437|1000)[0-9]{10}"), DPD_CH("https://www.dpdgroup.com/ch/mydpd/my-parcels/incoming?parcelNumber=%s", "DPD", "06086328[0-9]{6}"), // 16 [0-9] - CANADA_POST("https://www.canadapost-postescanada.ca/track-reperage/en#/search?searchFor=%s", "Canada Post", "(201255|732131|102303)[0-9]{10}"), + CANADA_POST("https://www.canadapost-postescanada.ca/track-reperage/en#/search?searchFor=%s", "Canada Post", "(201255|732131|102303|400864|102977)[0-9]{10}"), // 18 [0-9] QUICKPAC("https://quickpac.ch/de/tracking", "Quickpac", "44001091[0-9]{10}"), ECO_SCOOTING("https://www.ecoscooting.com/tracking/%s", "EcoScooting", "[0-9]{5}00000[0-9]{8}"), From b23a273b896c07f17ccef12efdc67c6fb642fc97 Mon Sep 17 00:00:00 2001 From: Gauthier LO Date: Fri, 27 Dec 2024 15:31:56 +0100 Subject: [PATCH 06/20] feat : first sheet and latest weight imported in Mabang --- .../admin/PurchaseOrderController.java | 10 ++- .../controller/admin/SkuWeightController.java | 87 ++++++++++--------- .../impl/SkuListMabangServiceImpl.java | 52 +++++++++-- 3 files changed, 95 insertions(+), 54 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/PurchaseOrderController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/PurchaseOrderController.java index ac94aae36..59a9f83a2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/PurchaseOrderController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/PurchaseOrderController.java @@ -212,9 +212,13 @@ public class PurchaseOrderController { BeanUtils.copyProperties(purchaseOrderPage, purchaseOrder); purchaseOrder.setPaymentDocumentString(new String(purchaseOrderPage.getPaymentDocument())); purchaseOrder.setInventoryDocumentString(new String(purchaseOrderPage.getInventoryDocument())); + Map responsesMappedByReason = new HashMap<>(); if(purchaseOrderPage.getPlatformOrderId() == null) { + Responses purchaseUpdateResponse = new Responses(); purchaseOrderService.updateById(purchaseOrder); - return Result.OK("sys.api.entryEditSuccess"); + purchaseUpdateResponse.addSuccess("updated"); + responsesMappedByReason.put("orderUpdate : " + purchaseOrder.getInvoiceNumber(), purchaseUpdateResponse); + return Result.OK("sys.api.entryEditSuccess", responsesMappedByReason); } List platformOrderIds = new ArrayList<>(Arrays.asList(purchaseOrderPage.getPlatformOrderId().split(","))); log.info("Editing purchase order and attributing it to orders : {}", platformOrderIds); @@ -222,7 +226,7 @@ public class PurchaseOrderController { platformOrderService.removePurchaseInvoiceNumber(purchaseOrder.getInvoiceNumber(), purchaseOrder.getClientId()); List platformOrders = platformOrderService.selectByPlatformOrderIds(platformOrderIds); log.info("Platform orders found for attribution : {}", platformOrders.stream().map(PlatformOrder::getPlatformOrderId).collect(Collectors.toList())); - Map responsesMappedByReason = new HashMap<>(); + Responses platformOrderIdUpdateResponse = new Responses(); if(!platformOrders.isEmpty()) { for(PlatformOrder po : platformOrders) { @@ -237,7 +241,7 @@ public class PurchaseOrderController { platformOrderIdUpdateResponse.getFailures().addAll(platformOrderIds); } purchaseOrderService.updateById(purchaseOrder); - responsesMappedByReason.put("Platform Order IDs Update / 平台订单号码更新 : " + purchaseOrder.getInvoiceNumber(), platformOrderIdUpdateResponse); + responsesMappedByReason.put("orderIdUpdate : " + purchaseOrder.getInvoiceNumber(), platformOrderIdUpdateResponse); return Result.OK("sys.api.entryEditSuccess", responsesMappedByReason); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java index a6829606b..9254ab1df 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java @@ -186,56 +186,59 @@ public class SkuWeightController extends JeecgController skuWeightSuccesses = new ArrayList<>(); - mabangResponses.getSuccesses().forEach(skuErpCode -> skuWeightSuccesses.add(skuWeightMappedByErpCode.get(skuErpCode))); + mabangResponses.getSuccesses().forEach(skuErpCode -> { + String erpCode = skuErpCode.split(":")[0].trim(); + skuWeightSuccesses.add(skuWeightMappedByErpCode.get(erpCode)); + }); skuWeightSuccesses.forEach(skuWeight -> skuMongoService.upsertSkuWeight(skuWeight)); skuWeightService.saveBatch(skuWeights); - responses.setSuccesses(mabangResponses.getSuccesses()); + responses.getSuccesses().addAll(mabangResponses.getSuccesses()); + responses.getFailures().addAll(mabangResponses.getFailures()); } catch (Exception e) { e.printStackTrace(); String msg = e.getMessage(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java index df1cd96dd..e2002b3ec 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java @@ -638,11 +638,38 @@ public class SkuListMabangServiceImpl extends ServiceImpl skuWeights) { Responses responses = new Responses(); List failures = new ArrayList<>(); - List skus = skuService.listByIds(skuWeights.stream() - .map(SkuWeight::getSkuId).collect(toList())); - + List skuIds = skuWeights.stream() + .map(SkuWeight::getSkuId) + .collect(toList()); + List skus = skuService.listByIds(skuIds); + // Map skuWeights by skuId, if skuId already in map, keep the skuWeight with the latest effective date + Map skuWeightMappedById = skuWeights.stream() + .collect(Collectors.toMap(SkuWeight::getSkuId, Function.identity(), (skuWeight1, skuWeight2) -> { + if(skuWeight1.getEffectiveDate().after(skuWeight2.getEffectiveDate())) { + log.info("The weight [{}] for sku [{}] is more recent.", skuWeight1.getWeight() ,skuWeight1.getSkuId()); + return skuWeight1; + } + log.info("The weight [{}] for sku [{}] is more recent.", skuWeight2.getWeight() ,skuWeight2.getSkuId()); + return skuWeight2; + })); + List skusToUpdate = new ArrayList<>(); + for(Sku sku : skus) { + SkuWeight latestSkuWeight = skuWeightService.getBySkuId(sku.getId()); + if(latestSkuWeight == null) { + skusToUpdate.add(sku); + continue; + } + Date latestEffectiveDate = latestSkuWeight.getEffectiveDate(); + Date effectiveDateToImport = skuWeightMappedById.get(sku.getId()).getEffectiveDate(); + if(latestEffectiveDate.after(effectiveDateToImport)) { + log.info("Sku {} has a more recent weight in DB. Therefore won't be imported to Mabang", sku.getErpCode()); + responses.addSuccess(sku.getErpCode()); + continue; + } + skusToUpdate.add(sku); + } Map remarkMappedByErpCode = new HashMap<>(); - List> skusPartition = Lists.partition(skus.stream().map(Sku::getErpCode).collect(toList()), 50); + List> skusPartition = Lists.partition(skusToUpdate.stream().map(Sku::getErpCode).collect(toList()), 50); for(List skuPartition : skusPartition) { SkuListRequestBody body = new SkuListRequestBody(); body.setStockSkuList(String.join(",", skuPartition)); @@ -664,15 +691,22 @@ public class SkuListMabangServiceImpl extends ServiceImpl skuDataList = skuWeights.stream() .map(skuWeight -> { - Sku sku = skus.stream() + Sku sku = skusToUpdate.stream() .filter(s -> s.getId().equals(skuWeight.getSkuId())) .findFirst() .orElse(null); - if(null == sku) { + Sku skuInDb = skus.stream() + .filter(s -> s.getId().equals(skuWeight.getSkuId())) + .findFirst() + .orElse(null); + if(null == skuInDb) { log.error("Sku not found : {}", skuWeight.getSkuId()); failures.add(skuWeight.getSkuId()); return null; } + if(null == sku) { + return null; + } SkuData skuData = new SkuData(); skuData.setErpCode(sku.getErpCode()); if(remarkMappedByErpCode.containsKey(sku.getErpCode())) { @@ -713,14 +747,14 @@ public class SkuListMabangServiceImpl extends ServiceImpl successes = results.stream() .filter(SkuChangeResponse::success) - .map(SkuChangeResponse::getStockSku) + .map(response -> response.getStockSku() + " : Mabang OK") .collect(toList()); failures.addAll(results.stream() .filter(response -> !response.success()) - .map(SkuChangeResponse::getStockSku) + .map(response -> response.getStockSku() + " | Mabang") .collect(toList())); - responses.setSuccesses(successes); + responses.getSuccesses().addAll(successes); responses.setFailures(failures); return responses; } From 3ac14b6a0d3f82f1fc035c2e5423021b66df979b Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Fri, 27 Dec 2024 16:58:19 +0100 Subject: [PATCH 07/20] Update project version --- .../jeecg-system-start/src/main/resources/banner.txt | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt index 1a3088b8a..ce53597f1 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt @@ -8,7 +8,7 @@ ${AnsiColor.BRIGHT_BLUE} ${AnsiColor.BRIGHT_GREEN} -WIA APP Version: 3.0.3 +WIA APP Version: 3.0.4 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version} Website: www.wia-sourcing.com ${AnsiColor.BLACK} diff --git a/pom.xml b/pom.xml index eaf17512d..367272d47 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ - 3.0.3 + 3.0.4 3.6.3 1.8 UTF-8 From da932802d7f6104f441b1fa20033e374416e0c85 Mon Sep 17 00:00:00 2001 From: Gauthier LO Date: Mon, 30 Dec 2024 10:04:38 +0100 Subject: [PATCH 08/20] feat : export sku weight via Excel, fix log for front --- .../controller/admin/SkuWeightController.java | 30 +++++++++++---- .../business/mapper/SkuWeightMapper.java | 5 +++ .../business/mapper/xml/SkuWeightMapper.xml | 38 +++++++++++++++++++ .../business/service/ISkuWeightService.java | 9 +++++ .../service/impl/SkuWeightServiceImpl.java | 11 ++++++ .../modules/business/vo/SkuWeightPage.java | 23 +++++++++++ 6 files changed, 109 insertions(+), 7 deletions(-) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuWeightPage.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java index 9254ab1df..347887959 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java @@ -32,9 +32,11 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.business.vo.Responses; +import org.jeecg.modules.business.vo.SkuWeightPage; import org.jeecg.modules.business.vo.SkuWeightParam; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -157,12 +159,23 @@ public class SkuWeightController extends JeecgController skuIds) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List skuWeightList; + if (skuIds == null || skuIds.isEmpty()) { + skuWeightList = skuWeightService.listLatestWeights(); + } else { + skuWeightList = skuWeightService.listLatestWeightForSkus(skuIds); + } + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + mv.addObject(NormalExcelConstants.FILE_NAME, "SKU重量列表"); + mv.addObject(NormalExcelConstants.CLASS, SkuWeightPage.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("SKU重量数据", "导出人:" + sysUser.getRealname(), "SKU重量")); + mv.addObject(NormalExcelConstants.DATA_LIST, skuWeightList); + return mv; } /** @@ -313,7 +326,10 @@ public class SkuWeightController extends JeecgController skuWeights = new ArrayList<>(skuWeightsMap.values()); Responses responses = skuListMabangService.mabangSkuWeightUpdate(skuWeights); List skuWeightSuccesses = new ArrayList<>(); - responses.getSuccesses().forEach(skuErpCode -> skuWeightSuccesses.add(skuWeightsMap.get(skuErpCode))); + responses.getSuccesses().forEach(skuErpCode -> { + String erpCode = skuErpCode.split(":")[0].trim(); + skuWeightSuccesses.add(skuWeightsMap.get(erpCode)); + }); skuWeightSuccesses.forEach(skuWeight -> skuMongoService.upsertSkuWeight(skuWeight)); skuWeightService.saveBatch(skuWeights); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuWeightMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuWeightMapper.java index c1b6db9a3..634967812 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuWeightMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuWeightMapper.java @@ -5,6 +5,7 @@ import java.util.List; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.business.entity.SkuWeight; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.business.vo.SkuWeightPage; import org.springframework.stereotype.Repository; /** @@ -18,4 +19,8 @@ public interface SkuWeightMapper extends BaseMapper { SkuWeight getBySkuId(@Param("skuId") String skuId); String searchFirstEmptyWeightSku(@Param("skuIds") List skuIds); + + List listLatestWeights(); + + List listLatestWeightForSkus(@Param("skuIds") List skuIds); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuWeightMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuWeightMapper.xml index bc210352e..a59b234bb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuWeightMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuWeightMapper.xml @@ -24,4 +24,42 @@ ) LIMIT 1; + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuWeightService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuWeightService.java index fe674e045..463c22047 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuWeightService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuWeightService.java @@ -2,6 +2,7 @@ package org.jeecg.modules.business.service; import org.jeecg.modules.business.entity.SkuWeight; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.business.vo.SkuWeightPage; import java.util.List; @@ -15,4 +16,12 @@ public interface ISkuWeightService extends IService { SkuWeight getBySkuId(String skuId); String searchFirstEmptyWeightSku(List skuIds); + + /** + * used to export all latest weights for front, so instead of fetching skuId, we fetch erpCode + * @return + */ + List listLatestWeights(); + + List listLatestWeightForSkus(List skuIds); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuWeightServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuWeightServiceImpl.java index 21ce36867..92c8d9b53 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuWeightServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuWeightServiceImpl.java @@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.business.entity.SkuWeight; import org.jeecg.modules.business.mapper.SkuWeightMapper; import org.jeecg.modules.business.service.ISkuWeightService; +import org.jeecg.modules.business.vo.SkuWeightPage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,4 +33,14 @@ public class SkuWeightServiceImpl extends ServiceImpl skuIds) { return skuWeightMapper.searchFirstEmptyWeightSku(skuIds); } + + @Override + public List listLatestWeights() { + return skuWeightMapper.listLatestWeights(); + } + + @Override + public List listLatestWeightForSkus(List skuIds) { + return skuWeightMapper.listLatestWeightForSkus(skuIds); + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuWeightPage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuWeightPage.java new file mode 100644 index 000000000..69ba4e094 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuWeightPage.java @@ -0,0 +1,23 @@ +package org.jeecg.modules.business.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.util.Date; + +@Data +@ApiModel(value = "sku_weight Page对象", description = "SKU重量") + +public class SkuWeightPage { + @Excel(name = "ERP中商品代码", width = 15) + @ApiModelProperty(value = "ERP中商品代码") + private String erpCode; + @Excel(name = "重量", width = 15) + @ApiModelProperty(value = "重量") + private Integer weight; + @Excel(name = "生效日期", width = 15) + @ApiModelProperty(value = "生效日期") + private Date effectiveDate; +} From 5de08ebb02429323d1fc1f8bd20625c5109c62d5 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Mon, 30 Dec 2024 12:01:16 +0100 Subject: [PATCH 09/20] Update tracking number patterns --- .../business/domain/api/shopify/CreateFulfillmentRequest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java index b63330ce2..7a06c7f22 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java @@ -57,11 +57,12 @@ public class CreateFulfillmentRequest extends ShopifyRequest { EVRI("https://www.evri.com/track/parcel/%s/details", "Evri", "H[0-9A-Z]{5}[0-9]{10}"), YODEL("https://www.yodel.co.uk/tracking/%s/%s", "Yodel", "JD[0-9]{16}"), UK_ROYAL_MAIL("https://www.royalmail.com/track-your-item#/tracking-results/%s", "Royal Mail", "(FJ002|WB788)[0-9]{6}GB"), - POST_NL("https://postnl.post/", "PostNL International Mail", "LS[0-9]{9}NL"), + POST_NL("https://postnl.post/", "PostNL International Mail", "L(S|R)[0-9]{9}NL"), COLI_COLI("https://www.colicoli.fr/trackings?id=%s", "Coli Coli", "CC[0-9]{14}[A-Z]*"), LUXEMBOURG_POST("https://www.post.lu/particuliers/colis-courrier/track-and-trace#/search", "Luxembourg Post", "LL[0-9]{9}LU"), PDN_Express("https://pdn.express/nl/track/%s", "PDN Express", "PDN0003[0-9]{6}"), UNI_EXPRESS("https://www.uniuni.com/tracking/#tracking-detail?no=%s", "Uni Express", "GV24CA[0-9A-Z]{12}"), + UPS("https://www.uniuni.com/tracking/#tracking-detail?no=%s", "UPS", "1Z88[0-9A-Z]{14}"), ; private final String trackingUrl; From ea2411318afd6f47b654263a78e7715729bc70e4 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Mon, 30 Dec 2024 12:01:50 +0100 Subject: [PATCH 10/20] Update project version --- .../jeecg-system-start/src/main/resources/banner.txt | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt index ce53597f1..f15d7867d 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt @@ -8,7 +8,7 @@ ${AnsiColor.BRIGHT_BLUE} ${AnsiColor.BRIGHT_GREEN} -WIA APP Version: 3.0.4 +WIA APP Version: 3.0.5 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version} Website: www.wia-sourcing.com ${AnsiColor.BLACK} diff --git a/pom.xml b/pom.xml index 367272d47..220d220a8 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ - 3.0.4 + 3.0.5 3.6.3 1.8 UTF-8 From bdf7b471db6d92da70747f688254c7dcd6fa652c Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Thu, 2 Jan 2025 14:58:32 +0100 Subject: [PATCH 11/20] Use client's own tracking URL for anything other than La Poste's tracking numbers --- .../domain/api/shopify/CreateFulfillmentRequest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java index 7a06c7f22..82a93db27 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java @@ -13,8 +13,10 @@ public class CreateFulfillmentRequest extends ShopifyRequest { private final static String OTHER = "Other"; private enum TransportCompany { + GIULIA_SCHIAPARELLI("","Giulia Schiaparelli","^(?![69][A-Z][0-9]{11}$)(?!LP[0-9]{9}FR$).+$"), + LA_POSTE("https://www.laposte.fr/outils/suivre-vos-envois?code=%s", "La Poste", "[69][A-Z]{1}[0-9]{11}|LP[0-9]{9}FR"), // 12 [0-9] - CJ_LOGISTICS("https://www.cjlogistics.com/ko/tool/parcel/tracking", "CJ대한통운", "57575[0-9]{7}|58476[0-9]{7}|5901[0-9]{8}|57476[0-9]{7}"), + /*CJ_LOGISTICS("https://www.cjlogistics.com/ko/tool/parcel/tracking", "CJ대한통운", "57575[0-9]{7}|58476[0-9]{7}|5901[0-9]{8}|57476[0-9]{7}"), // 14 [0-9] DPD_BE("https://www.dpdgroup.com/be/mydpd/my-parcels/track?parcelNumber=%s", "DPD", "06086316[0-9]{6}"), DPD_DE("https://www.dpd.com/de/de/", "DPD", "0150534[0-9]{7}"), @@ -62,7 +64,7 @@ public class CreateFulfillmentRequest extends ShopifyRequest { LUXEMBOURG_POST("https://www.post.lu/particuliers/colis-courrier/track-and-trace#/search", "Luxembourg Post", "LL[0-9]{9}LU"), PDN_Express("https://pdn.express/nl/track/%s", "PDN Express", "PDN0003[0-9]{6}"), UNI_EXPRESS("https://www.uniuni.com/tracking/#tracking-detail?no=%s", "Uni Express", "GV24CA[0-9A-Z]{12}"), - UPS("https://www.uniuni.com/tracking/#tracking-detail?no=%s", "UPS", "1Z88[0-9A-Z]{14}"), + UPS("https://www.uniuni.com/tracking/#tracking-detail?no=%s", "UPS", "1Z88[0-9A-Z]{14}"),*/ ; private final String trackingUrl; From 272c8d49b1f7f41869480bfb6785893fbe7e0bdb Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Tue, 4 Feb 2025 17:17:43 +0100 Subject: [PATCH 12/20] Replace domain name in Shouman API url by IP address --- .../org/jeecg/modules/business/domain/api/shouman/Request.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shouman/Request.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shouman/Request.java index 92ffbb4a3..a16d8cf92 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shouman/Request.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shouman/Request.java @@ -24,7 +24,7 @@ import java.util.Map; */ @Slf4j public abstract class Request { - private final static String BASE_URL = "http://xmsmdz.xyldiy.com:8012/api"; + private final static String BASE_URL = "http://43.192.16.96:8012/api"; private static final HttpMethod METHOD = HttpMethod.POST; private static final String KEY = "BpQWy6AtvKcixjePQ4ZMuvBqUyIsXWWX"; private static final String SHOP_CODE = "8ee5c82004c44049b9f22a0ed8dc4db3"; From fa821b1bdc2067873c58cc3f27358c1ca1deba32 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Tue, 4 Feb 2025 17:23:10 +0100 Subject: [PATCH 13/20] Use new tube for 50cm canvases --- .../modules/business/domain/job/AddPortraitTubeJob.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddPortraitTubeJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddPortraitTubeJob.java index 0de26ec65..a231b56c8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddPortraitTubeJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddPortraitTubeJob.java @@ -41,13 +41,13 @@ public class AddPortraitTubeJob implements Job { private static final String TUBE_NEW_40_SKU_SINGLE = "PJ349400032-JCH"; private static final String TUBE_NEW_40_SKU_MULTIPLE = "PJ349400045-JCH"; -// private static final String TUBE_NEW_50_SKU_SINGLE = "PJ349500032-JCH"; + private static final String TUBE_NEW_50_SKU_SINGLE = "PJ349500032-JCH"; private static final String TUBE_NEW_50_SKU_MULTIPLE = "PJ349500045-JCH"; private static final String TUBE_NEW_60_SKU_SINGLE = "PJ349600032-JCH"; private static final String TUBE_NEW_60_SKU_MULTIPLE = "PJ349600045-JCH"; private static final List TUBE_SKUS = Arrays.asList(TUBE_30_SKU_SINGLE_DOUBLE, TUBE_50_SKU_SINGLE, - TUBE_NEW_40_SKU_MULTIPLE, TUBE_NEW_50_SKU_MULTIPLE, TUBE_NEW_60_SKU_SINGLE, + TUBE_NEW_40_SKU_MULTIPLE, TUBE_NEW_50_SKU_MULTIPLE, TUBE_NEW_60_SKU_SINGLE, TUBE_NEW_50_SKU_SINGLE, TUBE_NEW_60_SKU_MULTIPLE, TUBE_NEW_40_SKU_SINGLE); private static final String PREFIX_50_CANVAS = "JJ2501"; private static final String PREFIX_50_CANVAS_CHROME = "JJ2001"; @@ -306,7 +306,7 @@ public class AddPortraitTubeJob implements Job { } if (tube50SingleCount > 0) { - adequateTubes.add(Pair.of(TUBE_50_SKU_SINGLE, tube50SingleCount)); + adequateTubes.add(Pair.of(TUBE_NEW_50_SKU_SINGLE, tube50SingleCount)); } if (tubeNew60MultipleCount > 0) { adequateTubes.add(Pair.of(TUBE_NEW_60_SKU_MULTIPLE, tubeNew60MultipleCount)); From 3030a527c2c229e7a9034296496788e201f545ee Mon Sep 17 00:00:00 2001 From: Gauthier LO Date: Thu, 6 Feb 2025 15:49:12 +0100 Subject: [PATCH 14/20] feat : tempSkuBuilder --- .../controller/admin/SkuController.java | 115 +++++++++++++++- .../controller/admin/SkuWeightController.java | 23 ++-- .../mabang/doSearchSkuListNew/SkuData.java | 12 +- .../doSearchSkuListNew/SkuListRawStream.java | 2 +- .../SkuListRequestBody.java | 2 +- .../mabang/doSearchSkuListNew/Warehouse.java | 43 ++++++ .../stockDoAddStock/SkuAddRequestBody.java | 2 +- .../stockDoAddStock/SkuAddResponse.java | 9 ++ .../domain/job/MabangUnpairedSkuJob.java | 12 +- .../mapper/SensitiveAttributeMapper.java | 4 + .../modules/business/mapper/SkuMapper.java | 4 + .../mapper/xml/SensitiveAttributeMapper.xml | 24 +++- .../modules/business/mapper/xml/SkuMapper.xml | 26 ++++ .../service/ISensitiveAttributeService.java | 4 + .../service/ISkuListMabangService.java | 12 +- .../modules/business/service/ISkuService.java | 4 + .../impl/SensitiveAttributeServiceImpl.java | 10 ++ .../impl/SkuListMabangServiceImpl.java | 114 ++++++++++++---- .../business/service/impl/SkuServiceImpl.java | 11 +- .../jeecg/modules/business/vo/NewSkuPage.java | 128 ++++++++++++++++++ .../modules/business/vo/ResponsesWithMsg.java | 45 ++++++ .../modules/business/vo/SkuOrderPage.java | 6 +- 22 files changed, 551 insertions(+), 61 deletions(-) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/Warehouse.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/NewSkuPage.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/ResponsesWithMsg.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java index 85247be72..f3189b5fd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java @@ -40,6 +40,8 @@ import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; @@ -56,6 +58,8 @@ import static org.jeecg.common.util.SqlInjectionUtil.specialFilterContentForDict @RequestMapping("/sku") @Slf4j public class SkuController { + @Autowired + private IShopService shopService; @Autowired private ISkuService skuService; @Autowired @@ -447,9 +451,88 @@ public class SkuController { @PostMapping("/createMabangSku") public Result createMabangSku(@RequestBody List skuList) { - skuList.forEach(sku -> sku.setStatus(3)); + log.info("Request to create {} new skus in Mabang", skuList.size()); + skuList.forEach(sku -> { + if(sku.getId() != null && !sku.getId().isEmpty()) { + log.info("Request to pair sku [{}] with old sku [{}]", sku.getErpCode(), sku.getId()); + } + if(sku.getShippingDiscount() == null) { + sku.setShippingDiscount(BigDecimal.ZERO); + } else { + BigDecimal oldValue = sku.getShippingDiscount().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP); + sku.setShippingDiscount(BigDecimal.ONE.subtract(oldValue)); + } + sku.setStatus(3); + }); return Result.OK(skuListMabangService.publishSkuToMabang(skuList)); } + @RequestMapping(value = "/exportNewMabangSkusXls") + public ModelAndView exportXls(@RequestParam Map params) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List skuList = parseSkuList(params); + log.info("Request to create {} new skus in Mabang", skuList.size()); + skuList.forEach(sku -> { + if(sku.getShippingDiscount() == null) { + sku.setShippingDiscount(BigDecimal.ONE); + } else { + BigDecimal oldValue = sku.getShippingDiscount().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP); + sku.setShippingDiscount(BigDecimal.ONE.subtract(oldValue)); + } + sku.setStatus(3); + }); + + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + mv.addObject(NormalExcelConstants.FILE_NAME, "新增库存SKU表"); + mv.addObject(NormalExcelConstants.CLASS, NewSkuPage.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("新增库存SKU表数据", "导出人:" + sysUser.getRealname(), "新增库存SKU表")); + mv.addObject(NormalExcelConstants.DATA_LIST, skuList); + return mv; + } + private List parseSkuList(Map params) { + // Group parameters by "selections[index]" + Map> grouped = new HashMap<>(); + for (Map.Entry entry : params.entrySet()) { + String key = entry.getKey(); + String value = entry.getValue(); + + if (key.startsWith("selections[")) { + int indexStart = key.indexOf("[") + 1; + int indexEnd = key.indexOf("]"); + int index = Integer.parseInt(key.substring(indexStart, indexEnd)); + + String field = key.substring(key.indexOf("][") + 2, key.length() - 1); + grouped.computeIfAbsent(index, k -> new HashMap<>()).put(field, value); + } + } + + // Convert maps to SkuOrderPage objects + return grouped.values().stream() + .map(this::mapToSkuOrderPage) + .collect(Collectors.toList()); + } + + private NewSkuPage mapToSkuOrderPage(Map map) { + NewSkuPage sku = new NewSkuPage(); + sku.setMabangSku(map.get("id")); + sku.setZhName(map.get("zhName")); + sku.setEnName(map.get("enName")); + sku.setDeclareEname(map.get("declareEname")); + sku.setDeclareName(map.get("declareName")); + sku.setErpCode(map.get("erpCode")); + sku.setWeight(map.get("weight") != null ? Integer.parseInt(map.get("weight")) : null); + sku.setStatus(map.get("status") != null ? Integer.parseInt(map.get("status")) : 3); + sku.setSensitiveAttribute(map.get("sensitiveAttribute")); + sku.setIsGift(map.get("isGift") != null ? Integer.parseInt(map.get("isGift")) : 2); + sku.setSkuPrice(map.get("skuPrice") != null ? new BigDecimal(map.get("skuPrice")) : BigDecimal.ZERO); + sku.setDeclaredValue(map.get("declaredValue") != null ? new BigDecimal(map.get("declaredValue")) : null); + sku.setShippingDiscount(map.get("shippingDiscount") != null ? new BigDecimal(map.get("shippingDiscount")) : BigDecimal.ZERO); + sku.setServiceFee(map.get("serviceFee") != null ? new BigDecimal(map.get("serviceFee")) : BigDecimal.ZERO); + sku.setWarehouse(map.get("warehouse")); + sku.setSupplier(map.get("supplier")); + sku.setSupplierLink(map.get("supplierLink")); + sku.setImageSource(map.get("imageSource")); + return sku; + } @PostMapping("syncSkus") public Result syncSkus(@RequestBody List erpCodes) { Map newSkusNeedTreatmentMap; @@ -496,4 +579,34 @@ public class SkuController { skuListMabangService.mabangSkuStockUpdate(erpCodes); return Result.OK(); } + + @GetMapping("/unpairedSkus") + public Result unpairedSkus(@RequestParam(name = "shop") String shopCode, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "50") Integer pageSize, + @RequestParam(name = "column", defaultValue = "erp_code") String column, + @RequestParam(name = "order", defaultValue = "ASC") String order + ) { + String parsedColumn = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, column.replace("_dictText", "")); + String parsedOrder = order.toUpperCase(); + if(!parsedOrder.equals("ASC") && !parsedOrder.equals("DESC")) { + return Result.error("Error 400 Bad Request"); + } + try { + specialFilterContentForDictSql(parsedColumn); + } catch (RuntimeException e) { + return Result.error("Error 400 Bad Request"); + } + String shopId = shopService.getIdByCode(shopCode); + if (shopId == null) return Result.error(404, "Shop not found"); + int total = skuListMabangService.countUnpairedSkus(shopId); + List unpairedSkus = skuListMabangService.unpairedSkus(shopId, pageNo, pageSize, parsedColumn, parsedOrder); + + IPage page = new Page<>(); + page.setRecords(unpairedSkus); + page.setCurrent(pageNo); + page.setSize(pageSize); + page.setTotal(total); + return Result.OK(page); + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java index 347887959..ed03dbcbe 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuWeightController.java @@ -31,7 +31,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; -import org.jeecg.modules.business.vo.Responses; +import org.jeecg.modules.business.vo.ResponsesWithMsg; import org.jeecg.modules.business.vo.SkuWeightPage; import org.jeecg.modules.business.vo.SkuWeightParam; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -192,7 +192,7 @@ public class SkuWeightController extends JeecgController fileMap = multipartRequest.getFileMap(); - Responses responses = new Responses(); + ResponsesWithMsg responses = new ResponsesWithMsg(); List skuWeights = new ArrayList<>(); Map skuWeightMappedByErpCode = new HashMap<>(); for (Map.Entry entity : fileMap.entrySet()) { @@ -242,16 +242,16 @@ public class SkuWeightController extends JeecgController skuWeightSuccesses = new ArrayList<>(); - mabangResponses.getSuccesses().forEach(skuErpCode -> { - String erpCode = skuErpCode.split(":")[0].trim(); - skuWeightSuccesses.add(skuWeightMappedByErpCode.get(erpCode)); + mabangResponses.getSuccesses().forEach((skuErpCode, messages) -> { + skuWeightSuccesses.add(skuWeightMappedByErpCode.get(skuErpCode)); }); skuWeightSuccesses.forEach(skuWeight -> skuMongoService.upsertSkuWeight(skuWeight)); skuWeightService.saveBatch(skuWeights); - responses.getSuccesses().addAll(mabangResponses.getSuccesses()); - responses.getFailures().addAll(mabangResponses.getFailures()); + + mabangResponses.getSuccesses().forEach(responses::addSuccess); + mabangResponses.getFailures().forEach(responses::addFailure); } catch (Exception e) { e.printStackTrace(); String msg = e.getMessage(); @@ -324,11 +324,10 @@ public class SkuWeightController extends JeecgController skuWeights = new ArrayList<>(skuWeightsMap.values()); - Responses responses = skuListMabangService.mabangSkuWeightUpdate(skuWeights); + ResponsesWithMsg responses = skuListMabangService.mabangSkuWeightUpdate(skuWeights); List skuWeightSuccesses = new ArrayList<>(); - responses.getSuccesses().forEach(skuErpCode -> { - String erpCode = skuErpCode.split(":")[0].trim(); - skuWeightSuccesses.add(skuWeightsMap.get(erpCode)); + responses.getSuccesses().forEach((skuErpCode, messages) -> { + skuWeightSuccesses.add(skuWeightsMap.get(skuErpCode)); }); skuWeightSuccesses.forEach(skuWeight -> skuMongoService.upsertSkuWeight(skuWeight)); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuData.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuData.java index 953e2c858..11f1f072f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuData.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuData.java @@ -40,6 +40,11 @@ public class SkuData { private Integer status; @JSONField(name="originalSku") private String originalSku; + /** + * if multiple virtual skus, they need to be separated by ";" + */ + @JSONField(name="virtualSkus") + private String virtualSkus; @JSONField(name="salePrice") private BigDecimal salePrice; @JSONField(name="declareValue") @@ -54,7 +59,10 @@ public class SkuData { private BigDecimal purchasePrice; /**默认供应商名称,接口参数传showProvider才返回*/ @JSONField(name="warehouse") - private String warehouse; + private Warehouse[] warehouse; + + @JSONField(name="warehouseName") + private String warehouseName; /** * if stockPicture is empty, we use it */ @@ -109,7 +117,7 @@ public class SkuData { /** * 是否为易燃品 1: 是 2：不是，默认为2 */ - @JSONField(name="is_flammable") + @JSONField(name="is_flammables") private Integer isFlammable; /** * 是否为刀具 1：是 2：不是，默认为2 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuListRawStream.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuListRawStream.java index 7c0c163ce..e8fa9da22 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuListRawStream.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuListRawStream.java @@ -31,7 +31,7 @@ public class SkuListRawStream implements NetworkDataStream { public SkuListResponse attempt() { log.info("Begin the first request"); this.currentResponse = new SkuListRequest(toSend).send(); - if (currentResponse.getData().isEmpty()) { + if (currentResponse.getData() == null || currentResponse.getData().isEmpty()) { return null; } began = true; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuListRequestBody.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuListRequestBody.java index 8433d44c1..60b523f80 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuListRequestBody.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuListRequestBody.java @@ -48,7 +48,7 @@ public class SkuListRequestBody implements RequestBody { putNonNull(json, "maxRows", maxRows); putNonNull(json, "showVirtualSku", showVirtualSku); putNonNull(json, "showProvider", showProvider); - putNonNull(json, "showWarehouse", showWarehouse); + putNonNull(json, "showWarehouse", String.valueOf(showWarehouse)); putNonNull(json, "showLabel", showLabel); putNonNull(json, "showAttributes", showAttributes); return json; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/Warehouse.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/Warehouse.java new file mode 100644 index 000000000..1dccaaf39 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/Warehouse.java @@ -0,0 +1,43 @@ +package org.jeecg.modules.business.domain.api.mabang.doSearchSkuListNew; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; + +@Data + // 仓库信息,接口参数传showWarehouse才返回 +public class Warehouse { + /**仓库编号*/ + @JSONField(name = "warehouseId") + private long warehouseId; + /**仓位**/ + @JSONField(name = "gridCode") + private String gridCode; + /**库存警戒天数*/ + @JSONField(name = "stockWarningDays") + private int stockWarningDays; + /**商品预警天数*/ + @JSONField(name="product_warning_days") + private int productWarningDays; + /**仓库名称*/ + @JSONField(name = "warehouseName") + private String warehouseName; + /**仓库状态:1启用;2停用*/ + @JSONField(name = "status") + private int status; + /**仓库成本价*/ + @JSONField(name = "stockCost") + private String stockCost; + /**是否是默认仓库1是;2否*/ + @JSONField(name = "isDefault") + private int isDefault; + /**警戒库存*/ + @JSONField(name = "stockWarningQuantity") + private int stockWarningQuantity; + /**采购天数*/ + @JSONField(name = "purchaseDays") + private int purchaseDays; + @JSONField(name = "minPurchaseQuantity") + private int minPurchaseQuantity; + @JSONField(name = "maxPurchaseQuantity") + private int maxPurchaseQuantity; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/stockDoAddStock/SkuAddRequestBody.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/stockDoAddStock/SkuAddRequestBody.java index 290c3e759..b025300c1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/stockDoAddStock/SkuAddRequestBody.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/stockDoAddStock/SkuAddRequestBody.java @@ -85,7 +85,7 @@ public class SkuAddRequestBody implements RequestBody { this.declareValue = data.getDeclareValue(); this.declareName = data.getDeclareNameZh(); this.declareEname = data.getDeclareNameEn(); - this.warehouse = data.getWarehouse(); + this.warehouse = data.getWarehouseName(); this.remark = data.getSaleRemark(); this.hasBattery = data.getHasBattery(); this.magnetic = data.getMagnetic(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/stockDoAddStock/SkuAddResponse.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/stockDoAddStock/SkuAddResponse.java index e6b69a89e..b124ecd21 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/stockDoAddStock/SkuAddResponse.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/stockDoAddStock/SkuAddResponse.java @@ -20,12 +20,21 @@ public class SkuAddResponse extends Response { private final String stockSku; + private String message; + public SkuAddResponse(Code code, JSONObject data, String stockId, String stockSku) { super(code); this.data = data; this.stockId = stockId; this.stockSku = stockSku; } + public SkuAddResponse(Code code, JSONObject data, String stockId, String stockSku, String message) { + super(code); + this.data = data; + this.stockId = stockId; + this.stockSku = stockSku; + this.message = message; + } /** * Make an instance by parsing json, it only checks validity of code. diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangUnpairedSkuJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangUnpairedSkuJob.java index 9f159806b..462243300 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangUnpairedSkuJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangUnpairedSkuJob.java @@ -4,19 +4,23 @@ import lombok.extern.slf4j.Slf4j; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.jeecg.modules.business.domain.api.mabang.doSearchSkuListNew.*; +import org.jeecg.modules.business.service.ISkuListMabangService; import org.quartz.Job; import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @Slf4j @Component public class MabangUnpairedSkuJob implements Job { + @Autowired + private ISkuListMabangService skuListMabangService; + @Override public void execute(JobExecutionContext context) throws JobExecutionException { JobDataMap jobDataMap = context.getMergedJobDataMap(); @@ -40,11 +44,7 @@ public class MabangUnpairedSkuJob implements Job { return; } - SkuListRequestBody body = new SkuListRequestBody(); - body.setStockSkuList(String.join(",", skuList)); - SkuListRawStream rawStream = new SkuListRawStream(body); - UnpairedSkuListStream stream = new UnpairedSkuListStream(rawStream); - List skusFromMabang = stream.all(); + List skuDatas = skuListMabangService.fetchUnpairedSkus(skuList); // System.out.println("skus from mabang : " + skusFromMabang); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SensitiveAttributeMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SensitiveAttributeMapper.java index 42473a62f..fc9f6e100 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SensitiveAttributeMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SensitiveAttributeMapper.java @@ -19,4 +19,8 @@ public interface SensitiveAttributeMapper extends BaseMapper String getHighestPriorityAttributeId(@Param("orderId") String orderId); List listIdAndPriority(); + + String getNameByAttributes(@Param("attribute") SensitiveAttribute sensitiveAttribute); + + SensitiveAttribute getByZhName(@Param("zhName") String zhName); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuMapper.java index 3c06561ae..cae71e6da 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/SkuMapper.java @@ -80,4 +80,8 @@ public interface SkuMapper extends BaseMapper { List listImgUrls(); List fetchAllClientSkuCodes(@Param("clientCode") String clientCode); + + List fetchUnpairedSkus(@Param("shopId") String shopId, @Param("offset") Integer offset, @Param("size") Integer pageSize, @Param("column") String column, @Param("order") String order); + + int countUnpairedSkus(@Param("shopId") String shopId); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SensitiveAttributeMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SensitiveAttributeMapper.xml index 4cee81bdc..4341955d7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SensitiveAttributeMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SensitiveAttributeMapper.xml @@ -25,8 +25,24 @@ WHERE po.id = #{orderId} ORDER BY sa.priority DESC LIMIT 1; - + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml index 6880e791f..5e76bb155 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml @@ -790,4 +790,30 @@ JOIN client c ON client_sku.client_id = c.id WHERE c.internal_code = #{clientCode}; + + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISensitiveAttributeService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISensitiveAttributeService.java index b0f4dd4f6..8bdf8a959 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISensitiveAttributeService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISensitiveAttributeService.java @@ -17,4 +17,8 @@ public interface ISensitiveAttributeService extends IService String getHighestPriorityAttributeId(String orderId); List listIdAndPriority(); + + String getNameByAttributes(SensitiveAttribute sensitiveAttribute); + + SensitiveAttribute getByZhName(String zhName); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuListMabangService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuListMabangService.java index 3a2545e55..763c6ef1a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuListMabangService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuListMabangService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.business.domain.api.mabang.doSearchSkuListNew.SkuData; import org.jeecg.modules.business.entity.Sku; import org.jeecg.modules.business.entity.SkuWeight; -import org.jeecg.modules.business.vo.Responses; +import org.jeecg.modules.business.vo.ResponsesWithMsg; import org.jeecg.modules.business.vo.SkuOrderPage; import java.util.List; @@ -33,12 +33,18 @@ public interface ISkuListMabangService extends IService { List parseSkuListToProductCodeList(List erpCodeList) throws Exception; Map createSkus(List skuDataList); - Responses publishSkuToMabang(List skuList); + ResponsesWithMsg publishSkuToMabang(List skuList); Map skuSyncUpsert(List erpCodes); void updateSkuId(); void mabangSkuStockUpdate(List erpCodes); - Responses mabangSkuWeightUpdate(List skuWeights); + ResponsesWithMsg mabangSkuWeightUpdate(List skuWeights); + + List fetchUnpairedSkus(List stockSkuList); + + List unpairedSkus(String shopId, Integer pageNo, Integer pageSize, String column, String order); + + int countUnpairedSkus(String shopId); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuService.java index f42e4ba91..0a5b85017 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ISkuService.java @@ -124,4 +124,8 @@ public interface ISkuService extends IService { List listImgUrls(); List fetchAllClientSkuCodes(String clientCode); + + List fetchUnpairedSkus(String shopId, int offset, Integer pageSize, String column, String order); + + int countUnpairedSkus(String shopId); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SensitiveAttributeServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SensitiveAttributeServiceImpl.java index 65aee98b8..c2f1033a9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SensitiveAttributeServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SensitiveAttributeServiceImpl.java @@ -35,4 +35,14 @@ public class SensitiveAttributeServiceImpl extends ServiceImpl listIdAndPriority() { return sensitiveAttributeMapper.listIdAndPriority(); } + + @Override + public String getNameByAttributes(SensitiveAttribute sensitiveAttribute) { + return sensitiveAttributeMapper.getNameByAttributes(sensitiveAttribute); + } + + @Override + public SensitiveAttribute getByZhName(String zhName) { + return sensitiveAttributeMapper.getByZhName(zhName); + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java index e2002b3ec..4d4da4a50 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java @@ -22,7 +22,7 @@ import org.jeecg.modules.business.entity.*; import org.jeecg.modules.business.mapper.SkuListMabangMapper; import org.jeecg.modules.business.mongoService.SkuMongoService; import org.jeecg.modules.business.service.*; -import org.jeecg.modules.business.vo.Responses; +import org.jeecg.modules.business.vo.ResponsesWithMsg; import org.jeecg.modules.business.vo.SkuOrderPage; import org.jeecg.modules.online.cgform.mapper.OnlCgformFieldMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -466,7 +466,8 @@ public class SkuListMabangServiceImpl extends ServiceImpl skuList) { + public ResponsesWithMsg publishSkuToMabang(List skuList) { + ResponsesWithMsg responses = new ResponsesWithMsg(); List skuDataList = skuList.stream() .map(this::SkuOrderPageToSkuData) .collect(toList()); @@ -483,7 +484,7 @@ public class SkuListMabangServiceImpl extends ServiceImpl failures = results.stream() - .filter(response -> !response.success()) - .map(SkuAddResponse::getStockSku) - .collect(toList()); - Responses responses = new Responses(); - responses.setSuccesses(successes); - responses.setFailures(failures); + results.forEach(response -> { + if(response.success()) { + responses.addSuccess(response.getStockSku()); + } else { + responses.addFailure(response.getStockSku(), response.getMessage()); + } + }); return responses; } @@ -544,7 +545,12 @@ public class SkuListMabangServiceImpl extends ServiceImpl skuWeights) { - Responses responses = new Responses(); - List failures = new ArrayList<>(); + public ResponsesWithMsg mabangSkuWeightUpdate(List skuWeights) { + ResponsesWithMsg responses = new ResponsesWithMsg(); List skuIds = skuWeights.stream() .map(SkuWeight::getSkuId) .collect(toList()); @@ -701,7 +733,7 @@ public class SkuListMabangServiceImpl extends ServiceImpl results = futures.stream().map(CompletableFuture::join).collect(toList()); long successCount = results.stream().filter(SkuChangeResponse::success).count(); log.info("{}/{} skus updated successfully.", successCount, skuDataList.size()); - List successes = results.stream() - .filter(SkuChangeResponse::success) - .map(response -> response.getStockSku() + " : Mabang OK") - .collect(toList()); - failures.addAll(results.stream() - .filter(response -> !response.success()) - .map(response -> response.getStockSku() + " | Mabang") - .collect(toList())); - - responses.getSuccesses().addAll(successes); - responses.setFailures(failures); + results.forEach(response -> { + if(response.success()) { + responses.addSuccess(response.getStockSku(), "Mabang"); + } + else { + responses.addFailure(response.getStockSku(), "Mabang"); + } + }); return responses; } + + @Override + public List fetchUnpairedSkus(List stockSkuList) { + List> skusPartition = Lists.partition(new ArrayList<>(stockSkuList), 50); + List skuDataList = new ArrayList<>(); + for(List skuPartition : skusPartition) { + SkuListRequestBody body = new SkuListRequestBody(); + body.setShowWarehouse(1); + body.setStockSkuList(String.join(",", skuPartition)); + SkuListRawStream rawStream = new SkuListRawStream(body); + UnpairedSkuListStream stream = new UnpairedSkuListStream(rawStream); + skuDataList.addAll(stream.all()); + } + return skuDataList; + } + + @Override + public List unpairedSkus(String shopId, Integer pageNo, Integer pageSize, String column, String order) { + int offset = (pageNo - 1) * pageSize; + List stockSkuList = skuService.fetchUnpairedSkus(shopId, offset, pageSize, column, order); + if(stockSkuList.isEmpty()){ + return new ArrayList<>(); + } + List skuDataList = fetchUnpairedSkus(stockSkuList); + return skuDataList.stream() + .map(this::SkuDataToSkuOrderPage) + .collect(toList()); + } + + @Override + public int countUnpairedSkus(String shopId) { + return skuService.countUnpairedSkus(shopId); + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuServiceImpl.java index 06e417442..b1277edb7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuServiceImpl.java @@ -59,8 +59,6 @@ public class SkuServiceImpl extends ServiceImpl implements ISkuS @Autowired private ILogisticChannelPriceService logisticChannelPriceService; @Autowired - private CountryService countryService; - @Autowired private IPlatformOrderContentService platformOrderContentService; @Autowired private ISkuLogisticChoiceService skuLogisticChoiceService; @@ -619,4 +617,13 @@ public class SkuServiceImpl extends ServiceImpl implements ISkuS return skuMapper.fetchAllClientSkuCodes(clientCode); } + @Override + public List fetchUnpairedSkus(String shopId, int offset, Integer pageSize, String column, String order) { + return skuMapper.fetchUnpairedSkus(shopId, offset, pageSize, column, order); + } + + @Override + public int countUnpairedSkus(String shopId) { + return skuMapper.countUnpairedSkus(shopId); + } } \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/NewSkuPage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/NewSkuPage.java new file mode 100644 index 000000000..83398f12b --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/NewSkuPage.java @@ -0,0 +1,128 @@ +package org.jeecg.modules.business.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.math.BigDecimal; + +/** + * @Description: SKU采购表 + * @Author: jeecg-boot + * @Date: 2024-03-25 + * @Version: V1.1 + */ +@Data +@ApiModel(value = "skuOrderPage对象", description = "SKU表") +public class NewSkuPage { + + /** + * 主键 + */ + @Excel(name = "马帮动创建Sku", width = 15) + @ApiModelProperty(value = "马帮动创建Sku") + private String mabangSku; + /** + * 商品ID + */ + @Excel(name = "商品", width = 15) + @ApiModelProperty(value = "商品") + private String zhName; + /** + * 商品ID + */ + @Excel(name = "商品英文", width = 15) + @ApiModelProperty(value = "商品英文") + private String enName; + /** + * ERP中商品代码 + */ + @Excel(name = "ERP中商品代码", width = 15) + @ApiModelProperty(value = "ERP中商品代码") + private String erpCode; + /** + * 重量 + */ + @Excel(name = "重量", width = 15) + @ApiModelProperty(value = "重量") + private Integer weight; + /** + * 图片链接 + */ + @Excel(name = "图片链接", width = 15) + @ApiModelProperty(value = "图片链接") + private String imageSource; + /** + * 运费折扣 + */ + @Excel(name = "运费折扣", width = 15) + @ApiModelProperty(value = "运费折扣") + private BigDecimal shippingDiscount; + /** + * 服务费 + */ + @Excel(name = "服务费", width = 15) + @ApiModelProperty(value = "服务费") + private BigDecimal serviceFee; + /** + * 状态 + * 1:自动创建;2:待开发;3:正常;4:清仓;5:停止销售" + * default : 3 + */ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + private Integer status; + /** + * 敏感属性 + */ + @Excel(name = "敏感属性", width = 15) + @ApiModelProperty(value = "敏感属性") + private String sensitiveAttribute; + /** + * 是否赠品 + * 1是 2否 + */ + @Excel(name = "是否赠品", width = 15) + @ApiModelProperty(value = "是否赠品") + private Integer isGift; + /** + * SKU价格 + */ + @ApiModelProperty(value = "SKU价格") + private BigDecimal skuPrice; + /** + * 申报价格 + */ + @Excel(name = "申报价格", width = 15) + @ApiModelProperty(value = "申报价格") + private BigDecimal declaredValue; + /** + * 申报中文名称 + */ + @Excel(name = "申报中文名称", width = 15) + @ApiModelProperty(value = "申报中文名称") + private String declareName; + /** + * 申报英文名称 + */ + @Excel(name = "申报英文名称", width = 15) + @ApiModelProperty(value = "申报英文名称") + private String declareEname; + /** + * 供应商 + */ + @Excel(name = "供应商", width = 15) + @ApiModelProperty(value = "供应商") + private String supplier; + /** + * 供应商商品网址 + */ + @Excel(name = "供应商商品网址", width = 15) + @ApiModelProperty(value = "供应商商品网址") + private String supplierLink; + + @Excel(name = "仓库", width = 15) + @ApiModelProperty(value = "仓库") + private String warehouse; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/ResponsesWithMsg.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/ResponsesWithMsg.java new file mode 100644 index 000000000..5b55aafb0 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/ResponsesWithMsg.java @@ -0,0 +1,45 @@ +package org.jeecg.modules.business.vo; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Data +public class ResponsesWithMsg { + private Map> successes = new HashMap<>(); + private Map> failures = new HashMap<>(); + + public void addSuccess(String message) { + successes.putIfAbsent(message, new ArrayList<>()); + } + public void addSuccess(String key, String message) { + if (!successes.containsKey(key)) { + successes.put(key, new ArrayList<>()); + } + successes.get(key).add(message); + } + public void addSuccess(String key, List messages) { + if (!successes.containsKey(key)) { + successes.put(key, new ArrayList<>()); + } + successes.get(key).addAll(messages); + } + public void addFailure(String message) { + failures.putIfAbsent(message, new ArrayList<>()); + } + public void addFailure(String key, String message) { + if (!failures.containsKey(key)) { + failures.put(key, new ArrayList<>()); + } + failures.get(key).add(message); + } + public void addFailure(String key, List messages) { + if (!failures.containsKey(key)) { + failures.put(key, new ArrayList<>()); + } + failures.get(key).addAll(messages); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuOrderPage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuOrderPage.java index 53c355e30..b779e7db7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuOrderPage.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuOrderPage.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecgframework.poi.excel.annotation.ExcelCollection; import java.math.BigDecimal; @@ -131,7 +130,6 @@ public class SkuOrderPage { /** * SKU价格 */ - @ExcelCollection(name = "SKU价格") @ApiModelProperty(value = "SKU价格") private java.math.BigDecimal skuPrice; /** @@ -206,4 +204,8 @@ public class SkuOrderPage { @Excel(name = "供应商商品网址", width = 15) @ApiModelProperty(value = "供应商商品网址") private String supplierLink; + + @Excel(name = "仓库", width = 15) + @ApiModelProperty(value = "仓库") + private String warehouse; } From 7d1bfbe03cce17c6c239f9a73d5322a00ddcd891 Mon Sep 17 00:00:00 2001 From: Gauthier LO Date: Thu, 6 Feb 2025 15:58:39 +0100 Subject: [PATCH 15/20] cleanup --- .../business/service/impl/SkuListMabangServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java index 4d4da4a50..00d7460ed 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java @@ -491,10 +491,6 @@ public class SkuListMabangServiceImpl extends ServiceImpl results = futures.stream().map(CompletableFuture::join).collect(toList()); long successCount = results.stream().filter(SkuAddResponse::success).count(); log.info("{}/{} skus published successfully.", successCount, skuDataList.size()); - List successes = results.stream() - .filter(SkuAddResponse::success) - .map(SkuAddResponse::getStockSku) - .collect(toList()); results.forEach(response -> { if(response.success()) { responses.addSuccess(response.getStockSku()); From a9a88dd2cc64412c0f94df6757150f75325fc11f Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Thu, 6 Feb 2025 17:13:39 +0100 Subject: [PATCH 16/20] Add missing tracking URL for Giulia Schiaparelli --- .../business/domain/api/shopify/CreateFulfillmentRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java index 82a93db27..a94b2c6d3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java @@ -13,7 +13,7 @@ public class CreateFulfillmentRequest extends ShopifyRequest { private final static String OTHER = "Other"; private enum TransportCompany { - GIULIA_SCHIAPARELLI("","Giulia Schiaparelli","^(?![69][A-Z][0-9]{11}$)(?!LP[0-9]{9}FR$).+$"), + GIULIA_SCHIAPARELLI("https://giuliaschiaparelli.com/apps/parcelpanel?nums=%s","Giulia Schiaparelli","^(?![69][A-Z][0-9]{11}$)(?!LP[0-9]{9}FR$).+$"), LA_POSTE("https://www.laposte.fr/outils/suivre-vos-envois?code=%s", "La Poste", "[69][A-Z]{1}[0-9]{11}|LP[0-9]{9}FR"), // 12 [0-9] /*CJ_LOGISTICS("https://www.cjlogistics.com/ko/tool/parcel/tracking", "CJ대한통운", "57575[0-9]{7}|58476[0-9]{7}|5901[0-9]{8}|57476[0-9]{7}"), From 22aeb4642642a467b825ba39323468298296ac12 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Thu, 6 Feb 2025 17:14:03 +0100 Subject: [PATCH 17/20] Update project version --- .../jeecg-system-start/src/main/resources/banner.txt | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt index f15d7867d..9430c65c5 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt @@ -8,7 +8,7 @@ ${AnsiColor.BRIGHT_BLUE} ${AnsiColor.BRIGHT_GREEN} -WIA APP Version: 3.0.5 +WIA APP Version: 3.0.6 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version} Website: www.wia-sourcing.com ${AnsiColor.BLACK} diff --git a/pom.xml b/pom.xml index 220d220a8..88c832f86 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ - 3.0.5 + 3.0.6 3.6.3 1.8 UTF-8 From f6e06c67ecae27562fdedc477e43e196aed721b1 Mon Sep 17 00:00:00 2001 From: Gauthier LO Date: Fri, 7 Feb 2025 15:50:16 +0100 Subject: [PATCH 18/20] feat: labelData --- .../controller/admin/LabelDataController.java | 163 ++++++++++++++++++ .../controller/admin/SkuController.java | 3 +- .../shippingInvoice/InvoiceController.java | 2 +- .../api/mabang/doSearchSkuListNew/Label.java | 15 ++ .../mabang/doSearchSkuListNew/SkuData.java | 9 +- .../SkuListRequestBody.java | 2 +- .../stockDoAddStock/SkuAddRequestBody.java | 15 ++ .../modules/business/entity/LabelData.java | 55 ++++++ .../business/mapper/LabelDataMapper.java | 19 ++ .../business/mapper/xml/LabelDataMapper.xml | 5 + .../business/service/ILabelDataService.java | 14 ++ .../service/impl/LabelDataServiceImpl.java | 19 ++ .../impl/SkuListMabangServiceImpl.java | 16 ++ .../jeecg/modules/business/vo/NewSkuPage.java | 4 + .../modules/business/vo/SkuOrderPage.java | 4 + 15 files changed, 341 insertions(+), 4 deletions(-) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/LabelDataController.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/Label.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/LabelData.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/LabelDataMapper.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/LabelDataMapper.xml create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ILabelDataService.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/LabelDataServiceImpl.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/LabelDataController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/LabelDataController.java new file mode 100644 index 000000000..4fac7f397 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/LabelDataController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.business.controller.admin; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.business.entity.LabelData; +import org.jeecg.modules.business.service.ILabelDataService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 自定义分类 + * @Author: jeecg-boot + * @Date: 2025-02-06 + * @Version: V1.0 + */ +@Api(tags="自定义分类") +@RestController +@RequestMapping("/labelData") +@Slf4j +public class LabelDataController extends JeecgController { + @Autowired + private ILabelDataService labelDataService; + + /** + * 分页列表查询 + * + * @param labelData + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "自定义分类-分页列表查询") + @ApiOperation(value="自定义分类-分页列表查询", notes="自定义分类-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(LabelData labelData, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(labelData, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = labelDataService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param labelData + * @return + */ + @AutoLog(value = "自定义分类-添加") + @ApiOperation(value="自定义分类-添加", notes="自定义分类-添加") + @RequiresPermissions("business:label_data:add") + @PostMapping(value = "/add") + public Result add(@RequestBody LabelData labelData) { + labelDataService.save(labelData); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param labelData + * @return + */ + @AutoLog(value = "自定义分类-编辑") + @ApiOperation(value="自定义分类-编辑", notes="自定义分类-编辑") + @RequiresPermissions("business:label_data:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody LabelData labelData) { + labelDataService.updateById(labelData); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "自定义分类-通过id删除") + @ApiOperation(value="自定义分类-通过id删除", notes="自定义分类-通过id删除") + @RequiresPermissions("business:label_data:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + labelDataService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "自定义分类-批量删除") + @ApiOperation(value="自定义分类-批量删除", notes="自定义分类-批量删除") + @RequiresPermissions("business:label_data:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.labelDataService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "自定义分类-通过id查询") + @ApiOperation(value="自定义分类-通过id查询", notes="自定义分类-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + LabelData labelData = labelDataService.getById(id); + if(labelData==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(labelData); + } + + /** + * 导出excel + * + * @param request + * @param labelData + */ + @RequiresPermissions("business:label_data:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, LabelData labelData) { + return super.exportXls(request, labelData, LabelData.class, "自定义分类"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("business:label_data:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, LabelData.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java index f3189b5fd..8e2278406 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java @@ -470,7 +470,7 @@ public class SkuController { public ModelAndView exportXls(@RequestParam Map params) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List skuList = parseSkuList(params); - log.info("Request to create {} new skus in Mabang", skuList.size()); + log.info("Exporting new skus to excel ..."); skuList.forEach(sku -> { if(sku.getShippingDiscount() == null) { sku.setShippingDiscount(BigDecimal.ONE); @@ -531,6 +531,7 @@ public class SkuController { sku.setSupplier(map.get("supplier")); sku.setSupplierLink(map.get("supplierLink")); sku.setImageSource(map.get("imageSource")); + sku.setLabelData(map.get("labelData")); return sku; } @PostMapping("syncSkus") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java index deddbbe89..e750aedb8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java @@ -557,7 +557,7 @@ public class InvoiceController { List orders = platformOrderService.fetchUninvoicedOrdersByShopForClientFullSQL(shopIdList, Collections.singletonList(1), parsedColumn, parsedOrder, pageNo, pageSize, productStatuses, shippingAvailable, purchaseAvailable); - int total = orders.get(0).getTotalCount(); + int total = !order.isEmpty() ? orders.get(0).getTotalCount() : 0; IPage page = new Page<>(); page.setRecords(orders); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/Label.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/Label.java new file mode 100644 index 000000000..4fd4f3e52 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/Label.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.business.domain.api.mabang.doSearchSkuListNew; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; + +@Data + // 仓库信息,接口参数传showWarehouse才返回 +public class Label { + /**自定义分类ID*/ + @JSONField(name = "id") + private long id; + /**自定义分类名称**/ + @JSONField(name = "name") + private String name; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuData.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuData.java index 11f1f072f..575b4c6c0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuData.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuData.java @@ -60,7 +60,9 @@ public class SkuData { /**默认供应商名称,接口参数传showProvider才返回*/ @JSONField(name="warehouse") private Warehouse[] warehouse; - + /** 自定义分类,接口参数传showLabel才返回*/ + @JSONField(name="label") + private Label[] label; @JSONField(name="warehouseName") private String warehouseName; /** @@ -89,6 +91,11 @@ public class SkuData { */ @JSONField(name="saleRemark") private String saleRemark; + /** + * 自定义分类json格式 + */ + @JSONField(name="labelData") + private Label[] labelData; /** * 是否含电池:1是;2否 */ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuListRequestBody.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuListRequestBody.java index 60b523f80..3a5fcca21 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuListRequestBody.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/doSearchSkuListNew/SkuListRequestBody.java @@ -49,7 +49,7 @@ public class SkuListRequestBody implements RequestBody { putNonNull(json, "showVirtualSku", showVirtualSku); putNonNull(json, "showProvider", showProvider); putNonNull(json, "showWarehouse", String.valueOf(showWarehouse)); - putNonNull(json, "showLabel", showLabel); + putNonNull(json, "showLabel", String.valueOf(showLabel)); putNonNull(json, "showAttributes", showAttributes); return json; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/stockDoAddStock/SkuAddRequestBody.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/stockDoAddStock/SkuAddRequestBody.java index b025300c1..46b36fe01 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/stockDoAddStock/SkuAddRequestBody.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/stockDoAddStock/SkuAddRequestBody.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.Getter; import lombok.Setter; import org.jeecg.modules.business.domain.api.mabang.RequestBody; +import org.jeecg.modules.business.domain.api.mabang.doSearchSkuListNew.Label; import org.jeecg.modules.business.domain.api.mabang.doSearchSkuListNew.SkuData; import java.math.BigDecimal; @@ -24,6 +25,7 @@ public class SkuAddRequestBody implements RequestBody { private String declareEname; private String warehouse; private String remark; + private Label[] labelData; private Integer hasBattery; private Integer magnetic; private Integer powder; @@ -34,6 +36,7 @@ public class SkuAddRequestBody implements RequestBody { private Integer isGift; private String supplier; private String supplierLink; + private String picture; @Override public String api() { @@ -51,6 +54,15 @@ public class SkuAddRequestBody implements RequestBody { putNonNull(json, "declareValue", declareValue); putNonNull(json, "declareName", declareName); putNonNull(json, "declareEname", declareEname); + if(labelData != null) { + JSONArray labelDataArray = new JSONArray(); + for(Label label : labelData) { + JSONObject labelJson = new JSONObject(); + labelJson.put("name", label.getName()); + labelDataArray.add(labelJson); + } + json.put("labelData", labelDataArray.toJSONString()); + } JSONArray warehouseData = new JSONArray(); JSONObject warehouse = new JSONObject(); warehouse.put("name", this.warehouse); @@ -74,6 +86,7 @@ public class SkuAddRequestBody implements RequestBody { supplier.put("flag", 1); supplierData.add(supplier); json.put("suppliersData", supplierData.toJSONString()); + putNonNull(json, "picture", picture); return json; } @@ -87,6 +100,7 @@ public class SkuAddRequestBody implements RequestBody { this.declareEname = data.getDeclareNameEn(); this.warehouse = data.getWarehouseName(); this.remark = data.getSaleRemark(); + this.labelData = data.getLabelData(); this.hasBattery = data.getHasBattery(); this.magnetic = data.getMagnetic(); this.powder = data.getPowder(); @@ -97,6 +111,7 @@ public class SkuAddRequestBody implements RequestBody { this.isGift = data.getIsGift(); this.supplier = data.getSupplier(); this.supplierLink = data.getSupplierLink(); + this.picture = data.getSalePicture(); } private void putNonNull(JSONObject json, String key, E value) { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/LabelData.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/LabelData.java new file mode 100644 index 000000000..cb4e18354 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/LabelData.java @@ -0,0 +1,55 @@ +package org.jeecg.modules.business.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 自定义分类 + * @Author: jeecg-boot + * @Date: 2025-02-06 + * @Version: V1.0 + */ +@Data +@TableName("label_data") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="label_data对象", description="自定义分类") +public class LabelData implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**自定义分类名称*/ + @Excel(name = "自定义分类名称", width = 15) + @ApiModelProperty(value = "自定义分类名称") + private java.lang.String name; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/LabelDataMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/LabelDataMapper.java new file mode 100644 index 000000000..aa3ec618e --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/LabelDataMapper.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.business.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.business.entity.LabelData; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + * @Description: 自定义分类 + * @Author: jeecg-boot + * @Date: 2025-02-06 + * @Version: V1.0 + */ +@Repository +public interface LabelDataMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/LabelDataMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/LabelDataMapper.xml new file mode 100644 index 000000000..8577db782 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/LabelDataMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ILabelDataService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ILabelDataService.java new file mode 100644 index 000000000..44b36987c --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/ILabelDataService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.business.service; + +import org.jeecg.modules.business.entity.LabelData; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 自定义分类 + * @Author: jeecg-boot + * @Date: 2025-02-06 + * @Version: V1.0 + */ +public interface ILabelDataService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/LabelDataServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/LabelDataServiceImpl.java new file mode 100644 index 000000000..ddcbaa5e0 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/LabelDataServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.business.service.impl; + +import org.jeecg.modules.business.entity.LabelData; +import org.jeecg.modules.business.mapper.LabelDataMapper; +import org.jeecg.modules.business.service.ILabelDataService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 自定义分类 + * @Author: jeecg-boot + * @Date: 2025-02-06 + * @Version: V1.0 + */ +@Service +public class LabelDataServiceImpl extends ServiceImpl implements ILabelDataService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java index 00d7460ed..c46012754 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java @@ -555,6 +555,13 @@ public class SkuListMabangServiceImpl extends ServiceImpl labels = new ArrayList<>(); + for(String labelName : skuOrderPage.getLabelData().split(",")) { + Label label = new Label(); + label.setName(labelName); + labels.add(label); + } + skuData.setLabelData(labels.toArray(new Label[0])); if(skuOrderPage.getWeight() != null) skuData.setSaleRemark(skuOrderPage.getWeight().toString()); skuData.setHasBattery(sensitiveAttribute.getHasBattery()); @@ -567,6 +574,7 @@ public class SkuListMabangServiceImpl extends ServiceImpl skuPartition : skusPartition) { SkuListRequestBody body = new SkuListRequestBody(); body.setShowWarehouse(1); + body.setShowLabel(1); body.setStockSkuList(String.join(",", skuPartition)); SkuListRawStream rawStream = new SkuListRawStream(body); UnpairedSkuListStream stream = new UnpairedSkuListStream(rawStream); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/NewSkuPage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/NewSkuPage.java index 83398f12b..85d183076 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/NewSkuPage.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/NewSkuPage.java @@ -125,4 +125,8 @@ public class NewSkuPage { @Excel(name = "仓库", width = 15) @ApiModelProperty(value = "仓库") private String warehouse; + + @Excel(name = "自定义分类", width = 15) + @ApiModelProperty(value = "自定义分类") + private String labelData; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuOrderPage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuOrderPage.java index b779e7db7..c9ead3393 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuOrderPage.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/SkuOrderPage.java @@ -208,4 +208,8 @@ public class SkuOrderPage { @Excel(name = "仓库", width = 15) @ApiModelProperty(value = "仓库") private String warehouse; + + @Excel(name ="自定义分类", width = 15) + @ApiModelProperty(value = "自定义分类") + private String labelData; } From b2517f6a38658ed04a3ad2298bc5ef07fdc6dc78 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Mon, 17 Feb 2025 15:27:48 +0100 Subject: [PATCH 19/20] Update SkuController.java remove useless log --- .../jeecg/modules/business/controller/admin/SkuController.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java index 8e2278406..d65002148 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java @@ -453,9 +453,6 @@ public class SkuController { public Result createMabangSku(@RequestBody List skuList) { log.info("Request to create {} new skus in Mabang", skuList.size()); skuList.forEach(sku -> { - if(sku.getId() != null && !sku.getId().isEmpty()) { - log.info("Request to pair sku [{}] with old sku [{}]", sku.getErpCode(), sku.getId()); - } if(sku.getShippingDiscount() == null) { sku.setShippingDiscount(BigDecimal.ZERO); } else { From 3188347bec06b5b34723fe3f0679b9ffa7db8d8b Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Mon, 17 Feb 2025 15:45:50 +0100 Subject: [PATCH 20/20] Update SkuController.java Add code to error message --- .../modules/business/controller/admin/SkuController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java index d65002148..db4e63fe5 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/SkuController.java @@ -588,12 +588,12 @@ public class SkuController { String parsedColumn = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, column.replace("_dictText", "")); String parsedOrder = order.toUpperCase(); if(!parsedOrder.equals("ASC") && !parsedOrder.equals("DESC")) { - return Result.error("Error 400 Bad Request"); + return Result.error(400, "Bad Request"); } try { specialFilterContentForDictSql(parsedColumn); } catch (RuntimeException e) { - return Result.error("Error 400 Bad Request"); + return Result.error(400, "Bad Request"); } String shopId = shopService.getIdByCode(shopCode); if (shopId == null) return Result.error(404, "Shop not found");