修改账单ID类型为Long,更新相关服务和Mapper逻辑
This commit is contained in:
+1
-1
@@ -12,7 +12,7 @@ public class SrvBillAirAllocOrder
|
||||
private String orderNo;
|
||||
|
||||
/** 计费订单 ID,对应 prc_order_bill.bill_id */
|
||||
private String billId;
|
||||
private Long billId;
|
||||
|
||||
/** 计费重,没有计费重时依次取实际重量、收货重量 */
|
||||
private BigDecimal chargeWeight;
|
||||
|
||||
@@ -15,7 +15,8 @@ public class PayBillLine
|
||||
|
||||
private String feeId;
|
||||
|
||||
private String orderBillId;
|
||||
/** 计费订单ID,对应 prc_order_bill.bill_id */
|
||||
private Long orderBillId;
|
||||
|
||||
private String orderNo;
|
||||
|
||||
|
||||
@@ -9,7 +9,8 @@ import lombok.Data;
|
||||
@Data
|
||||
public class PayBillOrder
|
||||
{
|
||||
private String billId;
|
||||
/** 计费订单ID,对应 prc_order_bill.bill_id */
|
||||
private Long billId;
|
||||
|
||||
private String orderNo;
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@ public class PrcPayBill implements Serializable
|
||||
|
||||
/** 应付主表ID */
|
||||
private String payBillId;
|
||||
/** 计费订单ID */
|
||||
private String billId;
|
||||
/** 计费订单ID,对应 prc_order_bill.bill_id */
|
||||
private Long billId;
|
||||
/** 币种 */
|
||||
private String currency;
|
||||
/** 产品价合计 */
|
||||
|
||||
@@ -13,7 +13,8 @@ public class PrcPayBillFee implements Serializable
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private String feeId;
|
||||
private String billId;
|
||||
/** 计费订单ID,对应 prc_order_bill.bill_id */
|
||||
private Long billId;
|
||||
/** 应付主表ID */
|
||||
private String payBillId;
|
||||
private String feeType;
|
||||
|
||||
@@ -65,7 +65,7 @@ public interface PayBillMapper
|
||||
* @param billIds 计费订单ID
|
||||
* @return 订单应付费用
|
||||
*/
|
||||
List<PrcPayBillFee> selectOrderFees(@Param("billIds") List<String> billIds);
|
||||
List<PrcPayBillFee> selectOrderFees(@Param("billIds") List<Long> billIds);
|
||||
|
||||
/**
|
||||
* 读取还没被未作废账单占用的费用。旧账单没有费用行号时,整票视为已占用。
|
||||
@@ -73,7 +73,7 @@ public interface PayBillMapper
|
||||
* @param billIds 计费订单ID
|
||||
* @return 可抄进本次账单的费用
|
||||
*/
|
||||
List<PrcPayBillFee> selectFreeFees(@Param("billIds") List<String> billIds);
|
||||
List<PrcPayBillFee> selectFreeFees(@Param("billIds") List<Long> billIds);
|
||||
|
||||
/**
|
||||
* 这票订单还有没有未删除的计算费用。
|
||||
@@ -81,7 +81,7 @@ public interface PayBillMapper
|
||||
* @param billId 计费订单ID
|
||||
* @return 计算费用条数
|
||||
*/
|
||||
int countCalcFees(@Param("billId") String billId);
|
||||
int countCalcFees(@Param("billId") Long billId);
|
||||
|
||||
/**
|
||||
* 插入一张草稿应付账单。
|
||||
|
||||
@@ -24,5 +24,5 @@ public interface PayFinanceMapper
|
||||
|
||||
int stampFee(@Param("feeId") String feeId, @Param("supplierId") Long supplierId, @Param("supplierName") String supplierName);
|
||||
|
||||
int stampCalc(@Param("billId") String billId, @Param("supplierId") Long supplierId, @Param("supplierName") String supplierName);
|
||||
int stampCalc(@Param("billId") Long billId, @Param("supplierId") Long supplierId, @Param("supplierName") String supplierName);
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ public interface PrcPayBillFeeMapper
|
||||
* @param billId 计费订单ID
|
||||
* @return 费用明细
|
||||
*/
|
||||
public List<PrcPayBillFee> selectByBillId(String billId);
|
||||
public List<PrcPayBillFee> selectByBillId(Long billId);
|
||||
|
||||
/**
|
||||
* 插入一条订单应付费用。
|
||||
@@ -40,7 +40,7 @@ public interface PrcPayBillFeeMapper
|
||||
* @param billId 计费订单ID
|
||||
* @return 影响行数
|
||||
*/
|
||||
public int deleteByBillId(String billId);
|
||||
public int deleteByBillId(Long billId);
|
||||
|
||||
/**
|
||||
* 逻辑删除某一条提单费用分摊到订单上的明细。
|
||||
@@ -51,10 +51,10 @@ public interface PrcPayBillFeeMapper
|
||||
public int markLadingFeeDeleted(@Param("feeId") Long feeId);
|
||||
|
||||
/** 这条提单费用已经分摊到的订单。作废前取出,用来重算应付总额。 */
|
||||
public List<String> selectBillIdsByLadingFee(@Param("feeId") Long feeId);
|
||||
public List<Long> selectBillIdsByLadingFee(@Param("feeId") Long feeId);
|
||||
|
||||
/** 明细还没挂上应付主表时,按订单补上主表 ID。单次不超过 1000 个订单。 */
|
||||
public int bindPayBillId(@Param("billIds") List<String> billIds);
|
||||
public int bindPayBillId(@Param("billIds") List<Long> billIds);
|
||||
|
||||
/**
|
||||
* 这条提单费用分摊到的订单里,取一个已经生成应付账单的订单号。
|
||||
|
||||
@@ -13,7 +13,7 @@ public interface PrcPayBillMapper
|
||||
* @param billId 计费订单ID
|
||||
* @return 订单应付,没有时为 null
|
||||
*/
|
||||
PrcPayBill selectByBillId(String billId);
|
||||
PrcPayBill selectByBillId(Long billId);
|
||||
|
||||
/**
|
||||
* 按应付主表ID读取。
|
||||
@@ -53,7 +53,7 @@ public interface PrcPayBillMapper
|
||||
* @param billId 计费订单ID
|
||||
* @return 影响行数
|
||||
*/
|
||||
int deleteByBillId(String billId);
|
||||
int deleteByBillId(Long billId);
|
||||
|
||||
/**
|
||||
* 按未删除的应付明细合计,回写这些订单的应付总额。
|
||||
@@ -61,8 +61,8 @@ public interface PrcPayBillMapper
|
||||
* @param billIds 计费订单 ID,单次不超过 1000 个
|
||||
* @return 影响行数
|
||||
*/
|
||||
int refreshPayTotal(@Param("billIds") List<String> billIds);
|
||||
int refreshPayTotal(@Param("billIds") List<Long> billIds);
|
||||
|
||||
/** 订单还没有应付主表时补一行,总额随后按明细重算。单次不超过 1000 个订单。 */
|
||||
int insertMissingPayBills(@Param("billIds") List<String> billIds, @Param("operator") String operator);
|
||||
int insertMissingPayBills(@Param("billIds") List<Long> billIds, @Param("operator") String operator);
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ public interface SrvBillAirAllocMapper
|
||||
* @param billIds 计费订单 ID
|
||||
* @return 应付主表编号
|
||||
*/
|
||||
List<PrcPayBill> selectPayBills(@Param("billIds") List<String> billIds);
|
||||
List<PrcPayBill> selectPayBills(@Param("billIds") List<Long> billIds);
|
||||
|
||||
/**
|
||||
* 把仍是未分摊的费用改为已分摊。已经不是未分摊的行不会被改到。
|
||||
|
||||
@@ -24,10 +24,10 @@ public class PaySettleSupport
|
||||
* @param billId 计费订单ID
|
||||
* @param cardName 价卡归属名称
|
||||
*/
|
||||
public void stampCalc(String billId, String cardName)
|
||||
public void stampCalc(Long billId, String cardName)
|
||||
{
|
||||
BmsSupplier supplier = match(cardName);
|
||||
if (supplier == null || billId == null || billId.isBlank())
|
||||
if (supplier == null || billId == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -21,5 +21,5 @@ public interface IPrcPayBillFeeService
|
||||
*
|
||||
* @param billIds 计费订单 ID
|
||||
*/
|
||||
void refreshTotals(List<String> billIds);
|
||||
void refreshTotals(List<Long> billIds);
|
||||
}
|
||||
|
||||
+12
-12
@@ -152,9 +152,9 @@ public class PayBillServiceImpl implements IPayBillService
|
||||
throw new ServiceException(preview.getMissingNos().isEmpty() ? PaymentMesEnum.BMS_PAY_NO_GEN.getCnMes() : "订单号没有对上:" + String.join("、", preview.getMissingNos()));
|
||||
}
|
||||
String currency = currencyOf(orders);
|
||||
Map<String, Integer> versions = new HashMap<>();
|
||||
Map<Long, Integer> versions = new HashMap<>();
|
||||
List<String> skipped = new ArrayList<>();
|
||||
List<String> billIds = new ArrayList<>();
|
||||
List<Long> billIds = new ArrayList<>();
|
||||
for (PayBillOrder order : orders)
|
||||
{
|
||||
billIds.add(order.getBillId());
|
||||
@@ -164,8 +164,7 @@ public class PayBillServiceImpl implements IPayBillService
|
||||
}
|
||||
try
|
||||
{
|
||||
PayOrderCostResult cost = payOrderCostService.generateIsolated(
|
||||
order.getBillId() == null ? null : Long.valueOf(order.getBillId()));
|
||||
PayOrderCostResult cost = payOrderCostService.generateIsolated(order.getBillId());
|
||||
if (cost != null)
|
||||
{
|
||||
versions.put(order.getBillId(), cost.getVersionNo());
|
||||
@@ -229,7 +228,7 @@ public class PayBillServiceImpl implements IPayBillService
|
||||
bill.setSourceType(mode(command));
|
||||
bill.setPeriodStart(parseDay(command.getBeginDate()));
|
||||
bill.setPeriodEnd(parseDay(command.getEndDate()));
|
||||
Set<String> orderIds = new HashSet<>();
|
||||
Set<Long> orderIds = new HashSet<>();
|
||||
for (PayBillLine line : lines)
|
||||
{
|
||||
if (line.getOrderBillId() != null)
|
||||
@@ -948,11 +947,11 @@ public class PayBillServiceImpl implements IPayBillService
|
||||
* @param billId 计费订单ID
|
||||
* @return 订单;对不上时返回 null
|
||||
*/
|
||||
private PayBillOrder findOrder(List<PayBillOrder> orders, String billId)
|
||||
private PayBillOrder findOrder(List<PayBillOrder> orders, Long billId)
|
||||
{
|
||||
for (PayBillOrder order : orders)
|
||||
{
|
||||
if (order.getBillId().equals(billId))
|
||||
if (order.getBillId() != null && order.getBillId().equals(billId))
|
||||
{
|
||||
return order;
|
||||
}
|
||||
@@ -1112,11 +1111,12 @@ public class PayBillServiceImpl implements IPayBillService
|
||||
{
|
||||
List<PrcPayBillFee> kept = new ArrayList<>();
|
||||
Set<String> notes = new LinkedHashSet<>();
|
||||
Map<String, String> cards = new HashMap<>();
|
||||
Map<Long, String> cards = new HashMap<>();
|
||||
for (PrcPayBillFee fee : fees)
|
||||
{
|
||||
PayBillOrder order = findOrder(orders, fee.getBillId());
|
||||
String orderNo = order == null || order.getOrderNo() == null ? fee.getBillId() : order.getOrderNo();
|
||||
String orderNo = order == null || order.getOrderNo() == null
|
||||
? (fee.getBillId() == null ? "" : String.valueOf(fee.getBillId())) : order.getOrderNo();
|
||||
String why = partyReason(fee, order, supplier, cards);
|
||||
if (why == null)
|
||||
{
|
||||
@@ -1132,7 +1132,7 @@ public class PayBillServiceImpl implements IPayBillService
|
||||
return kept;
|
||||
}
|
||||
|
||||
private String partyReason(PrcPayBillFee fee, PayBillOrder order, BmsSupplier supplier, Map<String, String> cards)
|
||||
private String partyReason(PrcPayBillFee fee, PayBillOrder order, BmsSupplier supplier, Map<Long, String> cards)
|
||||
{
|
||||
if (fee.getSettleSupplierId() != null)
|
||||
{
|
||||
@@ -1154,7 +1154,7 @@ public class PayBillServiceImpl implements IPayBillService
|
||||
return "人工费用没有付款对象,未并入";
|
||||
}
|
||||
String card = cards.computeIfAbsent(fee.getBillId(),
|
||||
id -> payOrderCostService.cardSupplierName(id == null ? null : Long.valueOf(id)));
|
||||
id -> payOrderCostService.cardSupplierName(id));
|
||||
if (card == null || card.isBlank())
|
||||
{
|
||||
return "价卡没有归属供应商,未并入";
|
||||
@@ -1269,7 +1269,7 @@ public class PayBillServiceImpl implements IPayBillService
|
||||
List<PayBillLine> lines = payBillMapper.selectLines(billId);
|
||||
BigDecimal total = BigDecimal.ZERO;
|
||||
BigDecimal supplier = BigDecimal.ZERO;
|
||||
Set<String> orders = new HashSet<>();
|
||||
Set<Long> orders = new HashSet<>();
|
||||
for (PayBillLine line : lines)
|
||||
{
|
||||
BigDecimal amount = line.getAmount() == null ? BigDecimal.ZERO : line.getAmount();
|
||||
|
||||
+5
-5
@@ -132,12 +132,12 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService
|
||||
}
|
||||
String operator = SecurityUtils.getUsername();
|
||||
PrcPayBill payBill = saveBill(bill, result, operator);
|
||||
saveFees(String.valueOf(bill.getBillId()), payBill.getPayBillId(), result.getFees());
|
||||
saveFees(bill.getBillId(), payBill.getPayBillId(), result.getFees());
|
||||
String channelName = channel.getChannelName() == null ? channel.getChannelCode() : channel.getChannelName();
|
||||
String end = product.getTermEnd() == null ? "不限" : day(product.getTermEnd());
|
||||
result.setMessage("渠道「" + channelName + "」" + product.getProductName() + " 第 " + product.getVersionNo()
|
||||
+ " 版(" + day(product.getTermStart()) + " 至 " + end + ")," + result.getMessage());
|
||||
paySettleSupport.stampCalc(String.valueOf(bill.getBillId()), product.getSupplierName());
|
||||
paySettleSupport.stampCalc(bill.getBillId(), product.getSupplierName());
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -551,12 +551,12 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService
|
||||
*/
|
||||
private PrcPayBill saveBill(PrcOrderBill bill, PayOrderCostResult result, String operator)
|
||||
{
|
||||
PrcPayBill existed = payBillMapper.selectByBillId(String.valueOf(bill.getBillId()));
|
||||
PrcPayBill existed = payBillMapper.selectByBillId(bill.getBillId());
|
||||
PrcPayBill row = existed == null ? new PrcPayBill() : existed;
|
||||
if (existed == null)
|
||||
{
|
||||
row.setPayBillId(UUID.randomUUID().toString());
|
||||
row.setBillId(String.valueOf(bill.getBillId()));
|
||||
row.setBillId(bill.getBillId());
|
||||
row.setCreateBy(operator);
|
||||
}
|
||||
row.setCurrency(result.getCurrency());
|
||||
@@ -585,7 +585,7 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService
|
||||
* @param payBillId 订单应付主表ID
|
||||
* @param fees 本次算出的费用
|
||||
*/
|
||||
private void saveFees(String billId, String payBillId, List<PayCostLine> fees)
|
||||
private void saveFees(Long billId, String payBillId, List<PayCostLine> fees)
|
||||
{
|
||||
payBillFeeMapper.deleteByBillId(billId);
|
||||
List<PrcPayBillFee> rows = new java.util.ArrayList<>();
|
||||
|
||||
+3
-3
@@ -2543,7 +2543,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
|
||||
}
|
||||
|
||||
|
||||
private List<PrcPayBillFee> toPayFeeRows(String billId, String payBillId, TmsPriceQuoteResult result)
|
||||
private List<PrcPayBillFee> toPayFeeRows(Long billId, String payBillId, TmsPriceQuoteResult result)
|
||||
{
|
||||
List<PrcPayBillFee> fees = new ArrayList<PrcPayBillFee>();
|
||||
if (result.getPayFeeDetails() == null)
|
||||
@@ -2575,12 +2575,12 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
|
||||
{
|
||||
return null;
|
||||
}
|
||||
PrcPayBill existed = payBillMapper.selectByBillId(bill.getBillId() == null ? null : String.valueOf(bill.getBillId()));
|
||||
PrcPayBill existed = payBillMapper.selectByBillId(bill.getBillId());
|
||||
PrcPayBill row = existed == null ? new PrcPayBill() : existed;
|
||||
if (existed == null)
|
||||
{
|
||||
row.setPayBillId(UUID.randomUUID().toString());
|
||||
row.setBillId(bill.getBillId() == null ? null : String.valueOf(bill.getBillId()));
|
||||
row.setBillId(bill.getBillId());
|
||||
row.setCreateBy(bill.getCreateBy());
|
||||
}
|
||||
row.setCurrency(StringUtils.isEmpty(bill.getCurrency()) ? "CNY" : bill.getCurrency());
|
||||
|
||||
+11
-29
@@ -38,7 +38,7 @@ public class PrcPayBillFeeServiceImpl implements IPrcPayBillFeeService
|
||||
{
|
||||
return;
|
||||
}
|
||||
LinkedHashSet<String> billIds = new LinkedHashSet<>();
|
||||
LinkedHashSet<Long> billIds = new LinkedHashSet<>();
|
||||
for (int from = 0; from < fees.size(); from += BATCH_SIZE)
|
||||
{
|
||||
List<PrcPayBillFee> chunk = fees.subList(from, Math.min(from + BATCH_SIZE, fees.size()));
|
||||
@@ -58,9 +58,9 @@ public class PrcPayBillFeeServiceImpl implements IPrcPayBillFeeService
|
||||
}
|
||||
for (PrcPayBillFee fee : chunk)
|
||||
{
|
||||
if (fee != null && fee.getBillId() != null && !fee.getBillId().isBlank())
|
||||
if (fee != null && fee.getBillId() != null)
|
||||
{
|
||||
billIds.add(fee.getBillId().trim());
|
||||
billIds.add(fee.getBillId());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -68,47 +68,29 @@ public class PrcPayBillFeeServiceImpl implements IPrcPayBillFeeService
|
||||
}
|
||||
|
||||
@Override
|
||||
public void refreshTotals(List<String> billIds)
|
||||
public void refreshTotals(List<Long> billIds)
|
||||
{
|
||||
if (billIds == null || billIds.isEmpty())
|
||||
{
|
||||
return;
|
||||
}
|
||||
LinkedHashSet<String> unique = new LinkedHashSet<>();
|
||||
for (String billId : billIds)
|
||||
LinkedHashSet<Long> unique = new LinkedHashSet<>();
|
||||
for (Long billId : billIds)
|
||||
{
|
||||
if (billId != null && !billId.isBlank())
|
||||
if (billId != null)
|
||||
{
|
||||
unique.add(billId.trim());
|
||||
unique.add(billId);
|
||||
}
|
||||
}
|
||||
List<String> ids = new ArrayList<>(unique);
|
||||
List<Long> ids = new ArrayList<>(unique);
|
||||
String operator = currentOperator();
|
||||
for (int from = 0; from < ids.size(); from += BATCH_SIZE)
|
||||
{
|
||||
List<String> chunk = ids.subList(from, Math.min(from + BATCH_SIZE, ids.size()));
|
||||
List<Long> chunk = ids.subList(from, Math.min(from + BATCH_SIZE, ids.size()));
|
||||
payBillMapper.insertMissingPayBills(chunk, operator);
|
||||
payBillFeeMapper.bindPayBillId(chunk);
|
||||
payBillMapper.refreshPayTotal(chunk);
|
||||
List<Long> longIds = new ArrayList<>(chunk.size());
|
||||
for (String id : chunk)
|
||||
{
|
||||
if (id == null || id.isBlank())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
try
|
||||
{
|
||||
longIds.add(Long.valueOf(id.trim()));
|
||||
}
|
||||
catch (NumberFormatException ignore)
|
||||
{
|
||||
}
|
||||
}
|
||||
if (!longIds.isEmpty())
|
||||
{
|
||||
orderBillMapper.refreshPayTotalFromFees(longIds);
|
||||
}
|
||||
orderBillMapper.refreshPayTotalFromFees(chunk);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+7
-7
@@ -95,7 +95,7 @@ public class SrvBillAirAllocServiceImpl implements ISrvBillAirAllocService
|
||||
throw new ServiceException(fee.getBillCode() + " " + blankName(fee) + ":" + reason);
|
||||
}
|
||||
}
|
||||
Map<String, String> payBillIds = payBillIds(orders);
|
||||
Map<Long, String> payBillIds = payBillIds(orders);
|
||||
List<PrcPayBillFee> batch = new ArrayList<>(BATCH_SIZE);
|
||||
int lineCount = 0;
|
||||
for (SrvBillAirAllocFee fee : fees)
|
||||
@@ -168,7 +168,7 @@ public class SrvBillAirAllocServiceImpl implements ISrvBillAirAllocService
|
||||
Map<String, List<SrvBillAirAllocOrder>> grouped = new LinkedHashMap<>();
|
||||
for (SrvBillAirAllocOrder order : allocMapper.selectOrders(codes))
|
||||
{
|
||||
if (order.getBillId() == null || order.getBillId().isBlank())
|
||||
if (order.getBillId() == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@@ -177,9 +177,9 @@ public class SrvBillAirAllocServiceImpl implements ISrvBillAirAllocService
|
||||
return grouped;
|
||||
}
|
||||
|
||||
private Map<String, String> payBillIds(Map<String, List<SrvBillAirAllocOrder>> orders)
|
||||
private Map<Long, String> payBillIds(Map<String, List<SrvBillAirAllocOrder>> orders)
|
||||
{
|
||||
List<String> billIds = new ArrayList<>();
|
||||
List<Long> billIds = new ArrayList<>();
|
||||
for (List<SrvBillAirAllocOrder> rows : orders.values())
|
||||
{
|
||||
for (SrvBillAirAllocOrder order : rows)
|
||||
@@ -187,10 +187,10 @@ public class SrvBillAirAllocServiceImpl implements ISrvBillAirAllocService
|
||||
billIds.add(order.getBillId());
|
||||
}
|
||||
}
|
||||
Map<String, String> payIds = new LinkedHashMap<>();
|
||||
Map<Long, String> payIds = new LinkedHashMap<>();
|
||||
for (int from = 0; from < billIds.size(); from += BATCH_SIZE)
|
||||
{
|
||||
List<String> chunk = billIds.subList(from, Math.min(from + BATCH_SIZE, billIds.size()));
|
||||
List<Long> chunk = billIds.subList(from, Math.min(from + BATCH_SIZE, billIds.size()));
|
||||
for (PrcPayBill payBill : allocMapper.selectPayBills(chunk))
|
||||
{
|
||||
if (payBill.getBillId() != null && payBill.getPayBillId() != null)
|
||||
@@ -231,7 +231,7 @@ public class SrvBillAirAllocServiceImpl implements ISrvBillAirAllocService
|
||||
return "";
|
||||
}
|
||||
|
||||
private PrcPayBillFee toOrderFee(SrvBillAirAllocFee fee, SrvBillAirAllocOrder order, BigDecimal amount, Map<String, String> payBillIds)
|
||||
private PrcPayBillFee toOrderFee(SrvBillAirAllocFee fee, SrvBillAirAllocOrder order, BigDecimal amount, Map<Long, String> payBillIds)
|
||||
{
|
||||
PrcPayBillFee row = new PrcPayBillFee();
|
||||
row.setFeeId(UUID.randomUUID().toString());
|
||||
|
||||
+1
-1
@@ -409,7 +409,7 @@ public class SrvBillAirFeeServiceImpl implements ISrvBillAirFeeService
|
||||
}
|
||||
Operator operator = operator();
|
||||
Date now = DateUtils.getNowDate();
|
||||
List<String> affectedBills = payBillFeeMapper.selectBillIdsByLadingFee(feeId);
|
||||
List<Long> affectedBills = payBillFeeMapper.selectBillIdsByLadingFee(feeId);
|
||||
payBillFeeMapper.markLadingFeeDeleted(feeId);
|
||||
payBillFeeService.refreshTotals(affectedBills);
|
||||
if (feeMapper.voidFee(feeId, code, operator.account, now) != 1)
|
||||
|
||||
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="createTime" column="create_time" />
|
||||
</resultMap>
|
||||
|
||||
<select id="selectByBillId" parameterType="String" resultMap="PrcPayBillFeeResult">
|
||||
<select id="selectByBillId" parameterType="Long" resultMap="PrcPayBillFeeResult">
|
||||
select fee_id, bill_id, pay_bill_id, fee_type, fee_name, sc_id, fee_level, amount, currency, round_mode, remark,
|
||||
fee_source, source_id, is_deleted, create_time
|
||||
from prc_pay_bill_fee
|
||||
@@ -74,14 +74,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<foreach collection="billIds" item="billId" open="(" separator="," close=")">#{billId}</foreach>
|
||||
</update>
|
||||
|
||||
<select id="selectBillIdsByLadingFee" resultType="String">
|
||||
<select id="selectBillIdsByLadingFee" resultType="Long">
|
||||
select distinct bill_id
|
||||
from prc_pay_bill_fee
|
||||
where fee_source = 'LADING'
|
||||
and sc_id = #{feeId}
|
||||
and ifnull(is_deleted, '0') = '0'
|
||||
and bill_id is not null
|
||||
and bill_id != ''
|
||||
</select>
|
||||
|
||||
<update id="markLadingFeeDeleted">
|
||||
@@ -100,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<foreach collection="feeIds" item="feeId" open="(" separator="," close=")">#{feeId}</foreach>
|
||||
</update>
|
||||
|
||||
<delete id="deleteByBillId" parameterType="String">
|
||||
<delete id="deleteByBillId" parameterType="Long">
|
||||
delete from prc_pay_bill_fee
|
||||
where bill_id = #{billId}
|
||||
and (fee_source is null or fee_source = '' or fee_source = 'CALC')
|
||||
|
||||
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
from prc_pay_bill
|
||||
</sql>
|
||||
|
||||
<select id="selectByBillId" parameterType="String" resultMap="PrcPayBillResult">
|
||||
<select id="selectByBillId" parameterType="Long" resultMap="PrcPayBillResult">
|
||||
<include refid="selectPrcPayBillVo"/>
|
||||
where bill_id = #{billId}
|
||||
</select>
|
||||
@@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<foreach collection="billIds" item="billId" open="(" separator="," close=")">#{billId}</foreach>
|
||||
</update>
|
||||
|
||||
<delete id="deleteByBillId" parameterType="String">
|
||||
<delete id="deleteByBillId" parameterType="Long">
|
||||
delete from prc_pay_bill where bill_id = #{billId}
|
||||
</delete>
|
||||
</mapper>
|
||||
|
||||
@@ -257,18 +257,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
where prc_income_bill_fee_id = #{oldFeeId}
|
||||
</update>
|
||||
|
||||
<!-- 现网关联表回写 order_id(旧 UUID 列不动) -->
|
||||
<!-- 应付表:正式列 bill_id/order_bill_id;旧 UUID 保留在 *_old -->
|
||||
|
||||
<update id="updatePayBillOrderId">
|
||||
update prc_pay_bill
|
||||
set order_id = #{newBillId}
|
||||
where bill_id = #{oldBillId}
|
||||
set bill_id = #{newBillId}
|
||||
where bill_id_old = #{oldBillId}
|
||||
</update>
|
||||
|
||||
<update id="updatePayFeeOrderId">
|
||||
update prc_pay_bill_fee
|
||||
set order_id = #{newBillId}
|
||||
where bill_id = #{oldBillId}
|
||||
set bill_id = #{newBillId}
|
||||
where bill_id_old = #{oldBillId}
|
||||
</update>
|
||||
|
||||
<update id="updateArDetailOrderId">
|
||||
@@ -279,8 +279,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
<update id="updatePayBillLineOrderId">
|
||||
update pay_bill_line
|
||||
set order_id = #{newBillId}
|
||||
where order_bill_id = #{oldBillId}
|
||||
set order_bill_id = #{newBillId}
|
||||
where order_bill_id_old = #{oldBillId}
|
||||
</update>
|
||||
|
||||
<!-- bill_id dropped; order_id is the live FK. No-op for legacy sync. -->
|
||||
|
||||
Reference in New Issue
Block a user