|
|
@@ -91,6 +91,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
TOrder tOrder = new TOrder();
|
|
|
tOrder.setOrderNo(orderNo);
|
|
|
tOrder.setCommodityId(commodityId);
|
|
|
+ tOrder.setCommodityName(bo.getCommodityName());
|
|
|
tOrder.setCreater(TokenManager.getUserToken().getNickname());
|
|
|
tOrder.setCreateTime(DateUtils.parseDate(createTime, AFTConstants.YYYYMMDDHHMMSS));
|
|
|
if(commodityType == CommodityType.DEMAND_PROVIDE.getTypeCode()){
|
|
|
@@ -519,18 +520,19 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
List<OrderDetailBo> boList = new ArrayList<OrderDetailBo>();
|
|
|
if(list.size()>0){
|
|
|
for(TOrder t:list){
|
|
|
- bo = tOrderMapper.selectCommodityDetail(t.getCommodityId(),t.getCommodityType());
|
|
|
+ bo = new OrderDetailBo();
|
|
|
bo.setOrderNo(String.valueOf(t.getOrderNo()));
|
|
|
+ bo.setCommodityName(t.getCommodityName());
|
|
|
bo.setCommodityQuantity(t.getCommodityQuantity());
|
|
|
bo.setCommodityMode(t.getCommodityMode());
|
|
|
bo.setCommodityId(t.getCommodityId());
|
|
|
- bo.setCommodityPrice(String.valueOf(t.getCommodityPrice()));
|
|
|
bo.setOrderRemarks(t.getOrderRemarks());
|
|
|
- bo.setCreateTime(DateUtils.formatDate(t.getCreateTime(),AFTConstants.YYYYMMDDHHMMSS));
|
|
|
- bo.setOrderStatus(OrderState.getStatus(t.getOrderStatus()).getDesc());
|
|
|
bo.setCommodityType(t.getCommodityType());
|
|
|
- bo.setOrderAmount(String.valueOf(t.getOrderAmount()));
|
|
|
- bo.setFirstPayment(String.valueOf(t.getFirstPayment()));
|
|
|
+ bo.setOrderStatus(OrderState.getStatus(t.getOrderStatus()).getDesc());
|
|
|
+ bo.setCreateTime(DateUtils.formatDate(t.getCreateTime(),AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ bo.setCommodityPrice(String.valueOf(t.getCommodityPrice()).equals("0")?"面议":String.valueOf(t.getCommodityPrice())+" 万");
|
|
|
+ bo.setOrderAmount(String.valueOf(t.getOrderAmount()).equals("0")?"面议":String.valueOf(t.getOrderAmount())+" 万");
|
|
|
+ bo.setFirstPayment(String.valueOf(t.getFirstPayment()).equals("0")?"面议":String.valueOf(t.getFirstPayment())+" 万");
|
|
|
bo.setOperatorActive(setOperatorActive(t));
|
|
|
boList.add(bo);
|
|
|
}
|
|
|
@@ -546,16 +548,17 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
@Override
|
|
|
public OrderDetailBo selectOrderDetail(Long orderNo) {
|
|
|
TOrder t = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
- OrderDetailBo bo = tOrderMapper.selectCommodityDetail(t.getCommodityId(),t.getCommodityType());
|
|
|
+ OrderDetailBo bo = new OrderDetailBo();
|
|
|
bo.setOrderNo(String.valueOf(t.getOrderNo()));
|
|
|
+ bo.setCommodityName(t.getCommodityName());
|
|
|
bo.setCommodityQuantity(t.getCommodityQuantity());
|
|
|
bo.setCommodityMode(t.getCommodityMode());
|
|
|
bo.setCommodityId(t.getCommodityId());
|
|
|
- bo.setCommodityPrice(String.valueOf(t.getCommodityPrice()).equals("0")?"面议":String.valueOf(t.getCommodityPrice())+" 万");
|
|
|
bo.setCommodityType(t.getCommodityType());
|
|
|
bo.setOrderRemarks(t.getOrderRemarks());
|
|
|
- bo.setCreateTime(DateUtils.formatDate(t.getCreateTime(),AFTConstants.YYYYMMDDHHMMSS));
|
|
|
bo.setOrderStatus(OrderState.getStatus(t.getOrderStatus()).getDesc());
|
|
|
+ bo.setCreateTime(DateUtils.formatDate(t.getCreateTime(),AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ bo.setCommodityPrice(String.valueOf(t.getCommodityPrice()).equals("0")?"面议":String.valueOf(t.getCommodityPrice())+" 万");
|
|
|
bo.setOrderAmount(String.valueOf(t.getOrderAmount()).equals("0")?"面议":String.valueOf(t.getOrderAmount())+" 万");
|
|
|
bo.setFirstPayment(String.valueOf(t.getFirstPayment()).equals("0")?"面议":String.valueOf(t.getFirstPayment())+" 万");
|
|
|
bo.setOperatorActive(setOperatorActive(t));
|