|
|
@@ -759,7 +759,7 @@ public class KwoTradeOrderService {
|
|
|
}
|
|
|
detail.setFirmName(Objects.isNull(ent) ? null : ent.getFirmName()).setCreateByName(Objects.isNull(createUser) ? null : createUser.getName());
|
|
|
detail.setPickupTypeLabel(CollUtil.isNotEmpty(pickupMap) ? pickupMap.get(detail.getPickupType()) : null).setDeliveryTypeLabel(CollUtil.isNotEmpty(deleveryMap) ? deleveryMap.get(detail.getDeliveryType()) : null);
|
|
|
- detail.setSourceLabel(CollUtil.isNotEmpty(sourceMap) ? sourceMap.get(detail.getSource()) : null).setStatusLabel(CollUtil.isNotEmpty(statusMap) ? statusMap.get(String.valueOf(detail.getStatus())) : null);
|
|
|
+ detail.setSourceLabel(CollUtil.isNotEmpty(sourceMap) ? sourceMap.get(detail.getSource()) : null).setStatusLabel(TradeOrderStatusEnum.getMsg(detail.getStatus()));
|
|
|
detail.setChargeTypeLabel(CollUtil.isNotEmpty(chargeTypeMap) ? chargeTypeMap.get(String.valueOf(detail.getChargeType())) : null);
|
|
|
detail.setConsignmentWayLabel(DictEnum.getLabel(DictTypeEnum.CONSIGNMENT_WAY.getType(), String.valueOf(detail.getConsignmentWay())));
|
|
|
if (Objects.equals(detail.getChargeType(), 1)) {//按装货量
|