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 bc42b7c8f..39c7ecc5a 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 @@ -579,30 +579,15 @@ public class SkuController { 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 + @RequestParam(name = "skus[]", required = false) List skuNames ) { - 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(400, "Bad Request"); - } - try { - specialFilterContentForDictSql(parsedColumn); - } catch (RuntimeException e) { - return Result.error(400, "Bad Request"); - } + if(skuNames == null) + skuNames = new ArrayList<>(); 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); + List unpairedSkus = skuListMabangService.unpairedSkus(shopId, skuNames); - IPage page = new Page<>(); - page.setRecords(unpairedSkus); - page.setCurrent(pageNo); - page.setSize(pageSize); - page.setTotal(total); - return Result.OK(page); + return Result.OK(unpairedSkus); } @GetMapping(value = "/latestSkuCounter") 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 575b4c6c0..646065358 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 @@ -141,6 +141,12 @@ public class SkuData { private String supplier; @JSONField(name="productLinkAddress") private String supplierLink; + @JSONField(name="saleUrl") + private String saleUrl; + /** + * 商品多属性 + */ + private String specifics; public SkuStatus getStatus() { return SkuStatus.fromCode(this.status); @@ -168,7 +174,9 @@ public class SkuData { "\nIs Flammable : " + this.isFlammable + "\nIs Knife : " + this.isKnife + "\nIs Gift : " + this.isGift + - "\nProvider : " + this.supplier + "\nProvider : " + this.supplier + + "\nProduct Link : " + this.supplierLink + + "\nSale Url : " + this.saleUrl ; } } 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 3a5fcca21..e7ce6d02a 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 @@ -50,7 +50,7 @@ public class SkuListRequestBody implements RequestBody { putNonNull(json, "showProvider", showProvider); putNonNull(json, "showWarehouse", String.valueOf(showWarehouse)); putNonNull(json, "showLabel", String.valueOf(showLabel)); - putNonNull(json, "showAttributes", showAttributes); + putNonNull(json, "showattributes", String.valueOf(showAttributes)); return json; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/OrderItem.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/OrderItem.java index 28f1839ca..de83f7503 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/OrderItem.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/mabang/getorderlist/OrderItem.java @@ -9,12 +9,17 @@ import lombok.Data; @Data public class OrderItem { + @JSONField(name="stockId") + private String stockId; /** * Erp code of sku in DB. */ @JSONField(name = "stockSku") private String erpCode; - + @JSONField(name="title") + private String title; + @JSONField(name="originTitle") + private String originTitle; @JSONField(deserialize = false) private String platformOrderId; @@ -42,6 +47,8 @@ public class OrderItem { @JSONField(name = "specifics") private String specifics; + @JSONField(name="amazonAsin") + private String saleUrl; /** * Status : * 2 = Normal 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 2f5397da9..58b6a03c2 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 @@ -7,6 +7,7 @@ import org.jeecg.modules.business.entity.Sku; import org.jeecg.modules.business.vo.SkuOrderPage; import org.jeecg.modules.business.vo.SkuQuantity; import org.jeecg.modules.business.vo.SkuUpdate; +import org.jeecg.modules.business.vo.UnpairedSku; import org.jeecg.modules.business.vo.inventory.InventoryRecord; import org.springframework.stereotype.Repository; @@ -83,9 +84,7 @@ public interface SkuMapper extends BaseMapper { 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); + List fetchUnpairedSkus(@Param("shopId") String shopId); List latestSkuCounter(@Param("userCode") String userCode, @Param("clientCode") String clientCode, @Param("date") String date); 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 f235fc6b5..dc9266eba 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 @@ -799,8 +799,8 @@ WHERE c.internal_code = #{clientCode}; - + SELECT po.platform_order_id as platform_order_id, poc.sku_id as stock_sku FROM platform_order po JOIN shop s ON po.shop_id = s.id JOIN platform_order_content poc ON po.id = poc.platform_order_id @@ -809,20 +809,7 @@ AND po.erp_status IN (1, 2) AND poc.erp_status <> 5 AND s.id = #{shopId} - GROUP BY poc.sku_id - ORDER BY ${column} ${order} - LIMIT #{offset}, #{size}; - -