|
@@ -708,7 +708,11 @@ public class KwoTradeOrderService {
|
|
|
} else {
|
|
} else {
|
|
|
detail.setTradingLabel("线下支付");
|
|
detail.setTradingLabel("线下支付");
|
|
|
}
|
|
}
|
|
|
- detail.setFirmName(Objects.isNull(ent) ? null : ent.getFirmName()).setCreateByName(Objects.isNull(createUser) ? null : createUser.getName()).setPickupTypeLabel(CollUtil.isNotEmpty(pickupMap) ? pickupMap.get(detail.getPickupType()) : null).setDeliveryTypeLabel(CollUtil.isNotEmpty(deleveryMap) ? deleveryMap.get(detail.getDeliveryType()) : null).setSourceLabel(CollUtil.isNotEmpty(sourceMap) ? sourceMap.get(detail.getSource()) : null).setStatusLabel(CollUtil.isNotEmpty(statusMap) ? statusMap.get(String.valueOf(detail.getStatus())) : null).setChargeTypeLabel(CollUtil.isNotEmpty(chargeTypeMap) ? chargeTypeMap.get(String.valueOf(detail.getChargeType())) : null).setConsignmentWayLabel(CollUtil.isNotEmpty(consignmentWayMap) ? consignmentWayMap.get(String.valueOf(detail.getConsignmentWay())) : null);
|
|
|
|
|
|
|
+ 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.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)) {//按装货量
|
|
if (Objects.equals(detail.getChargeType(), 1)) {//按装货量
|
|
|
detail.setDealAmount(detail.getLoadAmount());
|
|
detail.setDealAmount(detail.getLoadAmount());
|
|
|
} else {
|
|
} else {
|