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 ...@@ -91,7 +91,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
91 * 非501数据 91 * 非501数据
92 */ 92 */
93 if (StringUtils.isEmpty(bo.getShipperAccount())){ 93 if (StringUtils.isEmpty(bo.getShipperAccount())){
94 - consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ZERO); 94 + consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_TWO);
95 return responseUtils.success(consignmentAddDto); 95 return responseUtils.success(consignmentAddDto);
96 } 96 }
97 return consignmentUtil.consignmentCheckWithNotCe(consignment,bo); 97 return consignmentUtil.consignmentCheckWithNotCe(consignment,bo);
......
...@@ -16,7 +16,6 @@ import com.fedex.connect.customer.enums.ResponseCode; ...@@ -16,7 +16,6 @@ import com.fedex.connect.customer.enums.ResponseCode;
16 import com.fedex.connect.customer.repository.repo.*; 16 import com.fedex.connect.customer.repository.repo.*;
17 import com.fedex.connect.customer.service.biz.IEmailService; 17 import com.fedex.connect.customer.service.biz.IEmailService;
18 import lombok.extern.slf4j.Slf4j; 18 import lombok.extern.slf4j.Slf4j;
19 -import org.springframework.beans.BeanUtils;
20 import org.springframework.beans.factory.annotation.Autowired; 19 import org.springframework.beans.factory.annotation.Autowired;
21 import org.springframework.stereotype.Component; 20 import org.springframework.stereotype.Component;
22 import org.springframework.transaction.annotation.Transactional; 21 import org.springframework.transaction.annotation.Transactional;
...@@ -132,6 +131,11 @@ public class ConsignmentUtil { ...@@ -132,6 +131,11 @@ public class ConsignmentUtil {
132 if (isShipperAccountMatch(bo.getShipperAccount(), consignment.getUserInputShipperAccount())){ 131 if (isShipperAccountMatch(bo.getShipperAccount(), consignment.getUserInputShipperAccount())){
133 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE); 132 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE);
134 Consignment consignmentUserInput = new Consignment(); 133 Consignment consignmentUserInput = new Consignment();
134 + consignmentUserInput.setId(consignment.getId());
135 + consignmentUserInput.setConsignmentCode(consignment.getConsignmentCode());
136 + consignmentUserInput.setUserInputShipperAccount(consignment.getUserInputShipperAccount());
137 + consignmentUserInput.setUserInputOriginCountry(consignment.getUserInputOriginCountry());
138 + consignmentUserInput.setUserInputOriginCountryCode(consignment.getUserInputOriginCountryCode());
135 consignmentUserInput.setOriginCountry(consignment.getUserInputOriginCountry()); 139 consignmentUserInput.setOriginCountry(consignment.getUserInputOriginCountry());
136 consignmentUserInput.setOriginCountryCode(consignment.getUserInputOriginCountryCode()); 140 consignmentUserInput.setOriginCountryCode(consignment.getUserInputOriginCountryCode());
137 consignmentUserInput.setShipperAccount(consignment.getUserInputShipperAccount()); 141 consignmentUserInput.setShipperAccount(consignment.getUserInputShipperAccount());
...@@ -197,6 +201,11 @@ public class ConsignmentUtil { ...@@ -197,6 +201,11 @@ public class ConsignmentUtil {
197 if (isShipperAccountMatch(bo.getShipperAccount(),consignment.getUserInputShipperAccount())){ 201 if (isShipperAccountMatch(bo.getShipperAccount(),consignment.getUserInputShipperAccount())){
198 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE); 202 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE);
199 Consignment consignmentUserInput = new Consignment(); 203 Consignment consignmentUserInput = new Consignment();
204 + consignmentUserInput.setId(consignment.getId());
205 + consignmentUserInput.setConsignmentCode(consignment.getConsignmentCode());
206 + consignmentUserInput.setUserInputShipperAccount(consignment.getUserInputShipperAccount());
207 + consignmentUserInput.setUserInputOriginCountry(consignment.getUserInputOriginCountry());
208 + consignmentUserInput.setUserInputOriginCountryCode(consignment.getUserInputOriginCountryCode());
200 consignmentUserInput.setOriginCountry(consignment.getUserInputOriginCountry()); 209 consignmentUserInput.setOriginCountry(consignment.getUserInputOriginCountry());
201 consignmentUserInput.setOriginCountryCode(consignment.getUserInputOriginCountryCode()); 210 consignmentUserInput.setOriginCountryCode(consignment.getUserInputOriginCountryCode());
202 consignmentUserInput.setShipperAccount(consignment.getUserInputShipperAccount()); 211 consignmentUserInput.setShipperAccount(consignment.getUserInputShipperAccount());
......