Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
06fc8f18 1 parent 57343ec2

customer|添加ce标志

Inline Side-by-side
Showing 12 changed files with 143 additions and 32 deletions
1 package com.fedex.connect.customer.data.dto; 1 package com.fedex.connect.customer.data.dto;
2 2
3 -import com.fedex.connect.common.model.biz.Consignment;
4 import lombok.Data; 3 import lombok.Data;
5 4
6 @Data 5 @Data
...@@ -9,5 +8,5 @@ public class ConsignmentAddDto { ...@@ -9,5 +8,5 @@ public class ConsignmentAddDto {
9 * 是否为该用户的运单 1：是 0：否 8 * 是否为该用户的运单 1：是 0：否
10 */ 9 */
11 private Integer isCreatorFlag; 10 private Integer isCreatorFlag;
12 - private Consignment consignment; 11 + private ConsignmentDto consignment;
13 } 12 }
......
1 +package com.fedex.connect.customer.data.dto;
2 +
3 +import com.fedex.connect.common.model.biz.Consignment;
4 +import lombok.Data;
5 +
6 +@Data
7 +public class ConsignmentDto extends Consignment {
8 + private Long ceFlag;
9 +}
...@@ -34,4 +34,6 @@ public class FindConsignmentsDto { ...@@ -34,4 +34,6 @@ public class FindConsignmentsDto {
34 private String userInputOriginCountryCode; 34 private String userInputOriginCountryCode;
35 35
36 private String userInputOriginCountry; 36 private String userInputOriginCountry;
37 +
38 + private Long ceFlag;
37 } 39 }
......
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
33 c.SHIPPER_ACCOUNT, 33 c.SHIPPER_ACCOUNT,
34 c.USER_INPUT_SHIPPER_ACCOUNT, 34 c.USER_INPUT_SHIPPER_ACCOUNT,
35 c.USER_INPUT_ORIGIN_COUNTRY_CODE, 35 c.USER_INPUT_ORIGIN_COUNTRY_CODE,
36 - c.USER_INPUT_ORIGIN_COUNTRY 36 + c.USER_INPUT_ORIGIN_COUNTRY,
37 + m.CE_FLAG
37 </sql> 38 </sql>
38 39
39 <select id="findConsignments" resultType="com.fedex.connect.customer.data.dto.FindConsignmentsDto"> 40 <select id="findConsignments" resultType="com.fedex.connect.customer.data.dto.FindConsignmentsDto">
...@@ -47,9 +48,12 @@ ...@@ -47,9 +48,12 @@
47 (m.user_id = #{userId} AND m.consignment_id IS NOT NULL) 48 (m.user_id = #{userId} AND m.consignment_id IS NOT NULL)
48 OR c.user_uuid = #{uuid,jdbcType=VARCHAR} 49 OR c.user_uuid = #{uuid,jdbcType=VARCHAR}
49 ) 50 )
50 - <if test="statusCode != null and statusCode != ''"> 51 + <if test="statusCode != null and statusCode != '' and statusCode != 'null'">
51 AND c.STATUS_CODE = #{statusCode} 52 AND c.STATUS_CODE = #{statusCode}
52 </if> 53 </if>
54 + <if test="statusCode == 'null'">
55 + AND c.STATUS_CODE IS NULL
56 + </if>
53 <if test="createTimeFrom != null and createTimeFrom != ''"> 57 <if test="createTimeFrom != null and createTimeFrom != ''">
54 AND c.CREATE_TIME &gt; TO_DATE(#{createTimeFrom} || ' 00:00:00', 'YYYY-MM-DD HH24:MI:SS') 58 AND c.CREATE_TIME &gt; TO_DATE(#{createTimeFrom} || ' 00:00:00', 'YYYY-MM-DD HH24:MI:SS')
55 </if> 59 </if>
......
...@@ -30,4 +30,14 @@ public interface IUserConsignmentMappingRepository { ...@@ -30,4 +30,14 @@ public interface IUserConsignmentMappingRepository {
30 * @return void 30 * @return void
31 */ 31 */
32 void saveOrUpdateAll(List<UserConsignmentMapping> list); 32 void saveOrUpdateAll(List<UserConsignmentMapping> list);
33 +
34 + /**
35 + * @Author Szl
36 + * @Description 功能说明 根据用户id和运单号查询mapping
37 + * @Date 2024/12/31
38 + * @param userId
39 + * @param consignmentCode
40 + * @return com.fedex.connect.common.model.biz.UserConsignmentMapping
41 + */
42 + UserConsignmentMapping findByUserIdAndConsignmentCode(Long userId,String consignmentCode);
33 } 43 }
......
...@@ -9,10 +9,7 @@ import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery; ...@@ -9,10 +9,7 @@ import com.fedex.connect.customer.data.query.UserConsignmentInfoQuery;
9 import com.fedex.connect.customer.repository.base.BaseDao; 9 import com.fedex.connect.customer.repository.base.BaseDao;
10 import com.fedex.connect.customer.repository.repo.IConsignmentRepository; 10 import com.fedex.connect.customer.repository.repo.IConsignmentRepository;
11 import org.apache.commons.lang3.StringUtils; 11 import org.apache.commons.lang3.StringUtils;
12 -import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Repository; 12 import org.springframework.stereotype.Repository;
14 -import org.springframework.transaction.annotation.Propagation;
15 -import org.springframework.transaction.annotation.Transactional;
16 13
17 import java.time.LocalDate; 14 import java.time.LocalDate;
18 import java.util.Collections; 15 import java.util.Collections;
...@@ -49,9 +46,7 @@ public class ConsignmentRepositoryImpl extends BaseDao implements IConsignmentRe ...@@ -49,9 +46,7 @@ public class ConsignmentRepositoryImpl extends BaseDao implements IConsignmentRe
49 if (SystemDefaultUserConstants.SYSTEM_USER_KEYS.USER_NAME.equals(consignment.getCreateUserName())){ 46 if (SystemDefaultUserConstants.SYSTEM_USER_KEYS.USER_NAME.equals(consignment.getCreateUserName())){
50 consignment.setCreateUserName(user.getUserName()); 47 consignment.setCreateUserName(user.getUserName());
51 } 48 }
52 - if (!StringUtils.equals(user.getUserUuid(), consignment.getUserUuid()) 49 + if (!StringUtils.equals(user.getUserUuid(), consignment.getUserUuid()) || (consignment.getCeFlag() != null && consignment.getCeFlag() == 0)) {
53 - && !StringUtils.equals(user.getAccountNo(), consignment.getShipperAccount())
54 - && !StringUtils.equals(consignment.getUserInputShipperAccount(), consignment.getShipperAccount())) {
55 consignment.setRecipientContactName(null); 50 consignment.setRecipientContactName(null);
56 consignment.setRecipientCompany(null); 51 consignment.setRecipientCompany(null);
57 consignment.setDocNondocFlag(null); 52 consignment.setDocNondocFlag(null);
......
...@@ -51,4 +51,22 @@ public class UserConsignmentMappingRepositoryImpl extends BaseDao implements IUs ...@@ -51,4 +51,22 @@ public class UserConsignmentMappingRepositoryImpl extends BaseDao implements IUs
51 } 51 }
52 }); 52 });
53 } 53 }
54 +
55 + /**
56 + * @Author Szl
57 + * @Description 功能说明 根据用户id和运单号查询mapping
58 + * @Date 2024/12/31
59 + * @param userId
60 + * @param consignmentCode
61 + * @return com.fedex.connect.common.model.biz.UserConsignmentMapping
62 + */
63 + @Override
64 + public UserConsignmentMapping findByUserIdAndConsignmentCode(Long userId,String consignmentCode){
65 + UserConsignmentMappingExample example = new UserConsignmentMappingExample();
66 + UserConsignmentMappingExample.Criteria criteria = example.createCriteria();
67 + criteria.andUserIdEqualTo(userId);
68 + criteria.andConsignmentCodeEqualTo(consignmentCode);
69 + criteria.andStatusEqualTo(StatusEnum.YES.getCode());
70 + return CollectionUtils.firstElement(userConsignmentMappingMapper.selectByExample(example));
71 + }
54 } 72 }
......
...@@ -6,6 +6,7 @@ import com.fedex.connect.common.dependencies.exception.OpErrorException; ...@@ -6,6 +6,7 @@ import com.fedex.connect.common.dependencies.exception.OpErrorException;
6 import com.fedex.connect.common.model.biz.Attachment; 6 import com.fedex.connect.common.model.biz.Attachment;
7 import com.fedex.connect.common.model.biz.Consignment; 7 import com.fedex.connect.common.model.biz.Consignment;
8 import com.fedex.connect.common.model.biz.UploadRecord; 8 import com.fedex.connect.common.model.biz.UploadRecord;
9 +import com.fedex.connect.common.model.biz.UserConsignmentMapping;
9 import com.fedex.connect.common.model.sys.User; 10 import com.fedex.connect.common.model.sys.User;
10 import com.fedex.connect.customer.data.bo.AddBo; 11 import com.fedex.connect.customer.data.bo.AddBo;
11 import com.fedex.connect.customer.data.bo.ConsignmentBo; 12 import com.fedex.connect.customer.data.bo.ConsignmentBo;
...@@ -84,6 +85,18 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -84,6 +85,18 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
84 } 85 }
85 } 86 }
86 /** 87 /**
88 + * 存在运单则获取mapping表
89 + */
90 + UserConsignmentMapping byUserIdAndConsignmentCode = userConsignmentMappingRepository.findByUserIdAndConsignmentCode(user.getId(), consignment.getConsignmentCode());
91 + Long ceFlag = 1L;
92 + if (byUserIdAndConsignmentCode == null){
93 + ceFlag = 3L;
94 + }else if (byUserIdAndConsignmentCode.getCeFlag() != null){
95 + ceFlag = byUserIdAndConsignmentCode.getCeFlag();
96 + }
97 +
98 +
99 + /**
87 * 根据是否是DM501返回不同的提示 100 * 根据是否是DM501返回不同的提示
88 */ 101 */
89 if (StringUtils.isEmpty(consignment.getUserUuid()) && StringUtils.isEmpty(consignment.getShipperAccount())){ 102 if (StringUtils.isEmpty(consignment.getUserUuid()) && StringUtils.isEmpty(consignment.getShipperAccount())){
...@@ -99,7 +112,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -99,7 +112,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
99 /** 112 /**
100 * 501数据 113 * 501数据
101 */ 114 */
102 - return consignmentUtil.consignmentCheckWithCe(consignment,bo,user); 115 + return consignmentUtil.consignmentCheckWithCe(consignment,bo,user,ceFlag);
103 } 116 }
104 } 117 }
105 118
......
...@@ -12,10 +12,12 @@ import com.fedex.connect.common.model.sys.User; ...@@ -12,10 +12,12 @@ import com.fedex.connect.common.model.sys.User;
12 import com.fedex.connect.customer.data.bo.AddBo; 12 import com.fedex.connect.customer.data.bo.AddBo;
13 import com.fedex.connect.customer.data.bo.ConsignmentBo; 13 import com.fedex.connect.customer.data.bo.ConsignmentBo;
14 import com.fedex.connect.customer.data.dto.ConsignmentAddDto; 14 import com.fedex.connect.customer.data.dto.ConsignmentAddDto;
15 +import com.fedex.connect.customer.data.dto.ConsignmentDto;
15 import com.fedex.connect.customer.enums.ResponseCode; 16 import com.fedex.connect.customer.enums.ResponseCode;
16 import com.fedex.connect.customer.repository.repo.*; 17 import com.fedex.connect.customer.repository.repo.*;
17 import com.fedex.connect.customer.service.biz.IEmailService; 18 import com.fedex.connect.customer.service.biz.IEmailService;
18 import lombok.extern.slf4j.Slf4j; 19 import lombok.extern.slf4j.Slf4j;
20 +import org.springframework.beans.BeanUtils;
19 import org.springframework.beans.factory.annotation.Autowired; 21 import org.springframework.beans.factory.annotation.Autowired;
20 import org.springframework.stereotype.Component; 22 import org.springframework.stereotype.Component;
21 import org.springframework.transaction.annotation.Transactional; 23 import org.springframework.transaction.annotation.Transactional;
...@@ -130,7 +132,7 @@ public class ConsignmentUtil { ...@@ -130,7 +132,7 @@ public class ConsignmentUtil {
130 ConsignmentAddDto consignmentAddDto = new ConsignmentAddDto(); 132 ConsignmentAddDto consignmentAddDto = new ConsignmentAddDto();
131 if (isShipperAccountMatch(bo.getShipperAccount(), consignment.getUserInputShipperAccount())){ 133 if (isShipperAccountMatch(bo.getShipperAccount(), consignment.getUserInputShipperAccount())){
132 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE); 134 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE);
133 - Consignment consignmentUserInput = new Consignment(); 135 + ConsignmentDto consignmentUserInput = new ConsignmentDto();
134 consignmentUserInput.setId(consignment.getId()); 136 consignmentUserInput.setId(consignment.getId());
135 consignmentUserInput.setConsignmentCode(consignment.getConsignmentCode()); 137 consignmentUserInput.setConsignmentCode(consignment.getConsignmentCode());
136 consignmentUserInput.setUserInputShipperAccount(consignment.getUserInputShipperAccount()); 138 consignmentUserInput.setUserInputShipperAccount(consignment.getUserInputShipperAccount());
...@@ -141,6 +143,7 @@ public class ConsignmentUtil { ...@@ -141,6 +143,7 @@ public class ConsignmentUtil {
141 consignmentUserInput.setShipperAccount(consignment.getUserInputShipperAccount()); 143 consignmentUserInput.setShipperAccount(consignment.getUserInputShipperAccount());
142 consignmentUserInput.setDestinationCountryCode(consignment.getDestinationCountryCode()); 144 consignmentUserInput.setDestinationCountryCode(consignment.getDestinationCountryCode());
143 consignmentUserInput.setDestinationCountry(consignment.getDestinationCountry()); 145 consignmentUserInput.setDestinationCountry(consignment.getDestinationCountry());
146 + consignmentUserInput.setCeFlag(0L);
144 consignmentAddDto.setConsignment(consignmentUserInput); 147 consignmentAddDto.setConsignment(consignmentUserInput);
145 return responseUtils.success(consignmentAddDto); 148 return responseUtils.success(consignmentAddDto);
146 }else { 149 }else {
...@@ -158,15 +161,17 @@ public class ConsignmentUtil { ...@@ -158,15 +161,17 @@ public class ConsignmentUtil {
158 * @param user 161 * @param user
159 * @return void 162 * @return void
160 */ 163 */
161 - public ResponseVo consignmentCheckWithCe(Consignment consignment, AddBo bo, User user) { 164 + public ResponseVo consignmentCheckWithCe(Consignment consignment, AddBo bo, User user,Long ceFlag) {
162 ConsignmentAddDto consignmentAddDto = new ConsignmentAddDto(); 165 ConsignmentAddDto consignmentAddDto = new ConsignmentAddDto();
163 - 166 + ConsignmentDto consignmentDto = new ConsignmentDto();
167 + BeanUtils.copyProperties(consignment, consignmentDto);
164 /** 168 /**
165 * uuid相同，直接返回所有运单信息 169 * uuid相同，直接返回所有运单信息
166 */ 170 */
167 if (Objects.equals(consignment.getUserUuid(), user.getUserUuid())) { 171 if (Objects.equals(consignment.getUserUuid(), user.getUserUuid())) {
168 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE); 172 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE);
169 - consignmentAddDto.setConsignment(consignment); 173 + consignmentDto.setCeFlag(1L);
174 + consignmentAddDto.setConsignment(consignmentDto);
170 return responseUtils.success(consignmentAddDto); 175 return responseUtils.success(consignmentAddDto);
171 } 176 }
172 177
...@@ -175,11 +180,29 @@ public class ConsignmentUtil { ...@@ -175,11 +180,29 @@ public class ConsignmentUtil {
175 */ 180 */
176 if (isShipperAccountMatch(user.getAccountNo(), consignment.getShipperAccount())) { 181 if (isShipperAccountMatch(user.getAccountNo(), consignment.getShipperAccount())) {
177 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE); 182 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE);
178 - consignmentAddDto.setConsignment(consignment); 183 + consignmentDto.setCeFlag(1L);
184 + consignmentAddDto.setConsignment(consignmentDto);
179 return responseUtils.success(ResponseCode.MESSAGE_CODE_30004, consignmentAddDto); 185 return responseUtils.success(ResponseCode.MESSAGE_CODE_30004, consignmentAddDto);
180 } 186 }
181 187
182 /** 188 /**
189 + * mapping表判断，存在mapping则返回对应数据
190 + */
191 + if (ceFlag == 0){
192 + consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE);
193 + ConsignmentDto consignmentUserInput = new ConsignmentDto();
194 + this.initConByNotCe(consignmentUserInput,consignmentDto);
195 + consignmentDto.setCeFlag(0L);
196 + consignmentAddDto.setConsignment(consignmentUserInput);
197 + return responseUtils.success(consignmentAddDto);
198 + }else if (ceFlag == 1){
199 + consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE);
200 + consignmentDto.setCeFlag(1L);
201 + consignmentAddDto.setConsignment(consignmentDto);
202 + return responseUtils.success(consignmentAddDto);
203 + }
204 +
205 + /**
183 * uuid不一致且未填写shipperAccount 206 * uuid不一致且未填写shipperAccount
184 */ 207 */
185 if (!StringUtils.hasText(bo.getShipperAccount())){ 208 if (!StringUtils.hasText(bo.getShipperAccount())){
...@@ -192,7 +215,7 @@ public class ConsignmentUtil { ...@@ -192,7 +215,7 @@ public class ConsignmentUtil {
192 */ 215 */
193 if (isShipperAccountMatch(bo.getShipperAccount(), consignment.getShipperAccount())) { 216 if (isShipperAccountMatch(bo.getShipperAccount(), consignment.getShipperAccount())) {
194 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE); 217 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE);
195 - consignmentAddDto.setConsignment(consignment); 218 + consignmentAddDto.setConsignment(consignmentDto);
196 return responseUtils.success(consignmentAddDto); 219 return responseUtils.success(consignmentAddDto);
197 } 220 }
198 221
...@@ -200,17 +223,9 @@ public class ConsignmentUtil { ...@@ -200,17 +223,9 @@ public class ConsignmentUtil {
200 if (!StringUtils.isEmpty(consignment.getUserInputShipperAccount())){ 223 if (!StringUtils.isEmpty(consignment.getUserInputShipperAccount())){
201 if (isShipperAccountMatch(bo.getShipperAccount(),consignment.getUserInputShipperAccount())){ 224 if (isShipperAccountMatch(bo.getShipperAccount(),consignment.getUserInputShipperAccount())){
202 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE); 225 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ONE);
203 - Consignment consignmentUserInput = new Consignment(); 226 + ConsignmentDto consignmentUserInput = new ConsignmentDto();
204 - consignmentUserInput.setId(consignment.getId()); 227 + this.initConByNotCe(consignmentUserInput,consignmentDto);
205 - consignmentUserInput.setConsignmentCode(consignment.getConsignmentCode()); 228 + consignmentDto.setCeFlag(0L);
206 - consignmentUserInput.setUserInputShipperAccount(consignment.getUserInputShipperAccount());
207 - consignmentUserInput.setUserInputOriginCountry(consignment.getUserInputOriginCountry());
208 - consignmentUserInput.setUserInputOriginCountryCode(consignment.getUserInputOriginCountryCode());
209 - consignmentUserInput.setOriginCountry(consignment.getUserInputOriginCountry());
210 - consignmentUserInput.setOriginCountryCode(consignment.getUserInputOriginCountryCode());
211 - consignmentUserInput.setShipperAccount(consignment.getUserInputShipperAccount());
212 - consignmentUserInput.setDestinationCountryCode(consignment.getDestinationCountryCode());
213 - consignmentUserInput.setDestinationCountry(consignment.getDestinationCountry());
214 consignmentAddDto.setConsignment(consignmentUserInput); 229 consignmentAddDto.setConsignment(consignmentUserInput);
215 return responseUtils.success(consignmentAddDto); 230 return responseUtils.success(consignmentAddDto);
216 }else { 231 }else {
...@@ -235,6 +250,20 @@ public class ConsignmentUtil { ...@@ -235,6 +250,20 @@ public class ConsignmentUtil {
235 return StringUtils.hasText(account1) && StringUtils.hasText(account2) && account1.equals(account2); 250 return StringUtils.hasText(account1) && StringUtils.hasText(account2) && account1.equals(account2);
236 } 251 }
237 252
253 + private Consignment initConByNotCe(ConsignmentDto consignmentUserInput,ConsignmentDto consignment){
254 + consignmentUserInput.setId(consignment.getId());
255 + consignmentUserInput.setConsignmentCode(consignment.getConsignmentCode());
256 + consignmentUserInput.setUserInputShipperAccount(consignment.getUserInputShipperAccount());
257 + consignmentUserInput.setUserInputOriginCountry(consignment.getUserInputOriginCountry());
258 + consignmentUserInput.setUserInputOriginCountryCode(consignment.getUserInputOriginCountryCode());
259 + consignmentUserInput.setOriginCountry(consignment.getUserInputOriginCountry());
260 + consignmentUserInput.setOriginCountryCode(consignment.getUserInputOriginCountryCode());
261 + consignmentUserInput.setShipperAccount(consignment.getUserInputShipperAccount());
262 + consignmentUserInput.setDestinationCountryCode(consignment.getDestinationCountryCode());
263 + consignmentUserInput.setDestinationCountry(consignment.getDestinationCountry());
264 + return consignmentUserInput;
265 + }
266 +
238 /** 267 /**
239 * @Author mt 268 * @Author mt
240 * @Description 保存运单相关信息 269 * @Description 保存运单相关信息
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
13 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" /> 13 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
14 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" /> 14 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
15 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" /> 15 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
16 + <result column="CE_FLAG" jdbcType="NUMERIC" property="ceFlag" />
16 </resultMap> 17 </resultMap>
17 <sql id="Example_Where_Clause"> 18 <sql id="Example_Where_Clause">
18 <where> 19 <where>
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
74 </sql> 75 </sql>
75 <sql id="Base_Column_List"> 76 <sql id="Base_Column_List">
76 ID, USER_ID, CONSIGNMENT_ID, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 77 ID, USER_ID, CONSIGNMENT_ID, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
77 - MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, CONSIGNMENT_CODE 78 + MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, CONSIGNMENT_CODE, CE_FLAG
78 </sql> 79 </sql>
79 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample" resultMap="BaseResultMap"> 80 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample" resultMap="BaseResultMap">
80 <include refid="OracleDialectPrefix" /> 81 <include refid="OracleDialectPrefix" />
...@@ -116,11 +117,11 @@ ...@@ -116,11 +117,11 @@
116 insert into ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING (ID, USER_ID, CONSIGNMENT_ID, 117 insert into ICLEARIMP.T_BIZ_USER_CONSIGNMENT_MAPPING (ID, USER_ID, CONSIGNMENT_ID,
117 STATUS, CREATE_TIME, CREATE_USER_ID, 118 STATUS, CREATE_TIME, CREATE_USER_ID,
118 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 119 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
119 - MODIFY_USER_NAME, CONSIGNMENT_CODE) 120 + MODIFY_USER_NAME, CONSIGNMENT_CODE, CE_FLAG)
120 values (#{id,jdbcType=NUMERIC}, #{userId,jdbcType=NUMERIC}, #{consignmentId,jdbcType=NUMERIC}, 121 values (#{id,jdbcType=NUMERIC}, #{userId,jdbcType=NUMERIC}, #{consignmentId,jdbcType=NUMERIC},
121 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 122 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
122 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 123 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
123 - #{modifyUserName,jdbcType=VARCHAR}, #{consignmentCode,jdbcType=VARCHAR}) 124 + #{modifyUserName,jdbcType=VARCHAR}, #{consignmentCode,jdbcType=VARCHAR}, #{ceFlag,jdbcType=NUMERIC})
124 </insert> 125 </insert>
125 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMapping"> 126 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMapping">
126 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 127 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -159,6 +160,9 @@ ...@@ -159,6 +160,9 @@
159 <if test="consignmentCode != null"> 160 <if test="consignmentCode != null">
160 CONSIGNMENT_CODE, 161 CONSIGNMENT_CODE,
161 </if> 162 </if>
163 + <if test="ceFlag != null">
164 + CE_FLAG,
165 + </if>
162 </trim> 166 </trim>
163 <trim prefix="values (" suffix=")" suffixOverrides=","> 167 <trim prefix="values (" suffix=")" suffixOverrides=",">
164 #{id,jdbcType=NUMERIC}, 168 #{id,jdbcType=NUMERIC},
...@@ -192,6 +196,9 @@ ...@@ -192,6 +196,9 @@
192 <if test="consignmentCode != null"> 196 <if test="consignmentCode != null">
193 #{consignmentCode,jdbcType=VARCHAR}, 197 #{consignmentCode,jdbcType=VARCHAR},
194 </if> 198 </if>
199 + <if test="ceFlag != null">
200 + #{ceFlag,jdbcType=NUMERIC},
201 + </if>
195 </trim> 202 </trim>
196 </insert> 203 </insert>
197 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample" resultType="java.lang.Long"> 204 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.UserConsignmentMappingExample" resultType="java.lang.Long">
...@@ -236,6 +243,9 @@ ...@@ -236,6 +243,9 @@
236 <if test="record.consignmentCode != null"> 243 <if test="record.consignmentCode != null">
237 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR}, 244 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
238 </if> 245 </if>
246 + <if test="record.ceFlag != null">
247 + CE_FLAG = #{record.ceFlag,jdbcType=NUMERIC},
248 + </if>
239 </set> 249 </set>
240 <if test="_parameter != null"> 250 <if test="_parameter != null">
241 <include refid="Update_By_Example_Where_Clause" /> 251 <include refid="Update_By_Example_Where_Clause" />
...@@ -254,6 +264,7 @@ ...@@ -254,6 +264,7 @@
254 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC}, 264 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
255 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 265 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
256 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR} 266 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR}
267 + CE_FLAG = #{record.ceFlag,jdbcType=NUMERIC}
257 <if test="_parameter != null"> 268 <if test="_parameter != null">
258 <include refid="Update_By_Example_Where_Clause" /> 269 <include refid="Update_By_Example_Where_Clause" />
259 </if> 270 </if>
...@@ -291,6 +302,9 @@ ...@@ -291,6 +302,9 @@
291 <if test="consignmentCode != null"> 302 <if test="consignmentCode != null">
292 CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR}, 303 CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
293 </if> 304 </if>
305 + <if test="cceFlag != null">
306 + CE_FLAG = #{cceFlag,jdbcType=NUMERIC},
307 + </if>
294 </set> 308 </set>
295 where ID = #{id,jdbcType=NUMERIC} 309 where ID = #{id,jdbcType=NUMERIC}
296 </update> 310 </update>
...@@ -306,6 +320,7 @@ ...@@ -306,6 +320,7 @@
306 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC}, 320 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
307 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 321 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
308 CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR} 322 CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR}
323 + CE_FLAG = #{ceFlag,jdbcType=NUMERIC}
309 where ID = #{id,jdbcType=NUMERIC} 324 where ID = #{id,jdbcType=NUMERIC}
310 </update> 325 </update>
311 <sql id="OracleDialectPrefix"> 326 <sql id="OracleDialectPrefix">
......
...@@ -63,6 +63,11 @@ public class UserConsignmentMapping implements Serializable { ...@@ -63,6 +63,11 @@ public class UserConsignmentMapping implements Serializable {
63 */ 63 */
64 private String consignmentCode; 64 private String consignmentCode;
65 65
66 + /**
67 + * 是否使用CE数据标志
68 + */
69 + private Long ceFlag;
70 +
66 private static final long serialVersionUID = 1L; 71 private static final long serialVersionUID = 1L;
67 72
68 public Long getId() { 73 public Long getId() {
...@@ -153,6 +158,18 @@ public class UserConsignmentMapping implements Serializable { ...@@ -153,6 +158,18 @@ public class UserConsignmentMapping implements Serializable {
153 this.consignmentCode = consignmentCode == null ? null : consignmentCode.trim(); 158 this.consignmentCode = consignmentCode == null ? null : consignmentCode.trim();
154 } 159 }
155 160
161 + public Long getCeFlag() {
162 + return ceFlag;
163 + }
164 +
165 + public void setCeFlag(Long ceFlag) {
166 + this.ceFlag = ceFlag;
167 + }
168 +
169 + public static long getSerialVersionUID() {
170 + return serialVersionUID;
171 + }
172 +
156 @Override 173 @Override
157 public String toString() { 174 public String toString() {
158 StringBuilder sb = new StringBuilder(); 175 StringBuilder sb = new StringBuilder();
......
...@@ -2,7 +2,7 @@ package com.fedex.connect.common.dependencies.enums.sys; ...@@ -2,7 +2,7 @@ package com.fedex.connect.common.dependencies.enums.sys;
2 2
3 public enum UserTypeEnum { 3 public enum UserTypeEnum {
4 LOCAL("userType_01","LOCAL","本地账号"), 4 LOCAL("userType_01","LOCAL","本地账号"),
5 - FCL("userType_02","FCL","FCL账号"); 5 + FCL("userType_02","FCL account number","FCL账号");
6 6
7 private String code; 7 private String code;
8 private String enMsg; 8 private String enMsg;
......