UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

协调平台时间格式问题

Browse Source
dev
anthonywj 2 years ago
parent 025672466a
commit 5ca5575e96
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File

17
src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
Unescape Escape View File

@ -240,18 +240,18 @@ public class IoOrderDetailResultController extends BaseController {
//查询第三方产品产品类别
ThrProductsEntity thrProductsEntity = thrProductsService.filterThrProductsByMainId(ioOrderDetailResultResponse.getBindRlFk() + "");
//查询发票信息
String dateStr="";
List<String> encodeList=new ArrayList<>();
IoOrderInvoiceRequest ioOrderInvoiceRequest=new IoOrderInvoiceRequest();
String dateStr = "";
List<String> encodeList = new ArrayList<>();
IoOrderInvoiceRequest ioOrderInvoiceRequest = new IoOrderInvoiceRequest();
ioOrderInvoiceRequest.setBindRlFk(ioOrderDetailResultResponse.getBindRlFk() + "");
ioOrderInvoiceRequest.setOrderIdFk(ioOrderDetailResultResponse.getOrderIdFk());
ioOrderInvoiceRequest.setBatchNo(ioOrderDetailResultResponse.getBatchNo());
List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList=ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceRequest);
List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceRequest);
for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) {
encodeList.add(ioOrderInvoiceEntity.getInvoiceEncode());
}
String encode=String.join(",", encodeList);
if(CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList)){
String encode = String.join(",", encodeList);
if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList)) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
dateStr = sdf.format(ioOrderInvoiceEntityList.get(0).getCreateTime());
}
@ -278,7 +278,7 @@ public class IoOrderDetailResultController extends BaseController {
ioOrderDetailResultData.put("billTypeName", ioOrderDetailResultResponse.getBillTypeName() == null ? ' ' : ioOrderDetailResultResponse.getBillTypeName());
ioOrderDetailResultData.put("mainAction", ioOrderDetailResultResponse.getMainAction() == null ? ' ' : ioOrderDetailResultResponse.getMainAction());
ioOrderDetailResultData.put("auditTime", ioOrderDetailResultResponse.getAuditTime() == null ? ' ' : formatter.format(ioOrderDetailResultResponse.getAuditTime()));
if(thrProductsEntity!=null){
if (thrProductsEntity != null) {
ioOrderDetailResultData.put("cplb", thrProductsEntity.getCplb() == null ? ' ' : thrProductsEntity.getCplb());
}
ioOrderDetailResultData.put("invoiceEncode", encode);
@ -294,7 +294,6 @@ public class IoOrderDetailResultController extends BaseController {
}
/**
* 提供UDI协调调用单据明细
*/
@ -311,7 +310,7 @@ public class IoOrderDetailResultController extends BaseController {
if (cptTraceOrderResponse.getCorpType() == 1 || cptTraceOrderResponse.getCorpType() == 2) {
CptTraceResultResponse cptTraceResultResponse = new CptTraceResultResponse();
cptTraceResultResponse.setBillNo(cptTraceOrderResponse.getBillNo());
cptTraceResultResponse.setBillDate(DateUtil.formatDate(cptTraceOrderResponse.getCreateTime()));
cptTraceResultResponse.setBillDate(DateUtil.formatDate(cptTraceOrderResponse.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
cptTraceResultResponse.setBillType(cptTraceOrderResponse.getBillType());
if (cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) {
if (StrUtil.isNotEmpty(cptTraceOrderResponse.getFromInvCode()))

Write Preview
Loading…
Cancel
Save