Skip to content

GitLab

Q
qk_backend
Commit 9220d00d authored by shiyu's avatar shiyu
Browse files
Options

快递公司名称展示，备注为空判断

parent b64b1c2f
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ConsignSaleServiceImpl.java
View file @ 9220d00d
......@@ -4,6 +4,7 @@ import com.alibaba.dubbo.config.annotation.Reference;
import com.github.pagehelper.PageInfo;
import com.wwdz.ch.core.consts.ConsignSaleEnum;
import com.wwdz.ch.core.consts.ItemStateEnum;
import com.wwdz.ch.core.consts.LogisticsEnum;
import com.wwdz.ch.core.entity.ConsignSaleRecordVo;
import com.wwdz.ch.core.entity.ConsignSaleVo;
import com.wwdz.ch.core.type.PageSearchResult;
......@@ -234,7 +235,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
consignSaleAppletVo.setItemName(item.getName());
consignSaleAppletVo.setSaleTime(consignSale.getSaleTime());
consignSaleAppletVo.setLogisticsCode(consignSale.getLogisticsCode());
consignSaleAppletVo.setLogisticsName(consignSale.getLogisticsCode());
consignSaleAppletVo.setLogisticsName(LogisticsEnum.getNameByCode(consignSale.getLogisticsCode()));
consignSaleAppletVo.setWaybill(consignSale.getWaybill());
consignSaleAppletVo.setSendType("自行寄出");
consignSaleAppletVo.setCustomState(consignSale.getCustomState());
......@@ -258,21 +259,21 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
appletStateNodeVoList.get(1).setDesc(ConsignSaleEnum.AppletNodeDescEnum.VALUATE.getDes());
} else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getCode()) {
appletStateNodeVoList.get(7).setPassed(true);
appletStateNodeVoList.get(7).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark());
appletStateNodeVoList.get(7).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark());
break;
} else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode()) {
appletStateNodeVoList.get(7).setPassed(true);
appletStateNodeVoList.get(7).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark());
appletStateNodeVoList.get(7).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark());
break;
}
//图文估价
else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.VALUATE.getCode()) {
appletStateNodeVoList.get(1).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark());
appletStateNodeVoList.get(1).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark());
}
//送货至平台
else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.USER_SEND.getCode()) {
appletStateNodeVoList.get(2).setPassed(true);
appletStateNodeVoList.get(2).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark());
appletStateNodeVoList.get(2).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark());
consignSaleAppletVo.setSendTime(consignSaleRecord.getCreateTime());
}
// 平台事务鉴定并定价，尚未鉴定
......@@ -283,7 +284,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
// 平台事务鉴定并定价,鉴定后
else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.WAIT_USER_CONFIRM_IDENTIFY.getCode()) {
appletStateNodeVoList.get(3).setPassed(true);
appletStateNodeVoList.get(3).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark());
appletStateNodeVoList.get(3).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark());
}
else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.TIME_OUT_CANCEL.getCode()) {
appletStateNodeVoList.get(7).setPassed(true);
......@@ -516,7 +517,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
//插入操作记录,平台待收货
StringBuffer stringBuffer = new StringBuffer();
stringBuffer.append("物流公司:");
stringBuffer.append(dto.getLogisticsCode() + "; ");
stringBuffer.append(LogisticsEnum.getNameByCode(dto.getLogisticsCode()) + "; ");
stringBuffer.append("快递单号:");
stringBuffer.append(dto.getWaybill());
consignSaleRecordDao.insert(dto.getSaleId(), stringBuffer.toString(), ConsignSaleEnum.OperateTypeEnum.USER_SEND.getCode(), null);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment