2024年10月29日16:55:12

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/dto/BFeesExcel.java

@@ -51,6 +51,12 @@ public class BFeesExcel implements Serializable {
 	@ExcelProperty(value = "中文名称(必填)")
 	private String cnName;
 	/**
+	 * 财务核算要素名称
+	 */
+	@ExcelProperty(value = "财务核算要素名称(必填)")
+	@ColumnWidth(35)
+	private String accElementName;
+	/**
 	 * 英文名称
 	 */
 	@ExcelProperty(value = "英文名称")
@@ -70,11 +76,7 @@ public class BFeesExcel implements Serializable {
 	 */
 	@ExcelProperty(value = "收付,D:收 C 付")
 	private String dc;
-	/**
-	 * 财务核算要素名称
-	 */
-	@ExcelProperty(value = "财务核算要素名称(必填)")
-	private String accElementName;
+
 	/**
 	 * 科目 Id
 	 */

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -572,6 +572,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R revocation(Delivery delivery) {
 		Long deliveryId = delivery.getId();
 		Delivery select = baseMapper.selectById(deliveryId);
@@ -723,6 +724,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public Delivery comfire(Delivery delivery) {
 		//防重校验
 		Long deliveryId = delivery.getId();
@@ -1392,6 +1394,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public void cancel(Delivery delivery) {
 		//防重校验
 		Long deliveryId = delivery.getId();

blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/controller/BCorpsController.java

@@ -390,7 +390,9 @@ public class BCorpsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCorps.getEnAddr()), BCorps::getEnAddr, bCorps.getEnAddr())
 			.like(ObjectUtils.isNotNull(bCorps.getCntyCode()), BCorps::getCntyCode, bCorps.getCntyCode())
 			.like(ObjectUtils.isNotNull(bCorps.getCntyName()), BCorps::getCntyName, bCorps.getCntyName())
-			.like(ObjectUtils.isNotNull(bCorps.getShortName()), BCorps::getShortName, bCorps.getShortName())
+			.and(ObjectUtils.isNotNull(bCorps.getShortName()), i -> i.like(BCorps::getCnName, bCorps.getShortName()).or()
+				.like(BCorps::getEnName, bCorps.getShortName()).or().like(BCorps::getCode, bCorps.getShortName())
+				.or().like(BCorps::getShortName, bCorps.getShortName()))
 			.like(ObjectUtils.isNotNull(bCorps.getTel()), BCorps::getTel, bCorps.getTel())
 			.like(ObjectUtils.isNotNull(bCorps.getAdminProfiles()), BCorps::getAdminProfiles, bCorps.getAdminProfiles())
 //			.apply(ObjectUtils.isNotNull(bCorps.getCorpType()), "find_in_set('" + bCorps.getCorpType() + "',corp_type)");

blade-service/blade-los/src/main/java/org/springblade/los/basic/ports/controller/BPortsController.java

@@ -104,7 +104,9 @@ public class BPortsController extends BladeController {
 			.and(ObjectUtils.isNotNull(bPorts.getCnName()), i -> i.like(BPorts::getCode, bPorts.getCnName()).or()
 				.like(BPorts::getCnName, bPorts.getCnName()).or()
 				.like(BPorts::getEnName, bPorts.getCnName()))
-			.like(ObjectUtils.isNotNull(bPorts.getEnName()), BPorts::getEnName, bPorts.getEnName())
+			.and(ObjectUtils.isNotNull(bPorts.getEnName()), i -> i.like(BPorts::getCode, bPorts.getEnName()).or()
+				.like(BPorts::getCnName, bPorts.getEnName()).or()
+				.like(BPorts::getEnName, bPorts.getEnName()))
 			.like(ObjectUtils.isNotNull(bPorts.getStatus()), BPorts::getStatus, bPorts.getStatus());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -46,9 +46,11 @@ import org.springblade.los.business.sea.dto.ContainersReports;
 import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.business.sea.entity.Containers;
 import org.springblade.los.business.sea.entity.PreContainers;
+import org.springblade.los.business.sea.entity.SeaBillsDetail;
 import org.springblade.los.business.sea.service.IBillsService;
 import org.springblade.los.business.sea.service.IContainersService;
 import org.springblade.los.business.sea.service.IPreContainersService;
+import org.springblade.los.business.sea.service.ISeaBillsDetailService;
 import org.springblade.los.finance.agreement.entity.AgreementPrice;
 import org.springblade.los.finance.agreement.entity.AgreementPriceItems;
 import org.springblade.los.finance.agreement.service.IAgreementPriceItemsService;
@@ -66,6 +68,7 @@ import org.springblade.los.finance.stl.entity.FinStlBillsItems;
 import org.springblade.los.finance.stl.service.IFinStlBillsItemsService;
 import org.springblade.los.finance.stl.service.IFinStlBillsService;
 import org.springblade.system.entity.Dept;
+import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -95,6 +98,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 
 	private final IUserClient userClient;
 
+	private final IDictBizClient dictBizClient;
+
 	private final IBillsService billsService;
 
 	private final IAeaBillsService aeaBillsService;
@@ -128,6 +133,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 
 	private final IDeptUtils deptUtils;
 
+	private final ISeaBillsDetailService seaBillsDetailService;
+
 
 	@Override
 	public IPage<ReportsVO> selectReportsPage(IPage<ReportsVO> page, ReportsVO reports) {
@@ -182,11 +189,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else {
 			throw new RuntimeException("获取报表表头数据失败");
 		}
-		BCurrency bCurrency = ibCurrencyService.getOne(new LambdaQueryWrapper<BCurrency>()
-			.eq(BCurrency::getStatus, 0)
-			.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
-			.eq(BCurrency::getIsDeleted, 0)
-			.eq(BCurrency::getCode, MagicValues.USD));
 		if (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type)) {
 			return this.getReportDataHY(billId, reportCode, groupCode, corpIds, itemIds, type, curCode);
 		} else if (MagicValues.KYCK.equals(type) || MagicValues.KYJK.equals(type)) {
@@ -6001,6 +6003,64 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			String profitMargin = sysClient.getParamServiceNew(MagicValues.PROFIT_MARGIN);
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
+				SeaBillsDetail seaBillsDetail = seaBillsDetailService.getOne(new LambdaQueryWrapper<SeaBillsDetail>()
+					.eq(SeaBillsDetail::getTenantId, AuthUtil.getTenantId())
+					.eq(SeaBillsDetail::getPid, bills.getId()));
+				if (seaBillsDetail != null) {
+					bills.setInttraToDoorCorpName(seaBillsDetail.getInttraToDoorCorpName());
+					bills.setInttraToDoorCorpAddr(seaBillsDetail.getInttraToDoorCorpAddr());
+					bills.setInttraToDoorCorpContacts(seaBillsDetail.getInttraToDoorCorpContacts());
+					bills.setInttraToDoorCorpTel(seaBillsDetail.getInttraToDoorCorpTel());
+					bills.setInttraDoorToCorpName(seaBillsDetail.getInttraDoorToCorpName());
+					bills.setInttraDoorToCorpAddr(seaBillsDetail.getInttraDoorToCorpAddr());
+					bills.setInttraDoorToCorpContacts(seaBillsDetail.getInttraDoorToCorpContacts());
+					bills.setInttraDoorToCorpTel(seaBillsDetail.getInttraDoorToCorpTel());
+					bills.setHshipperId(seaBillsDetail.getHshipperId());
+					bills.setHshipperCode(seaBillsDetail.getHshipperCode());
+					bills.setHshipperCnName(seaBillsDetail.getHshipperCnName());
+					bills.setHshipperEnName(seaBillsDetail.getHshipperEnName());
+					bills.setHshipperDetails(seaBillsDetail.getHshipperDetails());
+					bills.setHconsigneeId(seaBillsDetail.getHconsigneeId());
+					bills.setHconsigneeCode(seaBillsDetail.getHconsigneeCode());
+					bills.setHconsigneeCnName(seaBillsDetail.getHconsigneeCnName());
+					bills.setHconsigneeEnName(seaBillsDetail.getHconsigneeEnName());
+					bills.setHconsigneeDetails(seaBillsDetail.getHconsigneeDetails());
+					bills.setHnotifyId(seaBillsDetail.getHnotifyId());
+					bills.setHnotifyCode(seaBillsDetail.getHnotifyCode());
+					bills.setHnotifyCnName(seaBillsDetail.getHnotifyCnName());
+					bills.setHnotifyEnName(seaBillsDetail.getHnotifyEnName());
+					bills.setHnotifyDetails(seaBillsDetail.getHnotifyDetails());
+					bills.setHnotify2Id(seaBillsDetail.getHnotify2Id());
+					bills.setHnotify2Code(seaBillsDetail.getHnotify2Code());
+					bills.setHnotify2CnName(seaBillsDetail.getHnotify2CnName());
+					bills.setHnotify2EnName(seaBillsDetail.getHnotify2EnName());
+					bills.setHnotify2Details(seaBillsDetail.getHnotify2Details());
+					bills.setMshipperId(seaBillsDetail.getMshipperId());
+					bills.setMshipperCode(seaBillsDetail.getMshipperCode());
+					bills.setMshipperCnName(seaBillsDetail.getMshipperCnName());
+					bills.setMshipperEnName(seaBillsDetail.getMshipperEnName());
+					bills.setMshipperDetails(seaBillsDetail.getMshipperDetails());
+					bills.setMconsigneeId(seaBillsDetail.getMconsigneeId());
+					bills.setMconsigneeCode(seaBillsDetail.getMconsigneeCode());
+					bills.setMconsigneeCnName(seaBillsDetail.getMconsigneeCnName());
+					bills.setMconsigneeEnName(seaBillsDetail.getMconsigneeEnName());
+					bills.setMconsigneeDetails(seaBillsDetail.getMconsigneeDetails());
+					bills.setMnotifyId(seaBillsDetail.getMnotifyId());
+					bills.setMnotifyCode(seaBillsDetail.getMnotifyCode());
+					bills.setMnotifyCnName(seaBillsDetail.getMnotifyCnName());
+					bills.setMnotifyEnName(seaBillsDetail.getMnotifyEnName());
+					bills.setMnotifyDetails(seaBillsDetail.getMnotifyDetails());
+					bills.setMnotify2Id(seaBillsDetail.getMnotify2Id());
+					bills.setMnotify2Code(seaBillsDetail.getMnotify2Code());
+					bills.setMnotify2CnName(seaBillsDetail.getMnotify2CnName());
+					bills.setMnotify2EnName(seaBillsDetail.getMnotify2EnName());
+					bills.setMnotify2Details(seaBillsDetail.getMnotify2Details());
+					bills.setMforwarderDetails(seaBillsDetail.getMforwarderDetails());
+				}
 				if (bCurrency != null) {
 					bills.setRate(bCurrency.getExrate());
 				} else {
@@ -6187,6 +6247,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							feeCenterReportList.add(feeCenterReports);
 						}
 						bills.setFeeCenterList(feeCenterReportList);
+					}else{
+						throw new RuntimeException("请先维护费用");
 					}
 					list.add(0, bills);
 				} else if (MagicValues.MH.equals(bills.getBillType())) {
@@ -6469,6 +6531,64 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.BUSINESS.equals(reportCode) && MagicValues.MASTER_BILLS.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
+				SeaBillsDetail seaBillsDetail = seaBillsDetailService.getOne(new LambdaQueryWrapper<SeaBillsDetail>()
+					.eq(SeaBillsDetail::getTenantId, AuthUtil.getTenantId())
+					.eq(SeaBillsDetail::getPid, bills.getId()));
+				if (seaBillsDetail != null) {
+					bills.setInttraToDoorCorpName(seaBillsDetail.getInttraToDoorCorpName());
+					bills.setInttraToDoorCorpAddr(seaBillsDetail.getInttraToDoorCorpAddr());
+					bills.setInttraToDoorCorpContacts(seaBillsDetail.getInttraToDoorCorpContacts());
+					bills.setInttraToDoorCorpTel(seaBillsDetail.getInttraToDoorCorpTel());
+					bills.setInttraDoorToCorpName(seaBillsDetail.getInttraDoorToCorpName());
+					bills.setInttraDoorToCorpAddr(seaBillsDetail.getInttraDoorToCorpAddr());
+					bills.setInttraDoorToCorpContacts(seaBillsDetail.getInttraDoorToCorpContacts());
+					bills.setInttraDoorToCorpTel(seaBillsDetail.getInttraDoorToCorpTel());
+					bills.setHshipperId(seaBillsDetail.getHshipperId());
+					bills.setHshipperCode(seaBillsDetail.getHshipperCode());
+					bills.setHshipperCnName(seaBillsDetail.getHshipperCnName());
+					bills.setHshipperEnName(seaBillsDetail.getHshipperEnName());
+					bills.setHshipperDetails(seaBillsDetail.getHshipperDetails());
+					bills.setHconsigneeId(seaBillsDetail.getHconsigneeId());
+					bills.setHconsigneeCode(seaBillsDetail.getHconsigneeCode());
+					bills.setHconsigneeCnName(seaBillsDetail.getHconsigneeCnName());
+					bills.setHconsigneeEnName(seaBillsDetail.getHconsigneeEnName());
+					bills.setHconsigneeDetails(seaBillsDetail.getHconsigneeDetails());
+					bills.setHnotifyId(seaBillsDetail.getHnotifyId());
+					bills.setHnotifyCode(seaBillsDetail.getHnotifyCode());
+					bills.setHnotifyCnName(seaBillsDetail.getHnotifyCnName());
+					bills.setHnotifyEnName(seaBillsDetail.getHnotifyEnName());
+					bills.setHnotifyDetails(seaBillsDetail.getHnotifyDetails());
+					bills.setHnotify2Id(seaBillsDetail.getHnotify2Id());
+					bills.setHnotify2Code(seaBillsDetail.getHnotify2Code());
+					bills.setHnotify2CnName(seaBillsDetail.getHnotify2CnName());
+					bills.setHnotify2EnName(seaBillsDetail.getHnotify2EnName());
+					bills.setHnotify2Details(seaBillsDetail.getHnotify2Details());
+					bills.setMshipperId(seaBillsDetail.getMshipperId());
+					bills.setMshipperCode(seaBillsDetail.getMshipperCode());
+					bills.setMshipperCnName(seaBillsDetail.getMshipperCnName());
+					bills.setMshipperEnName(seaBillsDetail.getMshipperEnName());
+					bills.setMshipperDetails(seaBillsDetail.getMshipperDetails());
+					bills.setMconsigneeId(seaBillsDetail.getMconsigneeId());
+					bills.setMconsigneeCode(seaBillsDetail.getMconsigneeCode());
+					bills.setMconsigneeCnName(seaBillsDetail.getMconsigneeCnName());
+					bills.setMconsigneeEnName(seaBillsDetail.getMconsigneeEnName());
+					bills.setMconsigneeDetails(seaBillsDetail.getMconsigneeDetails());
+					bills.setMnotifyId(seaBillsDetail.getMnotifyId());
+					bills.setMnotifyCode(seaBillsDetail.getMnotifyCode());
+					bills.setMnotifyCnName(seaBillsDetail.getMnotifyCnName());
+					bills.setMnotifyEnName(seaBillsDetail.getMnotifyEnName());
+					bills.setMnotifyDetails(seaBillsDetail.getMnotifyDetails());
+					bills.setMnotify2Id(seaBillsDetail.getMnotify2Id());
+					bills.setMnotify2Code(seaBillsDetail.getMnotify2Code());
+					bills.setMnotify2CnName(seaBillsDetail.getMnotify2CnName());
+					bills.setMnotify2EnName(seaBillsDetail.getMnotify2EnName());
+					bills.setMnotify2Details(seaBillsDetail.getMnotify2Details());
+					bills.setMforwarderDetails(seaBillsDetail.getMforwarderDetails());
+				}
 //				bills.setFM(MagicValues.FM);
 				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
 				BigDecimal boxWeightSum = BigDecimal.ZERO;
@@ -6513,6 +6633,64 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.DOCUMENT.equals(reportCode) && MagicValues.BILLS_DETAIL.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
+				SeaBillsDetail seaBillsDetail = seaBillsDetailService.getOne(new LambdaQueryWrapper<SeaBillsDetail>()
+					.eq(SeaBillsDetail::getTenantId, AuthUtil.getTenantId())
+					.eq(SeaBillsDetail::getPid, bills.getId()));
+				if (seaBillsDetail != null) {
+					bills.setInttraToDoorCorpName(seaBillsDetail.getInttraToDoorCorpName());
+					bills.setInttraToDoorCorpAddr(seaBillsDetail.getInttraToDoorCorpAddr());
+					bills.setInttraToDoorCorpContacts(seaBillsDetail.getInttraToDoorCorpContacts());
+					bills.setInttraToDoorCorpTel(seaBillsDetail.getInttraToDoorCorpTel());
+					bills.setInttraDoorToCorpName(seaBillsDetail.getInttraDoorToCorpName());
+					bills.setInttraDoorToCorpAddr(seaBillsDetail.getInttraDoorToCorpAddr());
+					bills.setInttraDoorToCorpContacts(seaBillsDetail.getInttraDoorToCorpContacts());
+					bills.setInttraDoorToCorpTel(seaBillsDetail.getInttraDoorToCorpTel());
+					bills.setHshipperId(seaBillsDetail.getHshipperId());
+					bills.setHshipperCode(seaBillsDetail.getHshipperCode());
+					bills.setHshipperCnName(seaBillsDetail.getHshipperCnName());
+					bills.setHshipperEnName(seaBillsDetail.getHshipperEnName());
+					bills.setHshipperDetails(seaBillsDetail.getHshipperDetails());
+					bills.setHconsigneeId(seaBillsDetail.getHconsigneeId());
+					bills.setHconsigneeCode(seaBillsDetail.getHconsigneeCode());
+					bills.setHconsigneeCnName(seaBillsDetail.getHconsigneeCnName());
+					bills.setHconsigneeEnName(seaBillsDetail.getHconsigneeEnName());
+					bills.setHconsigneeDetails(seaBillsDetail.getHconsigneeDetails());
+					bills.setHnotifyId(seaBillsDetail.getHnotifyId());
+					bills.setHnotifyCode(seaBillsDetail.getHnotifyCode());
+					bills.setHnotifyCnName(seaBillsDetail.getHnotifyCnName());
+					bills.setHnotifyEnName(seaBillsDetail.getHnotifyEnName());
+					bills.setHnotifyDetails(seaBillsDetail.getHnotifyDetails());
+					bills.setHnotify2Id(seaBillsDetail.getHnotify2Id());
+					bills.setHnotify2Code(seaBillsDetail.getHnotify2Code());
+					bills.setHnotify2CnName(seaBillsDetail.getHnotify2CnName());
+					bills.setHnotify2EnName(seaBillsDetail.getHnotify2EnName());
+					bills.setHnotify2Details(seaBillsDetail.getHnotify2Details());
+					bills.setMshipperId(seaBillsDetail.getMshipperId());
+					bills.setMshipperCode(seaBillsDetail.getMshipperCode());
+					bills.setMshipperCnName(seaBillsDetail.getMshipperCnName());
+					bills.setMshipperEnName(seaBillsDetail.getMshipperEnName());
+					bills.setMshipperDetails(seaBillsDetail.getMshipperDetails());
+					bills.setMconsigneeId(seaBillsDetail.getMconsigneeId());
+					bills.setMconsigneeCode(seaBillsDetail.getMconsigneeCode());
+					bills.setMconsigneeCnName(seaBillsDetail.getMconsigneeCnName());
+					bills.setMconsigneeEnName(seaBillsDetail.getMconsigneeEnName());
+					bills.setMconsigneeDetails(seaBillsDetail.getMconsigneeDetails());
+					bills.setMnotifyId(seaBillsDetail.getMnotifyId());
+					bills.setMnotifyCode(seaBillsDetail.getMnotifyCode());
+					bills.setMnotifyCnName(seaBillsDetail.getMnotifyCnName());
+					bills.setMnotifyEnName(seaBillsDetail.getMnotifyEnName());
+					bills.setMnotifyDetails(seaBillsDetail.getMnotifyDetails());
+					bills.setMnotify2Id(seaBillsDetail.getMnotify2Id());
+					bills.setMnotify2Code(seaBillsDetail.getMnotify2Code());
+					bills.setMnotify2CnName(seaBillsDetail.getMnotify2CnName());
+					bills.setMnotify2EnName(seaBillsDetail.getMnotify2EnName());
+					bills.setMnotify2Details(seaBillsDetail.getMnotify2Details());
+					bills.setMforwarderDetails(seaBillsDetail.getMforwarderDetails());
+				}
 //				bills.setFM(MagicValues.FM);
 				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
 				BigDecimal boxWeightSum = BigDecimal.ZERO;
@@ -6551,6 +6729,64 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.DOCUMENT.equals(reportCode) && MagicValues.DISPATCH_NOTICE.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
+				SeaBillsDetail seaBillsDetail = seaBillsDetailService.getOne(new LambdaQueryWrapper<SeaBillsDetail>()
+					.eq(SeaBillsDetail::getTenantId, AuthUtil.getTenantId())
+					.eq(SeaBillsDetail::getPid, bills.getId()));
+				if (seaBillsDetail != null) {
+					bills.setInttraToDoorCorpName(seaBillsDetail.getInttraToDoorCorpName());
+					bills.setInttraToDoorCorpAddr(seaBillsDetail.getInttraToDoorCorpAddr());
+					bills.setInttraToDoorCorpContacts(seaBillsDetail.getInttraToDoorCorpContacts());
+					bills.setInttraToDoorCorpTel(seaBillsDetail.getInttraToDoorCorpTel());
+					bills.setInttraDoorToCorpName(seaBillsDetail.getInttraDoorToCorpName());
+					bills.setInttraDoorToCorpAddr(seaBillsDetail.getInttraDoorToCorpAddr());
+					bills.setInttraDoorToCorpContacts(seaBillsDetail.getInttraDoorToCorpContacts());
+					bills.setInttraDoorToCorpTel(seaBillsDetail.getInttraDoorToCorpTel());
+					bills.setHshipperId(seaBillsDetail.getHshipperId());
+					bills.setHshipperCode(seaBillsDetail.getHshipperCode());
+					bills.setHshipperCnName(seaBillsDetail.getHshipperCnName());
+					bills.setHshipperEnName(seaBillsDetail.getHshipperEnName());
+					bills.setHshipperDetails(seaBillsDetail.getHshipperDetails());
+					bills.setHconsigneeId(seaBillsDetail.getHconsigneeId());
+					bills.setHconsigneeCode(seaBillsDetail.getHconsigneeCode());
+					bills.setHconsigneeCnName(seaBillsDetail.getHconsigneeCnName());
+					bills.setHconsigneeEnName(seaBillsDetail.getHconsigneeEnName());
+					bills.setHconsigneeDetails(seaBillsDetail.getHconsigneeDetails());
+					bills.setHnotifyId(seaBillsDetail.getHnotifyId());
+					bills.setHnotifyCode(seaBillsDetail.getHnotifyCode());
+					bills.setHnotifyCnName(seaBillsDetail.getHnotifyCnName());
+					bills.setHnotifyEnName(seaBillsDetail.getHnotifyEnName());
+					bills.setHnotifyDetails(seaBillsDetail.getHnotifyDetails());
+					bills.setHnotify2Id(seaBillsDetail.getHnotify2Id());
+					bills.setHnotify2Code(seaBillsDetail.getHnotify2Code());
+					bills.setHnotify2CnName(seaBillsDetail.getHnotify2CnName());
+					bills.setHnotify2EnName(seaBillsDetail.getHnotify2EnName());
+					bills.setHnotify2Details(seaBillsDetail.getHnotify2Details());
+					bills.setMshipperId(seaBillsDetail.getMshipperId());
+					bills.setMshipperCode(seaBillsDetail.getMshipperCode());
+					bills.setMshipperCnName(seaBillsDetail.getMshipperCnName());
+					bills.setMshipperEnName(seaBillsDetail.getMshipperEnName());
+					bills.setMshipperDetails(seaBillsDetail.getMshipperDetails());
+					bills.setMconsigneeId(seaBillsDetail.getMconsigneeId());
+					bills.setMconsigneeCode(seaBillsDetail.getMconsigneeCode());
+					bills.setMconsigneeCnName(seaBillsDetail.getMconsigneeCnName());
+					bills.setMconsigneeEnName(seaBillsDetail.getMconsigneeEnName());
+					bills.setMconsigneeDetails(seaBillsDetail.getMconsigneeDetails());
+					bills.setMnotifyId(seaBillsDetail.getMnotifyId());
+					bills.setMnotifyCode(seaBillsDetail.getMnotifyCode());
+					bills.setMnotifyCnName(seaBillsDetail.getMnotifyCnName());
+					bills.setMnotifyEnName(seaBillsDetail.getMnotifyEnName());
+					bills.setMnotifyDetails(seaBillsDetail.getMnotifyDetails());
+					bills.setMnotify2Id(seaBillsDetail.getMnotify2Id());
+					bills.setMnotify2Code(seaBillsDetail.getMnotify2Code());
+					bills.setMnotify2CnName(seaBillsDetail.getMnotify2CnName());
+					bills.setMnotify2EnName(seaBillsDetail.getMnotify2EnName());
+					bills.setMnotify2Details(seaBillsDetail.getMnotify2Details());
+					bills.setMforwarderDetails(seaBillsDetail.getMforwarderDetails());
+				}
 //				bills.setFM(MagicValues.FM);
 				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
 				bills.setDept(dept);
@@ -6561,6 +6797,64 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.DOCUMENT.equals(reportCode) && MagicValues.INCOMING_NOTIFICATION.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
+				SeaBillsDetail seaBillsDetail = seaBillsDetailService.getOne(new LambdaQueryWrapper<SeaBillsDetail>()
+					.eq(SeaBillsDetail::getTenantId, AuthUtil.getTenantId())
+					.eq(SeaBillsDetail::getPid, bills.getId()));
+				if (seaBillsDetail != null) {
+					bills.setInttraToDoorCorpName(seaBillsDetail.getInttraToDoorCorpName());
+					bills.setInttraToDoorCorpAddr(seaBillsDetail.getInttraToDoorCorpAddr());
+					bills.setInttraToDoorCorpContacts(seaBillsDetail.getInttraToDoorCorpContacts());
+					bills.setInttraToDoorCorpTel(seaBillsDetail.getInttraToDoorCorpTel());
+					bills.setInttraDoorToCorpName(seaBillsDetail.getInttraDoorToCorpName());
+					bills.setInttraDoorToCorpAddr(seaBillsDetail.getInttraDoorToCorpAddr());
+					bills.setInttraDoorToCorpContacts(seaBillsDetail.getInttraDoorToCorpContacts());
+					bills.setInttraDoorToCorpTel(seaBillsDetail.getInttraDoorToCorpTel());
+					bills.setHshipperId(seaBillsDetail.getHshipperId());
+					bills.setHshipperCode(seaBillsDetail.getHshipperCode());
+					bills.setHshipperCnName(seaBillsDetail.getHshipperCnName());
+					bills.setHshipperEnName(seaBillsDetail.getHshipperEnName());
+					bills.setHshipperDetails(seaBillsDetail.getHshipperDetails());
+					bills.setHconsigneeId(seaBillsDetail.getHconsigneeId());
+					bills.setHconsigneeCode(seaBillsDetail.getHconsigneeCode());
+					bills.setHconsigneeCnName(seaBillsDetail.getHconsigneeCnName());
+					bills.setHconsigneeEnName(seaBillsDetail.getHconsigneeEnName());
+					bills.setHconsigneeDetails(seaBillsDetail.getHconsigneeDetails());
+					bills.setHnotifyId(seaBillsDetail.getHnotifyId());
+					bills.setHnotifyCode(seaBillsDetail.getHnotifyCode());
+					bills.setHnotifyCnName(seaBillsDetail.getHnotifyCnName());
+					bills.setHnotifyEnName(seaBillsDetail.getHnotifyEnName());
+					bills.setHnotifyDetails(seaBillsDetail.getHnotifyDetails());
+					bills.setHnotify2Id(seaBillsDetail.getHnotify2Id());
+					bills.setHnotify2Code(seaBillsDetail.getHnotify2Code());
+					bills.setHnotify2CnName(seaBillsDetail.getHnotify2CnName());
+					bills.setHnotify2EnName(seaBillsDetail.getHnotify2EnName());
+					bills.setHnotify2Details(seaBillsDetail.getHnotify2Details());
+					bills.setMshipperId(seaBillsDetail.getMshipperId());
+					bills.setMshipperCode(seaBillsDetail.getMshipperCode());
+					bills.setMshipperCnName(seaBillsDetail.getMshipperCnName());
+					bills.setMshipperEnName(seaBillsDetail.getMshipperEnName());
+					bills.setMshipperDetails(seaBillsDetail.getMshipperDetails());
+					bills.setMconsigneeId(seaBillsDetail.getMconsigneeId());
+					bills.setMconsigneeCode(seaBillsDetail.getMconsigneeCode());
+					bills.setMconsigneeCnName(seaBillsDetail.getMconsigneeCnName());
+					bills.setMconsigneeEnName(seaBillsDetail.getMconsigneeEnName());
+					bills.setMconsigneeDetails(seaBillsDetail.getMconsigneeDetails());
+					bills.setMnotifyId(seaBillsDetail.getMnotifyId());
+					bills.setMnotifyCode(seaBillsDetail.getMnotifyCode());
+					bills.setMnotifyCnName(seaBillsDetail.getMnotifyCnName());
+					bills.setMnotifyEnName(seaBillsDetail.getMnotifyEnName());
+					bills.setMnotifyDetails(seaBillsDetail.getMnotifyDetails());
+					bills.setMnotify2Id(seaBillsDetail.getMnotify2Id());
+					bills.setMnotify2Code(seaBillsDetail.getMnotify2Code());
+					bills.setMnotify2CnName(seaBillsDetail.getMnotify2CnName());
+					bills.setMnotify2EnName(seaBillsDetail.getMnotify2EnName());
+					bills.setMnotify2Details(seaBillsDetail.getMnotify2Details());
+					bills.setMforwarderDetails(seaBillsDetail.getMforwarderDetails());
+				}
 //				bills.setFM(MagicValues.FM);
 				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
 				bills.setDept(dept);
@@ -6571,6 +6865,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.COST.equals(reportCode) && MagicValues.RECEIVABLE.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
 //				bills.setFM(MagicValues.FM);
 				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
 				List<FeeCenter> feeCenterList;
@@ -6693,6 +6991,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.COST.equals(reportCode) && MagicValues.RECEIVABLE_BILL.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
 //				bills.setFM(MagicValues.FM);
 				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
 				List<FeeCenter> feeCenterList;
@@ -6815,6 +7117,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.COST.equals(reportCode) && MagicValues.MEET.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
 //				bills.setFM(MagicValues.FM);
 				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
 				List<FeeCenter> feeCenterList;
@@ -6927,6 +7233,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		} else if (MagicValues.COST.equals(reportCode) && MagicValues.MEET_BILL.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			Bills bills = billsService.getById(billId);
 			if (bills != null) {
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
 //				bills.setFM(MagicValues.FM);
 				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
 				List<FeeCenter> feeCenterList;
@@ -7071,6 +7381,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			List<AeaBills> list = new ArrayList<>();
 			AeaBills bills = aeaBillsService.getById(billId);
 			if (bills != null) {
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
 				if (bCurrency != null) {
 					bills.setRate(bCurrency.getExrate());
 				} else {
@@ -7483,6 +7797,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
 				BigDecimal boxWeightSum = BigDecimal.ZERO;
 				List<ContainersReports> containersReportsList = new ArrayList<>();
 				List<Containers> containersList = containersService.list(new LambdaQueryWrapper<Containers>()
@@ -7527,6 +7845,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
 				bills.setDept(dept);
 				map.put(MagicValues.DATA, bills);
 			} else {
@@ -7537,6 +7859,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
 				bills.setDept(dept);
 				map.put(MagicValues.DATA, bills);
 			} else {
@@ -7547,6 +7873,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
 				List<FeeCenter> feeCenterList;
 				List<Long> ids = new ArrayList<>();
 				if (MagicValues.MM.equals(bills.getBillType())) {
@@ -7668,6 +7998,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
 				List<FeeCenter> feeCenterList;
 				List<Long> ids = new ArrayList<>();
 				if (MagicValues.MM.equals(bills.getBillType())) {
@@ -7789,6 +8123,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
 				List<FeeCenter> feeCenterList;
 				List<Long> ids = new ArrayList<>();
 				if (MagicValues.MM.equals(bills.getBillType())) {
@@ -7900,6 +8238,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (bills != null) {
 //				bills.setFM(MagicValues.FM);
 //				bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
 				List<FeeCenter> feeCenterList;
 				List<Long> ids = new ArrayList<>();
 				if (MagicValues.MM.equals(bills.getBillType())) {
@@ -8062,6 +8404,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (bills != null) {
 //					bills.setFM(MagicValues.FM);
 					bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
+					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+					if (biz.isSuccess()) {
+						bills.setSrcType(biz.getData());
+					}
 				} else {
 					bills = new Bills();
 					BeanUtil.copyProperties(amends, bills);
@@ -8167,6 +8513,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (bills != null) {
 //					bills.setFM(MagicValues.FM);
 					bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
+					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+					if (biz.isSuccess()) {
+						bills.setSrcType(biz.getData());
+					}
 				} else {
 					bills = new Bills();
 					BeanUtil.copyProperties(amends, bills);
@@ -8272,6 +8622,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (bills != null) {
 //					bills.setFM(MagicValues.FM);
 					bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
+					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+					if (biz.isSuccess()) {
+						bills.setSrcType(biz.getData());
+					}
 				} else {
 					bills = new Bills();
 					BeanUtil.copyProperties(amends, bills);
@@ -8377,6 +8731,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (bills != null) {
 //					bills.setFM(MagicValues.FM);
 					bills.setVesselCnName(bills.getVesselEnName() + "/" + bills.getVoyageNo());
+					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+					if (biz.isSuccess()) {
+						bills.setSrcType(biz.getData());
+					}
 				} else {
 					bills = new Bills();
 					BeanUtil.copyProperties(amends, bills);
@@ -8485,6 +8843,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.eq(FeeCenter::getIsDeleted, 0));
 				Bills bills = billsService.getById(amends.getOrigId());
 				if (bills != null) {
+					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+					if (biz.isSuccess()) {
+						bills.setSrcType(biz.getData());
+					}
 					BCorps carrierCorps = bCorpsList.stream().filter(e -> e.getId().equals(bills.getCarrierId())).findFirst().orElse(null);
 					if (carrierCorps != null && ObjectUtils.isNotNull(carrierCorps.getShortName())) {
 						bills.setCarrierCnName(carrierCorps.getShortName());
@@ -9403,6 +9765,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					.eq(FeeCenter::getIsDeleted, 0));
 				AeaBills bills = aeaBillsService.getById(amends.getOrigId());
 				if (bills != null) {
+					R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+					if (biz.isSuccess()) {
+						bills.setSrcType(biz.getData());
+					}
 					BCorps carrierCorps = bCorpsList.stream().filter(e -> e.getId().equals(bills.getCarrierId())).findFirst().orElse(null);
 					if (carrierCorps != null && ObjectUtils.isNotNull(carrierCorps.getShortName())) {
 						bills.setCarrierCnName(carrierCorps.getShortName());
@@ -10297,6 +10663,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			List<CustomsDeclaration> list = new ArrayList<>();
 			CustomsDeclaration bills = customsDeclarationService.getById(billId);
 			if (bills != null) {
+				R<String> biz = dictBizClient.getOneValue("src_type_los", bills.getSeaType(), AuthUtil.getTenantId());
+				if (biz.isSuccess()) {
+					bills.setSrcType(biz.getData());
+				}
 				if (bCurrency != null) {
 					bills.setRate(bCurrency.getExrate());
 				} else {

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -767,7 +767,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		SeaBillsDetail seaBillsDetail = seaBillsDetailService.getOne(new LambdaQueryWrapper<SeaBillsDetail>()
 			.eq(SeaBillsDetail::getTenantId, AuthUtil.getTenantId())
 			.eq(SeaBillsDetail::getPid, detail.getId()));
-		detail.setDetail(seaBillsDetail != null ? seaBillsDetail :new SeaBillsDetail());
+		detail.setDetail(seaBillsDetail != null ? seaBillsDetail : new SeaBillsDetail());
 		detail.setPreContainersList(preContainersService.list(new LambdaQueryWrapper<PreContainers>()
 			.eq(PreContainers::getIsDeleted, 0)
 			.eq(PreContainers::getTenantId, AuthUtil.getTenantId())
@@ -1440,6 +1440,15 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			throw new SecurityException("缺少必要参数");
 		}
 		Bills detail = baseMapper.selectById(bills.getId());
+		SeaBillsDetail seaBillsDetail = seaBillsDetailService.getOne(new LambdaQueryWrapper<SeaBillsDetail>()
+			.eq(SeaBillsDetail::getTenantId, AuthUtil.getTenantId())
+			.eq(SeaBillsDetail::getPid, detail.getId()));
+		if (seaBillsDetail != null) {
+			seaBillsDetail.setId(null);
+		} else {
+			seaBillsDetail = new SeaBillsDetail();
+		}
+		detail.setDetail(seaBillsDetail);
 		List<PreContainers> preContainersList = preContainersService.list(new LambdaQueryWrapper<PreContainers>()
 			.eq(PreContainers::getIsDeleted, 0)
 			.eq(PreContainers::getTenantId, AuthUtil.getTenantId())
@@ -2221,7 +2230,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		SeaBillsDetail seaBillsDetail = seaBillsDetailService.getOne(new LambdaQueryWrapper<SeaBillsDetail>()
 			.eq(SeaBillsDetail::getTenantId, AuthUtil.getTenantId())
 			.eq(SeaBillsDetail::getPid, detail.getId()));
-		detail.setDetail(seaBillsDetail != null ? seaBillsDetail :new SeaBillsDetail());
+		detail.setDetail(seaBillsDetail != null ? seaBillsDetail : new SeaBillsDetail());
 		detail.setFilesList(filesCenterService.list(new LambdaQueryWrapper<FilesCenter>()
 			.eq(FilesCenter::getIsDeleted, 0)
 			.eq(FilesCenter::getTenantId, AuthUtil.getTenantId())

blade-service/blade-los/src/main/java/org/springblade/los/excel/BCntrTypesExcel.java

@@ -45,16 +45,6 @@ public class BCntrTypesExcel implements Serializable {
 	@ExcelProperty(value = "海关代码(必填)")
 	private String customsCode;
 	/**
-	 * 箱型 GP, HC, COLOAD etc.
-	 */
-	@ExcelProperty(value = "箱型")
-	private String cntrType;
-	/**
-	 * 尺码 V20, V40, COLOAD etc.
-	 */
-	@ExcelProperty(value = "尺码")
-	private String cntrSize;
-	/**
 	 * 中文名称
 	 */
 	@ExcelProperty(value = "中文名称(必填)")
@@ -65,6 +55,16 @@ public class BCntrTypesExcel implements Serializable {
 	@ExcelProperty(value = "英文名称(必填)")
 	private String enName;
 	/**
+	 * 箱型 GP, HC, COLOAD etc.
+	 */
+	@ExcelProperty(value = "箱型")
+	private String cntrType;
+	/**
+	 * 尺码 V20, V40, COLOAD etc.
+	 */
+	@ExcelProperty(value = "尺码")
+	private String cntrSize;
+	/**
 	 * 皮重 KGS
 	 */
 	@ExcelProperty(value = "皮重 KGS")

blade-service/blade-los/src/main/java/org/springblade/los/excel/BCorpsExcel.java

@@ -50,16 +50,21 @@ public class BCorpsExcel implements Serializable {
 	@ExcelProperty(value = "统一社会信用代码(必填)")
 	private String uscc;
 	/**
-	 * 简称
-	 */
-	@ExcelProperty(value = "简称")
-	private String shortName;
-	/**
 	 * 中文名称
 	 */
 	@ExcelProperty(value = "中文名称(必填)")
 	private String cnName;
 	/**
+	 * 客户类型
+	 */
+	@ExcelProperty(value = "客户类型(必填)")
+	private String corpTypeName;
+	/**
+	 * 简称
+	 */
+	@ExcelProperty(value = "简称")
+	private String shortName;
+	/**
 	 * 英文名称
 	 */
 	@ExcelProperty(value = "英文名称")
@@ -129,24 +134,16 @@ public class BCorpsExcel implements Serializable {
 	 */
 	@ExcelProperty(value = "客户来源类别")
 	private String sourceType;
-
 	/**
 	 * 业务员姓名
 	 */
 	@ExcelProperty(value = "业务员姓名")
 	private String salesName;
-
 	/**
 	 * 所属单位名称
 	 */
 	@ExcelProperty(value = "所属单位名称")
 	private String corpName;
-
-	/**
-	 * 客户类型
-	 */
-	@ExcelProperty(value = "客户类型")
-	private String corpTypeName;
 	/**
 	 * 分管员
 	 */

blade-service/blade-los/src/main/java/org/springblade/los/excel/BCountrysExcel.java

@@ -45,16 +45,16 @@ public class BCountrysExcel implements Serializable {
 	@ExcelProperty(value = "编码(必填)")
 	private String code;
 	/**
-	 * 国际三字码
-	 */
-	@ExcelProperty(value = "国际三字码")
-	private String unCode;
-	/**
 	 * 中文名称
 	 */
 	@ExcelProperty(value = "中文名称(必填)")
 	private String cnName;
 	/**
+	 * 国际三字码
+	 */
+	@ExcelProperty(value = "国际三字码")
+	private String unCode;
+	/**
 	 * 英文名称
 	 */
 	@ExcelProperty(value = "英文名称")

blade-service/blade-los/src/main/java/org/springblade/los/excel/BTradeModesExcel.java

@@ -45,6 +45,11 @@ public class BTradeModesExcel implements Serializable {
 	@ExcelProperty(value = "代码(必填)")
 	private String code;
 	/**
+	 * 中文名称
+	 */
+	@ExcelProperty(value = "中文名称(必填)")
+	private String cnName;
+	/**
 	 * 单一窗口代码
 	 */
 	@ExcelProperty(value = "单一窗口代码")
@@ -55,11 +60,6 @@ public class BTradeModesExcel implements Serializable {
 	@ExcelProperty(value = "简称")
 	private String shortName;
 	/**
-	 * 中文名称
-	 */
-	@ExcelProperty(value = "中文名称(必填)")
-	private String cnName;
-	/**
 	 * 英文名称
 	 */
 	@ExcelProperty(value = "英文名称")

blade-service/blade-los/src/main/java/org/springblade/los/excel/BUnitsExcel.java

@@ -46,16 +46,16 @@ public class BUnitsExcel implements Serializable {
 	@ExcelProperty(value = "代码(必填)")
 	private String code;
 	/**
-	 * 单一窗口代码
-	 */
-	@ExcelProperty(value = "单一窗口代码")
-	private String codeSw;
-	/**
 	 * 中文名称
 	 */
 	@ExcelProperty(value = "中文名称(必填)")
 	private String cnName;
 	/**
+	 * 单一窗口代码
+	 */
+	@ExcelProperty(value = "单一窗口代码")
+	private String codeSw;
+	/**
 	 * 英文名称
 	 */
 	@ExcelProperty(value = "英文名称")

blade-service/blade-los/src/main/java/org/springblade/los/excel/BVoucherTypeExcel.java

@@ -40,11 +40,6 @@ public class BVoucherTypeExcel implements Serializable {
 
 
 	/**
-	 * 会计年度
-	 */
-	@ExcelProperty(value = "会计年度")
-	private Integer fiscalYear;
-	/**
 	 * 代码
 	 */
 	@ExcelProperty(value = "代码(必填)")
@@ -55,6 +50,11 @@ public class BVoucherTypeExcel implements Serializable {
 	@ExcelProperty(value = "中文名称(必填)")
 	private String cnName;
 	/**
+	 * 会计年度
+	 */
+	@ExcelProperty(value = "会计年度")
+	private Integer fiscalYear;
+	/**
 	 * 英文名称
 	 */
 	@ExcelProperty(value = "英文名称")

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -549,11 +549,11 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				.eq(BCorps::getIsDeleted, 0));
 			for (FeeCenter feeCenter : list) {
 				if (!bCorpsList.isEmpty()){
-					BCorps bCorps = bCorpsList.stream().filter(e-> e.getCorpId().equals(feeCenter.getCorpId())).findFirst().orElse(null);
+					BCorps bCorps = bCorpsList.stream().filter(e-> e.getId().equals(feeCenter.getCorpId())).findFirst().orElse(null);
 					if (bCorps != null){
 						feeCenter.setShortName(bCorps.getShortName());
 					}
-					BCorps bCorps1 = bCorpsList.stream().filter(e-> e.getCorpId().equals(feeCenter.getBillCorpId())).findFirst().orElse(null);
+					BCorps bCorps1 = bCorpsList.stream().filter(e-> e.getId().equals(feeCenter.getBillCorpId())).findFirst().orElse(null);
 					if (bCorps1 != null){
 						feeCenter.setBillCorpEnName(bCorps1.getShortName());
 					}
@@ -1198,11 +1198,11 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						throw new RuntimeException("首款、尾款优惠汇率不能为空");
 					}
 					if (!bCorpsList.isEmpty()){
-						BCorps bCorps = bCorpsList.stream().filter(e-> e.getCorpId().equals(item.getCorpId())).findFirst().orElse(null);
+						BCorps bCorps = bCorpsList.stream().filter(e-> e.getId().equals(item.getCorpId())).findFirst().orElse(null);
 						if (bCorps != null){
 							item.setShortName(bCorps.getShortName());
 						}
-						BCorps bCorps1 = bCorpsList.stream().filter(e-> e.getCorpId().equals(item.getBillCorpId())).findFirst().orElse(null);
+						BCorps bCorps1 = bCorpsList.stream().filter(e-> e.getId().equals(item.getBillCorpId())).findFirst().orElse(null);
 						if (bCorps1 != null){
 							item.setBillCorpEnName(bCorps1.getShortName());
 						}

blade-service/blade-los/src/main/java/org/springblade/los/finance/invoices/service/impl/FinInvoicesServiceImpl.java

@@ -149,6 +149,9 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
 		}
 		this.saveOrUpdate(finInvoices);
 		if (ObjectUtils.isNotNull(finInvoices.getFinInvoicesItemsList())) {
+			finInvoices.setBusinessNo(finInvoices.getFinInvoicesItemsList().stream().map(FinInvoicesItems::getBillNo).distinct().collect(Collectors.joining(",")));
+			finInvoices.setMblno(finInvoices.getFinInvoicesItemsList().stream().map(FinInvoicesItems::getMblno).distinct().collect(Collectors.joining(",")));
+			finInvoices.setHblno(finInvoices.getFinInvoicesItemsList().stream().map(FinInvoicesItems::getHblno).distinct().collect(Collectors.joining(",")));
 			for (FinInvoicesItems item : finInvoices.getFinInvoicesItemsList()) {
 				//计算字段null值处理
 				item.setCurrentAmount(ObjectUtils.isNotNull(item.getCurrentAmount()) ? item.getCurrentAmount() : new BigDecimal("0.00"));

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/impl/FinStlBillsServiceImpl.java

@@ -243,6 +243,11 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 		}
 		this.saveOrUpdate(finStlBills);
 		if (ObjectUtils.isNotNull(finStlBills.getFinStlBillsItemsList())) {
+			finStlBills.setBusinessNo(finStlBills.getFinStlBillsItemsList().stream().map(FinStlBillsItems::getBillNo).distinct().collect(Collectors.joining(",")));
+			finStlBills.setAccountNo(finStlBills.getFinStlBillsItemsList().stream().map(FinStlBillsItems::getAccBillNo).distinct().collect(Collectors.joining(",")));
+			finStlBills.setMblno(finStlBills.getFinStlBillsItemsList().stream().map(FinStlBillsItems::getMblno).distinct().collect(Collectors.joining(",")));
+			finStlBills.setHblno(finStlBills.getFinStlBillsItemsList().stream().map(FinStlBillsItems::getHblno).distinct().collect(Collectors.joining(",")));
+			finStlBills.setInvoiceNo(finStlBills.getFinStlBillsItemsList().stream().map(FinStlBillsItems::getInvoiceNo).distinct().collect(Collectors.joining(",")));
 			List<FinStlBillsItems> finStlBillsItemsList = new ArrayList<>();
 			for (FinStlBillsItems item : finStlBills.getFinStlBillsItemsList()) {
 				//计算字段null值处理

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/utils/SybPayService.java

@@ -147,7 +147,7 @@ public class SybPayService {
 		}
 		params.put("remark", remark);
 		params.put("validtime", validtime);
-		params.put("limit_pay", "");
+		params.put("limit_pay", limit_pay);
 		params.put("randomstr", SybUtil.getValidatecode(8));
 		params.put("paytype", paytype);
 		params.put("signtype", transactionType);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -223,6 +223,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R saveOrderMessage(Order order) {
 		// 校验单号重复-新增
 		if (order.getId() == null && StringUtils.isNotBlank(order.getOrderNo())) {
@@ -711,6 +712,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R saveOrderMessageApp(Order order) {
 		// 校验单号重复-新增
 		if (order.getId() == null && StringUtils.isNotBlank(order.getOrderNo())) {
@@ -983,6 +985,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 */
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R affirm(Order order) {
 		// 订单时间
 		Date date = new Date();
@@ -1271,6 +1274,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public void checkOrder(Order order) {
 		Order salesOrder = baseMapper.selectById(order.getId());
 		if (order.getCheckFlag() != 3 && salesOrder.getStatus() != 0) {
@@ -1481,6 +1485,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public void checkChargeBack(Order order) {
 		Order salesOrder = baseMapper.selectById(order.getId());
 
@@ -1897,6 +1902,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 */
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public void checkPassCancel(Long id) {
 		//获得当前销售订单信息
 		Order orderMessage = baseMapper.selectById(id);
@@ -2137,6 +2143,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public void repealCancel(Order orderMessage) {
 		LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		orderLambdaQueryWrapper
@@ -2305,6 +2312,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 */
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R dealerSubmit(Order order) {
 		// dealer 1 确认订单 2 取消订单
 		Order selectById = baseMapper.selectById(order.getId());
@@ -3123,6 +3131,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R revoke(Order order) {
 		Order selectOrder = baseMapper.selectById(order.getId());
 		if (ObjectUtils.isNotNull(selectOrder)) {
@@ -3243,6 +3252,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R collectPayment(Order order) {
 		CorpsDesc corpsDesc = new CorpsDesc();
 		if (ObjectUtils.isNotNull(order.getCorpId())) {
@@ -3380,6 +3390,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R quickBilling(Order order) {
 		// 校验单号重复-新增
 		if (order.getId() == null && StringUtils.isNotBlank(order.getOrderNo())) {
@@ -4957,6 +4968,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public R returnGoodsRefund(Order order) {
 
@@ -5155,6 +5167,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public boolean shippingOrder(Order order) {
 		// 业务处理
 		LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -5241,6 +5254,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R collectHairGoods(Order order) {
 		if (order.getId() == null) {
 			throw new RuntimeException("缺少必要参数");
@@ -5567,6 +5581,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R offset(Order order) {
 		Order selectOrder = baseMapper.selectById(order.getId());
 		if (ObjectUtils.isNotNull(selectOrder) && ObjectUtils.isNotNull(selectOrder.getCorpId())) {
@@ -5591,6 +5606,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R cancelOrder(Order order) {
 		if (order.getId() == null) {
 			throw new RuntimeException("缺少必要参数");
@@ -5722,6 +5738,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R generatePurchase(Order order) {
 		if (null == order.getId()) {
 			throw new RuntimeException("缺少必要参数");
@@ -5790,6 +5807,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R generateShipment(Order order) {
 		// 获取销售单主表信息
 		Order orderMessage = baseMapper.selectById(order.getId());
@@ -5836,6 +5854,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R generatePurchaseBill(List<OrderItems> itemsList) {
 		if (ObjectUtils.isNull(itemsList)) {
 			throw new RuntimeException("缺少必要参数");
@@ -6090,6 +6109,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R purchaseStatusUpdate(Order order) {
 		if (null == order.getId()) {
 			throw new RuntimeException("缺少必要参数");
@@ -6271,6 +6291,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R cancelPurchaseStatus(Order order) {
 		if (null == order.getId()) {
 			throw new RuntimeException("缺少必要参数");
@@ -6484,6 +6505,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R quickBillingWX(Order order) {
 		// 校验单号重复-新增
 		if (order.getId() == null && StringUtils.isNotBlank(order.getOrderNo())) {
@@ -6757,6 +6779,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R quickBillingWXIntegral(Order order) {
 		// 校验单号重复-新增
 		if (order.getId() == null && StringUtils.isNotBlank(order.getOrderNo())) {
@@ -7049,6 +7072,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 */
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R delivery(Order order) {
 		if (order.getId() == null) {
 			throw new RuntimeException("缺少必要参数");
@@ -7246,6 +7270,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R savePlaceOrderMall(Order order) {
 		// 校验单号重复-新增
 		if (order.getId() == null && StringUtils.isNotBlank(order.getSysNo())) {
@@ -7483,6 +7508,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R quickBillingMall(Order order) {
 
 		Order details = vocationalWork(order);
@@ -7689,6 +7715,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R cancelOrderMall(Order order) {
 		if (order.getId() == null) {
 			throw new RuntimeException("缺少必要参数");
@@ -8049,6 +8076,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public R synchronization(Long billId, String ordNo, String primaryOrdNo) {
 		Order order = new Order();
 		order.setId(billId);
@@ -8538,6 +8566,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 */
 
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public void paymentApply(Order order, String billType, String itemType) {
 		//获取所属公司中文名
 		if (order.getBelongToCorpId() != null) {
@@ -8773,6 +8802,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 */
 
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
+	@Transactional(rollbackFor = Exception.class)
 	public void paymentApplyFD(Order order, String billType, String itemType) {
 		//获取所属公司中文名
 		if (order.getBelongToCorpId() != null) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/payMethod/PayServiceImpl.java

@@ -119,8 +119,8 @@ public class PayServiceImpl implements PayService {
 				paymentDTO.setOrgid(parameters.getOrgid());
 			}
 			//交易类型
-//			paymentDTO.setTransactionType(parameters.getTransactionType());
-			paymentDTO.setTransactionType("MD5");
+			paymentDTO.setTransactionType(parameters.getTransactionType());
+//			paymentDTO.setTransactionType("MD5");
 			//MD5交易密钥
 			paymentDTO.setSybMdAppkey(parameters.getSybMdAppkey());
 			//RSA私钥