Commit e0180e32 zshaohui

1.sdate映射问题提交

1 个父辈 6572d7a3
......@@ -144,11 +144,11 @@ public class LiteOrderCache {
if(order.isNew()||order.isTaskFinished()){
//判断是否到达时间
Date curr=new Date();
Date sDate = order.getSDate();
Date sDate = order.getSdate();
if (sDate == null){
sDate = order.getCreateDate();
}
if(order.getSDate().before(curr)){
if(order.getSdate().before(curr)){
//开始自动出库
String result= checkOutLiteOrder(order.getOrderNo(),false);
if(!ObjectUtil.isEmpty(result)){
......
......@@ -78,7 +78,7 @@ public class LiteOrderManagerImpl implements ILiteOrderManager {
liteOrderItem = liteOrderItemManager.save(liteOrderItem);
items.add(liteOrderItem);
}
if(liteOrder.getSDate()==null){
if(liteOrder.getSdate()==null){
liteOrder.setSdate(new Date(System.currentTimeMillis()));
}
liteOrder.setOrderItems(items);
......
......@@ -184,7 +184,11 @@ public class LiteOrder extends BasePo implements Serializable {
return orderTimes;
}
public Date getSDate(){
public void setSdate(Date sdate) {
this.sdate = sdate;
}
public Date getSdate() {
if(sdate==null){
return getCreateDate();
}
......
......@@ -144,7 +144,7 @@ public class GreeOrderController {
result.setHSerial(liteOrder.getOrderNo());
result.setLine(liteOrder.getLine());
result.setSo(liteOrder.getSo());
Date sDate = liteOrder.getSDate();
Date sDate = liteOrder.getSdate();
if (sDate == null) {
sDate = liteOrder.getCreateDate();
}
......@@ -183,7 +183,7 @@ public class GreeOrderController {
detailResult.setHSerial(order.getOrderNo());
detailResult.setLine(order.getLine());
detailResult.setSo(order.getSo());
Date sDate = order.getSDate();
Date sDate = order.getSdate();
if (sDate == null) {
sDate = order.getCreateDate();
}
......
......@@ -48,6 +48,17 @@ spring:
main:
allow-circular-references: true
allow-bean-definition-overriding: true
kafka:
bootstrap-servers:
topic:
msg:
header:
type:
source:
subject:
dataContenType:
consumer:
group-id:
#密码加密传输,前端公钥加密,后端私钥解密
rsa:
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!