From 3030a527c2c229e7a9034296496788e201f545ee Mon Sep 17 00:00:00 2001 From: Gauthier LO Date: Thu, 6 Feb 2025 15:49:12 +0100 Subject: [PATCH] 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; }