2024年8月26日16:09:50

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -305,6 +305,7 @@ public class Bills implements Serializable {
 	 * 订舱备注
 	 */
 	@ApiModelProperty(value = "订舱备注")
+	@LosSpecialHandle(massage = "", space = true, conversion = true)
 	private String bookingRemarks;
 	/**
 	 * 船名 id
@@ -342,6 +343,7 @@ public class Bills implements Serializable {
 	 * Reference NO
 	 */
 	@ApiModelProperty(value = "Reference NO")
+	@LosSpecialHandle(massage = "", space = true, conversion = true)
 	private String refno;
 	/**
 	 * 开船日期
@@ -625,24 +627,28 @@ public class Bills implements Serializable {
 	 */
 	@ApiModelProperty(value = "HB/L 发货人代码")
 	@TableField("h_shipper_code")
+	@LosSpecialHandle(massage = "", space = true, conversion = true)
 	private String hshipperCode;
 	/**
 	 * HB/L 发货人中文名称
 	 */
 	@ApiModelProperty(value = "HB/L 发货人中文名称")
 	@TableField("h_shipper_cn_name")
+	@LosSpecialHandle(massage = "", space = true, conversion = true)
 	private String hshipperCnName;
 	/**
 	 * HB/L 发货人英文名称
 	 */
 	@ApiModelProperty(value = "HB/L 发货人英文名称")
 	@TableField("h_shipper_en_name")
+	@LosSpecialHandle(massage = "", space = true, conversion = true)
 	private String hshipperEnName;
 	/**
 	 * HB/L 发货人提单描述
 	 */
 	@ApiModelProperty(value = "HB/L 发货人提单描述")
 	@TableField("h_shipper_details")
+	@LosSpecialHandle(massage = "", space = true, conversion = true)
 	private String hshipperDetails;
 	/**
 	 * HB/L 收货人 id

blade-service/blade-los/src/main/java/org/springblade/los/Util/StringTools.java

@@ -286,7 +286,8 @@ public class StringTools {
 				}
 			}
 			return bVessels;
-		}else if ("SeaReleaseBill".equals(type)) {
+		}
+		else if ("SeaReleaseBill".equals(type)) {
 			Class<?> inttraSoDtoClass = SeaReleaseBill.class;
 			Field[] fileds = inttraSoDtoClass.getDeclaredFields();
 			SeaReleaseBill bVessels = JSONObject.parseObject(JSONObject.toJSONString(data), SeaReleaseBill.class);

blade-service/blade-los/src/main/java/org/springblade/los/trade/service/impl/AgentServiceImpl.java

@@ -1826,11 +1826,11 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			AdvanceCharge advanceCharge = advanceChargeService.getOne(new LambdaQueryWrapper<AdvanceCharge>()
 				.eq(AdvanceCharge::getTenantId, AuthUtil.getTenantId())
 				.eq(AdvanceCharge::getIsDeleted, 0)
-				.eq(AdvanceCharge::getCorpId, agentList.get(0).getDomesticConsigneeId()));
+				.eq(AdvanceCharge::getCorpId, agentList.get(0).getCorpId()));
 			if (advanceCharge == null) {
 				advanceCharge = new AdvanceCharge();
-				advanceCharge.setCorpId(agentList.get(0).getDomesticConsigneeId());
-				advanceCharge.setCorpName(agentList.get(0).getDomesticConsigneeCname());
+				advanceCharge.setCorpId(agentList.get(0).getCorpId());
+				advanceCharge.setCorpName(agentList.get(0).getCorpName());
 				advanceCharge.setCreateUser(AuthUtil.getUserId());
 				advanceCharge.setCreateUserName(AuthUtil.getUserName());
 				advanceCharge.setCreateTime(new Date());