diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java index f1c98471..59b000b8 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java @@ -175,7 +175,6 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { * 按单号 */ public void start(String stockinNo) { - LOCK.lock(); try { QueryOfsStockinOrderRequestVO queryOfsStockinOrderRequestVO = new QueryOfsStockinOrderRequestVO(); @@ -196,8 +195,6 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { } catch (Exception e) { logger.error("丽知:OFS调整入库--->U8C其它入库,start(String goodsName)方法报错:", e); - }finally { - LOCK.unlock(); } } @@ -206,7 +203,6 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { * 按时间区间 */ public void start(String startTime, String endTime) { - LOCK.lock(); try { Date business_start = DateUtil.parse(startTime); Date business_end = DateUtil.parse(endTime); @@ -233,8 +229,6 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { } catch (Exception e) { logger.error("丽知:OFS调整入库--->U8C其它入库,start(String startTime, String endTime)方法报错:", e); - }finally { - LOCK.unlock(); } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java index d3202e2c..c7a466f7 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java @@ -178,7 +178,6 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { * 按单号 */ public void start(String stockoutNo) { - LOCK.lock(); try { QueryOfsStockoutOrderRequestVO queryOfsStockoutOrderRequestVO = new QueryOfsStockoutOrderRequestVO(); @@ -198,8 +197,6 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { } catch (Exception e) { logger.error("丽知:OFS调整出库--->U8C其它出库,start(String goodsName)方法报错:", e); - }finally { - LOCK.unlock(); } } @@ -208,7 +205,6 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { * 按时间区间,ofs接口最大显示7天,时间计算7天分段。 */ public void start(String startTime, String endTime) { - LOCK.lock(); try { Date business_start = DateUtil.parse(startTime); Date business_end = DateUtil.parse(endTime); @@ -234,8 +230,6 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { } catch (Exception e) { logger.error("丽知:OFS调整出库--->U8C其它出库,start(String startTime, String endTime)方法报错:", e); - }finally { - LOCK.unlock(); } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java index 818ccad0..0b04d213 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java @@ -48,7 +48,7 @@ import java.util.stream.Collectors; /** * add by zyd * O售后订单(仅退款) -> U8C红字应收单 - *

+ *

(取售中售后) * returnType:0 不退货 * exchangeType:0 不换货 * refundInd:1 退款 @@ -165,7 +165,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { if (returnGoodsOrders == null || returnGoodsOrders.size() == 0) { return; } - //过滤仅退款 returnType:0 不退货、exchangeType:0 不换货、refundInd:1 退款 + //过滤仅退款 returnType:0 不退货、exchangeType:0 不换货、refundInd:1 退款 returnnode:300/200 售后/售中 List refundOnlyData = filterRefundOnly(returnGoodsOrders); //保存数据 @@ -291,7 +291,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { } /** - * returnType:0 不退货、exchangeType:0 不换货、refundInd:1 退款 + * returnType:0 不退货、exchangeType:0 不换货、refundInd:1 退款、returnNode:300/200 售后/售中 * * @param rerturnGoodsOrderSearchData * @return @@ -300,7 +300,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { List filterRefundOnly = new ArrayList<>(); for (RerturnGoodsOrderSearchData rerturnGoodsOrderSearchDatum : rerturnGoodsOrderSearchData) { RerturnGoodsOrderSearchHeader header = rerturnGoodsOrderSearchDatum.getHeader(); - if ("0".equals(header.getReturnType()) && "0".equals(header.getExchangeType()) && "1".equals(header.getRefundInd())) { + if ("0".equals(header.getReturnType()) && "0".equals(header.getExchangeType()) && "1".equals(header.getRefundInd())&&("300".equals(header.getReturnNode())||"200".equals(header.getReturnNode()))) { filterRefundOnly.add(rerturnGoodsOrderSearchDatum); } } @@ -687,7 +687,6 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { //100订单池 500待同步 510已同步 900售后成功 400待合单 800已入库 999作废 700收货中 0待完善 // queryReturnOrderRequestVO.setStatus("900"); queryReturnOrderRequestVO.setPageNo(pageNo); - queryReturnOrderRequestVO.setPageSize(500L); interfaceParamDto.setData(JSON.toJSONString(queryReturnOrderRequestVO)); RerturnGoodsOrderSearchJsonRootBean rerturnGoodsOrderSearchJsonRootBean = (RerturnGoodsOrderSearchJsonRootBean) ofsUnifiedService.unified(interfaceParamDto);