diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java index d43a75be..97c1e7a2 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java @@ -1225,7 +1225,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity { * @author liuyang */ private List queryBasicArchivesStock(List passiveStorageResponseDataList, String sceneType) { - Assert.notNull(passiveStorageResponseDataList, "returnGoodHeaderDetailsDataDtoList1不能为空"); + Assert.notNull(passiveStorageResponseDataList, "passiveStorageResponseDataList不能为空"); Assert.notNull(sceneType, "sceneType不能为空"); List sonDetailsDtoList = new ArrayList<>(); @@ -1236,8 +1236,6 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity { //查询OFS无源入库单对应的售后订单，并关联无源无源入库单对象 List rerturnGoodsOrderSearchData = queryBatchAfterSalesOrder(passiveStorageResponseDataList); findAfterSalesOrder(rerturnGoodsOrderSearchData, passiveStorageResponseDataList); - //过滤掉售后订单没有交易成功的数据 - //查询OFS售后订单对应的OFS销售订单 List headerDetailsDtos = queryBatchOfsOrder(passiveStorageResponseDataList); @@ -1691,6 +1689,19 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity { passiveStorageSonDetailsDto.setCalculateAccountsReceivable(totalAmount); passiveStorageSonDetailsDto.setCalculationFormula(calculationFormulaStr.toString()); + +// if ("6973391732529".equals(passiveStorageSonDetailsDto.getSkuCode())) { +// ofsOrderDetail.setPlatformDiscounts("1.02"); +// ofsOrderDetail.setMerchantDiscounts("4.88"); +// ofsOrderDetail.setExpertDiscounts("3.13"); +// ofsOrderDetail.setPayDiscounts("7.88"); +// } else { +// ofsOrderDetail.setPlatformDiscounts("6.68"); +// ofsOrderDetail.setMerchantDiscounts("5.47"); +// ofsOrderDetail.setExpertDiscounts("4.31"); +// ofsOrderDetail.setPayDiscounts("3.09"); +// } + //把无源入库单明细行关联对应的售后订单明细行的优惠金额，带入到无源入库单明细行 passiveStorageSonDetailsDto.setPlatformDiscounts(ofsOrderDetail.getPlatformDiscounts()); passiveStorageSonDetailsDto.setMerchantDiscounts(ofsOrderDetail.getMerchantDiscounts()); @@ -1702,7 +1713,7 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity { passiveStorageSonDetailsDto.setGroupShipQty(groupShipQty); passiveStorageSonDetailsDto.setGroupTotalPayAmount(groupTotalPayAmount); - //汇总好之后，相同的sku累加优惠金额 + //相同的O无源入库单sku累加优惠金额 accumulatedDiscountAmountDef(sonDetailsDtoList); return passiveStorageSonDetailsDto; @@ -1788,13 +1799,8 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity { long startLong = System.currentTimeMillis(); logger.info("TOC推送开始，推送参数：" + param + ",U8C_URL:" + OverallConstant.getOverAllValue("u8c_url")); String apiCode = "8000370069"; - String result = HttpRequest.post(OverallConstant.getOverAllValue("u8c_url")) - .header("appId", OverallConstant.getOverAllValue("appId"))//头信息，多个头信息多次调用此方法即可 - .header("usercode", OverallConstant.getOverAllValue("u8cApiUsercodeCode")) - .header("password", OverallConstant.getOverAllValue("u8cApiPasswordCode")) - .header("system", OverallConstant.getOverAllValue("u8cApiSystemCode")) - .header("trantype", OverallConstant.getOverAllValue("u8cApiTrantypeCode")) - .header("apiCode", apiCode)//头信息，多个头信息多次调用此方法即可 + String result = HttpRequest.post(OverallConstant.getOverAllValue("u8c_url")).header("appId", OverallConstant.getOverAllValue("appId"))//头信息，多个头信息多次调用此方法即可 + .header("usercode", OverallConstant.getOverAllValue("u8cApiUsercodeCode")).header("password", OverallConstant.getOverAllValue("u8cApiPasswordCode")).header("system", OverallConstant.getOverAllValue("u8cApiSystemCode")).header("trantype", OverallConstant.getOverAllValue("u8cApiTrantypeCode")).header("apiCode", apiCode)//头信息，多个头信息多次调用此方法即可 .header("publicKey", OverallConstant.getOverAllValue("publicKey"))//头信息，多个头信息多次调用此方法即可 .header("secretKey", OverallConstant.getOverAllValue("secretKey"))//头信息，多个头信息多次调用此方法即可 .body(param)//表单内容 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryAdditionUtil.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryAdditionUtil.java index 06c31dda..3e64b730 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryAdditionUtil.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryAdditionUtil.java @@ -167,7 +167,7 @@ public class QueryAdditionUtil { //2025年2月17日 10:37:37 如果四舍五入保留2位后，如果为0，则不推送U8C，处理0.0033保留2位为0的问题 //和李佳妮、还有丽知-山海沟通确定的 - if (noriginalcursummnyRounding2.compareTo(BigDecimal.ZERO) != 0) { + if (!"0".equals(noriginalcursummnyStr)) { saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto1); } } @@ -190,42 +190,42 @@ public class QueryAdditionUtil { Assert.notNull(noriginalcursummny, "noriginalcursummny不能为空"); //如果size=0则不正常 - if (pushScenarioType.size() > 0) { - ArapDjzbVO.Childrenn childrenn = pushScenarioType.get(0); +// if (pushScenarioType.size() > 0) { +// ArapDjzbVO.Childrenn childrenn = pushScenarioType.get(0); - //拷贝SaleorderRequestChildrenDto对象 - ArapDjzbVO.Childrenn arapDjzbVOChildrenn = new ArapDjzbVO.Childrenn(); - BeanUtil.copyPropertiesV2(childrenn, arapDjzbVOChildrenn); + //拷贝SaleorderRequestChildrenDto对象 + ArapDjzbVO.Childrenn arapDjzbVOChildrenn = new ArapDjzbVO.Childrenn(); +// BeanUtil.copyPropertiesV2(childrenn, arapDjzbVOChildrenn); - //修改存货、数量、税率、价税合计、优惠金额设置为0 - //存货id、存货编码 - arapDjzbVOChildrenn.setCinventoryid(bdInvmandocEntity1.getPkInvmandoc()); + //修改存货、数量、税率、价税合计、优惠金额设置为0 + //存货id、存货编码 + arapDjzbVOChildrenn.setCinventoryid(bdInvbasdocEntity1.getInvcode()); - String tax = null;//税率 - BigDecimal noriginalcurmny = null;//无税金额 - BigDecimal noriginalcurtaxmny = null;//税额 - try { - tax = new BigDecimal(bdTaxitemsEntity.getTaxratio()).divide(new BigDecimal(100), 20, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString(); - noriginalcurmny = noriginalcursummny.divide(new BigDecimal(1).add(new BigDecimal(tax)), 20, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP); - noriginalcurtaxmny = noriginalcursummny.subtract(noriginalcurmny).setScale(2, BigDecimal.ROUND_HALF_UP); - } catch (Exception e) { - logger.error("金额计算失败", e); - Assert.state(false, "金额计算失败 异常：{}", e.getMessage()); - } - - //金额计算 - arapDjzbVOChildrenn.setJfbbje("-" + noriginalcursummny.stripTrailingZeros().toPlainString());//借方本币金额 - arapDjzbVOChildrenn.setJfybje("-" + noriginalcursummny.stripTrailingZeros().toPlainString());//借方原币金额 - arapDjzbVOChildrenn.setJfbbsj("-" + noriginalcurmny.stripTrailingZeros().toPlainString());//借方本币税金 - arapDjzbVOChildrenn.setJfybsj("-" + noriginalcurmny.stripTrailingZeros().toPlainString());//借方原币税金 - arapDjzbVOChildrenn.setWbfbbje("-" + noriginalcurtaxmny.stripTrailingZeros().toPlainString());//借方本币无税金额 - arapDjzbVOChildrenn.setJfybwsje("-" + noriginalcurtaxmny.stripTrailingZeros().toPlainString());//借方原币无税金额 - - //2025年2月17日 10:37:37 如果四舍五入保留2位后，如果为0，则不推送U8C，处理0.0033保留2位为0的问题 - //和李佳妮、还有丽知-山海沟通确定的 - if (!"0".equals(noriginalcursummny.setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString())) { - pushScenarioType.add(arapDjzbVOChildrenn); - } + String tax = null;//税率 + BigDecimal noriginalcurmny = null;//无税金额 + BigDecimal noriginalcurtaxmny = null;//税额 + try { + tax = new BigDecimal(bdTaxitemsEntity.getTaxratio()).divide(new BigDecimal(100), 20, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString(); + noriginalcurmny = noriginalcursummny.divide(new BigDecimal(1).add(new BigDecimal(tax)), 20, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP); + noriginalcurtaxmny = noriginalcursummny.subtract(noriginalcurmny).setScale(2, BigDecimal.ROUND_HALF_UP); + } catch (Exception e) { + logger.error("金额计算失败", e); + Assert.state(false, "金额计算失败 异常：{}", e.getMessage()); } + + //金额计算 + arapDjzbVOChildrenn.setJfbbje(noriginalcursummny.stripTrailingZeros().toPlainString());//借方本币金额 + arapDjzbVOChildrenn.setJfybje(noriginalcursummny.stripTrailingZeros().toPlainString());//借方原币金额 + arapDjzbVOChildrenn.setJfbbsj(noriginalcurmny.stripTrailingZeros().toPlainString());//借方本币税金 + arapDjzbVOChildrenn.setJfybsj(noriginalcurmny.stripTrailingZeros().toPlainString());//借方原币税金 + arapDjzbVOChildrenn.setWbfbbje(noriginalcurtaxmny.stripTrailingZeros().toPlainString());//借方本币无税金额 + arapDjzbVOChildrenn.setJfybwsje(noriginalcurtaxmny.stripTrailingZeros().toPlainString());//借方原币无税金额 + + //2025年2月17日 10:37:37 如果四舍五入保留2位后，如果为0，则不推送U8C，处理0.0033保留2位为0的问题 + //和李佳妮、还有丽知-山海沟通确定的 + if (!"0".equals(noriginalcursummny.setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString())) { + pushScenarioType.add(arapDjzbVOChildrenn); + } +// } } }