etrade / zr-etrade · Commits

Commit 3e3ec7baec929581028b17043758e4ded9b266cb

Authored by fengliang
1 parent 25a94497
build: skipped

update:修改传输参数

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/LedgerPayServiceImpl.java
  View file @3e3ec7b
@@ -116,6 +116,10 @@ public class LedgerPayServiceImpl implements ILedgerPayService { @@ -116,6 +116,10 @@ public class LedgerPayServiceImpl implements ILedgerPayService {
116 list.add(buildSerialRecordDtoSeller(ledgerPayDto,message.getData())); 116 list.add(buildSerialRecordDtoSeller(ledgerPayDto,message.getData()));
117 log.info("应付回款交易流水，json:{}",JsonUtils.toJsonString(list)); 117 log.info("应付回款交易流水，json:{}",JsonUtils.toJsonString(list));
118 rabbitTemplate.convertAndSend(RabbitConfig.EXCHANGE_ACCOUNT_SERIAL, RabbitConfig.ROUTING_ACCOUNT_SERIAL, JsonUtils.toJsonString(list)); 118 rabbitTemplate.convertAndSend(RabbitConfig.EXCHANGE_ACCOUNT_SERIAL, RabbitConfig.ROUTING_ACCOUNT_SERIAL, JsonUtils.toJsonString(list));
  119 + ledgerPayDto.getLedgerLog().setNote(message.getMessage());
  120 + ledgerPayDto.getLedgerLog().setState(LedgerLogState.FINISHED.getCode());
  121 + ledgerPayDto.getLedgerLog().setPayableTime(DateUtils.parseDateTime(balanceResponseDto.getWhen(),"yyyy-MM-dd HH:mm:ss"));
  122 + ledgerPayDto.getLedgerLog().setTradeId(balanceResponseDto.getTradeId());
119 sendToCollector.sendToKingDee(ledgerPayDto); 123 sendToCollector.sendToKingDee(ledgerPayDto);
120 } catch (Exception e) { 124 } catch (Exception e) {
121 log.error("发送交易流水失败",e); 125 log.error("发送交易流水失败",e);
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/SendToCollectorImpl.java
  View file @3e3ec7b
@@ -89,7 +89,6 @@ public class SendToCollectorImpl implements SendToCollector { @@ -89,7 +89,6 @@ public class SendToCollectorImpl implements SendToCollector {
89 fEntityDetail.setFPrice(price); 89 fEntityDetail.setFPrice(price);
90 fEntityDetail.setFTaxPrice(price); 90 fEntityDetail.setFTaxPrice(price);
91 fEntityDetail.setFPriceQty(NumberTransform.POSITIVE); 91 fEntityDetail.setFPriceQty(NumberTransform.POSITIVE);
92 - fEntityDetail.setFNoTaxAmountFor_D(price);  
93 fEntityDetail.setFCOSTID(new FCOSTID(OrderConstant.ORDER_BACK_CHARGE_ITEM_CODE));//费用项 92 fEntityDetail.setFCOSTID(new FCOSTID(OrderConstant.ORDER_BACK_CHARGE_ITEM_CODE));//费用项
94 fEntityDetail.setFASSETID(new FASSETID(ledgerPayDto.getLedgerLog().getCardNo())); 93 fEntityDetail.setFASSETID(new FASSETID(ledgerPayDto.getLedgerLog().getCardNo()));
95 fEntityDetailList.add(fEntityDetail); 94 fEntityDetailList.add(fEntityDetail);
@@ -123,7 +122,6 @@ public class SendToCollectorImpl implements SendToCollector { @@ -123,7 +122,6 @@ public class SendToCollectorImpl implements SendToCollector {
123 fEntityDetail.setFPrice(price); 122 fEntityDetail.setFPrice(price);
124 fEntityDetail.setFTaxPrice(price); 123 fEntityDetail.setFTaxPrice(price);
125 fEntityDetail.setFPriceQty(NumberTransform.NEGATIVE); 124 fEntityDetail.setFPriceQty(NumberTransform.NEGATIVE);
126 - fEntityDetail.setFNoTaxAmountFor_D(price);  
127 fEntityDetail.setFCOSTID(new FCOSTID(OrderConstant.ORDER_BACK_CHARGE_ITEM_CODE));//费用项 125 fEntityDetail.setFCOSTID(new FCOSTID(OrderConstant.ORDER_BACK_CHARGE_ITEM_CODE));//费用项
128 fEntityDetail.setFASSETID(new FASSETID(ledgerPayDto.getLedgerLog().getCustomerCardNo())); 126 fEntityDetail.setFASSETID(new FASSETID(ledgerPayDto.getLedgerLog().getCustomerCardNo()));
129 fEntityDetailList.add(fEntityDetail); 127 fEntityDetailList.add(fEntityDetail);
@@ -158,7 +156,6 @@ public class SendToCollectorImpl implements SendToCollector { @@ -158,7 +156,6 @@ public class SendToCollectorImpl implements SendToCollector {
158 }else{ 156 }else{
159 fEntityDetail.setFPriceQty(NumberTransform.NEGATIVE); 157 fEntityDetail.setFPriceQty(NumberTransform.NEGATIVE);
160 } 158 }
161 - fEntityDetail.setFNoTaxAmountFor_D(price);  
162 fEntityDetail.setFCOSTID(new FCOSTID(OrderConstant.ORDER_TRADE_CHARGE_ITEM_CODE));//费用项 159 fEntityDetail.setFCOSTID(new FCOSTID(OrderConstant.ORDER_TRADE_CHARGE_ITEM_CODE));//费用项
163 fEntityDetail.setFASSETID(new FASSETID(order.getBuyerCardNo())); 160 fEntityDetail.setFASSETID(new FASSETID(order.getBuyerCardNo()));
164 fEntityDetailList.add(fEntityDetail); 161 fEntityDetailList.add(fEntityDetail);
@@ -191,7 +188,6 @@ public class SendToCollectorImpl implements SendToCollector { @@ -191,7 +188,6 @@ public class SendToCollectorImpl implements SendToCollector {
191 }else{ 188 }else{
192 fEntityDetail.setFPriceQty(NumberTransform.POSITIVE); 189 fEntityDetail.setFPriceQty(NumberTransform.POSITIVE);
193 } 190 }
194 - fEntityDetail.setFNoTaxAmountFor_D(price);  
195 fEntityDetail.setFCOSTID(new FCOSTID(OrderConstant.ORDER_TRADE_CHARGE_ITEM_CODE));//费用项 191 fEntityDetail.setFCOSTID(new FCOSTID(OrderConstant.ORDER_TRADE_CHARGE_ITEM_CODE));//费用项
196 fEntityDetail.setFASSETID(new FASSETID(order.getShopCardNo())); 192 fEntityDetail.setFASSETID(new FASSETID(order.getShopCardNo()));
197 fEntityDetailList.add(fEntityDetail); 193 fEntityDetailList.add(fEntityDetail);