Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
bcd56ba9 1 parent 495b6672

customer|add调整

Inline Side-by-side
Showing 2 changed files with 11 additions and 2 deletions
......@@ -91,7 +91,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
* 非501数据
*/
if (StringUtils.isEmpty(bo.getShipperAccount())){
consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ZERO);
consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_TWO);
return responseUtils.success(consignmentAddDto);
}
return consignmentUtil.consignmentCheckWithNotCe(consignment,bo);
......
......@@ -16,7 +16,6 @@ import com.fedex.connect.customer.enums.ResponseCode;
import com.fedex.connect.customer.repository.repo.*;
import com.fedex.connect.customer.service.biz.IEmailService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
......@@ -132,6 +131,11 @@ public class ConsignmentUtil {
if (isShipperAccountMatch(bo.getShipperAccount(), consignment.getUserInputShipperAccount())){
consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE);
Consignment consignmentUserInput = new Consignment();
consignmentUserInput.setId(consignment.getId());
consignmentUserInput.setConsignmentCode(consignment.getConsignmentCode());
consignmentUserInput.setUserInputShipperAccount(consignment.getUserInputShipperAccount());
consignmentUserInput.setUserInputOriginCountry(consignment.getUserInputOriginCountry());
consignmentUserInput.setUserInputOriginCountryCode(consignment.getUserInputOriginCountryCode());
consignmentUserInput.setOriginCountry(consignment.getUserInputOriginCountry());
consignmentUserInput.setOriginCountryCode(consignment.getUserInputOriginCountryCode());
consignmentUserInput.setShipperAccount(consignment.getUserInputShipperAccount());
......@@ -197,6 +201,11 @@ public class ConsignmentUtil {
if (isShipperAccountMatch(bo.getShipperAccount(),consignment.getUserInputShipperAccount())){
consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE);
Consignment consignmentUserInput = new Consignment();
consignmentUserInput.setId(consignment.getId());
consignmentUserInput.setConsignmentCode(consignment.getConsignmentCode());
consignmentUserInput.setUserInputShipperAccount(consignment.getUserInputShipperAccount());
consignmentUserInput.setUserInputOriginCountry(consignment.getUserInputOriginCountry());
consignmentUserInput.setUserInputOriginCountryCode(consignment.getUserInputOriginCountryCode());
consignmentUserInput.setOriginCountry(consignment.getUserInputOriginCountry());
consignmentUserInput.setOriginCountryCode(consignment.getUserInputOriginCountryCode());
consignmentUserInput.setShipperAccount(consignment.getUserInputShipperAccount());
......