From 9bb677bf79fce6fc72f94453ca7a1bfb9d51b8de Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Wed, 6 Nov 2024 17:01:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(sales):=20=E4=BF=AE=E5=A4=8D=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95=E5=AE=9E=E4=BB=98=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91-=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E4=BA=86=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81=E7=89=87?= =?UTF-8?q?=E6=AE=B5-=20=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AE=9E=E4=BB=98?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E7=9A=84=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=BA=94=E6=94=B6=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E3=80=81=E8=AF=B7=E6=B1=82=E6=95=B0=E9=87=8F=E5=92=8C=E5=AE=9E?= =?UTF-8?q?=E5=8F=91=E6=95=B0=E9=87=8F=E8=BF=9B=E8=A1=8C=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=20-=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AF=B9=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=92=8C=E5=AE=9E=E5=8F=91=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E7=9A=84=E9=9D=9E=E9=9B=B6=E6=A0=A1=E9=AA=8C=20-=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BA=86=E5=AE=9E=E4=BB=98=E9=87=91=E9=A2=9D=E7=9A=84?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E5=A4=84=E7=90=86=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=20BigDecimal=20=E8=BF=9B=E8=A1=8C=E7=B2=BE=E7=A1=AE=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/SoSaleOutPluginInitializerToC.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java index e92832e4..5d831ca9 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java @@ -1094,11 +1094,6 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { List saleorderRequestDtoList = new ArrayList<>(); saleorderRequestDtoList.add(saleorderRequestDto); - //TODO 测试 - if (true) { - continue; - } - Map> stringStringMap = new HashMap<>(); stringStringMap.put("saleorder", saleorderRequestDtoList); SoSaleResultRootDto soSaleResultRootDto = sendU8CTOCOrder(JSON.toJSONString(stringStringMap)); @@ -1708,7 +1703,21 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { } Assert.notNull(totalPayAmount, "应收金额不能为空(应收金额=实付金额+达人优惠+支付优惠+平台优惠) 销售出库单编码：{} 出库单明细主键：{}", header.getCode(), sonDetailsDto.getId()); Assert.notNull(sonDetailsDto.getShipQty(), "实发数量不能为空 销售出库单编码:{} 出库单明细主键：{}", header.getCode(), sonDetailsDto.getId()); - BigDecimal totalPayAmountBigDecimal = new BigDecimal(totalPayAmount); + + BigDecimal totalPayAmountBigDecimal = new BigDecimal("0"); + //O实付金额=O应收金额/O请求数量*O实发数量 + if (!"0".equals(new BigDecimal(totalPayAmount).stripTrailingZeros().toPlainString())) { + //O应收金额/O请求数量 + Assert.notNull(sonDetailsDto.getRequestQty(), "请求数量不能为空！"); + if ("0".equals(new BigDecimal(sonDetailsDto.getRequestQty()).stripTrailingZeros().toPlainString())) { + Assert.state(false, "请求数量不能为0！"); + } + if ("0".equals(new BigDecimal(sonDetailsDto.getShipQty()).stripTrailingZeros().toPlainString())) { + Assert.state(false, "实发数量不能为空！"); + } + BigDecimal divide = new BigDecimal(totalPayAmount).divide(new BigDecimal(sonDetailsDto.getRequestQty()), 20, BigDecimal.ROUND_HALF_UP); + totalPayAmountBigDecimal = divide.multiply(new BigDecimal(sonDetailsDto.getShipQty())).setScale(2, BigDecimal.ROUND_HALF_UP); + } BigDecimal shipQtyBigDecimal = new BigDecimal(sonDetailsDto.getShipQty()); groupTotalPayAmount = groupTotalPayAmount.add(totalPayAmountBigDecimal); From 2f67e791dfbb6b298728d716e1f499ebd8225533 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Wed, 6 Nov 2024 19:14:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor(sales):=20=E4=BC=98=E5=8C=96=20TOC?= =?UTF-8?q?=20=E5=87=BA=E5=BA=93=E5=92=8C=E9=80=80=E8=B4=A7=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修正了 SoSaleOutPluginInitializerToC 和 SoSaleReturnPluginInitializerToC 中的变量命名 - 更新了退货入库单总金额的校验提示信息 - 修改了测试用例中的出库单和退货单编号 --- .../lets/plugin/sales/SoSaleOutPluginInitializerToC.java | 8 ++++---- .../plugin/sales/SoSaleReturnPluginInitializerToC.java | 2 +- .../plugin/sales/SoSaleOutPluginInitializerToCTest.java | 2 +- .../sales/SoSaleReturnPluginInitializerToCTest.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java index 5d831ca9..7cb785f2 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java @@ -228,7 +228,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { Assert.notNull(endTime, "查询条件，结束时间不能为空！"); // CalculateDateVo calculateDateVo = DateStrUtil.calculateCalculateEntireDayPeriod(dateStr); - String tobShop = shopTobOrToCUtil.getCommaShop("TOC"); + String tocShop = shopTobOrToCUtil.getCommaShop("TOC"); List headerDetailsDtoList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); @@ -241,7 +241,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(100L); - queryOfsSoSaleOutVo.setStoreCode(tobShop); + queryOfsSoSaleOutVo.setStoreCode(tocShop); // queryOfsSoSaleOutVo.setCode("LETS-SH2024070500000003"); ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoList, 1L, "ofs.shipment.search"); logger.info("数据返回行数：{}", headerDetailsDtoList.size()); @@ -322,7 +322,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { Assert.notNull(code, "O出库单编码不能为空！code is null！"); Assert.notNull(sceneType, "场景类型不能为空！"); - String tobShop = shopTobOrToCUtil.getCommaShop("TOC"); + String tocShop = shopTobOrToCUtil.getCommaShop("TOC"); List headerDetailsDtoList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); queryOfsSoSaleOutVo.setClientCode("LETS"); @@ -330,7 +330,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(100L); - queryOfsSoSaleOutVo.setStoreCode(tobShop); + queryOfsSoSaleOutVo.setStoreCode(tocShop); queryOfsSoSaleOutVo.setCode(code); ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoList, 1L, "ofs.shipment.search"); logger.info("数据返回行数：{}", headerDetailsDtoList.size()); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java index 12b40714..8d20cf34 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java @@ -1508,7 +1508,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { } //实付金额/实发数量 - Assert.notNull(totalAmount, "退货入库单总金额不能为空 明细行对象:{}", JSON.toJSONString(goodsRertunSonDetailsDto)); + Assert.notNull(totalAmount, "实退金额不能为空 明细行对象:{}", JSON.toJSONString(goodsRertunSonDetailsDto)); Assert.notNull(goodsRertunSonDetailsDto.getReceivedQty(), "实收数量不能为空 明细行对象:{}", JSON.toJSONString(goodsRertunSonDetailsDto)); BigDecimal totalPayAmountBigDecimal = new BigDecimal(totalAmount); BigDecimal shipQtyBigDecimal = new BigDecimal(goodsRertunSonDetailsDto.getReceivedQty()); diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java index 3f69cb0b..867cefa6 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java @@ -121,7 +121,7 @@ class SoSaleOutPluginInitializerToCTest { try { // soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024091900002878", "stock"); - soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024102600009446", "stock"); + soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024110400042153", "stock"); } catch (Exception e) { e.printStackTrace(); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java index c8870d22..73ee6bd0 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java @@ -30,7 +30,7 @@ public class SoSaleReturnPluginInitializerToCTest { public void startImplement() { // soSaleReturnPluginInitializerToC.startImplement(null, null); try { - String code = "LETS-RE2024092400000148"; + String code = "LETS-SH2024110500018255"; soSaleReturnPluginInitializerToC.startImplementByCode(code, "stock"); } catch (Exception e) { e.printStackTrace(); From 6e5bf89940f62ad786b647afcbfe031749e5ced8 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:31:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(sales):=20=E4=BF=AE=E5=A4=8D=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了不必要的注释代码 - 优化了实退金额的计算方式，使用含税单价乘以实退数量 - 增加了对实退数量为0的校验 - 调整了优惠金额的处理逻辑 -优化了日志输出信息，提高可读性 --- .../SoSaleReturnPluginInitializerToC.java | 57 ++++++++++++------- .../SoSaleOutPluginInitializerToCTest.java | 2 +- .../SoSaleReturnPluginInitializerToCTest.java | 2 +- 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java index 8d20cf34..e6ae84ee 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java @@ -262,7 +262,6 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { List returnGoodHeaderDetailsDataDtoList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); queryOfsSoSaleOutVo.setClientCode("LETS"); -// queryOfsSoSaleOutVo.setInternalInstructionType("SALES"); queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(50L); @@ -1034,6 +1033,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { * @author liuyang */ private String createGenerateBusinessDate(StockinOrderSearchResponse.StockinOrder.StockinH header) { +// header.setClosedAt("2024-11-07 11:57:12"); String code = null; if (header != null && header.getCode() != null) { code = header.getCode(); @@ -1114,6 +1114,14 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { //初始化公司档案对照关系 Map comparisonCompanyArchives = queryU8CEntityUtil.queryBdDefDocByPkDefDocAll(); + //测试 +// StockinOrderSearchResponse.StockinOrder stockinOrder1 = returnGoodHeaderDetailsDataDtoList1.get(0); +// List details2 = stockinOrder1.getDetails(); +// for (int i = 0; i < details2.size(); i++) { +// StockinOrderSearchResponse.StockinOrder.StockinB stockinB = details2.get(i); +// stockinB.setReceivedQty(stockinB.getRequestQty()); +// } + for (int i = 0; i < returnGoodHeaderDetailsDataDtoList1.size(); i++) { StockinOrderSearchResponse.StockinOrder stockinOrder = returnGoodHeaderDetailsDataDtoList1.get(i); StockinOrderSearchResponse.StockinOrder.StockinH header = stockinOrder.getHeader(); @@ -1508,8 +1516,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { } //实付金额/实发数量 - Assert.notNull(totalAmount, "实退金额不能为空 明细行对象:{}", JSON.toJSONString(goodsRertunSonDetailsDto)); - Assert.notNull(goodsRertunSonDetailsDto.getReceivedQty(), "实收数量不能为空 明细行对象:{}", JSON.toJSONString(goodsRertunSonDetailsDto)); + Assert.notNull(totalAmount, "实退金额不能为空 明细行主键:{}", goodsRertunSonDetailsDto.getId()); + Assert.notNull(goodsRertunSonDetailsDto.getReceivedQty(), "实收数量不能为空 明细行主键:{}", goodsRertunSonDetailsDto.getId()); BigDecimal totalPayAmountBigDecimal = new BigDecimal(totalAmount); BigDecimal shipQtyBigDecimal = new BigDecimal(goodsRertunSonDetailsDto.getReceivedQty()); @@ -1755,7 +1763,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { private void findAfterSalesOrder(List rerturnGoodsOrderSearchDataList, List returnGoodHeaderDetailsDataDtoList1) throws Exception { if (rerturnGoodsOrderSearchDataList != null && rerturnGoodsOrderSearchDataList.size() > 0 && returnGoodHeaderDetailsDataDtoList1 != null && returnGoodHeaderDetailsDataDtoList1.size() > 0) { try { - //如果id为空，则这里会报错，所以把id设置为"" + //key为售后订单主键，如果id为空，则这里会报错，所以把id设置为"" rerturnGoodsOrderSearchDataList.forEach(dto -> { if (dto.getHeader() != null && dto.getHeader().getId() == null) { dto.getHeader().setId(""); @@ -1777,9 +1785,9 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { // header.setRerturnGoodsOrderSearchData(rerturnGoodsOrderSearchData); // } // } - String id = header.getId(); - if (id != null && !"".equals(id)) { - RerturnGoodsOrderSearchData rerturnGoodsOrderSearchData = collect.get(id); + String refOrderId = header.getRefOrderId(); + if (refOrderId != null && !"".equals(refOrderId)) { + RerturnGoodsOrderSearchData rerturnGoodsOrderSearchData = collect.get(refOrderId); if (rerturnGoodsOrderSearchData != null) { header.setRerturnGoodsOrderSearchData(rerturnGoodsOrderSearchData); } @@ -2607,22 +2615,27 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { Assert.notNull(targetDetails, "根据OFS售后入库单细行(refOrderDetailId)无法匹配售后订单明细行", goodsRertunSonDetailsDto.getRefOrderDetailId()); //售后订单明细行-退货金额 - String totalAmount = targetDetails.getTotalAmount(); + String totalAmount = targetDetails.getTotalAmount();//实退金额 Assert.notNull(totalAmount, "售后订单：{} 存货明细行：{} 退货金额不能为空！", header.getCode(), targetDetails.getSkuCode()); Assert.state(!"".equals(totalAmount), "售后订单：{} 存货明细行：{} 退货金额不能为空！", header.getCode(), targetDetails.getSkuCode()); //售后订单明细行-请求数量 //实退数量存在可能为0的情况，如果用退货金额/实退数量可能会抛出异常 - String requestQty = targetDetails.getRequestQty(); + String requestQty = targetDetails.getRequestQty();//请求数量 Assert.notNull(requestQty, "售后订单：{} 存货明细行：{} 请求数量不能为空！", header.getCode(), targetDetails.getSkuCode()); Assert.state(!"".equals(requestQty), "售后订单：{} 存货明细行：{} 请求数量不能为空！", header.getCode(), targetDetails.getSkuCode()); - //通过退货金额/请求数量=含税单价 - BigDecimal unitPriceIncludingTax = new BigDecimal(totalAmount).divide(new BigDecimal(requestQty), 20, BigDecimal.ROUND_HALF_UP); - //含税单价*（O售后入库单）实退数量=实退金额 - BigDecimal actualRefundAmount = unitPriceIncludingTax.multiply(new BigDecimal(requestQty)).setScale(4, BigDecimal.ROUND_HALF_UP); - //出库对应的实退=含税单价(actualRefundAmount)*出库单实退数量 + String receivedQty = goodsRertunSonDetailsDto.getReceivedQty(); - Assert.notNull(receivedQty, "售后入库单号：{} 售后入库单明细行主键：{} 实收数量不能为空receivedQty！", header1.getCode(), goodsRertunSonDetailsDto.getId()); - BigDecimal actualRefundAmountBigDecimal = new BigDecimal(receivedQty).multiply(actualRefundAmount).setScale(2, BigDecimal.ROUND_HALF_UP); + Assert.notNull(receivedQty, "售后订单：{} 存货明细行：{} 请求数量不能为空！", header1.getCode(), goodsRertunSonDetailsDto.getId()); + Assert.state(!"".equals(receivedQty), header1.getCode(), goodsRertunSonDetailsDto.getId()); + if ("0".equals(new BigDecimal(receivedQty).stripTrailingZeros().toPlainString())) { + Assert.state(false, "售后订单：{} 存货明细行：{} 实退数量不能为0！", header1.getCode(), goodsRertunSonDetailsDto.getId()); + } + //O含税单价=通过退货金额/请求数量 + BigDecimal unitPriceIncludingTax = new BigDecimal(totalAmount).divide(new BigDecimal(requestQty), 20, BigDecimal.ROUND_HALF_UP); + //实退金额=O含税单价*（O售后入库单）实退数量 + BigDecimal actualRefundAmount = unitPriceIncludingTax.multiply(new BigDecimal(receivedQty)).setScale(4, BigDecimal.ROUND_HALF_UP); + //出库对应的实退=含税单价(actualRefundAmount)*出库单实退数量 +// BigDecimal actualRefundAmountBigDecimal = new BigDecimal(receivedQty).multiply(actualRefundAmount).setScale(2, BigDecimal.ROUND_HALF_UP); //商家优惠：不处理！！！仅保存 String merchantDiscounts = targetDetails.getMerchantDiscounts(); @@ -2639,8 +2652,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { BigDecimal payDiscountsBigDecimal = new BigDecimal("0");//支付优惠 BigDecimal platformDiscountsBigDecimal = new BigDecimal("0");//平台优惠 - if (actualRefundAmountBigDecimal != null) { - totalPayAmountBigDecimal = actualRefundAmountBigDecimal; + if (actualRefundAmount != null) { + totalPayAmountBigDecimal = actualRefundAmount; } if (expertDiscounts != null && !"".equals(expertDiscounts)) { expertDiscountsBigDecimal = new BigDecimal(expertDiscounts); @@ -2715,10 +2728,10 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { } } - sonDetailsDtoList.get(0).setVdef4(platformDiscountsBigDecimal); - sonDetailsDtoList.get(0).setVdef5(payDiscountsBigDecimal); - sonDetailsDtoList.get(0).setVdef6(expertDiscountsBigDecimal); - sonDetailsDtoList.get(0).setVdef7(merchantDiscountsBigDecimal); + sonDetailsDtoList.get(0).setVdef4(platformDiscountsBigDecimal);//平台 + sonDetailsDtoList.get(0).setVdef5(payDiscountsBigDecimal);//支付 + sonDetailsDtoList.get(0).setVdef6(expertDiscountsBigDecimal);//达人 + sonDetailsDtoList.get(0).setVdef7(merchantDiscountsBigDecimal);//商家 } } } \ No newline at end of file diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java index 867cefa6..e89a835c 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java @@ -121,7 +121,7 @@ class SoSaleOutPluginInitializerToCTest { try { // soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024091900002878", "stock"); - soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024110400042153", "stock"); + soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024110300036490", "tran"); } catch (Exception e) { e.printStackTrace(); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java index 73ee6bd0..c29e1733 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java @@ -30,7 +30,7 @@ public class SoSaleReturnPluginInitializerToCTest { public void startImplement() { // soSaleReturnPluginInitializerToC.startImplement(null, null); try { - String code = "LETS-SH2024110500018255"; + String code = "LETS-RE2024110500004678"; soSaleReturnPluginInitializerToC.startImplementByCode(code, "stock"); } catch (Exception e) { e.printStackTrace();