From 761ad617a49a14476c656868172b39612e6b0f35 Mon Sep 17 00:00:00 2001 From: sx <@sx.com> Date: Wed, 14 Aug 2024 11:11:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A2=E5=95=86=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E7=AE=A1=E7=90=86dto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lets/dao/impl/BdCubasdocDaoImpl.java | 2 +- .../plugin/lets/entity/BdCubasdocEntity.java | 103 +++++---- .../plugin/lets/entity/BdCubasdocEntity.xml | 12 +- .../plugin/lets/entity/BdCumandocEntity.java | 2 - .../base/CustmandocPluginInitializer.java | 20 +- .../plugin/base/ShopPluginInitializer.java | 13 +- .../base/SupplierPluginInitializer.java | 17 +- .../sales/SoSaleOutPluginInitializerToC.java | 2 +- .../SoSaleReturnPluginInitializerToC.java | 2 +- .../plugin/lets/queryvo/CustdocRequestVo.java | 3 +- .../lets/queryvo/CustmandocRequestVo.java | 7 +- .../plugin/lets/u8cdto/CustdocEntityDto.java | 150 +++++++++++++ .../lets/u8cdto/CustmandocEntityDto.java | 198 ++++++++++++++++++ .../plugin/lets/plugin/base/ShopTest.java | 28 ++- 14 files changed, 452 insertions(+), 107 deletions(-) create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/CustdocEntityDto.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/CustmandocEntityDto.java diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/BdCubasdocDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/BdCubasdocDaoImpl.java index 14aca308..14af6bb5 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/BdCubasdocDaoImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/BdCubasdocDaoImpl.java @@ -20,7 +20,7 @@ public class BdCubasdocDaoImpl extends MybatisGenericDao - - - - - - + + + + + + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCumandocEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCumandocEntity.java index 9421f13a..f4dd411e 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCumandocEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCumandocEntity.java @@ -31,8 +31,6 @@ public class BdCumandocEntity extends BaseEntity { private String creditmoney; private Long credlimitflag; private String custflag; - // 客商名称 - private String custname; private Long custstate; private String def1; 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 7ccec2b1..aeb14d24 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 @@ -6,13 +6,13 @@ 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.BdCubasdocEntity; -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.CustdocEntityDto; +import com.hzya.frame.plugin.lets.u8cdto.CustmandocEntityDto; import com.hzya.frame.plugin.lets.u8cdto.ReusltStrDto; import com.hzya.frame.plugin.lets.util.PushDataByU8cUtil; import com.hzya.frame.plugin.lets.util.SaveOrUpdateBusinessLogUtil; @@ -136,7 +136,7 @@ public class CustmandocPluginInitializer extends PluginBaseEntity { Date date = new Date(System.currentTimeMillis()); // 创建Date对象 String businessFormat = sdf.format(date); // 将Date对象格式化为字符串 - BdCubasdocEntity parentvo = vo.getParentvo(); + CustdocEntityDto parentvo = vo.getParentvo(); try { parentvo.setPk_areacl("F"); @@ -145,13 +145,13 @@ public class CustmandocPluginInitializer extends PluginBaseEntity { custmandocRequestVo.setAddrs(vo.getAddrs()); // custmandocRequestVo.setBanks(vo.getBanks()); - BdCumandocEntity BdCumandocEntity = new BdCumandocEntity(); - BdCumandocEntity.setCustflag("0"); - BdCumandocEntity BdCumandocEntity1 = new BdCumandocEntity(); - BdCumandocEntity1.setCustflag("4"); - List custmandocEntities = new ArrayList<>(); - custmandocEntities.add(BdCumandocEntity); - custmandocEntities.add(BdCumandocEntity1); + CustmandocEntityDto custmandocEntityDto = new CustmandocEntityDto(); + custmandocEntityDto.setCustflag("0"); + CustmandocEntityDto custmandocEntityDto1 = new CustmandocEntityDto(); + custmandocEntityDto1.setCustflag("4"); + List custmandocEntities = new ArrayList<>(); + custmandocEntities.add(custmandocEntityDto); + custmandocEntities.add(custmandocEntityDto1); custmandocRequestVo.setChildrenvo(custmandocEntities); HashMap mandocparam = new HashMap<>(); mandocparam.put("billvo", custmandocRequestVo); 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 8a653f4c..9e2325ee 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 @@ -8,12 +8,12 @@ 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.BdCubasdocEntity; import com.hzya.frame.plugin.lets.ofs.entity.ShopEntity; import com.hzya.frame.plugin.lets.queryvo.CustdocRequestVo; import com.hzya.frame.plugin.lets.resultvo.CbdocResultVo; import com.hzya.frame.plugin.lets.resultvo.ShopReturnMessageDto; +import com.hzya.frame.plugin.lets.u8cdto.CustdocEntityDto; import com.hzya.frame.plugin.lets.util.PushDataByU8cUtil; import com.hzya.frame.plugin.lets.util.SaveOrUpdateBusinessLogUtil; import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; @@ -201,8 +201,8 @@ public class ShopPluginInitializer extends PluginBaseEntity { try { - BdCubasdocEntity parentvo = new BdCubasdocEntity(); - CustdocRequestVo BdCubasdocEntity = new CustdocRequestVo(); + CustdocEntityDto parentvo = new CustdocEntityDto(); + CustdocRequestVo custdocRequestVo = new CustdocRequestVo(); //TODO 设置parentvo parentvo.setCustname(shopEntity.getName()); parentvo.setCustshortname(shopEntity.getName()); @@ -212,11 +212,11 @@ public class ShopPluginInitializer extends PluginBaseEntity { //设置还未同步到管理档案 parentvo.setDef11("N"); // parentvo.setCustprop("0"); - BdCubasdocEntity.setParentvo(parentvo); + custdocRequestVo.setParentvo(parentvo); //同步u8c HashMap param = new HashMap<>(); - param.put("cbdocvo", BdCubasdocEntity); + param.put("cbdocvo", custdocRequestVo); String jsonString = JSONObject.toJSONString(param); String response = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("custdocSave"), jsonString); System.out.println(response); @@ -230,9 +230,8 @@ public class ShopPluginInitializer extends PluginBaseEntity { String data = cbdocResultVo.getData(); } - if (!isSuccess) { - Assert.state(false, "同步到U8C失败，原因：{} 接口入参:{} {}", JSON.toJSONString(cbdocResultVo), JSON.toJSONString(OverallConstant.getOverAllValue("custdocSave")), JSON.toJSONString(BdCubasdocEntity)); + Assert.state(false, "同步到U8C失败，原因：{} 接口入参:{} {}", JSON.toJSONString(cbdocResultVo), JSON.toJSONString(OverallConstant.getOverAllValue("custdocSave")), JSON.toJSONString(custdocRequestVo)); } // 根据返回结果记录日志 //成功 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 e921c1f5..b688161b 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 @@ -8,7 +8,6 @@ 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.BdCubasdocEntity; import com.hzya.frame.plugin.lets.ofs.entity.ShopEntity; import com.hzya.frame.plugin.lets.ofs.entity.SupplierEntity; @@ -16,6 +15,7 @@ import com.hzya.frame.plugin.lets.queryvo.CustDocAssginVo; 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.CustdocEntityDto; import com.hzya.frame.plugin.lets.util.PushDataByU8cUtil; import com.hzya.frame.plugin.lets.util.SaveOrUpdateBusinessLogUtil; import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; @@ -181,8 +181,8 @@ public class SupplierPluginInitializer extends PluginBaseEntity { Date date = new Date(System.currentTimeMillis()); String businessFormat = sdf.format(date); for (SupplierEntity supplierEntity : shopEntityList) { - BdCubasdocEntity parentvo = new BdCubasdocEntity(); - CustdocRequestVo BdCubasdocEntity = new CustdocRequestVo(); + CustdocEntityDto parentvo = new CustdocEntityDto(); + CustdocRequestVo CustdocEntityDto = new CustdocRequestVo(); try { //T 设置parentvo // parentvo.setPk_areacl(""); @@ -194,10 +194,10 @@ public class SupplierPluginInitializer extends PluginBaseEntity { parentvo.setDef10("N"); //设置还未同步到管理档案 parentvo.setDef11("N"); - BdCubasdocEntity.setParentvo(parentvo); + CustdocEntityDto.setParentvo(parentvo); // 同步u8c HashMap param = new HashMap<>(); - param.put("cbdocvo", BdCubasdocEntity); + param.put("cbdocvo", CustdocEntityDto); String jsonString = JSONObject.toJSONString(param); String response = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("custdocSave"), jsonString); @@ -211,7 +211,7 @@ public class SupplierPluginInitializer extends PluginBaseEntity { String data = cbdocResultVo.getData(); } if (!isSuccess) { - Assert.state(false, "推送U8C，原因：{} 接口入参:{} {}", JSON.toJSONString(cbdocResultVo), JSON.toJSONString(OverallConstant.getOverAllValue("custdocSave")), JSON.toJSONString(BdCubasdocEntity)); + Assert.state(false, "推送U8C，原因：{} 接口入参:{} {}", JSON.toJSONString(cbdocResultVo), JSON.toJSONString(OverallConstant.getOverAllValue("custdocSave")), JSON.toJSONString(CustdocEntityDto)); } // 根据返回结果记录日志 //成功 @@ -229,13 +229,12 @@ public class SupplierPluginInitializer extends PluginBaseEntity { } - } catch (Exception e) { e.printStackTrace(); String ErrMessage = e.getMessage(); IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N); - integrationTaskLivingDetailsEntity.setRootAppNewData(JSONObject.toJSONString(BdCubasdocEntity)); + integrationTaskLivingDetailsEntity.setRootAppNewData(JSONObject.toJSONString(CustdocEntityDto)); integrationTaskLivingDetailsEntity.setNewTransmitInfo(ErrMessage); integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); integrationTaskLivingDetailsEntity.setBusinessDate(businessFormat); @@ -276,6 +275,4 @@ public class SupplierPluginInitializer extends PluginBaseEntity { } return supplierEntityList; } - - } 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 ed486007..a61b66f3 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 @@ -523,7 +523,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { //客商管理档案：2024年8月5日 15:41:54 TOC店铺名称查询U8C客商档案，已经和妮姐确认 //2024年8月5日 15:49:49 先根据O店铺编码，得到店铺档案信息，取到名称，通过U8C接口查询出来 //目前O店铺信息查询接口还没有，等待开发，所以我这里先写所一个名字 - BdCumandocEntity bdCumandocEntity = TocOrderBasicArchivesCacheUtil.stringBdCumandocEntityMap.get(bdCubasdocEntity.getPk_cubasdoc() + bdCorpEntity.getPkCorp()); + BdCumandocEntity bdCumandocEntity = TocOrderBasicArchivesCacheUtil.stringBdCumandocEntityMap.get(bdCubasdocEntity.getPkCubasdoc() + bdCorpEntity.getPkCorp()); Assert.notNull(bdCumandocEntity, "无法匹配到客商档案 店铺名称：{}", "天猫intoyou旗舰店-自营"); //查找平台 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 8ca6f626..49094206 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 @@ -513,7 +513,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { //客商管理档案：2024年8月5日 15:41:54 TOC店铺名称查询U8C客商档案，已经和妮姐确认 //2024年8月5日 15:49:49 先根据O店铺编码，得到店铺档案信息，取到名称，通过U8C接口查询出来 //目前O店铺信息查询接口还没有，等待开发，所以我这里先写所一个名字 - BdCumandocEntity bdCumandocEntity = TocReturnBasicArchivesCacheUtil.stringBdCumandocEntityMap.get(bdCubasdocEntity.getPk_cubasdoc() + bdCorpEntity.getPkCorp()); + BdCumandocEntity bdCumandocEntity = TocReturnBasicArchivesCacheUtil.stringBdCumandocEntityMap.get(bdCubasdocEntity.getPkCubasdoc() + bdCorpEntity.getPkCorp()); Assert.notNull(bdCumandocEntity, "无法匹配到客商档案 店铺名称：{}", "天猫intoyou旗舰店-自营"); //查找平台 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/queryvo/CustdocRequestVo.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/queryvo/CustdocRequestVo.java index fb3b3048..ba76d025 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/queryvo/CustdocRequestVo.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/queryvo/CustdocRequestVo.java @@ -1,6 +1,7 @@ package com.hzya.frame.plugin.lets.queryvo; import com.hzya.frame.plugin.lets.entity.BdCubasdocEntity; +import com.hzya.frame.plugin.lets.u8cdto.CustdocEntityDto; import lombok.Data; import java.util.List; @@ -17,6 +18,6 @@ public class CustdocRequestVo { private List addrs; private List banks; // private BdCubasdocEntity parentvo; - private BdCubasdocEntity parentvo; + private CustdocEntityDto parentvo; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/queryvo/CustmandocRequestVo.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/queryvo/CustmandocRequestVo.java index 319ce577..38836018 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/queryvo/CustmandocRequestVo.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/queryvo/CustmandocRequestVo.java @@ -1,7 +1,8 @@ package com.hzya.frame.plugin.lets.queryvo; -import com.hzya.frame.plugin.lets.entity.BdCubasdocEntity; import com.hzya.frame.plugin.lets.entity.BdCumandocEntity; +import com.hzya.frame.plugin.lets.u8cdto.CustdocEntityDto; +import com.hzya.frame.plugin.lets.u8cdto.CustmandocEntityDto; import lombok.Data; import java.util.List; @@ -18,6 +19,6 @@ public class CustmandocRequestVo { private List addrs; private List custBanks; - private List childrenvo; - private BdCubasdocEntity parentvo; + private List childrenvo; + private CustdocEntityDto parentvo; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/CustdocEntityDto.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/CustdocEntityDto.java new file mode 100644 index 00000000..39a4fa37 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/CustdocEntityDto.java @@ -0,0 +1,150 @@ +package com.hzya.frame.plugin.lets.u8cdto; + +import lombok.Data; + +/** + * @Author + * @Date 2024/8/6 16:14 + * @PackageName:com.hzya.frame.plugin.lets.plugin.base.vo + * @ClassName: parentvo + * @Description: 客商基本档案 + */ +@Data +public class CustdocEntityDto { + //客商基本档案主键(修改时必填,新增时禁止传入) + private String pk_cubasdoc; + //默认账户 + private String accdefault; + //呼机1 + private String bp1; + //呼机2 + private String bp2; + //呼机3 + private String bp3; + //通信地址 + private String conaddr; + //创建时间 + private String createtime; + //创建人 + private String creator; + //信用额度 + private String creditmny; + //客商编码 + private String custcode; + //客商名称 + private String custname; + //客商类型 0 - 外部单位,1 - 内部核算单位,2 - 内部法人单位,3 - 内部渠道成员) + private String custprop; + //客商简称 + private String custshortname; + + private String def1; + + private String def10; + + private String def11; + + private String def12; + + private String def13; + + private String def14; + + private String def15; + + private String def16; + + private String def17; + + private String def18; + + private String def19; + + private String def2; + private String def20; + + private String def3; + + private String def4; + + private String def5; + + private String def6; + + private String def7; + + private String def8; + + private String def9; + //是否drp节点 + private boolean drpnodeflag; + //经济类型(填写编码) + private String ecotypesincevfive; + //e-mail地址 + private String email; + //外文名称 + private String engname; + //传真1 + private String fax1; + //传真2 + private String fax2; + //是否散户 + private boolean freecustflag; + //是否渠道成员 + private boolean isconnflag; + //法人 + private String legalbody; + //联系人1 + private String linkman1; + //联系人2 + private String linkman2; + //联系人3 + private String linkman3; + //备注 + private String memo; + //助记码 + private String mnecode; + //手机1 + private String mobilephone1; + //手机2 + private String mobilephone2; + //手机3 + private String mobilephone3; + //修改人 + private String modifier; + //修改时间 + private String modifytime; + //电话1 + private String phone1; + //电话2 + private String phone2; + //电话3 + private String phone3; + //所属地区(填写编码) + private String pk_areacl; + //公司主键（填写对应编码） + private String pk_corp; + //对应公司(填写编码) + private String pk_corp1; + //客商总公司编码(填写编码) + private String pk_cubasdoc1; + //价格分组(填写编码) + private String pk_pricegroup; + //注册资金 + private String registerfund; + //营业地址 + private String saleaddr; + //封存标志 + private String sealflag; + //纳税人登记号 + private String taxpayerid; + //所属行业(填写编码) + private String trade; + //web网址 + private String url; + //邮政编码 + private String zipcode; + +} + + diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/CustmandocEntityDto.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/CustmandocEntityDto.java new file mode 100644 index 00000000..26072751 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/CustmandocEntityDto.java @@ -0,0 +1,198 @@ +package com.hzya.frame.plugin.lets.u8cdto; + + +import lombok.Data; + +import java.util.List; + +/** + * @Author + * @Date 2024/8/8 15:15 + * @PackageName:com.hzya.frame.plugin.lets.plugin.base.vo + * @ClassName: BdCumandocEntity + * @Description: 客商管理档案 + */ +@Data +public class CustmandocEntityDto { + // 于客商总公司账期控制 + private boolean acclimitcontrol; + // 呼机 + private String bp; + // 助记码 + private String cmnecode; + // 是否收付协同 + private boolean cooperateflag; + // 合作期限从 + private String cooperatingdayfrom; + // 合作期限到 + private String cooperatingdayto; + // 创建时间 + private String createtime; + // 创建人 + private String creator; + // 基于客商总公司信用控制 + private boolean creditcontrol; + // 信用等级(填写编码) + private String creditlevel; + // 信用期限 + private int creditlimitnum; + // 信用额度 + private double creditmny; + // 信用保证金 + private double creditmoney; + // 是否信用管制 + private String credlimitflag; + // 客商编码 + private String custcode; + //由于客商管理档案在数据库表中存的两条，所以childrenvo如果传的话需要传两条，这两条数据的客商属性字段必须是这些组合（客户0和4，供应商1和空格，客商2和3），不传childrenvo默认是客户0和4 + private String custflag; + // 客商名称 + private String custname; + // 客商状态 + private String custstate; + + private String def1; + + private String def10; + + private String def11; + + private String def12; + + private String def13; + + private String def14; + private String def15; + + private String def16; + + private String def17; + + private String def18; + + private String def19; + + private String def2; + + private String def20; + + private String def21; + + private String def22; + + private String def23; + + private String def24; + + private String def25; + private String def26; + + private String def27; + + private String def28; + + private String def29; + + private String def3; + + private String def30; + + private String def4; + + private String def5; + + private String def6; + + private String def7; + + private String def8; + + private String def9; + // 发展日期 + private String developdate; + //是否允许异币种核算 + private String diffcurrflag; + // 扣率 + private String discountrate; + // 删除标志 + private int dr; + // 免于帐期检查 + private boolean freeofacclmtcheck; + // 免于信用额度检查 + private boolean freeofcremnycheck; + // 冻结时间 + private String frozendate; + // 是否冻结 + private boolean frozenflag; + + // 等级 + private int grade; + // 内控帐期天数 + private String innerctldays; + // 筹投资单位 + private boolean iounit; + // 是否零售加盟店 + private boolean isagent; + // 是否催款 + private boolean ispromtesettlement; + // 联系人 + private String linkman; + // 备注 + private String memo; + // 手机 + private String mobilephone; + // 修改人 + private String modifier; + // 修改时间 + private String modifytime; + // 地区分类 + private String pk_areacl; + // 库存组织(填写编码) + private String pk_calbody; + // 公司(填写编码) + private String pk_corp; + // 默认交易币种(填写编码) + private String pk_currtype1; + // 开票客商(填写编码) + private String pk_cusmandoc2; + // 发货客商(填写编码) + private String pk_cusmandoc3; + // 默认业务类型(填写编码) + private String pk_defbusitype; + // 默认收付款协议(填写编码) + private String pk_payterm; + // 公司价格分组(填写编码) + private String pk_pricegroupcorp; + // 专管部门(填写编码) + private String pk_respdept1; + // 专管业务员(填写编码) + private String pk_resppsn1; + // 销售组织(填写编码) + private String pk_salestru; + // 发运方式(填写编码) + private String pk_sendtype; + // 结算单位主键(已废弃) + private String pk_settleunit; + // 仓库档案(填写编码) + private String pk_stordoc2; + // 预收款比例 + private int prepaidratio; + // 批准日期 + private String ratifydate; + // 封存标志 + private String sealflag; + // 存货最低售价比例 + private int stockpriceratio; + // 新产品试销保证金 + private double testsalemoney; +} + + + + + + + + + + diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/base/ShopTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/base/ShopTest.java index 82dd8f03..80b053f4 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/base/ShopTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/base/ShopTest.java @@ -1,10 +1,16 @@ package com.hzya.frame.plugin.lets.plugin.base; +import com.alibaba.fastjson.JSON; import com.hzya.frame.WebappApplication; import com.hzya.frame.plugin.lets.entity.BdCubasdocEntity; +import com.hzya.frame.plugin.lets.ofs.entity.ShopEntity; import com.hzya.frame.plugin.lets.queryvo.CustdocRequestVo; +import com.hzya.frame.plugin.lets.resultvo.ShopReturnMessageDto; +import com.hzya.frame.plugin.lets.u8cdto.CustdocEntityDto; import com.hzya.frame.plugin.lets.util.PushDataByU8cUtil; +import com.hzya.frame.ttxofs.dto.InterfaceParamDto; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import org.checkerframework.checker.units.qual.C; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +39,8 @@ public class ShopTest { private PushDataByU8cUtil pushDataByU8cUtil; @Autowired private CustmandocPluginInitializer custmandocPluginInitializer; + @Autowired + private CustdocAutoAllotPluginInitializer custdocAutoAllotPluginInitializer; @Test public void t00() { @@ -53,12 +61,12 @@ public class ShopTest { // ArrayList shopEntities = new ArrayList<>(); // ShopEntity shopEntity = new ShopEntity(); // shopEntity.setBizCode("intoyou-xhs"); -// shopEntity.setName("小红书INTO YOU心慕与你旗舰店-自营1test1a1231"); -// shopEntity.setCustomerCode("testcode11232411"); +// shopEntity.setName("小红书INTO YOU心慕与你旗舰店-自营1test1a1231"); +// shopEntity.setCustomerCode("testcode211232411"); // shopEntities.add(shopEntity); // shopPluginInitializer.implement(shopEntities); // System.out.println("shopEntities = " + shopEntities); - +// // try { // System.out.println("开始推送"); @@ -82,18 +90,20 @@ public class ShopTest { // } - //生成客商管理档案 - BdCubasdocEntity parentvo = new BdCubasdocEntity(); - parentvo.setCustname("测试客商管理档11223案"); - parentvo.setCustshortname("测试客商管理档13121案"); - parentvo.setCustcode("test34121a"); +// //生成客商管理档案 + CustdocEntityDto parentvo = new CustdocEntityDto(); + parentvo.setCustname("12测试客商管理档112213z案"); + parentvo.setCustshortname("12测试客商管理档131121z案"); + parentvo.setCustcode("test1324121ac1"); //地区名称：丽知商城客商？ - parentvo.setPk_areacl("F"); +// parentvo.setPk_areacl("F"); parentvo.setPk_corp("0001"); CustdocRequestVo custdocRequestVo = new CustdocRequestVo(); custdocRequestVo.setParentvo(parentvo); ArrayList list = new ArrayList<>(); list.add(custdocRequestVo); custmandocPluginInitializer.implement(list); + +// custdocAutoAllotPluginInitializer.start(); } }