提交 e86e9e34 authored 作者: aiqingguo's avatar aiqingguo

承运同步

上级 548f46fb
...@@ -8,6 +8,7 @@ import com.clx.performance.dao.OrderChildDao; ...@@ -8,6 +8,7 @@ import com.clx.performance.dao.OrderChildDao;
import com.clx.performance.dao.OrderGoodsDao; import com.clx.performance.dao.OrderGoodsDao;
import com.clx.performance.dao.settle.SettlementDriverDetailDao; import com.clx.performance.dao.settle.SettlementDriverDetailDao;
import com.clx.performance.dao.settle.SettlementOwnerDetailDao; import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
import com.clx.performance.dto.InvoicingStatusNotifyDTO;
import com.clx.performance.dto.OrderChildSyncDTO; import com.clx.performance.dto.OrderChildSyncDTO;
import com.clx.performance.dto.PayStatusNotifyDTO; import com.clx.performance.dto.PayStatusNotifyDTO;
import com.clx.performance.enums.PerformanceResultEnum; import com.clx.performance.enums.PerformanceResultEnum;
...@@ -82,7 +83,7 @@ public class TransportSyncController { ...@@ -82,7 +83,7 @@ public class TransportSyncController {
log.info("payStatusNotify 原始报文:{}", bean); log.info("payStatusNotify 原始报文:{}", bean);
String decrypt = ThirdComponent.decrypt(bean.getData()); String decrypt = ThirdComponent.decrypt(bean.getData());
log.info("payStatusNotify 解密后:{}", decrypt); log.info("payStatusNotify 解密后:{}", decrypt);
// PayStatusNotifyDTO payStatusNotifyDTO = JSONUtil.toBean(decrypt, PayStatusNotifyDTO.class); InvoicingStatusNotifyDTO invoicingStatusNotifyDTO = JSONUtil.toBean(decrypt, InvoicingStatusNotifyDTO.class);
// orderChildSyncTransportRecordService.updateStatus(payStatusNotifyDTO); // orderChildSyncTransportRecordService.updateStatus(payStatusNotifyDTO);
return ThirdComponent.encrypt(JSON.toJSONString(Result.ok())); return ThirdComponent.encrypt(JSON.toJSONString(Result.ok()));
} }
......
package com.clx.performance.dto;
import lombok.Data;
import java.util.List;
@Data
public class InvoicingStatusNotifyDTO {
List<String> childNoList;
}
...@@ -104,7 +104,7 @@ public class TransportSyncServiceImpl implements TransportSyncService { ...@@ -104,7 +104,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
param.setCreateTime(DateUtils.formatDateTime(orderChild.getCreateTime()).get()); param.setCreateTime(DateUtils.formatDateTime(orderChild.getCreateTime()).get());
param.setTruckNo(orderChild.getTruckNo()); param.setTruckNo(orderChild.getTruckNo());
param.setFreightPrice(Integer.valueOf(orderChild.getFreightPrice().toString())); param.setFreightPrice(Integer.valueOf(orderChild.getFreightPrice().toString()));
param.setFreight(settlementOwnerDetail.getFreight().intValue()); param.setFreight(settlementOwnerDetail.getFreight().intValue()); //货主结算金额
param.setLoadNet(orderChild.getLoadNet()); param.setLoadNet(orderChild.getLoadNet());
param.setNet(settlementDriverDetail.getWeight()); param.setNet(settlementDriverDetail.getWeight());
param.setSendAddress(orderGoods.getSendAddressShorter()); param.setSendAddress(orderGoods.getSendAddressShorter());
...@@ -114,7 +114,7 @@ public class TransportSyncServiceImpl implements TransportSyncService { ...@@ -114,7 +114,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
param.setSendTown(sendAddress.getTown()); param.setSendTown(sendAddress.getTown());
param.setSendName(sendAddress.getContact()); param.setSendName(sendAddress.getContact());
param.setSendMobile(sendAddress.getContactPhone()); param.setSendMobile(sendAddress.getContactPhone());
param.setFreightNoCard(settlementDriverDetail.getSettlementFreight().intValue()); param.setFreightNoCard(settlementDriverDetail.getSettlementFreight().intValue()); //司机结算金额
param.setReceiveAddress(receiveAddress.getAddress()); param.setReceiveAddress(receiveAddress.getAddress());
param.setReceiveProvince(receiveAddress.getProvince()); param.setReceiveProvince(receiveAddress.getProvince());
param.setReceiveCity(receiveAddress.getCity()); param.setReceiveCity(receiveAddress.getCity());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论