Commit 25a94497346ff7d90767a49f12e78f9dcd501b89

Authored by fengliang
1 parent be48539c

update:修改模板数据

etrade-order/src/main/java/com/diligrp/etrade/order/domain/collector/co/BusinessBillCo.java
@@ -87,6 +87,17 @@ public class BusinessBillCo { @@ -87,6 +87,17 @@ public class BusinessBillCo {
87 87
88 private List<FEntityDetail> FEntityDetail; 88 private List<FEntityDetail> FEntityDetail;
89 89
  90 + /**
  91 + * 系统业务类型
  92 + */
  93 + private String systemDynamicCode;
  94 +
  95 + /**
  96 + * 流水中的操作类型
  97 + */
  98 + private String F_PZCW_Text;
  99 +
  100 +
90 @JsonProperty("FAR_Remark") 101 @JsonProperty("FAR_Remark")
91 public String getFAR_Remark() { 102 public String getFAR_Remark() {
92 return FAR_Remark; 103 return FAR_Remark;
@@ -230,4 +241,21 @@ public class BusinessBillCo { @@ -230,4 +241,21 @@ public class BusinessBillCo {
230 public void setFEntityDetail(List<FEntityDetail> FEntityDetail) { 241 public void setFEntityDetail(List<FEntityDetail> FEntityDetail) {
231 this.FEntityDetail = FEntityDetail; 242 this.FEntityDetail = FEntityDetail;
232 } 243 }
  244 + @JsonProperty("systemDynamicCode")
  245 + public String getSystemDynamicCode() {
  246 + return systemDynamicCode;
  247 + }
  248 +
  249 + public void setSystemDynamicCode(String systemDynamicCode) {
  250 + this.systemDynamicCode = systemDynamicCode;
  251 + }
  252 +
  253 + @JsonProperty("F_PZCW_Text")
  254 + public String getF_PZCW_Text() {
  255 + return F_PZCW_Text;
  256 + }
  257 +
  258 + public void setF_PZCW_Text(String f_PZCW_Text) {
  259 + F_PZCW_Text = f_PZCW_Text;
  260 + }
233 } 261 }
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/SendToCollectorImpl.java
@@ -78,6 +78,7 @@ public class SendToCollectorImpl implements SendToCollector { @@ -78,6 +78,7 @@ public class SendToCollectorImpl implements SendToCollector {
78 BusinessBillCo billCo = new BusinessBillCo(); 78 BusinessBillCo billCo = new BusinessBillCo();
79 billCo.setFDATE(ledgerPayDto.getLedgerLog().getPayableTime().toLocalDate().format(formatter)); 79 billCo.setFDATE(ledgerPayDto.getLedgerLog().getPayableTime().toLocalDate().format(formatter));
80 billCo.setFBillTypeID(new FBillTypeID(BizNumberTypeEnum.HK.getCode())); 80 billCo.setFBillTypeID(new FBillTypeID(BizNumberTypeEnum.HK.getCode()));
  81 + billCo.setF_PZCW_Text(BizNumberTypeEnum.HK.getCode());
81 billCo.setFCUSTOMERID(new FCUSTOMERID(ledgerPayDto.getShopVo().getCustomerId().toString())); 82 billCo.setFCUSTOMERID(new FCUSTOMERID(ledgerPayDto.getShopVo().getCustomerId().toString()));
82 //billCo.setFSALEORGID(new FSALEORGID("1"));电子结算无部门 83 //billCo.setFSALEORGID(new FSALEORGID("1"));电子结算无部门
83 billCo.setFBUSINESSTYPE(BizNumberTypeEnum.HK.getCode()); 84 billCo.setFBUSINESSTYPE(BizNumberTypeEnum.HK.getCode());
@@ -98,6 +99,7 @@ public class SendToCollectorImpl implements SendToCollector { @@ -98,6 +99,7 @@ public class SendToCollectorImpl implements SendToCollector {
98 //不传订货方 99 //不传订货方
99 //billCo.setFORDERID(new FORDERID(ledgerPayDto.getShopVo().getCustomerId().toString())); 100 //billCo.setFORDERID(new FORDERID(ledgerPayDto.getShopVo().getCustomerId().toString()));
100 billCo.setFSettleTypeID(new FSettleTypeID(String.valueOf(TradeChannelEnum.BALANCE.getCode()))); 101 billCo.setFSettleTypeID(new FSettleTypeID(String.valueOf(TradeChannelEnum.BALANCE.getCode())));
  102 + billCo.setSystemDynamicCode(BizNumberTypeEnum.HK.getCode());
101 return billCo; 103 return billCo;
102 } 104 }
103 105
@@ -110,6 +112,7 @@ public class SendToCollectorImpl implements SendToCollector { @@ -110,6 +112,7 @@ public class SendToCollectorImpl implements SendToCollector {
110 BusinessBillCo billCo = new BusinessBillCo(); 112 BusinessBillCo billCo = new BusinessBillCo();
111 billCo.setFDATE(ledgerPayDto.getLedgerLog().getPayableTime().toLocalDate().format(formatter)); 113 billCo.setFDATE(ledgerPayDto.getLedgerLog().getPayableTime().toLocalDate().format(formatter));
112 billCo.setFBillTypeID(new FBillTypeID(BizNumberTypeEnum.HK.getCode())); 114 billCo.setFBillTypeID(new FBillTypeID(BizNumberTypeEnum.HK.getCode()));
  115 + billCo.setF_PZCW_Text(BizNumberTypeEnum.HK.getCode());
113 billCo.setFCUSTOMERID(new FCUSTOMERID(ledgerPayDto.getLedgerLog().getCustomerId().toString())); 116 billCo.setFCUSTOMERID(new FCUSTOMERID(ledgerPayDto.getLedgerLog().getCustomerId().toString()));
114 //billCo.setFSALEORGID(new FSALEORGID("1"));电子结算无部门 117 //billCo.setFSALEORGID(new FSALEORGID("1"));电子结算无部门
115 billCo.setFBUSINESSTYPE(BizNumberTypeEnum.HK.getCode()); 118 billCo.setFBUSINESSTYPE(BizNumberTypeEnum.HK.getCode());
@@ -130,6 +133,7 @@ public class SendToCollectorImpl implements SendToCollector { @@ -130,6 +133,7 @@ public class SendToCollectorImpl implements SendToCollector {
130 //不传订货方 133 //不传订货方
131 //billCo.setFORDERID(new FORDERID(ledgerPayDto.getLedgerLog().getCustomerId().toString())); 134 //billCo.setFORDERID(new FORDERID(ledgerPayDto.getLedgerLog().getCustomerId().toString()));
132 billCo.setFSettleTypeID(new FSettleTypeID(String.valueOf(TradeChannelEnum.BALANCE.getCode()))); 135 billCo.setFSettleTypeID(new FSettleTypeID(String.valueOf(TradeChannelEnum.BALANCE.getCode())));
  136 + billCo.setSystemDynamicCode(BizNumberTypeEnum.HK.getCode());
133 return billCo; 137 return billCo;
134 138
135 } 139 }
@@ -139,6 +143,7 @@ public class SendToCollectorImpl implements SendToCollector { @@ -139,6 +143,7 @@ public class SendToCollectorImpl implements SendToCollector {
139 BusinessBillCo billCo = new BusinessBillCo(); 143 BusinessBillCo billCo = new BusinessBillCo();
140 billCo.setFDATE(order.getPayTime().toLocalDate().format(formatter)); 144 billCo.setFDATE(order.getPayTime().toLocalDate().format(formatter));
141 billCo.setFBillTypeID(new FBillTypeID(BizNumberTypeEnum.ETRADE_TRADE.getCode())); 145 billCo.setFBillTypeID(new FBillTypeID(BizNumberTypeEnum.ETRADE_TRADE.getCode()));
  146 + billCo.setF_PZCW_Text(BizNumberTypeEnum.ETRADE_TRADE.getCode());
142 billCo.setFCUSTOMERID(new FCUSTOMERID(order.getBuyerId().toString())); 147 billCo.setFCUSTOMERID(new FCUSTOMERID(order.getBuyerId().toString()));
143 //billCo.setFSALEORGID(new FSALEORGID("1"));电子结算无部门 148 //billCo.setFSALEORGID(new FSALEORGID("1"));电子结算无部门
144 billCo.setFBUSINESSTYPE(BizNumberTypeEnum.ETRADE_TRADE.getCode()); 149 billCo.setFBUSINESSTYPE(BizNumberTypeEnum.ETRADE_TRADE.getCode());
@@ -163,6 +168,7 @@ public class SendToCollectorImpl implements SendToCollector { @@ -163,6 +168,7 @@ public class SendToCollectorImpl implements SendToCollector {
163 //不传订货方 168 //不传订货方
164 //billCo.setFORDERID(new FORDERID(order.getBuyerId().toString())); 169 //billCo.setFORDERID(new FORDERID(order.getBuyerId().toString()));
165 billCo.setFSettleTypeID(new FSettleTypeID(String.valueOf(TradeChannelEnum.BALANCE.getCode()))); 170 billCo.setFSettleTypeID(new FSettleTypeID(String.valueOf(TradeChannelEnum.BALANCE.getCode())));
  171 + billCo.setSystemDynamicCode(BizNumberTypeEnum.ETRADE_TRADE.getCode());
166 return billCo; 172 return billCo;
167 } 173 }
168 174
@@ -170,6 +176,7 @@ public class SendToCollectorImpl implements SendToCollector { @@ -170,6 +176,7 @@ public class SendToCollectorImpl implements SendToCollector {
170 BusinessBillCo billCo = new BusinessBillCo(); 176 BusinessBillCo billCo = new BusinessBillCo();
171 billCo.setFDATE(order.getPayTime().toLocalDate().format(formatter)); 177 billCo.setFDATE(order.getPayTime().toLocalDate().format(formatter));
172 billCo.setFBillTypeID(new FBillTypeID(BizNumberTypeEnum.ETRADE_TRADE.getCode())); 178 billCo.setFBillTypeID(new FBillTypeID(BizNumberTypeEnum.ETRADE_TRADE.getCode()));
  179 + billCo.setF_PZCW_Text(BizNumberTypeEnum.ETRADE_TRADE.getCode());
173 billCo.setFCUSTOMERID(new FCUSTOMERID(order.getShopCustomerId().toString())); 180 billCo.setFCUSTOMERID(new FCUSTOMERID(order.getShopCustomerId().toString()));
174 //billCo.setFSALEORGID(new FSALEORGID("1"));电子结算无部门 181 //billCo.setFSALEORGID(new FSALEORGID("1"));电子结算无部门
175 billCo.setFBUSINESSTYPE(BizNumberTypeEnum.ETRADE_TRADE.getCode()); 182 billCo.setFBUSINESSTYPE(BizNumberTypeEnum.ETRADE_TRADE.getCode());
@@ -194,6 +201,7 @@ public class SendToCollectorImpl implements SendToCollector { @@ -194,6 +201,7 @@ public class SendToCollectorImpl implements SendToCollector {
194 //不传订货方 201 //不传订货方
195 //billCo.setFORDERID(new FORDERID(order.getShopCustomerId().toString())); 202 //billCo.setFORDERID(new FORDERID(order.getShopCustomerId().toString()));
196 billCo.setFSettleTypeID(new FSettleTypeID(String.valueOf(TradeChannelEnum.BALANCE.getCode()))); 203 billCo.setFSettleTypeID(new FSettleTypeID(String.valueOf(TradeChannelEnum.BALANCE.getCode())));
  204 + billCo.setSystemDynamicCode(BizNumberTypeEnum.ETRADE_TRADE.getCode());
197 return billCo; 205 return billCo;
198 } 206 }
199 207