From eac2ca9b44bd62170f999ed4b4ee3fcf339e87ce Mon Sep 17 00:00:00 2001 From: sx <@sx.com> Date: Tue, 13 Aug 2024 13:58:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=EF=BC=8C=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustdocAutoAllotPluginInitializer.java | 40 ++++++++------- .../base/CustmandocPluginInitializer.java | 18 ++++--- .../plugin/base/ShopPluginInitializer.java | 5 +- .../base/SupplierPluginInitializer.java | 51 ++----------------- 4 files changed, 38 insertions(+), 76 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustdocAutoAllotPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustdocAutoAllotPluginInitializer.java index 07f18582..8bf25011 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustdocAutoAllotPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustdocAutoAllotPluginInitializer.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.plugin.lets.constant.OverallConstant; import com.hzya.frame.plugin.lets.constant.ProfilesActiveConstant; +import com.hzya.frame.plugin.lets.entity.BdCorpEntity; import com.hzya.frame.plugin.lets.entity.BdInvbasdocEntity; import com.hzya.frame.plugin.lets.queryvo.CustDocAssginVo; import com.hzya.frame.plugin.lets.queryvo.CustdocRequestVo; @@ -132,7 +133,10 @@ public class CustdocAutoAllotPluginInitializer extends PluginBaseEntity { String data = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("custdocQuery"), "{}"); CbdocResultVo cbdocResultVo = JSONObject.parseObject(data, CbdocResultVo.class); String datastring = cbdocResultVo.getData(); - List list = JSONObject.parseObject(datastring, List.class); + Map map = JSONObject.parseObject(datastring, Map.class); + Object o = map.get("datas"); + String jsonString = JSONObject.toJSONString(o); + List list = JSONObject.parseArray(jsonString, CustdocRequestVo.class); custdocRequestVos = filterData(list); } catch (Exception e) { logger.error("丽知：U8C->客商基本档案自动分配全公司,查询客商基本档案失败", e); @@ -140,13 +144,10 @@ public class CustdocAutoAllotPluginInitializer extends PluginBaseEntity { return custdocRequestVos; } - private List filterData(List list) { + private List filterData(List list) { List filterlist = new ArrayList<>(); - for (Object o : list) { + for (CustdocRequestVo requestVo : list) { //o转为 - CustdocRequestVo requestVo = JSONObject.parseObject(JSONObject.toJSONString(o), CustdocRequestVo.class); - - if("N".equals(requestVo.getParentvo().getDef10())){ filterlist.add(requestVo); } @@ -159,17 +160,22 @@ public class CustdocAutoAllotPluginInitializer extends PluginBaseEntity { */ public void implement(List list) { - //查询公司档案 - try { - String corpresponse = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("bdcorpQuery"), "{}"); - CbdocResultVo cbdocResultVo = JSONObject.parseObject(corpresponse, CbdocResultVo.class); - if(cbdocResultVo.getStatus()!="success"){ - Assert.state(false, "查询公司档案失败"); - } - - } catch (Exception e) { - throw new RuntimeException(e); - } +// //查询公司档案 +// try { +// String corpresponse = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("bdcorpQuery"), "{}"); +// CbdocResultVo cbdocResultVo = JSONObject.parseObject(corpresponse, CbdocResultVo.class); +// if(cbdocResultVo.getStatus()!="success"){ +// Assert.state(false, "查询公司档案失败"); +// } +// String data = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("bdcorpQuery"), "{}"); +// CbdocResultVo ResultVo = JSONObject.parseObject(data, CbdocResultVo.class); +// String datastring = ResultVo.getData(); +// Map map = JSONObject.parseObject(datastring, Map.class); +// Object o = map.get("datas"); +// List bdCorpEntities = JSONObject.parseArray(JSON.toJSONString(o), BdCorpEntity.class); +// } catch (Exception e) { +// throw new RuntimeException(e); +// } for (CustdocRequestVo custdocRequestVo : list) { String assginjsonString = ""; diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustmandocPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustmandocPluginInitializer.java index 6d491491..7ccec2b1 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustmandocPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustmandocPluginInitializer.java @@ -12,6 +12,7 @@ import com.hzya.frame.plugin.lets.entity.BdCumandocEntity; import com.hzya.frame.plugin.lets.queryvo.CustdocRequestVo; import com.hzya.frame.plugin.lets.queryvo.CustmandocRequestVo; +import com.hzya.frame.plugin.lets.resultvo.CbdocResultVo; import com.hzya.frame.plugin.lets.u8cdto.ReusltStrDto; import com.hzya.frame.plugin.lets.util.PushDataByU8cUtil; import com.hzya.frame.plugin.lets.util.SaveOrUpdateBusinessLogUtil; @@ -103,8 +104,11 @@ public class CustmandocPluginInitializer extends PluginBaseEntity { List custdocRequestVos=null; try { String data = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("custdocQuery"), "{}"); - - List list = JSONObject.parseObject(data, List.class); + CbdocResultVo cbdocResultVo = JSONObject.parseObject(data, CbdocResultVo.class); + String datastring = cbdocResultVo.getData(); + Map map = JSONObject.parseObject(datastring, Map.class); + Object o = map.get("datas"); + List list = JSONObject.parseArray(JSON.toJSONString(o), CustdocRequestVo.class); custdocRequestVos = filterData(list); } catch (Exception e) { @@ -113,13 +117,11 @@ public class CustmandocPluginInitializer extends PluginBaseEntity { return custdocRequestVos; } - private List filterData(List list) { + private List filterData(List list) { List filterlist = new ArrayList<>(); - for (Object o : list) { - //o转为 - CustdocRequestVo BdCubasdocEntity = JSONObject.parseObject(JSONObject.toJSONString(o), CustdocRequestVo.class); - if("N".equals(BdCubasdocEntity.getParentvo().getDef11())){ - filterlist.add(BdCubasdocEntity); + for (CustdocRequestVo requestVo : list) { + if("N".equals(requestVo.getParentvo().getDef11())){ + filterlist.add(requestVo); } } return filterlist; diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/ShopPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/ShopPluginInitializer.java index 98ccf719..8a653f4c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/ShopPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/ShopPluginInitializer.java @@ -209,7 +209,7 @@ public class ShopPluginInitializer extends PluginBaseEntity { parentvo.setCustcode(shopEntity.getCustomerCode()); //设置还未分配公司 parentvo.setDef10("N"); - //设置还同步到管理档案 + //设置还未同步到管理档案 parentvo.setDef11("N"); // parentvo.setCustprop("0"); BdCubasdocEntity.setParentvo(parentvo); @@ -249,8 +249,6 @@ public class ShopPluginInitializer extends PluginBaseEntity { //TODO 更新店铺状态 // CbdocResultVo cbdocResultVo1 = JSONObject.parseObject(response, CbdocResultVo.class); // String errormsg = cbdocResultVo1.getErrormsg(); - - } } catch (Exception e) { @@ -275,7 +273,6 @@ public class ShopPluginInitializer extends PluginBaseEntity { public List filterShopEntity(List list) { Assert.notNull(list, "不能为空！"); - List shopEntityList = new ArrayList<>(); if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java index eec3cd98..e921c1f5 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java @@ -190,6 +190,10 @@ public class SupplierPluginInitializer extends PluginBaseEntity { parentvo.setCustshortname(supplierEntity.getName()); parentvo.setCustcode(supplierEntity.getCompanyCode()); + //设置还未分配公司 + parentvo.setDef10("N"); + //设置还未同步到管理档案 + parentvo.setDef11("N"); BdCubasdocEntity.setParentvo(parentvo); // 同步u8c HashMap param = new HashMap<>(); @@ -205,53 +209,6 @@ public class SupplierPluginInitializer extends PluginBaseEntity { isSuccess = true; taskNumber = cbdocResultVo.getTaskNumber(); String data = cbdocResultVo.getData(); - -// CustdocRequestVo BdCubasdocEntity1 = JSONObject.parseObject(data, CustdocRequestVo.class); - List datalist = JSONObject.parseObject(data, List.class); - Object o = datalist.get(0); - CustdocRequestVo BdCubasdocEntity1 = JSONObject.parseObject(JSONObject.toJSONString(o), CustdocRequestVo.class); - - - CustDocAssginVo custDocAssginVo = new CustDocAssginVo(); - custDocAssginVo.setAssignallcorps("Y"); - //分配给所有公司 - custDocAssginVo.setCustprop("2"); - custDocAssginVo.setPk_cubasdoc(BdCubasdocEntity1.getParentvo().getPk_cubasdoc()); - HashMap assginHashMap = new HashMap<>(); - assginHashMap.put("custbasvo", custDocAssginVo); - String assginjsonString = JSONObject.toJSONString(assginHashMap); - String assignresponse = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("custdocAssgin"), assginjsonString); - CbdocResultVo assginCbdocResultVo = JSONObject.parseObject(assignresponse, CbdocResultVo.class); - if (!"success".equals(assginCbdocResultVo.getStatus())) { - isSuccess = false; - } - - //生成客商管理档案 - - //地区名称：丽知商城客商？ - parentvo.setPk_areacl("F"); - parentvo.setCustprop(BdCubasdocEntity1.getParentvo().getCustprop()); - CustmandocRequestVo custmandocRequestVo = new CustmandocRequestVo(); - custmandocRequestVo.setParentvo(parentvo); -// BdCumandocEntity BdCumandocEntity = new BdCumandocEntity(); -// BdCumandocEntity.setCustflag("1"); -// -// BdCumandocEntity BdCumandocEntity1 = new BdCumandocEntity(); -// BdCumandocEntity.setCustflag(" "); -// ArrayList list = new ArrayList<>(); -// list.add(BdCumandocEntity); -// list.add(BdCumandocEntity1); -// custmandocRequestVo.setChildrenvo(list); - - // 设置属性 - HashMap mandocparam = new HashMap<>(); - mandocparam.put("billvo", custmandocRequestVo); - String mandocjsonString = JSONObject.toJSONString(mandocparam); - String mandocresponse = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("custmandocSave"), mandocjsonString); - CbdocResultVo mandoccbdocResultVo = JSONObject.parseObject(mandocresponse, CbdocResultVo.class); - if (!"success".equals(mandoccbdocResultVo.getStatus())) { - isSuccess = false; - } } if (!isSuccess) { Assert.state(false, "推送U8C，原因：{} 接口入参:{} {}", JSON.toJSONString(cbdocResultVo), JSON.toJSONString(OverallConstant.getOverAllValue("custdocSave")), JSON.toJSONString(BdCubasdocEntity));