|
|
@@ -128,6 +128,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
|
|
|
|
|
|
TOrderDetail tOrderDetail = new TOrderDetail();
|
|
|
+ tOrderDetail.setId(UUID.randomUUID().toString());
|
|
|
tOrderDetail.setOrderNo(orderNo);
|
|
|
tOrderDetail.setCommodityId(commodityId);
|
|
|
tOrderDetail.setCommodityName(bo.getCommodityName());
|
|
|
@@ -542,11 +543,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
List<TOrder> list = (List<TOrder>)data.getList();
|
|
|
C2BOrderDetailBo bo = null;
|
|
|
List<C2BOrderDetailBo> boList = new ArrayList<C2BOrderDetailBo>();
|
|
|
- List<CommodityDetailBo> commoditys = new ArrayList<CommodityDetailBo>();
|
|
|
+ List<CommodityDetailBo> commoditys = null;
|
|
|
CommodityDetailBo cdb = null;
|
|
|
if(list.size()>0){
|
|
|
for(TOrder t:list){
|
|
|
bo = new C2BOrderDetailBo();
|
|
|
+ commoditys = new ArrayList<CommodityDetailBo>();
|
|
|
bo.setOrderNo(String.valueOf(t.getOrderNo()));
|
|
|
bo.setOrderRemarks(t.getOrderRemarks());
|
|
|
bo.setOrderStatus(OrderState.getStatus(t.getOrderStatus()).getDesc());
|