|
@@ -332,10 +332,10 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
CustomerCommon customerCommon = customerInfo.getCustomerCommon();
|
|
|
if(ccList.size() > 0){
|
|
|
cc = ccList.get(0);
|
|
|
- customerCommon.setRelationBackStatus(cc.getRelationBackStatus());
|
|
|
- customerCommon.setRelationSendStatus(cc.getRelationSendStatus());
|
|
|
- customerCommon.setRelationIsTransfer(cc.getRelationIsTransfer());
|
|
|
- customerCommon.setRelationBackPostage(cc.getRelationBackPostage());
|
|
|
+ customerCommon.setRelationBackStatus(cc.getRelationBackStatus() == null ? 1:cc.getRelationBackStatus());
|
|
|
+ customerCommon.setRelationSendStatus(cc.getRelationSendStatus() == null ? 1:cc.getRelationSendStatus());
|
|
|
+ customerCommon.setRelationIsTransfer(cc.getRelationIsTransfer() == null ? 0:cc.getRelationIsTransfer());
|
|
|
+ customerCommon.setRelationBackPostage(cc.getRelationBackPostage() == null ? 0:cc.getRelationBackPostage());
|
|
|
|
|
|
customerCommon.setRelationBackLogisticsCompany(cc.getRelationBackLogisticsCompany());
|
|
|
customerCommon.setRelationBackLogisticsNo(cc.getRelationBackLogisticsNo());
|