Compare commits
163 Commits
621128530a
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| d64f343ecd | |||
| 5b70e70159 | |||
| daf36e39e1 | |||
| 837633be3c | |||
| ad7cf3c18c | |||
| a0b9b58291 | |||
| 0445c4fa21 | |||
| 4b766184b5 | |||
| 5442967cb6 | |||
| 38d5471a9d | |||
| 0c477a232c | |||
| b13284ebaa | |||
| 69491b07d9 | |||
| b3ef85b0bb | |||
| b4569e5c15 | |||
| a72417b2c1 | |||
| 8df728f2d7 | |||
| ccfb05bf50 | |||
| fb15b12275 | |||
| 99aa751b2a | |||
| ca45e15559 | |||
| 6b2b205083 | |||
| 4f2954ebce | |||
| ec7f97f831 | |||
| 8d45439931 | |||
| e2deccc65a | |||
| 32cea1c348 | |||
| 2aec7fdd5c | |||
| 5c8e905a37 | |||
| ad2d8c8b50 | |||
| 8fb042f171 | |||
| 4ad799719a | |||
| d8f6ceda59 | |||
| e104c5a3e9 | |||
| fcaf0dc9be | |||
| c86cad30ec | |||
| 33e8a5890a | |||
| 8ede0bb5ec | |||
| 366ddff0b3 | |||
| e2d123de85 | |||
| e22f4bc9d7 | |||
| 7500728c1d | |||
| 9483bb4899 | |||
| 69d9971a79 | |||
| f6012f96e3 | |||
| 111176e767 | |||
| cce123890e | |||
| b76b26b2b1 | |||
| 6e01167f41 | |||
| e0b8eec98d | |||
| 54ac6428e7 | |||
| ee5c79ba29 | |||
| ea62697b98 | |||
| f00f8c619a | |||
| f9038c62ac | |||
| 49f24a6b1b | |||
| 9273fcec56 | |||
| 5b8d4de262 | |||
| 215effe036 | |||
| 4503424cf0 | |||
| 3cf7fa30bd | |||
| e34e4f117c | |||
| 03043104bc | |||
| a5cd752005 | |||
| 5d44cc4edf | |||
| 0400f55838 | |||
| 1b43bcca4c | |||
| a38e2c7f57 | |||
| 63ded27fd5 | |||
| 2f25a99396 | |||
| 206e4e786b | |||
| 48b7fbc7cf | |||
| 15a72e3503 | |||
| 0179a35942 | |||
| 99651b6758 | |||
| 2342d34194 | |||
| 4de755ca60 | |||
| bcd9c789cb | |||
| bf7b46a231 | |||
| 358e5a46b9 | |||
| 6f78b813f3 | |||
| a71f0a164f | |||
| ee36c8c902 | |||
| f7c7d9fe8b | |||
| 7e699fb80e | |||
| 80d639d887 | |||
| 87ae3e6674 | |||
| 359c3c18e4 | |||
| 4f2f2db20f | |||
| 0094e4aaff | |||
| 8b7c346ec4 | |||
| bde1d7d86e | |||
| 87eab12d51 | |||
| 880b4751c5 | |||
| 3a104d2d8c | |||
| a024b45940 | |||
| 6675808dfc | |||
| 2d5ffc4e06 | |||
| 1ba431540d | |||
| f03aa7be6c | |||
| 0d0613e810 | |||
| 47b95b6bfd | |||
| e7fd7f9059 | |||
| 1ffaf424b1 | |||
| 8ca5af1ff0 | |||
| 73ce7f4eae | |||
| b49600ab9f | |||
| fb41b2a86c | |||
| fe30b8576b | |||
| 65fcb6895a | |||
| d4f5bb8a4c | |||
| e71103af58 | |||
| 79cc524c03 | |||
| efc7ecbd01 | |||
| b8bbf36767 | |||
| 92cb19fbea | |||
| 4cb82ec107 | |||
| e0dc755ee3 | |||
| 6a02de8069 | |||
| 974f12429a | |||
| e06f07b3dd | |||
| 956fb08bea | |||
| 8d34f84cbb | |||
| b9cdb6c3f9 | |||
| f57af555ea | |||
| 220b01127b | |||
| aa61dc2d1c | |||
| 86ed86fc68 | |||
| fba8b786c0 | |||
| a4bda4d636 | |||
| 00e36cdf3f | |||
| 8eb5dca4f0 | |||
| b671ebefae | |||
| fb5d6d46a8 | |||
| 039c0d4858 | |||
| 43299e5329 | |||
| 3fe34c471c | |||
| 134855fc31 | |||
| 01cee41301 | |||
| 1f0d757e29 | |||
| 762cad2c0d | |||
| 7ef3f40a4f | |||
| 58e41b669d | |||
| 9a48abbacd | |||
| f95edbdf0a | |||
| b30dfdf675 | |||
| 9a393fe7dc | |||
| a2468099c2 | |||
| cbed4dc2a3 | |||
| d66b96b2ff | |||
| cdfc90556d | |||
| dfa90d6e33 | |||
| 4a34075022 | |||
| 6a03300f2f | |||
| 7496f8cbc6 | |||
| 2f2305825a | |||
| b79cd6f995 | |||
| 70a3c34c20 | |||
| 2b5633190e | |||
| 77dfb4291b | |||
| d71b7f04fe | |||
| f8ae347846 | |||
| 94991a1ed3 |
+10
@@ -90,6 +90,16 @@ public class BmsSupplierController extends BaseController
|
|||||||
return toAjax(bmsSupplierService.updateBmsSupplier(bmsSupplier));
|
return toAjax(bmsSupplierService.updateBmsSupplier(bmsSupplier));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 只绑定这一家供应商的渠道 */
|
||||||
|
@PreAuthorize("@ss.hasPermi('customersupplier:supplierinfo:bindChannel')")
|
||||||
|
@Log(title = "供应商绑定渠道", businessType = BusinessType.UPDATE)
|
||||||
|
@PutMapping("/{supplierId}/channels")
|
||||||
|
public AjaxResult bindChannels(@PathVariable("supplierId") Long supplierId, @RequestBody BmsSupplier bmsSupplier)
|
||||||
|
{
|
||||||
|
String channelIds = bmsSupplier == null ? "" : bmsSupplier.getChannelIds();
|
||||||
|
return toAjax(bmsSupplierService.bindChannels(supplierId, channelIds));
|
||||||
|
}
|
||||||
|
|
||||||
/** 删除供应商 */
|
/** 删除供应商 */
|
||||||
@PreAuthorize("@ss.hasPermi('customersupplier:supplierinfo:remove')")
|
@PreAuthorize("@ss.hasPermi('customersupplier:supplierinfo:remove')")
|
||||||
@Log(title = "供应商信息", businessType = BusinessType.DELETE)
|
@Log(title = "供应商信息", businessType = BusinessType.DELETE)
|
||||||
|
|||||||
+72
-1
@@ -40,10 +40,81 @@ public class PayPostcodeController extends BaseController
|
|||||||
public TableDataInfo list(PayPostcodeGroup query)
|
public TableDataInfo list(PayPostcodeGroup query)
|
||||||
{
|
{
|
||||||
startPage();
|
startPage();
|
||||||
List<PayPostcodeGroup> list = payPostcodeService.selectGroupList(query);
|
List<PayPostcodeGroup> list = payPostcodeService.selectCountryList(query);
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('data:payPostcode:query')")
|
||||||
|
@GetMapping("/zones")
|
||||||
|
public AjaxResult zones(PayPostcodeGroup query)
|
||||||
|
{
|
||||||
|
return success(payPostcodeService.selectZoneList(query));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('data:payPostcode:edit')")
|
||||||
|
@Log(title = "应付邮编配置", businessType = BusinessType.INSERT)
|
||||||
|
@PostMapping("/zones")
|
||||||
|
public AjaxResult addZone(@RequestBody PayPostcodeGroup zone)
|
||||||
|
{
|
||||||
|
return toAjax(payPostcodeService.addZone(zone, getUsername()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('data:payPostcode:edit')")
|
||||||
|
@Log(title = "应付邮编配置", businessType = BusinessType.UPDATE)
|
||||||
|
@PutMapping("/zones")
|
||||||
|
public AjaxResult editZone(@RequestBody PayPostcodeGroup zone)
|
||||||
|
{
|
||||||
|
return toAjax(payPostcodeService.updateZone(zone));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('data:payPostcode:remove')")
|
||||||
|
@Log(title = "应付邮编配置", businessType = BusinessType.DELETE)
|
||||||
|
@DeleteMapping("/zones")
|
||||||
|
public AjaxResult removeZone(PayPostcodeGroup zone)
|
||||||
|
{
|
||||||
|
return toAjax(payPostcodeService.deleteZone(zone));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('data:payPostcode:edit')")
|
||||||
|
@Log(title = "应付邮编配置", businessType = BusinessType.UPDATE)
|
||||||
|
@PutMapping("/country")
|
||||||
|
public AjaxResult editCountry(@RequestBody PayPostcodeGroup country)
|
||||||
|
{
|
||||||
|
return toAjax(payPostcodeService.updateCountry(country));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('data:payPostcode:remove')")
|
||||||
|
@Log(title = "应付邮编配置", businessType = BusinessType.DELETE)
|
||||||
|
@DeleteMapping("/country")
|
||||||
|
public AjaxResult removeCountry(PayPostcodeGroup country)
|
||||||
|
{
|
||||||
|
return toAjax(payPostcodeService.deleteCountry(country));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('data:payPostcode:edit')")
|
||||||
|
@Log(title = "应付邮编配置", businessType = BusinessType.INSERT)
|
||||||
|
@PostMapping("/lines")
|
||||||
|
public AjaxResult addLine(@RequestBody PayPostcodeLine line)
|
||||||
|
{
|
||||||
|
return toAjax(payPostcodeService.addLine(line));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('data:payPostcode:edit')")
|
||||||
|
@Log(title = "应付邮编配置", businessType = BusinessType.UPDATE)
|
||||||
|
@PutMapping("/lines")
|
||||||
|
public AjaxResult editLine(@RequestBody PayPostcodeLine line)
|
||||||
|
{
|
||||||
|
return toAjax(payPostcodeService.updateLine(line));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('data:payPostcode:remove')")
|
||||||
|
@Log(title = "应付邮编配置", businessType = BusinessType.DELETE)
|
||||||
|
@DeleteMapping("/lines/{lineIds}")
|
||||||
|
public AjaxResult removeLines(@PathVariable Long[] lineIds)
|
||||||
|
{
|
||||||
|
return toAjax(payPostcodeService.deleteLines(lineIds));
|
||||||
|
}
|
||||||
|
|
||||||
/** 按国家去重区块,供附加费编辑分区下拉 */
|
/** 按国家去重区块,供附加费编辑分区下拉 */
|
||||||
@PreAuthorize("@ss.hasPermi('data:payPostcode:list')")
|
@PreAuthorize("@ss.hasPermi('data:payPostcode:list')")
|
||||||
@GetMapping("/blockOptions")
|
@GetMapping("/blockOptions")
|
||||||
|
|||||||
+5
-6
@@ -33,16 +33,15 @@ public class BillingTaskMonitorController extends BaseController
|
|||||||
@Autowired
|
@Autowired
|
||||||
private IPrcBillingTaskService billingTaskService;
|
private IPrcBillingTaskService billingTaskService;
|
||||||
|
|
||||||
/** 默认列表 = FAILED 异常任务。 */
|
/** 列表默认不过滤状态(全部);successStatus=ALL 同样不过滤。 */
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:billingTask:list')")
|
@PreAuthorize("@ss.hasPermi('monitor:billingTask:list')")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo list(PrcBillingTask query)
|
public TableDataInfo list(PrcBillingTask query)
|
||||||
{
|
{
|
||||||
if (query.getSuccessStatus() == null || query.getSuccessStatus().isEmpty())
|
// 空/全部:不过滤状态;仍可按 FAILED/WAITING/SUCCESS 筛选
|
||||||
{
|
if (query.getSuccessStatus() == null
|
||||||
query.setSuccessStatus(BillTaskSuccessStatus.FAILED.getCode());
|
|| query.getSuccessStatus().isEmpty()
|
||||||
}
|
|| "ALL".equalsIgnoreCase(query.getSuccessStatus()))
|
||||||
else if ("ALL".equalsIgnoreCase(query.getSuccessStatus()))
|
|
||||||
{
|
{
|
||||||
query.setSuccessStatus(null);
|
query.setSuccessStatus(null);
|
||||||
}
|
}
|
||||||
|
|||||||
+21
-26
@@ -2,7 +2,6 @@ package com.bms.web.controller.price;
|
|||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -168,8 +167,9 @@ public class BillingController extends BaseController
|
|||||||
{
|
{
|
||||||
query = new PrcOrderBill();
|
query = new PrcOrderBill();
|
||||||
}
|
}
|
||||||
// 计费列表只展示计费成功的订单。
|
// 计费列表:仅展示 prc_income_bill 存在的订单
|
||||||
query.setBillingFailStatuses(limitBillingListFailStatus());
|
query.setRequireIncomeBill(Boolean.TRUE);
|
||||||
|
query.setBillingFailStatuses(null);
|
||||||
query.setBillingFailStatus(null);
|
query.setBillingFailStatus(null);
|
||||||
startPage();
|
startPage();
|
||||||
List<PrcOrderBill> list = prcOrderBillService.selectBillList(query);
|
List<PrcOrderBill> list = prcOrderBillService.selectBillList(query);
|
||||||
@@ -177,7 +177,7 @@ public class BillingController extends BaseController
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 按当前筛选条件异步导出计费列表(状态限定为成功 success=0)。
|
* 按当前筛选条件异步导出计费列表(仅 prc_income_bill 存在)。
|
||||||
* 需至少一个有效筛选条件。轮询任务完成后再下载。
|
* 需至少一个有效筛选条件。轮询任务完成后再下载。
|
||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('price:billing:export')")
|
@PreAuthorize("@ss.hasPermi('price:billing:export')")
|
||||||
@@ -194,7 +194,8 @@ public class BillingController extends BaseController
|
|||||||
{
|
{
|
||||||
return error(MessageUtils.message("price.bill.export.filterRequired"));
|
return error(MessageUtils.message("price.bill.export.filterRequired"));
|
||||||
}
|
}
|
||||||
query.setBillingFailStatuses(limitBillingListFailStatus());
|
query.setRequireIncomeBill(Boolean.TRUE);
|
||||||
|
query.setBillingFailStatuses(null);
|
||||||
query.setBillingFailStatus(null);
|
query.setBillingFailStatus(null);
|
||||||
return successTask(prcOrderBillService.submitOrderBillExport(
|
return successTask(prcOrderBillService.submitOrderBillExport(
|
||||||
PrcOrderBillExportTask.TYPE_BILLING, query));
|
PrcOrderBillExportTask.TYPE_BILLING, query));
|
||||||
@@ -220,13 +221,7 @@ public class BillingController extends BaseController
|
|||||||
prcOrderBillService.downloadOrderBillExport(taskId, response);
|
prcOrderBillService.downloadOrderBillExport(taskId, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<Integer> limitBillingListFailStatus()
|
/** 全部 prc_order_bill 记录。计费列表按 prc_income_bill 存在过滤。 */
|
||||||
{
|
|
||||||
// 计费列表仅包含成功数据(billing_fail_status = 0)。
|
|
||||||
return new ArrayList<Integer>(Arrays.asList(Integer.valueOf(0)));
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 全部 prc_order_bill 记录。计费列表仍限定为状态 0。 */
|
|
||||||
@PreAuthorize("@ss.hasPermi('price:orderBill:list')")
|
@PreAuthorize("@ss.hasPermi('price:orderBill:list')")
|
||||||
@GetMapping("/orderBill/list")
|
@GetMapping("/orderBill/list")
|
||||||
public TableDataInfo orderBillList(PrcOrderBill query)
|
public TableDataInfo orderBillList(PrcOrderBill query)
|
||||||
@@ -253,7 +248,7 @@ public class BillingController extends BaseController
|
|||||||
/** 订单列表弹窗:按 billId 查询计费失败原因(受数据权限控制)。 */
|
/** 订单列表弹窗:按 billId 查询计费失败原因(受数据权限控制)。 */
|
||||||
@PreAuthorize("@ss.hasPermi('price:orderBill:list')")
|
@PreAuthorize("@ss.hasPermi('price:orderBill:list')")
|
||||||
@GetMapping("/orderBill/{billId}/failReason")
|
@GetMapping("/orderBill/{billId}/failReason")
|
||||||
public AjaxResult orderBillFailReason(@PathVariable("billId") String billId)
|
public AjaxResult orderBillFailReason(@PathVariable("billId") Long billId)
|
||||||
{
|
{
|
||||||
return success(prcOrderBillService.getBillingFailReason(billId));
|
return success(prcOrderBillService.getBillingFailReason(billId));
|
||||||
}
|
}
|
||||||
@@ -378,9 +373,9 @@ public class BillingController extends BaseController
|
|||||||
return query;
|
return query;
|
||||||
}
|
}
|
||||||
|
|
||||||
@PreAuthorize("@ss.hasPermi('price:billing:bill') or @ss.hasPermi('price:orderBill:list')")
|
@PreAuthorize("@ss.hasPermi('price:billing:bill') or @ss.hasPermi('price:orderBill:list') or @ss.hasPermi('price:payOrder:query')")
|
||||||
@GetMapping("/bill/{billId}")
|
@GetMapping("/bill/{billId}")
|
||||||
public AjaxResult getBill(@PathVariable String billId)
|
public AjaxResult getBill(@PathVariable Long billId)
|
||||||
{
|
{
|
||||||
return success(prcOrderBillService.getBill(billId));
|
return success(prcOrderBillService.getBill(billId));
|
||||||
}
|
}
|
||||||
@@ -389,15 +384,15 @@ public class BillingController extends BaseController
|
|||||||
* 该订单的 ES BILL 日志(计费 / 上游同步 / 失败快照)。
|
* 该订单的 ES BILL 日志(计费 / 上游同步 / 失败快照)。
|
||||||
* bizId 优先取 transferNo,其次取 orderNo(与写入路径一致)。
|
* bizId 优先取 transferNo,其次取 orderNo(与写入路径一致)。
|
||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('price:billing:bill') or @ss.hasPermi('price:orderBill:list')")
|
@PreAuthorize("@ss.hasPermi('price:billing:bill') or @ss.hasPermi('price:orderBill:list') or @ss.hasPermi('price:payOrder:query')")
|
||||||
@GetMapping("/bill/{billId}/history")
|
@GetMapping("/bill/{billId}/history")
|
||||||
public TableDataInfo billHistory(@PathVariable("billId") String billId)
|
public TableDataInfo billHistory(@PathVariable("billId") Long billId)
|
||||||
{
|
{
|
||||||
if (StringUtils.isEmpty(billId))
|
if (billId == null)
|
||||||
{
|
{
|
||||||
return getDataTable(new ArrayList<BillSyncSnapshot>());
|
return getDataTable(new ArrayList<BillSyncSnapshot>());
|
||||||
}
|
}
|
||||||
TmsPriceQuoteResult bill = prcOrderBillService.getBill(billId.trim());
|
TmsPriceQuoteResult bill = prcOrderBillService.getBill(billId);
|
||||||
if (bill == null)
|
if (bill == null)
|
||||||
{
|
{
|
||||||
TableDataInfo empty = new TableDataInfo();
|
TableDataInfo empty = new TableDataInfo();
|
||||||
@@ -482,13 +477,13 @@ public class BillingController extends BaseController
|
|||||||
@PreAuthorize("@ss.hasPermi('price:billing:refund')")
|
@PreAuthorize("@ss.hasPermi('price:billing:refund')")
|
||||||
@Log(title = "Billing refund", businessType = BusinessType.UPDATE)
|
@Log(title = "Billing refund", businessType = BusinessType.UPDATE)
|
||||||
@PostMapping("/bill/{billId}/refund")
|
@PostMapping("/bill/{billId}/refund")
|
||||||
public AjaxResult refundBill(@PathVariable("billId") String billId)
|
public AjaxResult refundBill(@PathVariable("billId") Long billId)
|
||||||
{
|
{
|
||||||
if (StringUtils.isEmpty(billId))
|
if (billId == null)
|
||||||
{
|
{
|
||||||
return error("billId required");
|
return error("billId required");
|
||||||
}
|
}
|
||||||
TmsPriceQuoteResult bill = prcOrderBillService.getBill(billId.trim());
|
TmsPriceQuoteResult bill = prcOrderBillService.getBill(billId);
|
||||||
if (bill == null || StringUtils.isEmpty(bill.getOrderNo()))
|
if (bill == null || StringUtils.isEmpty(bill.getOrderNo()))
|
||||||
{
|
{
|
||||||
return error("bill not found");
|
return error("bill not found");
|
||||||
@@ -519,7 +514,7 @@ public class BillingController extends BaseController
|
|||||||
@PreAuthorize("@ss.hasPermi('price:billing:arrearsUpdate')")
|
@PreAuthorize("@ss.hasPermi('price:billing:arrearsUpdate')")
|
||||||
@Log(title = "Billing credit arrears", businessType = BusinessType.UPDATE)
|
@Log(title = "Billing credit arrears", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping("/bill/creditArrears")
|
@PutMapping("/bill/creditArrears")
|
||||||
public AjaxResult updateCreditArrears(@RequestBody java.util.List<String> billIds)
|
public AjaxResult updateCreditArrears(@RequestBody java.util.List<Long> billIds)
|
||||||
{
|
{
|
||||||
if (billIds == null || billIds.isEmpty())
|
if (billIds == null || billIds.isEmpty())
|
||||||
{
|
{
|
||||||
@@ -527,7 +522,7 @@ public class BillingController extends BaseController
|
|||||||
}
|
}
|
||||||
int success = 0;
|
int success = 0;
|
||||||
java.util.List<String> fails = new java.util.ArrayList<String>();
|
java.util.List<String> fails = new java.util.ArrayList<String>();
|
||||||
for (String billId : billIds)
|
for (Long billId : billIds)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -541,7 +536,7 @@ public class BillingController extends BaseController
|
|||||||
{
|
{
|
||||||
msg = e.getClass().getSimpleName();
|
msg = e.getClass().getSimpleName();
|
||||||
}
|
}
|
||||||
fails.add((billId == null ? "" : billId) + ": " + msg);
|
fails.add((billId == null ? "" : String.valueOf(billId)) + ": " + msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (fails.isEmpty())
|
if (fails.isEmpty())
|
||||||
@@ -664,7 +659,7 @@ public class BillingController extends BaseController
|
|||||||
@PreAuthorize("@ss.hasPermi('price:billing:feeRemove')")
|
@PreAuthorize("@ss.hasPermi('price:billing:feeRemove')")
|
||||||
@Log(title = "Billing income fee", businessType = BusinessType.DELETE)
|
@Log(title = "Billing income fee", businessType = BusinessType.DELETE)
|
||||||
@DeleteMapping("/bill/fee/{feeId}")
|
@DeleteMapping("/bill/fee/{feeId}")
|
||||||
public AjaxResult deleteIncomeFee(@PathVariable String feeId)
|
public AjaxResult deleteIncomeFee(@PathVariable Long feeId)
|
||||||
{
|
{
|
||||||
return success(prcOrderBillService.deleteIncomeFee(feeId));
|
return success(prcOrderBillService.deleteIncomeFee(feeId));
|
||||||
}
|
}
|
||||||
|
|||||||
+66
-24
@@ -8,6 +8,7 @@ import java.util.Locale;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
import org.springframework.security.core.Authentication;
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
@@ -24,15 +25,19 @@ import com.bms.common.core.domain.AjaxResult;
|
|||||||
import com.bms.common.core.page.TableDataInfo;
|
import com.bms.common.core.page.TableDataInfo;
|
||||||
import com.bms.common.enums.BusinessType;
|
import com.bms.common.enums.BusinessType;
|
||||||
import com.bms.common.exception.ServiceException;
|
import com.bms.common.exception.ServiceException;
|
||||||
import com.bms.price.domain.PaySaveCommand;
|
import com.bms.price.domain.LblProduct;
|
||||||
|
import com.bms.price.domain.LblSurcharge;
|
||||||
|
import com.bms.price.domain.LblWeightBand;
|
||||||
|
import com.bms.price.domain.LblSaveCommand;
|
||||||
|
|
||||||
import com.bms.price.domain.PrcCustomerPriceSet;
|
import com.bms.price.domain.PrcCustomerPriceSet;
|
||||||
import com.bms.price.domain.PrcCustomerPriceSetBatch;
|
import com.bms.price.domain.PrcCustomerPriceSetBatch;
|
||||||
import com.bms.price.domain.PrcPriceSet;
|
import com.bms.price.domain.PrcPriceSet;
|
||||||
import com.bms.price.service.IPayProductService;
|
import com.bms.price.service.ILblProductService;
|
||||||
import com.bms.price.service.IPrcPriceSetService;
|
import com.bms.price.service.IPrcPriceSetService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 打单套餐:套餐壳 + 应收价卡(pay_*)。
|
* 打单套餐:套餐壳 + 独立打单价卡(prc_label_*)。
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/price/label")
|
@RequestMapping("/price/label")
|
||||||
@@ -42,7 +47,7 @@ public class LabelPackageController extends BaseController
|
|||||||
private IPrcPriceSetService priceSetService;
|
private IPrcPriceSetService priceSetService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private IPayProductService payProductService;
|
private ILblProductService lblProductService;
|
||||||
|
|
||||||
@PreAuthorize("@ss.hasPermi('price:label:list')")
|
@PreAuthorize("@ss.hasPermi('price:label:list')")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
@@ -126,30 +131,37 @@ public class LabelPackageController extends BaseController
|
|||||||
priceSetService.assertSetCategory(priceSetId, PrcPriceSet.CATEGORY_LABEL);
|
priceSetService.assertSetCategory(priceSetId, PrcPriceSet.CATEGORY_LABEL);
|
||||||
}
|
}
|
||||||
// 打单独立预览:已存在按本套餐判断,不与应付公共模板互挡
|
// 打单独立预览:已存在按本套餐判断,不与应付公共模板互挡
|
||||||
return success(payProductService.previewLabel(file.getBytes(), name, dictValue, progressId, priceSetId));
|
return success(lblProductService.preview(file.getBytes(), name, dictValue, progressId, priceSetId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@PreAuthorize("@ss.hasPermi('price:label:import')")
|
@PreAuthorize("@ss.hasPermi('price:label:import')")
|
||||||
@GetMapping("/preview/progress")
|
@GetMapping("/preview/progress")
|
||||||
public AjaxResult parseProgress(@RequestParam("progressId") String progressId)
|
public AjaxResult parseProgress(@RequestParam("progressId") String progressId)
|
||||||
{
|
{
|
||||||
return success(payProductService.parseProgress(progressId));
|
return success(lblProductService.parseProgress(progressId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@PreAuthorize("@ss.hasPermi('price:label:import')")
|
@PreAuthorize("@ss.hasPermi('price:label:import')")
|
||||||
@Log(title = "打单套餐导入", businessType = BusinessType.IMPORT)
|
@Log(title = "打单套餐导入", businessType = BusinessType.IMPORT)
|
||||||
@PostMapping("/importSave")
|
@PostMapping("/importSave")
|
||||||
public AjaxResult importSave(@RequestBody PaySaveCommand command)
|
public AjaxResult importSave(@RequestBody LblSaveCommand command)
|
||||||
{
|
{
|
||||||
if (command == null)
|
if (command == null)
|
||||||
{
|
{
|
||||||
throw new ServiceException("保存参数不能为空");
|
throw new ServiceException("保存参数不能为空");
|
||||||
}
|
}
|
||||||
String message = payProductService.saveLabel(command);
|
String taskId = lblProductService.submitSave(command);
|
||||||
Map<String, Object> payload = new HashMap<String, Object>();
|
Map<String, Object> payload = new HashMap<String, Object>();
|
||||||
payload.put("message", message);
|
payload.put("taskId", taskId);
|
||||||
payload.put("priceSetId", command.getPriceSetId());
|
// data.taskId + 顶层 taskId,兼容前端不同取值方式
|
||||||
return success(payload);
|
return success(payload).put("taskId", taskId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:label:import')")
|
||||||
|
@GetMapping("/importSave/task/{taskId}")
|
||||||
|
public AjaxResult importSaveTask(@PathVariable String taskId)
|
||||||
|
{
|
||||||
|
return success(lblProductService.getSaveTask(taskId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@PreAuthorize("@ss.hasPermi('price:label:list')")
|
@PreAuthorize("@ss.hasPermi('price:label:list')")
|
||||||
@@ -157,7 +169,7 @@ public class LabelPackageController extends BaseController
|
|||||||
public AjaxResult versions(@PathVariable Long priceSetId)
|
public AjaxResult versions(@PathVariable Long priceSetId)
|
||||||
{
|
{
|
||||||
priceSetService.assertSetCategory(priceSetId, PrcPriceSet.CATEGORY_LABEL);
|
priceSetService.assertSetCategory(priceSetId, PrcPriceSet.CATEGORY_LABEL);
|
||||||
return success(payProductService.selectLabelVersions(priceSetId));
|
return success(lblProductService.selectVersions(priceSetId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@PreAuthorize("@ss.hasPermi('price:label:edit')")
|
@PreAuthorize("@ss.hasPermi('price:label:edit')")
|
||||||
@@ -168,19 +180,19 @@ public class LabelPackageController extends BaseController
|
|||||||
{
|
{
|
||||||
priceSetService.assertSetCategory(priceSetId, PrcPriceSet.CATEGORY_LABEL);
|
priceSetService.assertSetCategory(priceSetId, PrcPriceSet.CATEGORY_LABEL);
|
||||||
Date effectiveTime = parseEffectiveTime(body == null ? null : body.get("effectiveTime"));
|
Date effectiveTime = parseEffectiveTime(body == null ? null : body.get("effectiveTime"));
|
||||||
String message = payProductService.activateLabelVersion(priceSetId, versionNo, effectiveTime);
|
String message = lblProductService.activateVersion(priceSetId, versionNo, effectiveTime);
|
||||||
Map<String, Object> payload = new HashMap<String, Object>();
|
Map<String, Object> payload = new HashMap<String, Object>();
|
||||||
payload.put("message", message);
|
payload.put("message", message);
|
||||||
return success(payload);
|
return success(payload);
|
||||||
}
|
}
|
||||||
|
|
||||||
@PreAuthorize("@ss.hasPermi('price:label:remove')")
|
@PreAuthorize("@ss.hasPermi('price:label:edit')")
|
||||||
@Log(title = "打单套餐删除版本", businessType = BusinessType.DELETE)
|
@Log(title = "打单套餐删除版本", businessType = BusinessType.DELETE)
|
||||||
@DeleteMapping("/{priceSetId}/versions/{versionNo}")
|
@DeleteMapping("/{priceSetId}/versions/{versionNo}")
|
||||||
public AjaxResult deleteVersion(@PathVariable Long priceSetId, @PathVariable Integer versionNo)
|
public AjaxResult deleteVersion(@PathVariable Long priceSetId, @PathVariable Integer versionNo)
|
||||||
{
|
{
|
||||||
priceSetService.assertSetCategory(priceSetId, PrcPriceSet.CATEGORY_LABEL);
|
priceSetService.assertSetCategory(priceSetId, PrcPriceSet.CATEGORY_LABEL);
|
||||||
return toAjax(payProductService.deleteLabelVersion(priceSetId, versionNo));
|
return toAjax(lblProductService.deleteVersion(priceSetId, versionNo));
|
||||||
}
|
}
|
||||||
|
|
||||||
@PreAuthorize("@ss.hasPermi('price:label:list')")
|
@PreAuthorize("@ss.hasPermi('price:label:list')")
|
||||||
@@ -191,23 +203,53 @@ public class LabelPackageController extends BaseController
|
|||||||
priceSetService.assertSetCategory(priceSetId, PrcPriceSet.CATEGORY_LABEL);
|
priceSetService.assertSetCategory(priceSetId, PrcPriceSet.CATEGORY_LABEL);
|
||||||
if (versionNo != null)
|
if (versionNo != null)
|
||||||
{
|
{
|
||||||
return success(payProductService.selectLabelProductsByVersion(priceSetId, versionNo));
|
return success(lblProductService.selectProductsByVersion(priceSetId, versionNo));
|
||||||
}
|
}
|
||||||
return success(payProductService.selectLabelProducts(priceSetId));
|
return success(lblProductService.selectProducts(priceSetId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@PreAuthorize("@ss.hasPermi('price:label:query')")
|
@PreAuthorize("@ss.hasPermi('price:label:query')")
|
||||||
@GetMapping("/product/{productId}")
|
@GetMapping("/product/{productId}")
|
||||||
public AjaxResult productDetail(@PathVariable Long productId,
|
public AjaxResult productDetail(@PathVariable Long productId,
|
||||||
@RequestParam(value = "termId", required = false) Long termId)
|
@RequestParam(value = "termId", required = false) Long termId,
|
||||||
|
@RequestParam(value = "versionId", required = false) Long versionId)
|
||||||
{
|
{
|
||||||
if (termId != null)
|
Long vid = versionId != null ? versionId : termId;
|
||||||
|
if (vid != null)
|
||||||
{
|
{
|
||||||
return success(payProductService.selectPayProductDetailByTerm(termId));
|
return success(lblProductService.selectDetailByVersionId(vid));
|
||||||
}
|
}
|
||||||
return success(payProductService.selectPayProductDetail(productId));
|
throw new ServiceException("请传入 versionId");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 保存打单产品明细(重量段/附加费等),按当前 version 覆盖子表 */
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:label:edit')")
|
||||||
|
@Log(title = "打单产品明细", businessType = BusinessType.UPDATE)
|
||||||
|
@PutMapping("/product")
|
||||||
|
public AjaxResult updateProduct(@RequestBody LblProduct product)
|
||||||
|
{
|
||||||
|
return toAjax(lblProductService.updateDetail(product));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 仅保存当前重量段行 */
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:label:edit')")
|
||||||
|
@Log(title = "打单重量段", businessType = BusinessType.UPDATE)
|
||||||
|
@PutMapping("/product/band")
|
||||||
|
public AjaxResult updateWeightBand(@RequestBody LblWeightBand band)
|
||||||
|
{
|
||||||
|
return toAjax(lblProductService.updateWeightBand(band));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 仅保存当前附加费行 */
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:label:edit')")
|
||||||
|
@Log(title = "打单附加费", businessType = BusinessType.UPDATE)
|
||||||
|
@PutMapping("/product/surcharge")
|
||||||
|
public AjaxResult updateSurcharge(@RequestBody LblSurcharge surcharge)
|
||||||
|
{
|
||||||
|
return toAjax(lblProductService.updateSurcharge(surcharge));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/** 查询打单产品已绑定渠道(默认应收 AR) */
|
/** 查询打单产品已绑定渠道(默认应收 AR) */
|
||||||
@PreAuthorize("@ss.hasPermi('price:label:query')")
|
@PreAuthorize("@ss.hasPermi('price:label:query')")
|
||||||
@GetMapping("/product/{productId}/channels")
|
@GetMapping("/product/{productId}/channels")
|
||||||
@@ -215,7 +257,7 @@ public class LabelPackageController extends BaseController
|
|||||||
@RequestParam(value = "payType", required = false) String payType)
|
@RequestParam(value = "payType", required = false) String payType)
|
||||||
{
|
{
|
||||||
String type = (payType == null || payType.trim().isEmpty()) ? "AR" : payType.trim();
|
String type = (payType == null || payType.trim().isEmpty()) ? "AR" : payType.trim();
|
||||||
return success(payProductService.listProductChannelBinds(productId, type));
|
return success(lblProductService.listProductChannelBinds(productId, type));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 覆盖保存打单产品渠道绑定,写入 srv_channel_product_map */
|
/** 覆盖保存打单产品渠道绑定,写入 srv_channel_product_map */
|
||||||
@@ -237,7 +279,7 @@ public class LabelPackageController extends BaseController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
String msg = payProductService.replaceProductChannelBinds(productId, payType, channelIds);
|
String msg = lblProductService.replaceProductChannelBinds(productId, payType, channelIds);
|
||||||
return AjaxResult.success(msg);
|
return AjaxResult.success(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -247,7 +289,7 @@ public class LabelPackageController extends BaseController
|
|||||||
public AjaxResult removeProducts(@PathVariable Long priceSetId, @PathVariable Long[] productIds)
|
public AjaxResult removeProducts(@PathVariable Long priceSetId, @PathVariable Long[] productIds)
|
||||||
{
|
{
|
||||||
priceSetService.assertSetCategory(priceSetId, PrcPriceSet.CATEGORY_LABEL);
|
priceSetService.assertSetCategory(priceSetId, PrcPriceSet.CATEGORY_LABEL);
|
||||||
return toAjax(payProductService.removeLabelProducts(priceSetId, productIds));
|
return toAjax(lblProductService.removeProducts(priceSetId, productIds));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,14 @@
|
|||||||
package com.bms.web.controller.price;
|
package com.bms.web.controller.price;
|
||||||
|
|
||||||
|
import java.net.URLEncoder;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
@@ -15,6 +21,7 @@ import com.bms.common.core.domain.AjaxResult;
|
|||||||
import com.bms.common.core.page.TableDataInfo;
|
import com.bms.common.core.page.TableDataInfo;
|
||||||
import com.bms.price.domain.PayBill;
|
import com.bms.price.domain.PayBill;
|
||||||
import com.bms.price.domain.PayBillCommand;
|
import com.bms.price.domain.PayBillCommand;
|
||||||
|
import com.bms.price.domain.PayBillFile;
|
||||||
import com.bms.price.service.IPayBillService;
|
import com.bms.price.service.IPayBillService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -119,4 +126,176 @@ public class PayBillController extends BaseController
|
|||||||
payBillService.voidBill(command);
|
payBillService.voidBill(command);
|
||||||
return success();
|
return success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 草稿提交审核。
|
||||||
|
*
|
||||||
|
* @param billId 应付账单ID
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasAnyPermi('price:payBill:submit,price:payBill:confirm')")
|
||||||
|
@PutMapping("/submit/{billId}")
|
||||||
|
public AjaxResult submit(@PathVariable Long billId)
|
||||||
|
{
|
||||||
|
payBillService.submit(billId);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核通过。蓝字账单需要先有凭证。
|
||||||
|
*
|
||||||
|
* @param billId 应付账单ID
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasAnyPermi('price:payBill:approve,price:payBill:confirm')")
|
||||||
|
@PutMapping("/approve/{billId}")
|
||||||
|
public AjaxResult approve(@PathVariable Long billId)
|
||||||
|
{
|
||||||
|
payBillService.approve(billId);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核驳回。
|
||||||
|
*
|
||||||
|
* @param command 账单ID和驳回意见
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasAnyPermi('price:payBill:approve,price:payBill:confirm')")
|
||||||
|
@PutMapping("/reject")
|
||||||
|
public AjaxResult reject(@RequestBody PayBillCommand command)
|
||||||
|
{
|
||||||
|
payBillService.reject(command);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 草稿登记对方金额。
|
||||||
|
*
|
||||||
|
* @param command 账单和费用行
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasAnyPermi('price:payBill:add,price:payBill:submit')")
|
||||||
|
@PutMapping("/diff")
|
||||||
|
public AjaxResult diff(@RequestBody PayBillCommand command)
|
||||||
|
{
|
||||||
|
payBillService.saveSupplierAmounts(command);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 接受我方或接受对方金额。
|
||||||
|
*
|
||||||
|
* @param command 费用行和处理方式
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasAnyPermi('price:payBill:add,price:payBill:submit')")
|
||||||
|
@PutMapping("/diff/accept")
|
||||||
|
public AjaxResult accept(@RequestBody PayBillCommand command)
|
||||||
|
{
|
||||||
|
payBillService.acceptDiff(command);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 从草稿剔除一条费用。
|
||||||
|
*
|
||||||
|
* @param command 账单ID和行ID
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasAnyPermi('price:payBill:add,price:payBill:submit')")
|
||||||
|
@PutMapping("/line/remove")
|
||||||
|
public AjaxResult removeLine(@RequestBody PayBillCommand command)
|
||||||
|
{
|
||||||
|
payBillService.removeLine(command);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 上传应付凭证。
|
||||||
|
*
|
||||||
|
* @param file 凭证
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasAnyPermi('price:payVoucher:add,price:payBill:add')")
|
||||||
|
@PostMapping("/file")
|
||||||
|
public AjaxResult saveFile(@RequestBody PayBillFile file)
|
||||||
|
{
|
||||||
|
payBillService.saveFile(file);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除应付凭证。
|
||||||
|
*
|
||||||
|
* @param fileId 凭证ID
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasAnyPermi('price:payVoucher:remove,price:payBill:void')")
|
||||||
|
@DeleteMapping("/file/{fileId}")
|
||||||
|
public AjaxResult deleteFile(@PathVariable Long fileId)
|
||||||
|
{
|
||||||
|
payBillService.deleteFile(fileId);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询应付凭证。
|
||||||
|
*
|
||||||
|
* @param query 账单号、供应商、发票号、类型
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasAnyPermi('price:payVoucher:list,price:payBill:query')")
|
||||||
|
@GetMapping("/file/list")
|
||||||
|
public TableDataInfo fileList(PayBillFile query)
|
||||||
|
{
|
||||||
|
startPage();
|
||||||
|
return getDataTable(payBillService.listFiles(query));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 对未付款的已确认账单开红字。
|
||||||
|
*
|
||||||
|
* @param command 原账单和原因
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasAnyPermi('price:payBill:approve,price:payBill:confirm')")
|
||||||
|
@PostMapping("/red")
|
||||||
|
public AjaxResult red(@RequestBody PayBillCommand command)
|
||||||
|
{
|
||||||
|
return success(payBillService.redBill(command));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 草稿保存税率和汇率。
|
||||||
|
*
|
||||||
|
* @param command 账单、税率、汇率和汇率日期
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasAnyPermi('price:payBill:add,price:payBill:submit')")
|
||||||
|
@PutMapping("/finance")
|
||||||
|
public AjaxResult finance(@RequestBody PayBillCommand command)
|
||||||
|
{
|
||||||
|
payBillService.saveFinance(command);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 导出对账单。
|
||||||
|
*
|
||||||
|
* @param billId 应付账单ID
|
||||||
|
* @param response 文件流
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payBill:query')")
|
||||||
|
@GetMapping("/statement/{billId}")
|
||||||
|
public void statement(@PathVariable Long billId, HttpServletResponse response) throws Exception
|
||||||
|
{
|
||||||
|
String name = URLEncoder.encode("应付对账单.xlsx", StandardCharsets.UTF_8).replace("+", "%20");
|
||||||
|
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
||||||
|
response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + name);
|
||||||
|
payBillService.exportStatement(billId, response.getOutputStream());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 导入对方金额。
|
||||||
|
*
|
||||||
|
* @param billId 应付账单ID
|
||||||
|
* @param file 导出的对账单
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasAnyPermi('price:payBill:add,price:payBill:submit')")
|
||||||
|
@PostMapping("/diff/import")
|
||||||
|
public AjaxResult importDiff(@RequestParam Long billId, @RequestParam("file") MultipartFile file)
|
||||||
|
{
|
||||||
|
payBillService.importSupplierAmounts(billId, file);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+155
@@ -0,0 +1,155 @@
|
|||||||
|
package com.bms.web.controller.price;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
import com.bms.common.core.controller.BaseController;
|
||||||
|
import com.bms.common.core.domain.AjaxResult;
|
||||||
|
import com.bms.common.core.page.TableDataInfo;
|
||||||
|
import com.bms.price.domain.PayOrderFeeLine;
|
||||||
|
import com.bms.price.domain.PayOrderQuery;
|
||||||
|
import com.bms.price.domain.PayOrderRecalcCommand;
|
||||||
|
import com.bms.price.domain.PayOrderRecalcTask;
|
||||||
|
import com.bms.price.service.IPayOrderListService;
|
||||||
|
import com.bms.price.service.IPrcOrderBillService;
|
||||||
|
|
||||||
|
/** 提单管理下的应付列表。 */
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/price/payOrder")
|
||||||
|
public class PayOrderController extends BaseController
|
||||||
|
{
|
||||||
|
@Autowired
|
||||||
|
private IPayOrderListService payOrderListService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IPrcOrderBillService orderBillService;
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payOrder:list')")
|
||||||
|
@GetMapping("/list")
|
||||||
|
public TableDataInfo list(PayOrderQuery query)
|
||||||
|
{
|
||||||
|
startPage();
|
||||||
|
return getDataTable(payOrderListService.list(query));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 按订单号或提单号批量重算尾程应付。一票失败不影响其他订单。
|
||||||
|
*
|
||||||
|
* @param command sourceType 为 ORDER 或 LADING,text 为单号原文
|
||||||
|
* @return 成功数、失败数和每一票的结果
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payOrder:recalc')")
|
||||||
|
@PostMapping("/recalc")
|
||||||
|
public AjaxResult recalc(@RequestBody PayOrderRecalcCommand command)
|
||||||
|
{
|
||||||
|
Map<String, String> payload = new HashMap<>();
|
||||||
|
payload.put("taskId", payOrderListService.submitRecalc(command));
|
||||||
|
return success(payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询应付费用重算进度。
|
||||||
|
*
|
||||||
|
* @param taskId 任务号
|
||||||
|
* @return Redis 中的进度和每一票结果
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payOrder:recalc')")
|
||||||
|
@GetMapping("/recalc/task/{taskId}")
|
||||||
|
public AjaxResult recalcTask(@PathVariable String taskId)
|
||||||
|
{
|
||||||
|
PayOrderRecalcTask task = payOrderListService.getRecalcTask(taskId);
|
||||||
|
if (task == null)
|
||||||
|
{
|
||||||
|
return error("重算任务不存在或已过期");
|
||||||
|
}
|
||||||
|
return success(task);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 取消还没开始的应付费用重算。正在计算的这一票会算完。
|
||||||
|
*
|
||||||
|
* @param taskId 任务号
|
||||||
|
* @return 更新后的进度
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payOrder:recalc')")
|
||||||
|
@PostMapping("/recalc/task/{taskId}/cancel")
|
||||||
|
public AjaxResult cancelRecalc(@PathVariable String taskId)
|
||||||
|
{
|
||||||
|
return success(payOrderListService.cancelRecalc(taskId));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应付列表里的订单详情。带出应收费用和应付费用,不按计费列表的销售员权限过滤。
|
||||||
|
*
|
||||||
|
* @param billId 计费订单 ID
|
||||||
|
* @return 订单、应收明细和应付明细
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payOrder:query')")
|
||||||
|
@GetMapping("/{billId}")
|
||||||
|
public AjaxResult detail(@PathVariable Long billId)
|
||||||
|
{
|
||||||
|
return success(orderBillService.getPayOrderBill(billId));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查看一票订单的应付费用,按 A、B、C、D 四段返回。
|
||||||
|
*
|
||||||
|
* @param billId 计费订单 ID
|
||||||
|
* @return 四段费用
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payOrder:fee')")
|
||||||
|
@GetMapping("/{billId}/fees")
|
||||||
|
public AjaxResult fees(@PathVariable String billId)
|
||||||
|
{
|
||||||
|
return success(payOrderListService.fees(billId));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 在某一段手工增加一行应付费用。创建人取当前登录用户。
|
||||||
|
*
|
||||||
|
* @param billId 计费订单 ID
|
||||||
|
* @param line 费用项、金额、币种、说明和所属阶段
|
||||||
|
* @return 写入后的费用行
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payOrder:feeAdd')")
|
||||||
|
@PostMapping("/{billId}/fees")
|
||||||
|
public AjaxResult addFee(@PathVariable String billId, @RequestBody PayOrderFeeLine line)
|
||||||
|
{
|
||||||
|
return success(payOrderListService.addManualFee(billId, line));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 逻辑删除一条应付费用。
|
||||||
|
*
|
||||||
|
* @param feeId 费用明细 ID
|
||||||
|
* @return 操作结果
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payOrder:feeRemove')")
|
||||||
|
@DeleteMapping("/fees/{feeId}")
|
||||||
|
public AjaxResult removeFee(@PathVariable String feeId)
|
||||||
|
{
|
||||||
|
payOrderListService.removeFee(feeId);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页查看一票订单的费用操作日志,含变更前和变更后。
|
||||||
|
*
|
||||||
|
* @param billId 计费订单 ID
|
||||||
|
* @return 当前页日志
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payOrder:log')")
|
||||||
|
@GetMapping("/{billId}/feeLogs")
|
||||||
|
public TableDataInfo feeLogs(@PathVariable String billId)
|
||||||
|
{
|
||||||
|
return getDataTable(payOrderListService.feeLogs(billId));
|
||||||
|
}
|
||||||
|
}
|
||||||
+137
@@ -0,0 +1,137 @@
|
|||||||
|
package com.bms.web.controller.price;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PutMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
import com.bms.common.core.controller.BaseController;
|
||||||
|
import com.bms.common.core.domain.AjaxResult;
|
||||||
|
import com.bms.common.core.page.TableDataInfo;
|
||||||
|
import com.bms.price.domain.PayPayment;
|
||||||
|
import com.bms.price.domain.PayPaymentAlloc;
|
||||||
|
import com.bms.price.service.IPayPaymentService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 账单管理下的应付付款。
|
||||||
|
*/
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/price/payPayment")
|
||||||
|
public class PayPaymentController extends BaseController
|
||||||
|
{
|
||||||
|
@Autowired
|
||||||
|
private IPayPaymentService payPaymentService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页查询应付付款。
|
||||||
|
*
|
||||||
|
* @param query 付款单号、供应商、状态、币种
|
||||||
|
* @return 付款单列表
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payPayment:list')")
|
||||||
|
@GetMapping("/list")
|
||||||
|
public TableDataInfo list(PayPayment query)
|
||||||
|
{
|
||||||
|
startPage();
|
||||||
|
List<PayPayment> list = payPaymentService.selectPayPaymentList(query);
|
||||||
|
return getDataTable(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 付款单详情,含核销明细。
|
||||||
|
*
|
||||||
|
* @param paymentId 付款单ID
|
||||||
|
* @return 付款单
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payPayment:query')")
|
||||||
|
@GetMapping("/{paymentId}")
|
||||||
|
public AjaxResult detail(@PathVariable Long paymentId)
|
||||||
|
{
|
||||||
|
return success(payPaymentService.selectPayPaymentDetail(paymentId));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询这个供应商、这个币种下还能核销的账单。
|
||||||
|
*
|
||||||
|
* @param supplierId 供应商ID
|
||||||
|
* @param currency 币种
|
||||||
|
* @return 未付账单
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payPayment:query')")
|
||||||
|
@GetMapping("/open")
|
||||||
|
public AjaxResult open(Long supplierId, String currency)
|
||||||
|
{
|
||||||
|
List<PayPaymentAlloc> list = payPaymentService.selectOpenBills(supplierId, currency);
|
||||||
|
return success(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 登记草稿付款。确认后才核销账单。
|
||||||
|
*
|
||||||
|
* @param payment 付款单和核销明细
|
||||||
|
* @return 付款单
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payPayment:add')")
|
||||||
|
@PostMapping
|
||||||
|
public AjaxResult create(@RequestBody PayPayment payment)
|
||||||
|
{
|
||||||
|
return success(payPaymentService.create(payment));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 确认付款并核销。
|
||||||
|
*
|
||||||
|
* @param paymentId 付款单ID
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payPayment:confirm')")
|
||||||
|
@PutMapping("/confirm/{paymentId}")
|
||||||
|
public AjaxResult confirm(@PathVariable Long paymentId)
|
||||||
|
{
|
||||||
|
payPaymentService.confirm(paymentId);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 作废草稿付款。已确认的付款不在这里作废。
|
||||||
|
*
|
||||||
|
* @param paymentId 付款单ID
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payPayment:void')")
|
||||||
|
@PutMapping("/void/{paymentId}")
|
||||||
|
public AjaxResult voidPayment(@PathVariable Long paymentId)
|
||||||
|
{
|
||||||
|
payPaymentService.voidPayment(paymentId);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 反核销。账单未付金额恢复。
|
||||||
|
*
|
||||||
|
* @param paymentId 付款单ID
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payPayment:confirm')")
|
||||||
|
@PutMapping("/reverse/{paymentId}")
|
||||||
|
public AjaxResult reverse(@PathVariable Long paymentId)
|
||||||
|
{
|
||||||
|
payPaymentService.reverse(paymentId);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 退款。冲回核销,付款单改为已退款。
|
||||||
|
*
|
||||||
|
* @param paymentId 付款单ID
|
||||||
|
*/
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:payPayment:confirm')")
|
||||||
|
@PutMapping("/refund/{paymentId}")
|
||||||
|
public AjaxResult refund(@PathVariable Long paymentId)
|
||||||
|
{
|
||||||
|
payPaymentService.refund(paymentId);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
}
|
||||||
+56
-3
@@ -29,13 +29,16 @@ import com.bms.price.domain.ChannelProductMap;
|
|||||||
import com.bms.price.domain.PayProduct;
|
import com.bms.price.domain.PayProduct;
|
||||||
import com.bms.price.domain.PayProductTerm;
|
import com.bms.price.domain.PayProductTerm;
|
||||||
import com.bms.price.domain.PaySaveCommand;
|
import com.bms.price.domain.PaySaveCommand;
|
||||||
|
import com.bms.price.domain.PaySurcharge;
|
||||||
import com.bms.price.pay.PayDetailExporter;
|
import com.bms.price.pay.PayDetailExporter;
|
||||||
|
import com.bms.price.pay.PayChargeMode;
|
||||||
|
import com.bms.price.pay.PayTemplateWorkbook;
|
||||||
import com.bms.price.service.IPayOrderCostService;
|
import com.bms.price.service.IPayOrderCostService;
|
||||||
import com.bms.price.service.IPayProductService;
|
import com.bms.price.service.IPayProductService;
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 价格基础下的应付配置。导入先预览,确认后才入库。
|
* 应付管理下的应付配置。导入先预览,确认后才入库。
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/price/pay")
|
@RequestMapping("/price/pay")
|
||||||
@@ -84,7 +87,7 @@ public class PayProductController extends BaseController
|
|||||||
@PreAuthorize("@ss.hasAnyPermi('price:billing:bill,price:pay:edit')")
|
@PreAuthorize("@ss.hasAnyPermi('price:billing:bill,price:pay:edit')")
|
||||||
@Log(title = "应付账单", businessType = BusinessType.INSERT)
|
@Log(title = "应付账单", businessType = BusinessType.INSERT)
|
||||||
@PostMapping("/order/{billId}")
|
@PostMapping("/order/{billId}")
|
||||||
public AjaxResult generateOrderCost(@PathVariable String billId)
|
public AjaxResult generateOrderCost(@PathVariable Long billId)
|
||||||
{
|
{
|
||||||
payOrderCostService.generate(billId);
|
payOrderCostService.generate(billId);
|
||||||
return success("操作成功");
|
return success("操作成功");
|
||||||
@@ -102,6 +105,56 @@ public class PayProductController extends BaseController
|
|||||||
payProductService.writeSource(productId, response.getOutputStream());
|
payProductService.writeSource(productId, response.getOutputStream());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 下载所选计费模式的标准模板 */
|
||||||
|
@PreAuthorize("@ss.hasAnyPermi('price:pay:import,price:pay:add')")
|
||||||
|
@PostMapping("/template")
|
||||||
|
public void template(HttpServletResponse response, @RequestParam String chargeType) throws Exception
|
||||||
|
{
|
||||||
|
String mode = PayChargeMode.code(chargeType);
|
||||||
|
String filename = (mode.isEmpty() ? "价卡" : PayChargeMode.label(mode)) + "模板.xlsx";
|
||||||
|
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
||||||
|
response.setCharacterEncoding("utf-8");
|
||||||
|
FileUtils.setAttachmentResponseHeader(response, filename);
|
||||||
|
PayTemplateWorkbook.write(mode, response.getOutputStream());
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 按标准模板预览,不写数据库 */
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:pay:import')")
|
||||||
|
@Log(title = "应付配置", businessType = BusinessType.IMPORT)
|
||||||
|
@PostMapping(value = "/template/preview", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
||||||
|
public AjaxResult previewTemplate(MultipartFile file, @RequestParam String chargeType) throws Exception
|
||||||
|
{
|
||||||
|
assertWorkbook(file);
|
||||||
|
return success(payProductService.previewTemplate(file.getBytes(), file.getOriginalFilename(), chargeType));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 按所选计费模式手工新增一条价卡 */
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:pay:add')")
|
||||||
|
@Log(title = "应付配置", businessType = BusinessType.INSERT)
|
||||||
|
@PostMapping("/manual")
|
||||||
|
public AjaxResult manual(@RequestBody PayProduct product)
|
||||||
|
{
|
||||||
|
return success(payProductService.saveManual(product));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 这一版从附加费配置勾选的费用 */
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:pay:surcharge')")
|
||||||
|
@GetMapping("/term/{termId}/config-surcharges")
|
||||||
|
public AjaxResult configSurcharges(@PathVariable Long termId)
|
||||||
|
{
|
||||||
|
return success(payProductService.listConfigSurcharges(termId));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 保存这一版勾选的附加费和计费参数 */
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:pay:surcharge')")
|
||||||
|
@Log(title = "应付价卡附加费", businessType = BusinessType.UPDATE)
|
||||||
|
@PutMapping("/term/{termId}/config-surcharges")
|
||||||
|
public AjaxResult saveConfigSurcharges(@PathVariable Long termId, @RequestBody List<PaySurcharge> rows)
|
||||||
|
{
|
||||||
|
payProductService.saveConfigSurcharges(termId, rows);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
@PreAuthorize("@ss.hasPermi('price:pay:query')")
|
@PreAuthorize("@ss.hasPermi('price:pay:query')")
|
||||||
@GetMapping("/{productId}")
|
@GetMapping("/{productId}")
|
||||||
public AjaxResult getInfo(@PathVariable Long productId)
|
public AjaxResult getInfo(@PathVariable Long productId)
|
||||||
@@ -143,7 +196,7 @@ public class PayProductController extends BaseController
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** 批量绑定渠道应收/应付产品 */
|
/** 批量绑定渠道应收/应付产品 */
|
||||||
@PreAuthorize("@ss.hasAnyPermi('price:pay:edit,data:serviceChannel:edit')")
|
@PreAuthorize("@ss.hasAnyPermi('price:pay:edit,price:pay:bind,data:serviceChannel:edit')")
|
||||||
@Log(title = "渠道批量绑定产品", businessType = BusinessType.UPDATE)
|
@Log(title = "渠道批量绑定产品", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping("/channel/batchBind")
|
@PutMapping("/channel/batchBind")
|
||||||
public AjaxResult batchBindChannel(@RequestBody Map<String, Object> body)
|
public AjaxResult batchBindChannel(@RequestBody Map<String, Object> body)
|
||||||
|
|||||||
@@ -87,6 +87,7 @@ public class SurchargeController extends BaseController
|
|||||||
+ " or @ss.hasPermi('price:set:query') or @ss.hasPermi('price:set:add') or @ss.hasPermi('price:set:edit')"
|
+ " or @ss.hasPermi('price:set:query') or @ss.hasPermi('price:set:add') or @ss.hasPermi('price:set:edit')"
|
||||||
+ " or @ss.hasPermi('price:billing:bill')"
|
+ " or @ss.hasPermi('price:billing:bill')"
|
||||||
+ " or @ss.hasPermi('price:pay:query') or @ss.hasPermi('price:pay:edit') or @ss.hasPermi('price:pay:import')"
|
+ " or @ss.hasPermi('price:pay:query') or @ss.hasPermi('price:pay:edit') or @ss.hasPermi('price:pay:import')"
|
||||||
|
+ " or @ss.hasPermi('price:pay:surcharge')"
|
||||||
+ " or @ss.hasPermi('price:airBill:fee')")
|
+ " or @ss.hasPermi('price:airBill:fee')")
|
||||||
@GetMapping("/options")
|
@GetMapping("/options")
|
||||||
public AjaxResult listOptions(PrcSurcharge surcharge)
|
public AjaxResult listOptions(PrcSurcharge surcharge)
|
||||||
|
|||||||
@@ -20,11 +20,12 @@ import com.bms.common.core.page.TableDataInfo;
|
|||||||
import com.bms.common.enums.BusinessType;
|
import com.bms.common.enums.BusinessType;
|
||||||
import com.bms.price.domain.PrcZone;
|
import com.bms.price.domain.PrcZone;
|
||||||
import com.bms.price.domain.PrcZoneDetail;
|
import com.bms.price.domain.PrcZoneDetail;
|
||||||
|
import com.bms.price.domain.PrcZoneLabelProduct;
|
||||||
import com.bms.price.domain.PrcZoneRegion;
|
import com.bms.price.domain.PrcZoneRegion;
|
||||||
import com.bms.price.service.IPrcZoneService;
|
import com.bms.price.service.IPrcZoneService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分区管理:国家(region) -> 分区 -> 邮编明细
|
* 分区管理:常规按国家;打单按产品。
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/price/zone")
|
@RequestMapping("/price/zone")
|
||||||
@@ -59,12 +60,36 @@ public class ZoneController extends BaseController
|
|||||||
return toAjax(zoneService.deleteZonesByRegionIds(regionIds));
|
return toAjax(zoneService.deleteZonesByRegionIds(regionIds));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// ========== label product zones ==========
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:zone:list')")
|
||||||
|
@GetMapping("/label/product/list")
|
||||||
|
public TableDataInfo labelProductList(PrcZoneLabelProduct query)
|
||||||
|
{
|
||||||
|
startPage();
|
||||||
|
List<PrcZoneLabelProduct> list = zoneService.selectLabelProductZoneList(query);
|
||||||
|
return getDataTable(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('price:zone:remove')")
|
||||||
|
@Log(title = "LabelZoneProduct", businessType = BusinessType.DELETE)
|
||||||
|
@DeleteMapping("/label/product/{productId}")
|
||||||
|
public AjaxResult removeLabelProductZones(@PathVariable Long productId)
|
||||||
|
{
|
||||||
|
return toAjax(zoneService.deleteZonesByProductId(productId));
|
||||||
|
}
|
||||||
|
|
||||||
// ========== zone ==========
|
// ========== zone ==========
|
||||||
|
|
||||||
@PreAuthorize("@ss.hasPermi('price:zone:list')")
|
@PreAuthorize("@ss.hasPermi('price:zone:list')")
|
||||||
@GetMapping("/item/list")
|
@GetMapping("/item/list")
|
||||||
public TableDataInfo zoneList(PrcZone zone)
|
public TableDataInfo zoneList(PrcZone zone)
|
||||||
{
|
{
|
||||||
|
if (zone.getZoneType() == null || zone.getZoneType().isEmpty())
|
||||||
|
{
|
||||||
|
zone.setZoneType(PrcZone.TYPE_REGULAR);
|
||||||
|
}
|
||||||
startPage();
|
startPage();
|
||||||
List<PrcZone> list = zoneService.selectPrcZoneList(zone);
|
List<PrcZone> list = zoneService.selectPrcZoneList(zone);
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
|
|||||||
+28
-9
@@ -25,16 +25,20 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
import com.bms.receivable.domain.ArBill;
|
import com.bms.receivable.domain.ArBill;
|
||||||
|
import com.bms.receivable.domain.vo.ArBillExportRequest;
|
||||||
import com.bms.receivable.domain.ArBankAccount;
|
import com.bms.receivable.domain.ArBankAccount;
|
||||||
import com.bms.receivable.domain.ArBillDetailFee;
|
import com.bms.receivable.domain.ArBillDetailFee;
|
||||||
import com.bms.receivable.domain.ArBillGenerateTask;
|
import com.bms.receivable.domain.ArBillGenerateTask;
|
||||||
import com.bms.receivable.domain.ArBillLog;
|
import com.bms.receivable.domain.ArBillLog;
|
||||||
import com.bms.receivable.domain.vo.ArBillActionRequest;
|
import com.bms.receivable.domain.vo.ArBillActionRequest;
|
||||||
|
import com.bms.receivable.domain.vo.ArBillDetailQuery;
|
||||||
import com.bms.receivable.domain.vo.ArBillGenerateQuery;
|
import com.bms.receivable.domain.vo.ArBillGenerateQuery;
|
||||||
import com.bms.receivable.domain.vo.ArBillGenerateRequest;
|
import com.bms.receivable.domain.vo.ArBillGenerateRequest;
|
||||||
import com.bms.receivable.domain.vo.ArBillListExportRow;
|
import com.bms.receivable.domain.vo.ArBillListExportRow;
|
||||||
import com.bms.receivable.domain.vo.ArBillQuery;
|
import com.bms.receivable.domain.vo.ArBillQuery;
|
||||||
|
import com.bms.receivable.domain.vo.ArBillPreviewOrder;
|
||||||
import com.bms.receivable.service.IArBillService;
|
import com.bms.receivable.service.IArBillService;
|
||||||
|
import com.bms.receivable.service.ArBillVoidTaskService;
|
||||||
import com.bms.receivable.security.ArBillScopeResolver;
|
import com.bms.receivable.security.ArBillScopeResolver;
|
||||||
import com.bms.receivable.task.ArBillGeneratePreviewExportRunner;
|
import com.bms.receivable.task.ArBillGeneratePreviewExportRunner;
|
||||||
import com.bms.common.annotation.Log;
|
import com.bms.common.annotation.Log;
|
||||||
@@ -61,6 +65,9 @@ public class ArBillController extends BaseController {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private IArBillService billService;
|
private IArBillService billService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ArBillVoidTaskService voidTaskService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ArBillScopeResolver billScope;
|
private ArBillScopeResolver billScope;
|
||||||
|
|
||||||
@@ -135,9 +142,9 @@ public class ArBillController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('ar:bill:query')")
|
@PreAuthorize("@ss.hasPermi('ar:bill:query')")
|
||||||
@GetMapping("/{arBillId}/details")
|
@GetMapping("/{arBillId}/details")
|
||||||
public TableDataInfo details(@PathVariable Long arBillId) {
|
public TableDataInfo details(@PathVariable Long arBillId, @Valid ArBillDetailQuery query) {
|
||||||
startPage();
|
startPage();
|
||||||
return getDataTable(billService.selectArBillDetails(arBillId));
|
return getDataTable(billService.selectArBillDetails(arBillId, query));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -171,7 +178,7 @@ public class ArBillController extends BaseController {
|
|||||||
List<PrcOrderBill> list = billService.previewBill(query);
|
List<PrcOrderBill> list = billService.previewBill(query);
|
||||||
TableDataInfo pageData = getDataTable(list);
|
TableDataInfo pageData = getDataTable(list);
|
||||||
AjaxResult result = success();
|
AjaxResult result = success();
|
||||||
result.put("rows", pageData.getRows());
|
result.put("rows", list.stream().map(ArBillPreviewOrder::from).toList());
|
||||||
result.put("total", pageData.getTotal());
|
result.put("total", pageData.getTotal());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -215,7 +222,7 @@ public class ArBillController extends BaseController {
|
|||||||
List<PrcOrderBill> list = billService.previewExcludedBill(query);
|
List<PrcOrderBill> list = billService.previewExcludedBill(query);
|
||||||
TableDataInfo pageData = getDataTable(list);
|
TableDataInfo pageData = getDataTable(list);
|
||||||
AjaxResult result = success();
|
AjaxResult result = success();
|
||||||
result.put("rows", pageData.getRows());
|
result.put("rows", list.stream().map(ArBillPreviewOrder::from).toList());
|
||||||
result.put("total", pageData.getTotal());
|
result.put("total", pageData.getTotal());
|
||||||
result.put("totalAmount", billService.sumPreviewBill(query));
|
result.put("totalAmount", billService.sumPreviewBill(query));
|
||||||
return result;
|
return result;
|
||||||
@@ -297,19 +304,31 @@ public class ArBillController extends BaseController {
|
|||||||
public AjaxResult voidBill(@PathVariable Long arBillId, @RequestBody ArBillActionRequest request,
|
public AjaxResult voidBill(@PathVariable Long arBillId, @RequestBody ArBillActionRequest request,
|
||||||
@RequestHeader(value = "X-Request-Id", required = false) String headerRequestId) {
|
@RequestHeader(value = "X-Request-Id", required = false) String headerRequestId) {
|
||||||
String requestId = requestId(request == null ? null : request.getRequestId(), headerRequestId);
|
String requestId = requestId(request == null ? null : request.getRequestId(), headerRequestId);
|
||||||
return success(billService.voidBill(arBillId, request, getUsername(), requestId)).put("request_id", requestId);
|
return success(voidTaskService.submit(arBillId, request == null ? null : request.getRemark(), getUsername(), requestId)).put("request_id", requestId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
@PreAuthorize("@ss.hasPermi('ar:bill:list')")
|
||||||
* 仅提交导出任务;前端通过导出任务状态接口轮询并在完成后下载。
|
@GetMapping("/void/task/{taskId}")
|
||||||
*/
|
public AjaxResult voidTask(@PathVariable Long taskId) {
|
||||||
|
return success(voidTaskService.get(taskId));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('ar:bill:export')")
|
||||||
|
@GetMapping("/{arBillId}/export-templates")
|
||||||
|
public AjaxResult exportTemplates(@PathVariable Long arBillId) {
|
||||||
|
return success(billService.selectExportTemplates(arBillId));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 仅提交导出任务;前端轮询任务状态后下载。 */
|
||||||
@Log(title = "应收账单导出", businessType = BusinessType.EXPORT)
|
@Log(title = "应收账单导出", businessType = BusinessType.EXPORT)
|
||||||
@PreAuthorize("@ss.hasPermi('ar:bill:export')")
|
@PreAuthorize("@ss.hasPermi('ar:bill:export')")
|
||||||
@PostMapping("/{arBillId}/export")
|
@PostMapping("/{arBillId}/export")
|
||||||
public AjaxResult export(@PathVariable Long arBillId,
|
public AjaxResult export(@PathVariable Long arBillId,
|
||||||
|
@RequestBody(required = false) ArBillExportRequest request,
|
||||||
@RequestHeader(value = "X-Request-Id", required = false) String headerRequestId) {
|
@RequestHeader(value = "X-Request-Id", required = false) String headerRequestId) {
|
||||||
String requestId = requestId(null, headerRequestId);
|
String requestId = requestId(null, headerRequestId);
|
||||||
return success(billService.exportBill(arBillId, getUsername(), requestId)).put("request_id", requestId);
|
return success(billService.exportBill(arBillId, request == null ? null : request.getTemplateId(),
|
||||||
|
getUsername(), requestId)).put("request_id", requestId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+22
-9
@@ -8,6 +8,8 @@ import java.nio.file.Paths;
|
|||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import com.github.pagehelper.PageHelper;
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.GetMapping;
|
|||||||
import org.springframework.web.bind.annotation.PathVariable;
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
import com.bms.common.annotation.Log;
|
import com.bms.common.annotation.Log;
|
||||||
@@ -38,6 +41,7 @@ import com.bms.price.domain.vo.PrcProfitReportProductRow;
|
|||||||
import com.bms.price.domain.vo.PrcProfitReportQuery;
|
import com.bms.price.domain.vo.PrcProfitReportQuery;
|
||||||
import com.bms.price.domain.vo.PrcProfitReportSummary;
|
import com.bms.price.domain.vo.PrcProfitReportSummary;
|
||||||
import com.bms.price.service.IPrcProfitReportService;
|
import com.bms.price.service.IPrcProfitReportService;
|
||||||
|
import com.bms.price.task.PrcProfitReportExportRunner;
|
||||||
|
|
||||||
/** 产品/订单维度毛利报表。 */
|
/** 产品/订单维度毛利报表。 */
|
||||||
@RestController
|
@RestController
|
||||||
@@ -50,6 +54,9 @@ public class PrcProfitReportController extends BaseController
|
|||||||
@Autowired
|
@Autowired
|
||||||
private OssStorage ossStorage;
|
private OssStorage ossStorage;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private PrcProfitReportExportRunner exportRunner;
|
||||||
|
|
||||||
/** 客户筛选选项,沿用毛利报表的访问权限和查询范围。 */
|
/** 客户筛选选项,沿用毛利报表的访问权限和查询范围。 */
|
||||||
@PreAuthorize("@ss.hasPermi('report:profit:list')")
|
@PreAuthorize("@ss.hasPermi('report:profit:list')")
|
||||||
@GetMapping("/customer-options")
|
@GetMapping("/customer-options")
|
||||||
@@ -105,6 +112,8 @@ public class PrcProfitReportController extends BaseController
|
|||||||
public TableDataInfo orders(PrcProfitReportQuery query)
|
public TableDataInfo orders(PrcProfitReportQuery query)
|
||||||
{
|
{
|
||||||
startPage();
|
startPage();
|
||||||
|
// 分页总数由页面复用汇总订单数,订单明细仅执行分页查询。
|
||||||
|
PageHelper.getLocalPage().setCount(false);
|
||||||
List<PrcProfitReportOrderRow> rows = profitReportService.selectOrderRows(query);
|
List<PrcProfitReportOrderRow> rows = profitReportService.selectOrderRows(query);
|
||||||
return getDataTable(rows);
|
return getDataTable(rows);
|
||||||
}
|
}
|
||||||
@@ -121,19 +130,23 @@ public class PrcProfitReportController extends BaseController
|
|||||||
@Log(title = "毛利报表-订单维度", businessType = BusinessType.EXPORT)
|
@Log(title = "毛利报表-订单维度", businessType = BusinessType.EXPORT)
|
||||||
@PreAuthorize("@ss.hasPermi('report:profit:export')")
|
@PreAuthorize("@ss.hasPermi('report:profit:export')")
|
||||||
@PostMapping("/orders/export")
|
@PostMapping("/orders/export")
|
||||||
public AjaxResult exportOrders(PrcProfitReportQuery query)
|
public AjaxResult exportOrders(@RequestBody PrcProfitReportQuery query)
|
||||||
{
|
{
|
||||||
PrcProfitReportExport export = beginExport("ORDER", "订单维度毛利分析");
|
return success(Map.of("taskId", exportRunner.submit(query, getUserId())));
|
||||||
try
|
|
||||||
{
|
|
||||||
List<PrcProfitReportOrderRow> rows = profitReportService.selectOrderRows(query);
|
|
||||||
return finishExport(export, rows, PrcProfitReportOrderRow.class, "订单毛利报表", query.getProfitRule());
|
|
||||||
}
|
}
|
||||||
catch (RuntimeException e)
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('report:profit:export')")
|
||||||
|
@GetMapping("/orders/export/task/{taskId}")
|
||||||
|
public AjaxResult orderExportTask(@PathVariable String taskId)
|
||||||
{
|
{
|
||||||
failExport(export, e);
|
return success(exportRunner.getTask(taskId, getUserId()));
|
||||||
throw e;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PreAuthorize("@ss.hasPermi('report:profit:export')")
|
||||||
|
@GetMapping("/orders/export/download/{taskId}")
|
||||||
|
public void downloadOrderExport(@PathVariable String taskId, HttpServletResponse response) throws Exception
|
||||||
|
{
|
||||||
|
exportRunner.download(taskId, getUserId(), response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Log(title = "毛利报表-产品维度", businessType = BusinessType.EXPORT)
|
@Log(title = "毛利报表-产品维度", businessType = BusinessType.EXPORT)
|
||||||
|
|||||||
@@ -10,6 +10,11 @@ oss:
|
|||||||
|
|
||||||
# 项目相关配置
|
# 项目相关配置
|
||||||
bms:
|
bms:
|
||||||
|
# 毛利报表区域客户 ID 过滤:默认关闭,完成生产计划和耗时对比后再启用。
|
||||||
|
profit-report:
|
||||||
|
customer-id-filter-enabled: ${BMS_PROFIT_REPORT_CUSTOMER_ID_FILTER_ENABLED:false}
|
||||||
|
# 超过此客户数时自动回退客户表关联;小于等于 0 时停用,上限为 5000。
|
||||||
|
max-customer-ids: ${BMS_PROFIT_REPORT_MAX_CUSTOMER_IDS:1000}
|
||||||
# 名称
|
# 名称
|
||||||
name: BMS
|
name: BMS
|
||||||
# 版本
|
# 版本
|
||||||
|
|||||||
@@ -55,6 +55,92 @@ class PayCostCalculatorTest
|
|||||||
assertEquals(new BigDecimal("3.72"), over.getPayTotal());
|
assertEquals(new BigDecimal("3.72"), over.getPayTotal());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void boundSurchargesKeepTheCardContinuation()
|
||||||
|
{
|
||||||
|
PayWeightBand first = band("0", "1", "10", "UK Mainland");
|
||||||
|
first.setSectionName("派送费");
|
||||||
|
first.setPriceUnit("CNY/ITEM");
|
||||||
|
first.setChargeName("首重");
|
||||||
|
PaySurcharge extra = fee(1L, "每公斤续重", "2", "CNY", "EXTRA_KG", "1");
|
||||||
|
extra.setSectionName("派送费");
|
||||||
|
extra.setZoneName("UK Mainland");
|
||||||
|
extra.setPriceUnit("CNY/KG");
|
||||||
|
PaySurcharge imported = fee(2L, "偏远地区附加费", "8", "CNY", "POSTCODE", "BT");
|
||||||
|
PaySurcharge bound = fee(3L, "燃油", "1", "CNY", "ALWAYS", null);
|
||||||
|
bound.setSectionName("附加费配置");
|
||||||
|
PaySurcharge configExtra = fee(5L, "超重续收", "9", "CNY", "EXTRA_KG", "1");
|
||||||
|
configExtra.setSectionName("附加费配置");
|
||||||
|
configExtra.setExtraWeightKg(new BigDecimal("1"));
|
||||||
|
configExtra.setZoneName("UK Mainland");
|
||||||
|
PayProduct product = new PayProduct();
|
||||||
|
product.setProductName("续重价");
|
||||||
|
product.setCurrency("CNY");
|
||||||
|
product.setWeightBands(new ArrayList<>(List.of(first)));
|
||||||
|
product.setSurcharges(PaySurchargeRules.surchargesForCalc(List.of(extra, imported), List.of(bound, configExtra)));
|
||||||
|
|
||||||
|
PayOrderCostResult over = PayCostCalculator.calculate(product, new BigDecimal("3"),
|
||||||
|
null, null, null, "KY4 0DN", "UK Mainland", null, 1);
|
||||||
|
assertTrue(hasFee(over, "基础运费", "10"));
|
||||||
|
assertTrue(hasFee(over, "每公斤续重", "4"));
|
||||||
|
assertTrue(hasFee(over, "燃油", "1"));
|
||||||
|
assertFalse(over.getFees().stream().anyMatch(fee -> fee.getFeeName().contains("偏远")));
|
||||||
|
assertFalse(over.getFees().stream().anyMatch(fee -> "超重续收".equals(fee.getFeeName())));
|
||||||
|
assertEquals(new BigDecimal("15.00"), over.getPayTotal());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void boundConfigFeesFollowTheirOwnChargeRule()
|
||||||
|
{
|
||||||
|
PayProduct product = new PayProduct();
|
||||||
|
product.setProductName("CTT 48H");
|
||||||
|
product.setCurrency("EUR");
|
||||||
|
product.setWeightBands(new ArrayList<>(List.of(band("0", "5", "2.05", "马德里"))));
|
||||||
|
PaySurcharge fuel = fee(11L, "燃油附加费", "0.50", "EUR", "ALWAYS", null);
|
||||||
|
fuel.setSectionName("附加费配置");
|
||||||
|
fuel.setScId(101L);
|
||||||
|
PaySurcharge heavy = fee(12L, "超重附加费", "3", "EUR", "WEIGHT", null);
|
||||||
|
heavy.setSectionName("附加费配置");
|
||||||
|
heavy.setOverWeightKg(new BigDecimal("2"));
|
||||||
|
PaySurcharge bulky = fee(13L, "超尺寸附加费", "4", "EUR", "SIZE", null);
|
||||||
|
bulky.setSectionName("附加费配置");
|
||||||
|
bulky.setLengthCm(new BigDecimal("60"));
|
||||||
|
bulky.setWidthCm(new BigDecimal("40"));
|
||||||
|
bulky.setHeightCm(new BigDecimal("30"));
|
||||||
|
PaySurcharge remote = fee(14L, "偏远附加费", "7.1", "EUR", "POSTCODE", null);
|
||||||
|
remote.setSectionName("附加费配置");
|
||||||
|
remote.setPostcodeText("07");
|
||||||
|
remote.setCountryCode("ES");
|
||||||
|
PaySurcharge manual = fee(15L, "仓库操作费", "1", "EUR", "MANUAL", null);
|
||||||
|
manual.setSectionName("附加费配置");
|
||||||
|
PaySurcharge returned = fee(16L, "退件费", "2", "EUR", "RETURN", null);
|
||||||
|
returned.setSectionName("附加费配置");
|
||||||
|
product.setSurcharges(List.of(fuel, heavy, bulky, remote, manual, returned));
|
||||||
|
|
||||||
|
PayOrderCostResult light = PayCostCalculator.calculate(product, new BigDecimal("1"),
|
||||||
|
new BigDecimal("10"), new BigDecimal("10"), new BigDecimal("10"), "28001", "马德里", null, 1,
|
||||||
|
List.of(), true, true, "ES", "西班牙");
|
||||||
|
assertTrue(hasFee(light, "燃油附加费", "0.50"));
|
||||||
|
assertEquals(101L, light.getFees().stream().filter(row -> "燃油附加费".equals(row.getFeeName())).findFirst().orElseThrow().getScId());
|
||||||
|
assertTrue(light.getFees().stream().noneMatch(row -> "超重附加费".equals(row.getFeeName()) || "超尺寸附加费".equals(row.getFeeName())
|
||||||
|
|| "偏远附加费".equals(row.getFeeName()) || "仓库操作费".equals(row.getFeeName()) || "退件费".equals(row.getFeeName())));
|
||||||
|
|
||||||
|
PayOrderCostResult hit = PayCostCalculator.calculate(product, new BigDecimal("3"),
|
||||||
|
new BigDecimal("70"), new BigDecimal("50"), new BigDecimal("40"), "07008", "马德里", null, 9,
|
||||||
|
List.of(), true, true, "ES", "西班牙");
|
||||||
|
assertTrue(hasFee(hit, "燃油附加费", "0.50"));
|
||||||
|
assertTrue(hasFee(hit, "超重附加费", "3"));
|
||||||
|
assertTrue(hasFee(hit, "超尺寸附加费", "4"));
|
||||||
|
assertTrue(hasFee(hit, "偏远附加费", "7.1"));
|
||||||
|
assertTrue(hasFee(hit, "退件费", "2"));
|
||||||
|
assertTrue(hit.getFees().stream().noneMatch(row -> "仓库操作费".equals(row.getFeeName())));
|
||||||
|
|
||||||
|
PayOrderCostResult france = PayCostCalculator.calculate(product, new BigDecimal("3"),
|
||||||
|
new BigDecimal("70"), new BigDecimal("50"), new BigDecimal("40"), "07008", "马德里", null, 9,
|
||||||
|
List.of(), true, true, "FR", "法国");
|
||||||
|
assertTrue(france.getFees().stream().noneMatch(row -> "偏远附加费".equals(row.getFeeName())));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void extraKgFollowsTheSameServiceSection()
|
void extraKgFollowsTheSameServiceSection()
|
||||||
{
|
{
|
||||||
@@ -184,6 +270,49 @@ class PayCostCalculatorTest
|
|||||||
assertTrue(PaySurchargeRules.matchesPostcode("07,35,38,51,52,9", "9000"));
|
assertTrue(PaySurchargeRules.matchesPostcode("07,35,38,51,52,9", "9000"));
|
||||||
assertFalse(PaySurchargeRules.matchesPostcode("07,35,38,51,52,9", "28001"));
|
assertFalse(PaySurchargeRules.matchesPostcode("07,35,38,51,52,9", "28001"));
|
||||||
assertTrue(PaySurchargeRules.matchesPostcode("IV,HS,KA27-28", "KA27 8AA"));
|
assertTrue(PaySurchargeRules.matchesPostcode("IV,HS,KA27-28", "KA27 8AA"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void zoneFeeBandsKeepDeliveryAndAddRemoteAndLineHaul()
|
||||||
|
{
|
||||||
|
PayProduct product = new PayProduct();
|
||||||
|
product.setProductName("CTT 48H");
|
||||||
|
product.setCurrency("EUR");
|
||||||
|
PayWeightBand delivery = band("0", "1", "2.05", "Mad High Density 马德里高密度地区");
|
||||||
|
delivery.setSectionName("派送费");
|
||||||
|
delivery.setChargeName("派送费");
|
||||||
|
PayWeightBand lineHaul = band("0", "1", "0.09", "Mad High Density 马德里高密度地区");
|
||||||
|
lineHaul.setSectionName("额外线路运输费");
|
||||||
|
lineHaul.setChargeName("额外线路运输费");
|
||||||
|
PayWeightBand remote = band("0", "1", "7.1", "Balearic Islands 07邮编开头");
|
||||||
|
remote.setSectionName("偏远附加费");
|
||||||
|
remote.setChargeName("偏远附加费");
|
||||||
|
product.setWeightBands(new ArrayList<>(List.of(delivery, lineHaul, remote)));
|
||||||
|
PaySurcharge deliveryExtra = fee(11L, "每公斤续重", "0.29", "EUR", "EXTRA_KG", "1");
|
||||||
|
deliveryExtra.setSectionName("派送费");
|
||||||
|
deliveryExtra.setZoneName("Mad High Density 马德里高密度地区");
|
||||||
|
PaySurcharge lineExtra = fee(12L, "每公斤续重", "0.05", "EUR", "EXTRA_KG", "1");
|
||||||
|
lineExtra.setSectionName("额外线路运输费");
|
||||||
|
lineExtra.setZoneName("Mad High Density 马德里高密度地区");
|
||||||
|
PaySurcharge remoteExtra = fee(13L, "每公斤续重", "4", "EUR", "EXTRA_KG", "1");
|
||||||
|
remoteExtra.setSectionName("偏远附加费");
|
||||||
|
remoteExtra.setZoneName("Balearic Islands 07邮编开头");
|
||||||
|
product.setSurcharges(List.of(deliveryExtra, lineExtra, remoteExtra));
|
||||||
|
|
||||||
|
PayOrderCostResult island = PayCostCalculator.calculate(product, new BigDecimal("3"),
|
||||||
|
null, null, null, "07008", "Mad High Density 马德里高密度地区", null, 1);
|
||||||
|
assertTrue(hasFee(island, "基础运费", "2.05"));
|
||||||
|
assertTrue(hasFee(island, "每公斤续重", "0.58"));
|
||||||
|
assertTrue(hasFee(island, "额外线路运输费", "0.09"));
|
||||||
|
assertTrue(hasFee(island, "额外线路运输费", "0.10"));
|
||||||
|
assertTrue(hasFee(island, "偏远附加费", "7.1"));
|
||||||
|
assertTrue(hasFee(island, "偏远附加费", "8"));
|
||||||
|
|
||||||
|
PayOrderCostResult mainland = PayCostCalculator.calculate(product, new BigDecimal("3"),
|
||||||
|
null, null, null, "28001", "Mad High Density 马德里高密度地区", null, 1);
|
||||||
|
assertTrue(hasFee(mainland, "基础运费", "2.05"));
|
||||||
|
assertTrue(hasFee(mainland, "额外线路运输费", "0.09"));
|
||||||
|
assertTrue(mainland.getFees().stream().noneMatch(fee -> "偏远附加费".equals(fee.getFeeName())));
|
||||||
assertEquals("07", PaySurchargeRules.remotePrefixes("Balearic Islands 07邮编开头"));
|
assertEquals("07", PaySurchargeRules.remotePrefixes("Balearic Islands 07邮编开头"));
|
||||||
assertEquals("35,38", PaySurchargeRules.remotePrefixes("Canary Islands 35、38邮编开头"));
|
assertEquals("35,38", PaySurchargeRules.remotePrefixes("Canary Islands 35、38邮编开头"));
|
||||||
assertEquals("9", PaySurchargeRules.remotePrefixes("Portuguese Island 9邮编开头"));
|
assertEquals("9", PaySurchargeRules.remotePrefixes("Portuguese Island 9邮编开头"));
|
||||||
@@ -228,6 +357,44 @@ class PayCostCalculatorTest
|
|||||||
assertTrue(hasFee(result, "偏远附加费", "0.70"));
|
assertTrue(hasFee(result, "偏远附加费", "0.70"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void countryRemoteHitWithoutAZoneUsesTheFeePostcodeTier()
|
||||||
|
{
|
||||||
|
PayProduct product = new PayProduct();
|
||||||
|
product.setProductName("CTT 48H");
|
||||||
|
product.setCurrency("EUR");
|
||||||
|
product.setWeightBands(new ArrayList<>(List.of(band("0", "5", "2.05", "马德里"))));
|
||||||
|
PaySurcharge balearic = fee(1L, "偏远附加费", "7.1", "EUR", "POSTCODE", "07");
|
||||||
|
balearic.setZoneName("Balearic Islands 07邮编开头");
|
||||||
|
balearic.setPostcodeParam("07");
|
||||||
|
PaySurcharge canary = fee(2L, "偏远附加费", "8.9", "EUR", "POSTCODE", "35,38");
|
||||||
|
canary.setZoneName("Canary Islands 35、38邮编开头");
|
||||||
|
canary.setPostcodeParam("35,38");
|
||||||
|
PaySurcharge extra = fee(3L, "偏远附加费", "4", "EUR", "EXTRA_KG", "1");
|
||||||
|
extra.setZoneName("Balearic Islands 07邮编开头");
|
||||||
|
extra.setPostcodeParam("07");
|
||||||
|
extra.setPriceUnit("EUR/KG");
|
||||||
|
product.setSurcharges(List.of(balearic, canary, extra));
|
||||||
|
List<PayRemoteBook.Hit> hits = List.of(new PayRemoteBook.Hit("", null, "", ""));
|
||||||
|
|
||||||
|
PayOrderCostResult light = PayCostCalculator.calculate(product, new BigDecimal("0.8"),
|
||||||
|
null, null, null, "07008", "马德里", null, 1, hits, false, false, "ES", "西班牙");
|
||||||
|
assertTrue(hasFee(light, "偏远附加费", "7.1"));
|
||||||
|
assertTrue(light.getFees().stream().noneMatch(fee -> fee.getFeeName().equals("偏远附加费")
|
||||||
|
&& fee.getAmount().compareTo(new BigDecimal("8.9")) == 0));
|
||||||
|
assertTrue(light.getFees().stream().noneMatch(fee -> fee.getAmount().compareTo(new BigDecimal("4")) == 0));
|
||||||
|
|
||||||
|
PayOrderCostResult heavy = PayCostCalculator.calculate(product, new BigDecimal("3"),
|
||||||
|
null, null, null, "07008", "马德里", null, 1, hits, false, false, "ES", "西班牙");
|
||||||
|
assertTrue(hasFee(heavy, "偏远附加费", "7.1"));
|
||||||
|
assertTrue(hasFee(heavy, "偏远附加费", "8"));
|
||||||
|
|
||||||
|
List<PayRemoteBook.Hit> named = List.of(new PayRemoteBook.Hit("", null, "", "Aland Islands"));
|
||||||
|
PayOrderCostResult skipped = PayCostCalculator.calculate(product, new BigDecimal("0.8"),
|
||||||
|
null, null, null, "07008", "马德里", null, 1, named, false, false, "ES", "西班牙");
|
||||||
|
assertTrue(skipped.getFees().stream().noneMatch(fee -> "偏远附加费".equals(fee.getFeeName())));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void remoteHitsFollowTheProductGroupAndCountry()
|
void remoteHitsFollowTheProductGroupAndCountry()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,212 @@
|
|||||||
|
package com.bms.price.pay;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.time.ZoneId;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import com.bms.price.domain.PayOrderCostResult;
|
||||||
|
import com.bms.price.domain.PayProduct;
|
||||||
|
import com.bms.price.domain.PaySurcharge;
|
||||||
|
import com.bms.price.domain.PaySurchargeRule;
|
||||||
|
import com.bms.price.domain.PayWeightBand;
|
||||||
|
|
||||||
|
/** 用 DE-iMile 价卡和附加费配置,按测试订单的重量、尺寸、日期测算。 */
|
||||||
|
class PaySurchargeConfigCalcTest
|
||||||
|
{
|
||||||
|
@Test
|
||||||
|
void lightOctoberOrderChargesFreightAndCarbonOnly()
|
||||||
|
{
|
||||||
|
PayOrderCostResult result = PayCostCalculator.calculate(imile(), new BigDecimal("0.451"),
|
||||||
|
new BigDecimal("35.70"), new BigDecimal("32.80"), new BigDecimal("4.00"),
|
||||||
|
null, null, day(2026, 10, 17), 8);
|
||||||
|
assertTrue(hasFee(result, "基础运费", "2.99"));
|
||||||
|
assertTrue(hasFee(result, "CO₂附加费", "0.03"));
|
||||||
|
assertTrue(result.getFees().stream().noneMatch(fee -> fee.getFeeName().contains("超尺寸")));
|
||||||
|
assertTrue(result.getFees().stream().noneMatch(fee -> fee.getFeeName().contains("旺季")));
|
||||||
|
assertEquals(new BigDecimal("3.02"), result.getPayTotal());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void heavierOctoberOrderUsesTheNextWeightBand()
|
||||||
|
{
|
||||||
|
PayOrderCostResult result = PayCostCalculator.calculate(imile(), new BigDecimal("1.246"),
|
||||||
|
new BigDecimal("41.10"), new BigDecimal("34.20"), new BigDecimal("6.10"),
|
||||||
|
null, null, day(2026, 10, 17), 5);
|
||||||
|
assertTrue(hasFee(result, "基础运费", "3.12"));
|
||||||
|
assertTrue(hasFee(result, "CO₂附加费", "0.03"));
|
||||||
|
assertEquals(new BigDecimal("3.15"), result.getPayTotal());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void oversizeAndPeakSeasonUseTheConfiguredRules()
|
||||||
|
{
|
||||||
|
PayOrderCostResult oversize = PayCostCalculator.calculate(imile(), new BigDecimal("1.246"),
|
||||||
|
new BigDecimal("130"), new BigDecimal("70"), new BigDecimal("40"),
|
||||||
|
null, null, day(2026, 11, 12), 5);
|
||||||
|
assertTrue(hasFee(oversize, "基础运费", "3.12"));
|
||||||
|
assertTrue(hasFee(oversize, "CO₂附加费", "0.03"));
|
||||||
|
assertTrue(hasFee(oversize, "异形件/超尺寸处理费", "3.60"));
|
||||||
|
assertTrue(hasFee(oversize, "旺季附加费", "0.19"));
|
||||||
|
assertEquals(new BigDecimal("6.94"), oversize.getPayTotal());
|
||||||
|
|
||||||
|
PayOrderCostResult peak = PayCostCalculator.calculate(dhl(), new BigDecimal("0.664"),
|
||||||
|
new BigDecimal("25.50"), new BigDecimal("18.90"), new BigDecimal("7.80"),
|
||||||
|
null, null, day(2026, 11, 4), 11);
|
||||||
|
assertTrue(hasFee(peak, "基础运费", "3.13"));
|
||||||
|
assertTrue(hasFee(peak, "燃油附加费", "0.15"));
|
||||||
|
assertTrue(hasFee(peak, "旺季附加费", "0.19"));
|
||||||
|
assertTrue(peak.getFees().stream().noneMatch(fee -> "高峰旺季附加费".equals(fee.getFeeName())));
|
||||||
|
assertTrue(peak.getFees().stream().noneMatch(fee -> fee.getFeeName().contains("超尺寸")));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void sumOverThreeHundredChargesEachExtraTenCentimetres()
|
||||||
|
{
|
||||||
|
PayOrderCostResult result = PayCostCalculator.calculate(sumStep(), new BigDecimal("0.039"),
|
||||||
|
new BigDecimal("300"), new BigDecimal("300"), new BigDecimal("300"),
|
||||||
|
null, null, null, 8);
|
||||||
|
assertTrue(hasFee(result, "基础运费", "2.40"));
|
||||||
|
assertTrue(hasFee(result, "超尺寸附加费", "2.43"));
|
||||||
|
assertTrue(hasFee(result, "超尺寸附加费", "378.00"));
|
||||||
|
assertEquals(new BigDecimal("382.83"), result.getPayTotal());
|
||||||
|
|
||||||
|
PayOrderCostResult oneStep = PayCostCalculator.calculate(sumStep(), new BigDecimal("0.039"),
|
||||||
|
new BigDecimal("100"), new BigDecimal("100"), new BigDecimal("101"),
|
||||||
|
null, null, null, 8);
|
||||||
|
assertTrue(hasFee(oneStep, "超尺寸附加费", "2.43"));
|
||||||
|
assertTrue(hasFee(oneStep, "超尺寸附加费", "6.30"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean hasFee(PayOrderCostResult result, String name, String amount)
|
||||||
|
{
|
||||||
|
return result.getFees().stream().anyMatch(fee -> name.equals(fee.getFeeName())
|
||||||
|
&& fee.getAmount().compareTo(new BigDecimal(amount)) == 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Date day(int year, int month, int day)
|
||||||
|
{
|
||||||
|
return Date.from(LocalDate.of(year, month, day).atStartOfDay(ZoneId.systemDefault()).toInstant());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PayProduct sumStep()
|
||||||
|
{
|
||||||
|
PayProduct product = new PayProduct();
|
||||||
|
product.setProductName("CTT 48H");
|
||||||
|
product.setCurrency("EUR");
|
||||||
|
product.setWeightBands(List.of(band("0", "1", "2.40")));
|
||||||
|
PaySurcharge flat = fee("超尺寸附加费", "2.43", "SIZE");
|
||||||
|
PaySurcharge step = fee("超尺寸附加费", "6.30", "SIZE");
|
||||||
|
step.setChargeText("6.3EUR/增加10cm");
|
||||||
|
product.setSurcharges(List.of(flat, step));
|
||||||
|
PaySurchargeRule rule = new PaySurchargeRule();
|
||||||
|
rule.setCalcRule("SIZE");
|
||||||
|
rule.setEnabled("1");
|
||||||
|
Map<String, Object> detail = new LinkedHashMap<>();
|
||||||
|
detail.put("matchMode", "ANY");
|
||||||
|
detail.put("sumMin", new BigDecimal("300"));
|
||||||
|
detail.put("exceedStepCm", new BigDecimal("10"));
|
||||||
|
rule.setDetail(detail);
|
||||||
|
product.setBillingRules(List.of(rule));
|
||||||
|
return product;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PayProduct imile()
|
||||||
|
{
|
||||||
|
PayProduct product = new PayProduct();
|
||||||
|
product.setProductName("DE-iMile");
|
||||||
|
product.setCurrency("EUR");
|
||||||
|
product.setWeightBands(List.of(
|
||||||
|
band("0", "1", "2.99"),
|
||||||
|
band("1", "2", "3.12")));
|
||||||
|
product.setSurcharges(List.of(
|
||||||
|
fee("CO₂附加费", "0.03", "ALWAYS"),
|
||||||
|
fee("异形件/超尺寸处理费", "3.60", "SIZE"),
|
||||||
|
fee("旺季附加费", "0.19", "ALWAYS")));
|
||||||
|
product.setBillingRules(List.of(
|
||||||
|
always(null, null, null),
|
||||||
|
always("旺季附加费", "11-01", "12-31"),
|
||||||
|
sizeBox()));
|
||||||
|
return product;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PayProduct dhl()
|
||||||
|
{
|
||||||
|
PayProduct product = new PayProduct();
|
||||||
|
product.setProductName("德国DHL");
|
||||||
|
product.setCurrency("EUR");
|
||||||
|
product.setWeightBands(List.of(band("0", "1", "3.13")));
|
||||||
|
product.setSurcharges(List.of(
|
||||||
|
fee("燃油附加费", "0.15", "ALWAYS"),
|
||||||
|
fee("超尺寸超重费", "14.00", "SIZE"),
|
||||||
|
fee("旺季附加费", "0.19", "ALWAYS"),
|
||||||
|
fee("高峰旺季附加费", "0.50", "ALWAYS")));
|
||||||
|
product.setBillingRules(List.of(
|
||||||
|
always(null, null, null),
|
||||||
|
always("旺季附加费", "11-01", "12-31"),
|
||||||
|
always("高峰旺季附加费", "11-24", "12-07"),
|
||||||
|
sizeBox()));
|
||||||
|
return product;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PaySurchargeRule always(String feeName, String start, String end)
|
||||||
|
{
|
||||||
|
PaySurchargeRule rule = new PaySurchargeRule();
|
||||||
|
rule.setCalcRule("ALWAYS");
|
||||||
|
rule.setEnabled("1");
|
||||||
|
Map<String, Object> detail = new LinkedHashMap<>();
|
||||||
|
if (feeName != null)
|
||||||
|
{
|
||||||
|
detail.put("feeName", feeName);
|
||||||
|
detail.put("periodStart", start);
|
||||||
|
detail.put("periodEnd", end);
|
||||||
|
}
|
||||||
|
rule.setDetail(detail);
|
||||||
|
return rule;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PaySurchargeRule sizeBox()
|
||||||
|
{
|
||||||
|
PaySurchargeRule rule = new PaySurchargeRule();
|
||||||
|
rule.setCalcRule("SIZE");
|
||||||
|
rule.setEnabled("1");
|
||||||
|
Map<String, Object> detail = new LinkedHashMap<>();
|
||||||
|
detail.put("matchMode", "ANY");
|
||||||
|
detail.put("boxMode", "OVER");
|
||||||
|
detail.put("boxLength", new BigDecimal("120"));
|
||||||
|
detail.put("boxWidth", new BigDecimal("60"));
|
||||||
|
detail.put("boxHeight", new BigDecimal("60"));
|
||||||
|
rule.setDetail(detail);
|
||||||
|
return rule;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PayWeightBand band(String min, String max, String price)
|
||||||
|
{
|
||||||
|
PayWeightBand band = new PayWeightBand();
|
||||||
|
band.setWeightMin(new BigDecimal(min));
|
||||||
|
band.setWeightMax(new BigDecimal(max));
|
||||||
|
band.setWeightLabel(min + "-" + max);
|
||||||
|
band.setPrice(new BigDecimal(price));
|
||||||
|
band.setPriceUnit("EUR/ITEM");
|
||||||
|
return band;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PaySurcharge fee(String name, String amount, String rule)
|
||||||
|
{
|
||||||
|
PaySurcharge fee = new PaySurcharge();
|
||||||
|
fee.setFeeName(name);
|
||||||
|
fee.setAmount(new BigDecimal(amount));
|
||||||
|
fee.setCurrency("EUR");
|
||||||
|
fee.setCalcRule(rule);
|
||||||
|
fee.setChargeText(amount + " EUR/ITEM");
|
||||||
|
return fee;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
package com.bms.price.pay;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
|
import java.io.ByteArrayOutputStream;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import com.bms.price.domain.PayPreview;
|
||||||
|
import com.bms.price.domain.PayProduct;
|
||||||
|
import com.bms.price.pay.PayCostCalculator;
|
||||||
|
import com.bms.price.domain.PayOrderCostResult;
|
||||||
|
|
||||||
|
/** 三种标准模板都能导回,并且按各自公式算出运费。 */
|
||||||
|
class PayTemplateWorkbookTest
|
||||||
|
{
|
||||||
|
@Test
|
||||||
|
void flatTemplateChargesTheBandPrice() throws Exception
|
||||||
|
{
|
||||||
|
byte[] file = workbook(PayChargeMode.FLAT);
|
||||||
|
PayPreview preview = PayTemplateWorkbook.parse(replaceSample(file,
|
||||||
|
"法国Colissimo", "威狮", "EUR", "法国", "FR", "", "0", "1", "3.03"), "一口价.xlsx", PayChargeMode.FLAT);
|
||||||
|
PayProduct product = preview.getProducts().get(0);
|
||||||
|
assertEquals(PayChargeMode.FLAT, product.getChargeType());
|
||||||
|
PayOrderCostResult result = PayCostCalculator.calculate(product, new BigDecimal("0.6"), null, null, null, null, null, null);
|
||||||
|
assertEquals(new BigDecimal("3.03"), result.getPayTotal());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void perKgTemplateMultipliesWeight() throws Exception
|
||||||
|
{
|
||||||
|
byte[] file = workbook(PayChargeMode.PER_KG);
|
||||||
|
PayPreview preview = PayTemplateWorkbook.parse(replaceSample(file,
|
||||||
|
"DHL泛欧", "威狮", "EUR", "奥地利", "AT", "", "0", "31.5", "0.29"), "常规计费.xlsx", PayChargeMode.PER_KG);
|
||||||
|
PayProduct product = preview.getProducts().get(0);
|
||||||
|
PayOrderCostResult result = PayCostCalculator.calculate(product, new BigDecimal("2.4"), null, null, null, null, null, null);
|
||||||
|
assertEquals(new BigDecimal("0.70"), result.getPayTotal());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void extraTemplateAddsWeightBeyondTheFirstKilo() throws Exception
|
||||||
|
{
|
||||||
|
byte[] file = workbook(PayChargeMode.EXTRA);
|
||||||
|
PayPreview preview = PayTemplateWorkbook.parse(replaceSample(file,
|
||||||
|
"CTT", "威狮", "EUR", "西班牙", "ES", "马德里", "1", "2.05", "0.29"), "续重价.xlsx", PayChargeMode.EXTRA);
|
||||||
|
PayProduct product = preview.getProducts().get(0);
|
||||||
|
assertTrue(product.getSurcharges().stream().anyMatch(fee -> "EXTRA_KG".equals(fee.getCalcRule())));
|
||||||
|
PayOrderCostResult result = PayCostCalculator.calculate(product, new BigDecimal("2.4"), null, null, null, null, null, null);
|
||||||
|
assertEquals(new BigDecimal("2.46"), result.getPayTotal());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static byte[] workbook(String mode) throws Exception
|
||||||
|
{
|
||||||
|
ByteArrayOutputStream out = new ByteArrayOutputStream();
|
||||||
|
PayTemplateWorkbook.write(mode, out);
|
||||||
|
return out.toByteArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 用真实数据换掉模板里的示例行,避免示例被跳过。 */
|
||||||
|
private static byte[] replaceSample(byte[] source, String... values) throws Exception
|
||||||
|
{
|
||||||
|
try (org.apache.poi.xssf.usermodel.XSSFWorkbook book = new org.apache.poi.xssf.usermodel.XSSFWorkbook(new java.io.ByteArrayInputStream(source)))
|
||||||
|
{
|
||||||
|
org.apache.poi.ss.usermodel.Row row = book.getSheetAt(0).getRow(1);
|
||||||
|
for (int i = 0; i < values.length; i++)
|
||||||
|
{
|
||||||
|
row.getCell(i).setCellValue(values[i]);
|
||||||
|
}
|
||||||
|
ByteArrayOutputStream out = new ByteArrayOutputStream();
|
||||||
|
book.write(out);
|
||||||
|
return out.toByteArray();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ package com.bms.price.pay;
|
|||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -34,7 +35,10 @@ class PayWorkbookParserTest
|
|||||||
assertTrue(evri.getSurcharges().stream().anyMatch(fee -> "战争附加费".equals(fee.getFeeName()) && fee.getChargeText().contains("2.5")));
|
assertTrue(evri.getSurcharges().stream().anyMatch(fee -> "战争附加费".equals(fee.getFeeName()) && fee.getChargeText().contains("2.5")));
|
||||||
PayProduct ctt = product(preview, "CTT 48H");
|
PayProduct ctt = product(preview, "CTT 48H");
|
||||||
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> band.getWeightLabel() != null && band.getWeightLabel().contains("首重") && decimal(band, "2.05")));
|
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> band.getWeightLabel() != null && band.getWeightLabel().contains("首重") && decimal(band, "2.05")));
|
||||||
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> "每增加 1Kg".equals(band.getWeightLabel()) || (band.getWeightLabel() != null && band.getWeightLabel().contains("每增加"))));
|
assertTrue(ctt.getWeightBands().stream().noneMatch(band -> band.getWeightLabel() != null && band.getWeightLabel().contains("每增加")));
|
||||||
|
assertTrue(ctt.getSurcharges().stream().anyMatch(fee -> "每公斤续重".equals(fee.getFeeName()) && fee.getAmount() != null && fee.getAmount().compareTo(new BigDecimal("0.29")) == 0));
|
||||||
|
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> band.getChargeName() != null && band.getChargeName().contains("偏远") && decimal(band, "7.1")));
|
||||||
|
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> band.getChargeName() != null && (band.getChargeName().contains("额外") || band.getChargeName().toLowerCase().contains("line-haul")) && decimal(band, "0.09")));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -489,7 +493,7 @@ class PayWorkbookParserTest
|
|||||||
"西班牙CTT带电专线(主要地区)", List.of("西班牙CTT带电专线(主要地区)"));
|
"西班牙CTT带电专线(主要地区)", List.of("西班牙CTT带电专线(主要地区)"));
|
||||||
PayProduct ctt = preview.getProducts().get(0);
|
PayProduct ctt = preview.getProducts().get(0);
|
||||||
assertEquals("OK", ctt.getParseStatus());
|
assertEquals("OK", ctt.getParseStatus());
|
||||||
assertEquals("单票价", ctt.getChargeType());
|
assertEquals("FLAT", ctt.getChargeType());
|
||||||
assertTrue(ctt.getExtraPerKg() == null || ctt.getExtraPerKg().isBlank());
|
assertTrue(ctt.getExtraPerKg() == null || ctt.getExtraPerKg().isBlank());
|
||||||
assertEquals(150, ctt.getWeightBands().size());
|
assertEquals(150, ctt.getWeightBands().size());
|
||||||
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> "1".equals(band.getWeightLabel())
|
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> "1".equals(band.getWeightLabel())
|
||||||
@@ -534,7 +538,7 @@ class PayWorkbookParserTest
|
|||||||
PayProduct ctt = preview.getProducts().get(0);
|
PayProduct ctt = preview.getProducts().get(0);
|
||||||
assertEquals("OK", ctt.getParseStatus());
|
assertEquals("OK", ctt.getParseStatus());
|
||||||
assertEquals("EUR", ctt.getCurrency());
|
assertEquals("EUR", ctt.getCurrency());
|
||||||
assertEquals("续重计费", ctt.getChargeType());
|
assertEquals("EXTRA", ctt.getChargeType());
|
||||||
assertTrue(covers(ctt.getExtraPerKg(), "1.86"));
|
assertTrue(covers(ctt.getExtraPerKg(), "1.86"));
|
||||||
assertTrue(covers(ctt.getExtraPerKg(), "5.79"));
|
assertTrue(covers(ctt.getExtraPerKg(), "5.79"));
|
||||||
assertEquals(24, ctt.getWeightBands().size());
|
assertEquals(24, ctt.getWeightBands().size());
|
||||||
@@ -607,7 +611,7 @@ class PayWorkbookParserTest
|
|||||||
PayProduct ctt = preview.getProducts().get(0);
|
PayProduct ctt = preview.getProducts().get(0);
|
||||||
assertEquals("OK", ctt.getParseStatus());
|
assertEquals("OK", ctt.getParseStatus());
|
||||||
assertEquals("西班牙", ctt.getCountryScope());
|
assertEquals("西班牙", ctt.getCountryScope());
|
||||||
assertEquals("续重计费", ctt.getChargeType());
|
assertEquals("EXTRA", ctt.getChargeType());
|
||||||
assertTrue(covers(ctt.getExtraPerKg(), "0.82"));
|
assertTrue(covers(ctt.getExtraPerKg(), "0.82"));
|
||||||
assertEquals(60, ctt.getWeightBands().size());
|
assertEquals(60, ctt.getWeightBands().size());
|
||||||
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> "西班牙".equals(band.getCountryName()) && "ES".equals(band.getCountryCode())
|
assertTrue(ctt.getWeightBands().stream().anyMatch(band -> "西班牙".equals(band.getCountryName()) && "ES".equals(band.getCountryCode())
|
||||||
|
|||||||
@@ -25,6 +25,17 @@ class PayZoneMatcherTest
|
|||||||
assertEquals("UK Mainland\n英国大陆", decision.getZoneName());
|
assertEquals("UK Mainland\n英国大陆", decision.getZoneName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void ordinaryUkPostcodeIsMainlandAndNotARemoteZone()
|
||||||
|
{
|
||||||
|
PayZoneMatcher.Decision decision = PayZoneMatcher.resolve(ZONES, evriLines(), "KY4 0DN");
|
||||||
|
assertNull(decision.getMessage());
|
||||||
|
assertEquals("UK Mainland\n英国大陆", decision.getZoneName());
|
||||||
|
PayZoneMatcher.Decision emptyBook = PayZoneMatcher.resolve(ZONES, List.of(), "KY4 0DN");
|
||||||
|
assertNull(emptyBook.getMessage());
|
||||||
|
assertEquals("UK Mainland\n英国大陆", emptyBook.getZoneName());
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void northernIrelandAndHighlandsComeFromThePostcodeBook()
|
void northernIrelandAndHighlandsComeFromThePostcodeBook()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,122 @@
|
|||||||
|
package com.bms.receivable;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertSame;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.ArgumentMatchers.eq;
|
||||||
|
import static org.mockito.ArgumentMatchers.nullable;
|
||||||
|
import static org.mockito.Mockito.doThrow;
|
||||||
|
import static org.mockito.Mockito.mock;
|
||||||
|
import static org.mockito.Mockito.never;
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
import static org.mockito.Mockito.verifyNoInteractions;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.AfterEach;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||||
|
import org.springframework.security.core.context.SecurityContextHolder;
|
||||||
|
import org.springframework.test.util.ReflectionTestUtils;
|
||||||
|
|
||||||
|
import com.bms.common.core.domain.entity.SysUser;
|
||||||
|
import com.bms.common.core.domain.model.LoginUser;
|
||||||
|
import com.bms.common.exception.ServiceException;
|
||||||
|
import com.bms.receivable.domain.ArBill;
|
||||||
|
import com.bms.receivable.domain.ArBillLog;
|
||||||
|
import com.bms.receivable.mapper.ArBillDetailMapper;
|
||||||
|
import com.bms.receivable.mapper.ArBillExportMapper;
|
||||||
|
import com.bms.receivable.mapper.ArBillMapper;
|
||||||
|
import com.bms.receivable.security.ArBillScopeResolver;
|
||||||
|
import com.bms.receivable.service.IArBillLogService;
|
||||||
|
import com.bms.receivable.service.impl.ArBillServiceImpl;
|
||||||
|
|
||||||
|
class ArBillConfirmTest {
|
||||||
|
private final ArBillMapper billMapper = mock(ArBillMapper.class);
|
||||||
|
private final ArBillDetailMapper detailMapper = mock(ArBillDetailMapper.class);
|
||||||
|
private final ArBillExportMapper exportMapper = mock(ArBillExportMapper.class);
|
||||||
|
private final ArBillScopeResolver scope = mock(ArBillScopeResolver.class);
|
||||||
|
private final IArBillLogService logService = mock(IArBillLogService.class);
|
||||||
|
private final ArBillServiceImpl service = new ArBillServiceImpl();
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void setUp() {
|
||||||
|
ReflectionTestUtils.setField(service, "billMapper", billMapper);
|
||||||
|
ReflectionTestUtils.setField(service, "detailMapper", detailMapper);
|
||||||
|
ReflectionTestUtils.setField(service, "exportMapper", exportMapper);
|
||||||
|
ReflectionTestUtils.setField(service, "billScope", scope);
|
||||||
|
ReflectionTestUtils.setField(service, "logService", logService);
|
||||||
|
SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken(
|
||||||
|
new LoginUser(7L, 1L, new SysUser(), Set.of()), null));
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterEach
|
||||||
|
void clearSecurity() {
|
||||||
|
SecurityContextHolder.clearContext();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void readyDraftCanBeConfirmedWithoutReadingDetails() {
|
||||||
|
ArBill draft = bill("DRAFT", "READY");
|
||||||
|
draft.setTotalAmount(new BigDecimal("123.45"));
|
||||||
|
ArBill confirmed = bill("CONFIRMED", "READY");
|
||||||
|
when(billMapper.selectArBillByIdForUpdate(11L)).thenReturn(draft);
|
||||||
|
when(billMapper.updateArBillStatus(11L, "CONFIRMED", null, "finance", "DRAFT")).thenReturn(1);
|
||||||
|
when(billMapper.selectArBillByIdScoped(11L, null)).thenReturn(confirmed);
|
||||||
|
when(exportMapper.selectByBillId(11L)).thenReturn(List.of());
|
||||||
|
|
||||||
|
assertSame(confirmed, service.confirmBill(11L, null, "finance", "request-1"));
|
||||||
|
verify(scope).requireBillAccessible(11L);
|
||||||
|
verifyNoInteractions(detailMapper);
|
||||||
|
verify(logService).record(any(ArBillLog.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void unfinishedOrNonDraftBillStillCannotBeConfirmed() {
|
||||||
|
when(billMapper.selectArBillByIdForUpdate(11L)).thenReturn(
|
||||||
|
bill("DRAFT", "GENERATING"), bill("CONFIRMED", "READY"));
|
||||||
|
|
||||||
|
ServiceException unfinished = assertThrows(ServiceException.class,
|
||||||
|
() -> service.confirmBill(11L, null, "finance", "request-1"));
|
||||||
|
assertEquals("账单尚未生成完成,暂不能确认", unfinished.getMessage());
|
||||||
|
ServiceException notDraft = assertThrows(ServiceException.class,
|
||||||
|
() -> service.confirmBill(11L, null, "finance", "request-2"));
|
||||||
|
assertEquals("只有草稿账单可以确认,当前状态为 CONFIRMED", notDraft.getMessage());
|
||||||
|
verify(billMapper, never()).updateArBillStatus(eq(11L), any(), nullable(String.class), any(), any());
|
||||||
|
verifyNoInteractions(detailMapper);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void inaccessibleBillStillCannotBeConfirmed() {
|
||||||
|
when(billMapper.selectArBillByIdForUpdate(11L)).thenReturn(bill("DRAFT", "READY"));
|
||||||
|
doThrow(new ServiceException("账单不存在或无权访问")).when(scope).requireBillAccessible(11L);
|
||||||
|
|
||||||
|
assertThrows(ServiceException.class, () -> service.confirmBill(11L, null, "finance", "request-1"));
|
||||||
|
verify(billMapper, never()).updateArBillStatus(eq(11L), any(), nullable(String.class), any(), any());
|
||||||
|
verifyNoInteractions(detailMapper);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void concurrentStatusChangeStillPreventsConfirmation() {
|
||||||
|
when(billMapper.selectArBillByIdForUpdate(11L)).thenReturn(bill("DRAFT", "READY"));
|
||||||
|
|
||||||
|
ServiceException error = assertThrows(ServiceException.class,
|
||||||
|
() -> service.confirmBill(11L, null, "finance", "request-1"));
|
||||||
|
assertEquals("账单状态已发生变化,请刷新后重试", error.getMessage());
|
||||||
|
verify(logService, never()).record(any(ArBillLog.class));
|
||||||
|
verifyNoInteractions(detailMapper);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ArBill bill(String status, String generationStatus) {
|
||||||
|
ArBill bill = new ArBill();
|
||||||
|
bill.setArBillId(11L);
|
||||||
|
bill.setStatus(status);
|
||||||
|
bill.setGenerationStatus(generationStatus);
|
||||||
|
return bill;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,142 @@
|
|||||||
|
package com.bms.receivable;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
import static org.mockito.ArgumentMatchers.*;
|
||||||
|
import static org.mockito.Mockito.*;
|
||||||
|
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import com.bms.receivable.domain.ArBillDetail;
|
||||||
|
import com.bms.receivable.domain.vo.ArBillDetailQuery;
|
||||||
|
import com.bms.receivable.mapper.ArBillDetailMapper;
|
||||||
|
import com.bms.receivable.security.ArBillRowScope;
|
||||||
|
import com.bms.receivable.security.ArBillScopeResolver;
|
||||||
|
import com.bms.receivable.service.impl.ArBillServiceImpl;
|
||||||
|
import com.github.pagehelper.PageHelper;
|
||||||
|
import com.github.pagehelper.parser.defaults.DefaultCountSqlParser;
|
||||||
|
import org.apache.ibatis.builder.xml.XMLMapperBuilder;
|
||||||
|
import org.apache.ibatis.mapping.BoundSql;
|
||||||
|
import org.apache.ibatis.session.Configuration;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.test.util.ReflectionTestUtils;
|
||||||
|
|
||||||
|
class ArBillDetailSearchTest {
|
||||||
|
@Test
|
||||||
|
void numberSearchUsesExactMatchesAndCannotBypassBillOrPermissionScope() throws Exception {
|
||||||
|
ArBillDetailQuery query = new ArBillDetailQuery();
|
||||||
|
query.setOrderKeyword("00123' OR 1=1 --");
|
||||||
|
BoundSql bound = detailSql(query, scope(false, true));
|
||||||
|
String sql = normalized(bound.getSql());
|
||||||
|
assertTrue(sql.contains("where ar_bill_id = ?"));
|
||||||
|
assertTrue(sql.contains("and (order_no = ? or tracking_no = ? or transfer_no = ?)"));
|
||||||
|
assertTrue(sql.contains("b.ar_bill_id = ar_bill_detail.ar_bill_id"));
|
||||||
|
assertTrue(sql.contains("c.customer_id = b.customer_id"));
|
||||||
|
assertTrue(sql.contains("su.user_id = ?"));
|
||||||
|
assertFalse(sql.contains("order_no like"));
|
||||||
|
assertFalse(sql.contains(query.getOrderKeyword()));
|
||||||
|
assertEquals(3, bound.getParameterMappings().stream()
|
||||||
|
.filter(parameter -> parameter.getProperty().equals("query.orderKeyword")).count());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void productSearchAndPaginationCountApplyBothFiltersAndTheSameScope() throws Exception {
|
||||||
|
ArBillDetailQuery query = new ArBillDetailQuery();
|
||||||
|
query.setOrderKeyword("ORDER001");
|
||||||
|
query.setProductKeyword("荷兰");
|
||||||
|
String sql = normalized(detailSql(query, scope(false, true)).getSql());
|
||||||
|
assertTrue(sql.contains("and (product_code like concat('%', ?, '%') or product_name like concat('%', ?, '%'))"));
|
||||||
|
String count = normalized(new DefaultCountSqlParser().getSmartCountSql(sql, "0"));
|
||||||
|
assertTrue(count.startsWith("select count(0)"));
|
||||||
|
assertTrue(count.contains("ar_bill_id = ?"));
|
||||||
|
assertTrue(count.contains("order_no = ?"));
|
||||||
|
assertTrue(count.contains("tracking_no = ?"));
|
||||||
|
assertTrue(count.contains("transfer_no = ?"));
|
||||||
|
assertTrue(count.contains("product_code like"));
|
||||||
|
assertTrue(count.contains("product_name like"));
|
||||||
|
assertTrue(count.contains("su.user_id = ?"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void noSearchKeepsExistingQueryAndDeniedScopeRemainsDenied() throws Exception {
|
||||||
|
for (ArBillDetailQuery query : new ArBillDetailQuery[]{null, new ArBillDetailQuery()}) {
|
||||||
|
String sql = normalized(detailSql(query, scope(false, false)).getSql());
|
||||||
|
assertFalse(sql.contains("order_no = ?"));
|
||||||
|
assertFalse(sql.contains("product_code like"));
|
||||||
|
assertTrue(sql.contains("and 1 = 0"));
|
||||||
|
assertTrue(sql.contains("where ar_bill_id = ?"));
|
||||||
|
assertTrue(sql.endsWith("order by detail_no"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void serviceTrimsSearchAndPreservesPaginationForTheScopedDetailQuery() {
|
||||||
|
ArBillServiceImpl service = new ArBillServiceImpl();
|
||||||
|
ArBillDetailMapper details = mock(ArBillDetailMapper.class);
|
||||||
|
ArBillScopeResolver resolver = mock(ArBillScopeResolver.class);
|
||||||
|
ArBillRowScope scope = mock(ArBillRowScope.class);
|
||||||
|
ReflectionTestUtils.setField(service, "detailMapper", details);
|
||||||
|
ReflectionTestUtils.setField(service, "billScope", resolver);
|
||||||
|
when(resolver.resolve()).thenReturn(scope);
|
||||||
|
List<ArBillDetail> result = List.of(new ArBillDetail());
|
||||||
|
when(details.selectByBillIdScoped(eq(7L), any(), same(scope))).thenAnswer(invocation -> {
|
||||||
|
ArBillDetailQuery query = invocation.getArgument(1);
|
||||||
|
assertEquals("000123", query.getOrderKeyword());
|
||||||
|
assertEquals("荷兰", query.getProductKeyword());
|
||||||
|
assertEquals(3, PageHelper.getLocalPage().getPageNum());
|
||||||
|
return result;
|
||||||
|
});
|
||||||
|
ArBillDetailQuery query = new ArBillDetailQuery();
|
||||||
|
query.setOrderKeyword(" 000123 ");
|
||||||
|
query.setProductKeyword(" 荷兰 ");
|
||||||
|
PageHelper.startPage(3, 10);
|
||||||
|
try {
|
||||||
|
assertSame(result, service.selectArBillDetails(7L, query));
|
||||||
|
verify(details).selectByBillIdScoped(eq(7L), any(), same(scope));
|
||||||
|
verifyNoMoreInteractions(details);
|
||||||
|
} finally {
|
||||||
|
PageHelper.clearPage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void wholeBillExportQueryDoesNotInheritDetailSearchFilters() throws Exception {
|
||||||
|
String sql = normalized(configuration().getMappedStatement("com.bms.receivable.mapper.ArBillDetailMapper.selectExportPage")
|
||||||
|
.getBoundSql(Map.of("arBillId", 7L, "lastDetailNo", 0, "pageSize", 2000)).getSql());
|
||||||
|
assertTrue(sql.contains("where ar_bill_id = ? and detail_no > ?"));
|
||||||
|
assertFalse(sql.contains("order_no = ?"));
|
||||||
|
assertFalse(sql.contains("product_code like"));
|
||||||
|
assertTrue(sql.endsWith("limit ?"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private BoundSql detailSql(ArBillDetailQuery query, Map<String, Object> scope) throws Exception {
|
||||||
|
Map<String, Object> parameters = new HashMap<>();
|
||||||
|
parameters.put("arBillId", 7L);
|
||||||
|
parameters.put("query", query);
|
||||||
|
parameters.put("scope", scope);
|
||||||
|
return configuration().getMappedStatement("com.bms.receivable.mapper.ArBillDetailMapper.selectByBillIdScoped")
|
||||||
|
.getBoundSql(parameters);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Configuration configuration() throws Exception {
|
||||||
|
Configuration configuration = new Configuration();
|
||||||
|
configuration.getTypeAliasRegistry().registerAlias("ArBillDetail", ArBillDetail.class);
|
||||||
|
for (String resource : List.of("mapper/receivable/ArBillScopeMapper.xml", "mapper/receivable/ArBillDetailMapper.xml")) {
|
||||||
|
try (InputStream input = getClass().getClassLoader().getResourceAsStream(resource)) {
|
||||||
|
new XMLMapperBuilder(input, configuration, resource, configuration.getSqlFragments()).parse();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return configuration;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Map<String, Object> scope(boolean all, boolean self) {
|
||||||
|
return Map.of("all", all, "self", self, "department", false, "userId", 9L, "deptId", 10L);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String normalized(String sql) {
|
||||||
|
return sql.replaceAll("\\s+", " ").trim().toLowerCase(Locale.ROOT);
|
||||||
|
}
|
||||||
|
}
|
||||||
+144
@@ -0,0 +1,144 @@
|
|||||||
|
package com.bms.receivable.export;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
import static org.mockito.ArgumentMatchers.*;
|
||||||
|
import static org.mockito.Mockito.*;
|
||||||
|
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.sql.Date;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import com.bms.common.core.domain.model.LoginUser;
|
||||||
|
import com.bms.common.exception.ServiceException;
|
||||||
|
import com.bms.receivable.domain.ArBill;
|
||||||
|
import com.bms.receivable.domain.ArBillExport;
|
||||||
|
import com.bms.receivable.domain.ArExportTemplate;
|
||||||
|
import com.bms.receivable.event.ArBillExportTaskEvent;
|
||||||
|
import com.bms.receivable.mapper.ArBillExportMapper;
|
||||||
|
import com.bms.receivable.mapper.ArBillLogMapper;
|
||||||
|
import com.bms.receivable.mapper.ArBillMapper;
|
||||||
|
import com.bms.receivable.mapper.ArExportTemplateMapper;
|
||||||
|
import com.bms.receivable.security.ArBillScopeResolver;
|
||||||
|
import com.bms.receivable.service.ArBillVoidTaskService;
|
||||||
|
import com.bms.receivable.service.IArBillLogService;
|
||||||
|
import com.bms.receivable.service.impl.ArBillServiceImpl;
|
||||||
|
import org.apache.ibatis.builder.xml.XMLMapperBuilder;
|
||||||
|
import org.apache.ibatis.session.Configuration;
|
||||||
|
import org.junit.jupiter.api.AfterEach;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.context.ApplicationEventPublisher;
|
||||||
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||||
|
import org.springframework.security.core.context.SecurityContextHolder;
|
||||||
|
import org.springframework.test.util.ReflectionTestUtils;
|
||||||
|
|
||||||
|
class ArBillTemplateSelectionTest {
|
||||||
|
private final ArBillServiceImpl service = new ArBillServiceImpl();
|
||||||
|
private final ArBillMapper bills = mock(ArBillMapper.class);
|
||||||
|
private final ArExportTemplateMapper templates = mock(ArExportTemplateMapper.class);
|
||||||
|
private final ArBillExportMapper exports = mock(ArBillExportMapper.class);
|
||||||
|
private final ApplicationEventPublisher publisher = mock(ApplicationEventPublisher.class);
|
||||||
|
private final ArBill bill = new ArBill();
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void setUp() {
|
||||||
|
LoginUser login = new LoginUser();
|
||||||
|
login.setUserId(1L);
|
||||||
|
SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken(login, null, List.of()));
|
||||||
|
ReflectionTestUtils.setField(service, "billMapper", bills);
|
||||||
|
ReflectionTestUtils.setField(service, "exportTemplateMapper", templates);
|
||||||
|
ReflectionTestUtils.setField(service, "exportMapper", exports);
|
||||||
|
ReflectionTestUtils.setField(service, "billScope", mock(ArBillScopeResolver.class));
|
||||||
|
ReflectionTestUtils.setField(service, "voidTaskService", mock(ArBillVoidTaskService.class));
|
||||||
|
ReflectionTestUtils.setField(service, "logMapper", mock(ArBillLogMapper.class));
|
||||||
|
ReflectionTestUtils.setField(service, "logService", mock(IArBillLogService.class));
|
||||||
|
ReflectionTestUtils.setField(service, "eventPublisher", publisher);
|
||||||
|
ReflectionTestUtils.setField(service, "workbookWriters", new ArBillWorkbookWriters(
|
||||||
|
new DefaultArBillWorkbookWriter(), new SummaryArBillWorkbookWriter()));
|
||||||
|
bill.setArBillId(7L);
|
||||||
|
bill.setGenerationStatus("READY");
|
||||||
|
bill.setStatus("CONFIRMED");
|
||||||
|
bill.setBillDate(Date.valueOf("2026-10-31"));
|
||||||
|
bill.setBillPeriodEnd(Date.valueOf("2026-10-31"));
|
||||||
|
bill.setCustomerName("测试客户");
|
||||||
|
bill.setCustomerCode("C1");
|
||||||
|
when(bills.selectArBillByIdForUpdate(7L)).thenReturn(bill);
|
||||||
|
when(bills.selectArBillById(7L)).thenReturn(bill);
|
||||||
|
when(exports.insert(any())).thenAnswer(invocation -> {
|
||||||
|
((ArBillExport) invocation.getArgument(0)).setExportId(99L);
|
||||||
|
return 1;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterEach
|
||||||
|
void clearLogin() { SecurityContextHolder.clearContext(); }
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void bindsSelectedTemplateAndOnlyReusesTasksWithTheSameTemplate() {
|
||||||
|
ArExportTemplate selected = template(2L, "AR_BILL_SUMMARY");
|
||||||
|
when(templates.selectEnabledById(2L, "AR_BILL", bill.getBillDate())).thenReturn(selected);
|
||||||
|
ArBillExport task = service.exportBill(7L, 2L, "admin", "request-summary");
|
||||||
|
assertEquals(2L, task.getTemplateId());
|
||||||
|
assertEquals("AR_BILL_SUMMARY", task.getTemplateCode());
|
||||||
|
assertEquals("1.0", task.getTemplateVersion());
|
||||||
|
assertEquals(selected.getStorageKey(), task.getTemplateStorageKey());
|
||||||
|
assertTrue(task.getFileName().endsWith("_汇总.xlsx"));
|
||||||
|
verify(exports).selectProcessingByBillAndTemplate(7L, 2L);
|
||||||
|
verify(publisher).publishEvent(any(ArBillExportTaskEvent.class));
|
||||||
|
|
||||||
|
when(exports.selectProcessingByBillAndTemplate(7L, 2L)).thenReturn(task);
|
||||||
|
assertSame(task, service.exportBill(7L, 2L, "admin", "request-repeat"));
|
||||||
|
verify(exports, times(1)).insert(any());
|
||||||
|
verify(templates, never()).selectDefaultEnabled(anyString(), any());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void omittingTemplateRetainsDefaultBehaviorAndInvalidSelectionCannotQueueAnExport() {
|
||||||
|
when(templates.selectDefaultEnabled("AR_BILL", bill.getBillDate())).thenReturn(template(1L, "AR_CUSTOMER_BILL"));
|
||||||
|
ArBillExport task = service.exportBill(7L, null, "admin", "request-default");
|
||||||
|
assertEquals(1L, task.getTemplateId());
|
||||||
|
assertFalse(task.getFileName().contains("汇总"));
|
||||||
|
assertThrows(ServiceException.class, () -> service.exportBill(7L, 9L, "admin", "request-invalid"));
|
||||||
|
verify(exports, times(1)).insert(any());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void optionsUseTheBillEffectiveDateAndOnlyExposeChoiceMetadata() {
|
||||||
|
when(templates.selectEnabledList("AR_BILL", bill.getBillDate())).thenReturn(List.of(template(2L, "AR_BILL_SUMMARY")));
|
||||||
|
var options = service.selectExportTemplates(7L);
|
||||||
|
assertEquals(2L, options.get(0).getTemplateId());
|
||||||
|
assertEquals("应收账单汇总模板", options.get(0).getTemplateName());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void mapperQueriesEnforceBusinessStatusEffectiveDatesAndTaskTemplate() throws Exception {
|
||||||
|
Configuration configuration = new Configuration();
|
||||||
|
configuration.getTypeAliasRegistry().registerAlias("ArExportTemplate", ArExportTemplate.class);
|
||||||
|
configuration.getTypeAliasRegistry().registerAlias("ArBillExport", ArBillExport.class);
|
||||||
|
for (String resource : List.of("mapper/receivable/ArExportTemplateMapper.xml", "mapper/receivable/ArBillExportMapper.xml")) {
|
||||||
|
try (InputStream input = getClass().getClassLoader().getResourceAsStream(resource)) {
|
||||||
|
new XMLMapperBuilder(input, configuration, resource, configuration.getSqlFragments()).parse();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
String sql = configuration.getMappedStatement("com.bms.receivable.mapper.ArExportTemplateMapper.selectEnabledById")
|
||||||
|
.getBoundSql(Map.of("templateId", 2L, "businessType", "AR_BILL", "effectiveDate", bill.getBillDate())).getSql();
|
||||||
|
for (String condition : List.of("business_type = ?", "status = 'ENABLED'", "effective_start <= ?",
|
||||||
|
"effective_end >= ?", "template_id = ?")) assertTrue(sql.contains(condition), sql);
|
||||||
|
String taskSql = configuration.getMappedStatement("com.bms.receivable.mapper.ArBillExportMapper.selectProcessingByBillAndTemplate")
|
||||||
|
.getBoundSql(Map.of("arBillId", 7L, "templateId", 2L)).getSql();
|
||||||
|
assertTrue(taskSql.contains("template_id = ?"));
|
||||||
|
assertTrue(taskSql.contains("export_status = 'PROCESSING'"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private ArExportTemplate template(Long id, String code) {
|
||||||
|
ArExportTemplate template = new ArExportTemplate();
|
||||||
|
template.setTemplateId(id);
|
||||||
|
template.setTemplateCode(code);
|
||||||
|
template.setTemplateName("应收账单汇总模板");
|
||||||
|
template.setTemplateVersion("1.0");
|
||||||
|
template.setStorageType("CLASSPATH");
|
||||||
|
template.setStorageKey("templates/receivable/ar_bill_template_summary.xlsx");
|
||||||
|
return template;
|
||||||
|
}
|
||||||
|
}
|
||||||
+258
@@ -0,0 +1,258 @@
|
|||||||
|
package com.bms.receivable.export;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
import static org.mockito.ArgumentMatchers.*;
|
||||||
|
import static org.mockito.Mockito.*;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.math.RoundingMode;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.sql.Date;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.stream.IntStream;
|
||||||
|
|
||||||
|
import com.bms.receivable.domain.ArBill;
|
||||||
|
import com.bms.receivable.domain.ArBillDetail;
|
||||||
|
import com.bms.receivable.domain.ArExportTemplate;
|
||||||
|
import com.bms.receivable.mapper.ArBillDetailFeeMapper;
|
||||||
|
import com.bms.receivable.mapper.ArBillDetailMapper;
|
||||||
|
import org.apache.poi.ss.usermodel.CellType;
|
||||||
|
import org.apache.poi.ss.usermodel.FormulaEvaluator;
|
||||||
|
import org.apache.poi.ss.usermodel.IndexedColors;
|
||||||
|
import org.apache.poi.xssf.usermodel.XSSFSheet;
|
||||||
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.io.TempDir;
|
||||||
|
|
||||||
|
class ArBillWorkbookWriterTest {
|
||||||
|
@TempDir
|
||||||
|
Path temporary;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void summaryAndDetailsReconcileSnapshotAmountsAndKeepFreightFormulaAndBlankFields() throws Exception {
|
||||||
|
ArBill bill = bill(3, "13.20", "CNY");
|
||||||
|
List<ArBillDetail> details = List.of(detail(1, "P1", "10.12"), detail(2, "P1", "-2.22"),
|
||||||
|
detail(3, "P2", "5.30"));
|
||||||
|
// 相同名称的不同产品仍需分组;收货日期也不能替代账单所属期。
|
||||||
|
details.forEach(row -> row.setProductName("相同产品名"));
|
||||||
|
Path target = temporary.resolve("summary.xlsx");
|
||||||
|
SummaryArBillWorkbookWriter writer = summaryWriter(details);
|
||||||
|
writer.write(bill, summaryTemplate(), target);
|
||||||
|
try (XSSFWorkbook workbook = new XSSFWorkbook(target.toFile())) {
|
||||||
|
assertEquals(2, workbook.getNumberOfSheets());
|
||||||
|
assertEquals("账单汇总", workbook.getSheetName(0));
|
||||||
|
assertEquals("运费明细", workbook.getSheetName(1));
|
||||||
|
XSSFSheet summary = workbook.getSheetAt(0);
|
||||||
|
XSSFSheet freight = workbook.getSheetAt(1);
|
||||||
|
assertEquals("客户 & <测试>", summary.getRow(3).getCell(1).getStringCellValue());
|
||||||
|
assertEquals("相同产品名", summary.getRow(3).getCell(2).getStringCellValue());
|
||||||
|
assertEquals("相同产品名", summary.getRow(4).getCell(2).getStringCellValue());
|
||||||
|
assertEquals("20261001-20261031", summary.getRow(3).getCell(3).getStringCellValue());
|
||||||
|
assertEquals("国际货物运输代理服务费", summary.getRow(4).getCell(6).getStringCellValue());
|
||||||
|
assertEquals(7.90, summary.getRow(3).getCell(4).getNumericCellValue(), 0.00001);
|
||||||
|
assertEquals(5.30, summary.getRow(4).getCell(4).getNumericCellValue(), 0.00001);
|
||||||
|
assertEquals("SUMIF(F4:F5,F7,E4:E5)", summary.getRow(6).getCell(4).getCellFormula());
|
||||||
|
assertEquals(13.20, summary.getRow(6).getCell(4).getNumericCellValue(), 0.00001);
|
||||||
|
assertEquals("收款账户快照", summary.getRow(11).getCell(1).getStringCellValue());
|
||||||
|
assertEquals("1234 5678 90", summary.getRow(12).getCell(1).getStringCellValue());
|
||||||
|
assertTrue(summary.getMergedRegions().stream().anyMatch(region -> "A11:B11".equals(region.formatAsString())));
|
||||||
|
|
||||||
|
assertEquals("客户 & <测试>", freight.getRow(2).getCell(1).getStringCellValue());
|
||||||
|
assertEquals("20261001-20261031", freight.getRow(2).getCell(18).getStringCellValue());
|
||||||
|
assertEquals("0000123", freight.getRow(4).getCell(0).getStringCellValue());
|
||||||
|
assertEquals("00000001", freight.getRow(4).getCell(2).getStringCellValue());
|
||||||
|
assertEquals("001234567890123456789", freight.getRow(4).getCell(3).getStringCellValue());
|
||||||
|
assertEquals("00123", freight.getRow(4).getCell(6).getStringCellValue());
|
||||||
|
assertEquals(9.5, freight.getRow(4).getCell(8).getNumericCellValue());
|
||||||
|
assertEquals("ROUND(J5*L5,2)", freight.getRow(4).getCell(13).getCellFormula());
|
||||||
|
assertEquals(2.81, freight.getRow(4).getCell(13).getNumericCellValue(), 0.00001);
|
||||||
|
assertEquals(CellType.FORMULA, freight.getRow(4).getCell(16).getCellType());
|
||||||
|
assertEquals("N5+K5+M5+P5+O5", freight.getRow(4).getCell(16).getCellFormula());
|
||||||
|
assertEquals(10.12, freight.getRow(4).getCell(16).getNumericCellValue(), 0.00001);
|
||||||
|
assertEquals(-2.22, freight.getRow(5).getCell(16).getNumericCellValue(), 0.00001);
|
||||||
|
assertEquals(21, freight.getRow(4).getLastCellNum());
|
||||||
|
assertEquals("说明", freight.getRow(3).getCell(20).getStringCellValue());
|
||||||
|
assertEquals("", freight.getRow(4).getCell(19).getStringCellValue());
|
||||||
|
assertEquals("", freight.getRow(4).getCell(20).getStringCellValue());
|
||||||
|
for (int column : new int[]{10, 14, 15}) {
|
||||||
|
assertEquals(0.0, freight.getRow(4).getCell(column).getNumericCellValue());
|
||||||
|
assertEquals("0.00", freight.getRow(4).getCell(column).getCellStyle().getDataFormatString());
|
||||||
|
}
|
||||||
|
for (int column : new int[]{7, 17, 18}) {
|
||||||
|
assertEquals("", freight.getRow(4).getCell(column).getStringCellValue());
|
||||||
|
}
|
||||||
|
assertEquals("SUM(Q5:Q7)", freight.getRow(8).getCell(16).getCellFormula());
|
||||||
|
assertEquals(13.20, freight.getRow(8).getCell(16).getNumericCellValue(), 0.00001);
|
||||||
|
FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
|
||||||
|
assertEquals(13.20, evaluator.evaluate(summary.getRow(6).getCell(4)).getNumberValue(), 0.00001);
|
||||||
|
assertEquals(13.20, evaluator.evaluate(freight.getRow(8).getCell(16)).getNumberValue(), 0.00001);
|
||||||
|
assertEquals(2.81, evaluator.evaluate(freight.getRow(4).getCell(13)).getNumberValue(), 0.00001);
|
||||||
|
assertFalse(workbook.getPrintArea(0).contains("#REF!"));
|
||||||
|
assertTrue(workbook.getPrintArea(1).contains("$U$9"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void readsSeveralCursorBatchesOnceAndExportsAllRowsToTheSameDetailSheet() throws Exception {
|
||||||
|
int count = 4001;
|
||||||
|
SummaryArBillWorkbookWriter writer = new SummaryArBillWorkbookWriter();
|
||||||
|
writer.detailMapper = mock(ArBillDetailMapper.class);
|
||||||
|
writer.detailFeeMapper = mock(ArBillDetailFeeMapper.class);
|
||||||
|
when(writer.detailFeeMapper.selectByDetailIds(anyList())).thenReturn(List.of());
|
||||||
|
List<Integer> cursors = new ArrayList<>();
|
||||||
|
when(writer.detailMapper.selectExportPage(eq(7L), anyInt(), eq(2000))).thenAnswer(invocation -> {
|
||||||
|
int previous = invocation.getArgument(1);
|
||||||
|
cursors.add(previous);
|
||||||
|
return IntStream.rangeClosed(previous + 1, Math.min(previous + 2000, count))
|
||||||
|
.mapToObj(number -> detail(number, "P" + (number % 3), "1.00")).toList();
|
||||||
|
});
|
||||||
|
Path target = temporary.resolve("large.xlsx");
|
||||||
|
writer.write(bill(count, "4001.00", "CNY"), summaryTemplate(), target);
|
||||||
|
assertEquals(List.of(0, 2000, 4000, 4001), cursors);
|
||||||
|
try (XSSFWorkbook workbook = new XSSFWorkbook(target.toFile())) {
|
||||||
|
assertEquals(2, workbook.getNumberOfSheets());
|
||||||
|
XSSFSheet sheet = workbook.getSheetAt(1);
|
||||||
|
assertEquals("ROUND(J4005*L4005,2)", sheet.getRow(4004).getCell(13).getCellFormula());
|
||||||
|
assertEquals("SUM(Q5:Q4005)", sheet.getRow(4006).getCell(16).getCellFormula());
|
||||||
|
assertEquals(4001, sheet.getRow(4006).getCell(16).getNumericCellValue());
|
||||||
|
assertEquals(4001, workbook.getSheetAt(0).getRow(7).getCell(4).getNumericCellValue());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void usesBillCurrencyForHeadersAndKeepsFailedOrderHighlightAndExplanation() throws Exception {
|
||||||
|
ArBillDetail detail = detail(1, "P1", "1.00");
|
||||||
|
detail.setCurrency("USD");
|
||||||
|
detail.setBillingFailStatus(2);
|
||||||
|
ArBillDetail withoutRemark = detail(2, "P1", "1.00");
|
||||||
|
withoutRemark.setCurrency("USD");
|
||||||
|
withoutRemark.setBillingFailStatus(2);
|
||||||
|
withoutRemark.setRemark(null);
|
||||||
|
withoutRemark.setGoodsDescription("仅供内部使用的品名描述");
|
||||||
|
ArBillDetail success = detail(3, "P1", "1.00");
|
||||||
|
success.setCurrency("USD");
|
||||||
|
success.setBillingFailStatus(0);
|
||||||
|
Path target = temporary.resolve("usd.xlsx");
|
||||||
|
summaryWriter(List.of(detail, withoutRemark, success)).write(bill(3, "3.00", "USD"), summaryTemplate(), target);
|
||||||
|
try (XSSFWorkbook workbook = new XSSFWorkbook(target.toFile())) {
|
||||||
|
XSSFSheet freight = workbook.getSheetAt(1);
|
||||||
|
for (int column : new int[]{11, 12, 13, 15, 16}) {
|
||||||
|
String title = freight.getRow(3).getCell(column).getStringCellValue();
|
||||||
|
assertTrue(title.contains("USD"));
|
||||||
|
assertFalse(title.contains("CNY"));
|
||||||
|
}
|
||||||
|
assertEquals("USD", workbook.getSheetAt(0).getRow(5).getCell(5).getStringCellValue());
|
||||||
|
for (int column = 0; column < 21; column++) {
|
||||||
|
assertEquals(IndexedColors.YELLOW.getIndex(), freight.getRow(4).getCell(column).getCellStyle().getFillForegroundColor());
|
||||||
|
}
|
||||||
|
assertEquals("", freight.getRow(4).getCell(19).getStringCellValue());
|
||||||
|
assertEquals("销售价未匹配国家", freight.getRow(4).getCell(20).getStringCellValue());
|
||||||
|
assertEquals("", freight.getRow(5).getCell(19).getStringCellValue());
|
||||||
|
assertEquals("销售价未匹配国家", freight.getRow(5).getCell(20).getStringCellValue());
|
||||||
|
assertEquals("", freight.getRow(6).getCell(19).getStringCellValue());
|
||||||
|
assertEquals("", freight.getRow(6).getCell(20).getStringCellValue());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void rejectsAnExportWhoseSnapshotDetailsDoNotReconcileWithTheBill() {
|
||||||
|
IOException error = assertThrows(IOException.class, () -> summaryWriter(List.of(detail(1, "P1", "1.00")))
|
||||||
|
.write(bill(1, "2.00", "CNY"), summaryTemplate(), temporary.resolve("mismatch.xlsx")));
|
||||||
|
assertTrue(error.getMessage().contains("应收金额合计与账单总额不一致"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void defaultTemplateStillPreservesItsImageAndTheBlankRowBeforeBankFooter() throws Exception {
|
||||||
|
DefaultArBillWorkbookWriter writer = new DefaultArBillWorkbookWriter();
|
||||||
|
writer.detailMapper = mapper(List.of(detail(1, "P1", "1.00")));
|
||||||
|
when(writer.detailMapper.selectReceiveTimeRangeByBillId(7L)).thenReturn(Map.of(
|
||||||
|
"minReceiveTime", Date.valueOf("2026-11-05"), "maxReceiveTime", Date.valueOf("2026-11-05")));
|
||||||
|
writer.detailFeeMapper = mock(ArBillDetailFeeMapper.class);
|
||||||
|
when(writer.detailFeeMapper.selectByDetailIds(anyList())).thenReturn(List.of());
|
||||||
|
ArExportTemplate template = new ArExportTemplate();
|
||||||
|
template.setStorageKey("templates/receivable/ar_bill_template.xlsx");
|
||||||
|
Path target = temporary.resolve("default.xlsx");
|
||||||
|
writer.write(bill(1, "1.00", "CNY"), template, target);
|
||||||
|
try (XSSFWorkbook workbook = new XSSFWorkbook(target.toFile())) {
|
||||||
|
assertEquals(1, workbook.getNumberOfSheets());
|
||||||
|
assertEquals(1, workbook.getAllPictures().size());
|
||||||
|
XSSFSheet sheet = workbook.getSheetAt(0);
|
||||||
|
assertEquals(21, sheet.getRow(4).getLastCellNum());
|
||||||
|
assertEquals(1, sheet.getRow(4).getCell(18).getNumericCellValue());
|
||||||
|
assertEquals("备注 & <快照>", sheet.getRow(4).getCell(19).getStringCellValue());
|
||||||
|
assertEquals(0, sheet.getRow(5).getPhysicalNumberOfCells());
|
||||||
|
assertEquals("银行信息", sheet.getRow(6).getCell(1).getStringCellValue());
|
||||||
|
assertEquals("收款账户快照", sheet.getRow(7).getCell(2).getStringCellValue());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private SummaryArBillWorkbookWriter summaryWriter(List<ArBillDetail> details) {
|
||||||
|
SummaryArBillWorkbookWriter writer = new SummaryArBillWorkbookWriter();
|
||||||
|
writer.detailMapper = mapper(details);
|
||||||
|
writer.detailFeeMapper = mock(ArBillDetailFeeMapper.class);
|
||||||
|
when(writer.detailFeeMapper.selectByDetailIds(anyList())).thenReturn(List.of());
|
||||||
|
return writer;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ArBillDetailMapper mapper(List<ArBillDetail> rows) {
|
||||||
|
ArBillDetailMapper mapper = mock(ArBillDetailMapper.class);
|
||||||
|
when(mapper.selectExportPage(eq(7L), anyInt(), eq(2000))).thenAnswer(invocation -> {
|
||||||
|
int previous = invocation.getArgument(1);
|
||||||
|
return rows.stream().filter(row -> row.getDetailNo() > previous).limit(2000).toList();
|
||||||
|
});
|
||||||
|
return mapper;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ArExportTemplate summaryTemplate() {
|
||||||
|
ArExportTemplate template = new ArExportTemplate();
|
||||||
|
template.setTemplateCode("AR_BILL_SUMMARY");
|
||||||
|
template.setStorageKey("templates/receivable/ar_bill_template_summary.xlsx");
|
||||||
|
return template;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ArBill bill(int count, String amount, String currency) {
|
||||||
|
ArBill bill = new ArBill();
|
||||||
|
bill.setArBillId(7L);
|
||||||
|
bill.setCustomerCode("0000123");
|
||||||
|
bill.setCustomerName("客户 & <测试>");
|
||||||
|
bill.setCurrency(currency);
|
||||||
|
bill.setBillPeriodStart(Date.valueOf("2026-10-01"));
|
||||||
|
bill.setBillPeriodEnd(Date.valueOf("2026-10-31"));
|
||||||
|
bill.setOrderCount(count);
|
||||||
|
bill.setTotalAmount(new BigDecimal(amount));
|
||||||
|
bill.setWrittenOffAmount(BigDecimal.ZERO);
|
||||||
|
bill.setUnwrittenAmount(new BigDecimal(amount));
|
||||||
|
bill.setBankAccountName("收款账户快照");
|
||||||
|
bill.setBankAccountNo("1234567890");
|
||||||
|
bill.setBankName("开户行快照");
|
||||||
|
return bill;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ArBillDetail detail(int number, String productCode, String amount) {
|
||||||
|
ArBillDetail detail = new ArBillDetail();
|
||||||
|
detail.setDetailId((long) number);
|
||||||
|
detail.setDetailNo(number);
|
||||||
|
detail.setOrderNo("ORDER" + number);
|
||||||
|
detail.setTransferNo(String.format("%08d", number));
|
||||||
|
detail.setTrackingNo("001234567890123456789");
|
||||||
|
detail.setProductCode(productCode);
|
||||||
|
detail.setProductName(productCode);
|
||||||
|
detail.setReceiveTime(Date.valueOf("2026-11-05"));
|
||||||
|
detail.setCountryName("德国");
|
||||||
|
detail.setDestPostcode("00123");
|
||||||
|
detail.setReceiveWeight(new BigDecimal("9.5"));
|
||||||
|
detail.setActualWeight(new BigDecimal("8.5"));
|
||||||
|
detail.setChargeWeight(new BigDecimal("1.125"));
|
||||||
|
detail.setFreightRate(new BigDecimal("2.5"));
|
||||||
|
// 公式导出要求费用组成与账单快照一致,保留运费样例,其余金额作为操作费。
|
||||||
|
BigDecimal freight = detail.getChargeWeight().multiply(detail.getFreightRate()).setScale(2, RoundingMode.HALF_UP);
|
||||||
|
detail.setRegistrationFee(new BigDecimal(amount).subtract(freight));
|
||||||
|
detail.setTotalAmount(new BigDecimal(amount));
|
||||||
|
detail.setCurrency("CNY");
|
||||||
|
detail.setRemark("备注 & <快照>");
|
||||||
|
return detail;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,142 @@
|
|||||||
|
package com.bms.report;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.lang.reflect.Proxy;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.atomic.AtomicReference;
|
||||||
|
import org.apache.ibatis.builder.xml.XMLMapperBuilder;
|
||||||
|
import org.apache.ibatis.session.Configuration;
|
||||||
|
import org.junit.jupiter.api.AfterEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.test.util.ReflectionTestUtils;
|
||||||
|
import com.bms.price.domain.PrcProfitReportExport;
|
||||||
|
import com.bms.price.domain.vo.PrcProfitReportOrderRow;
|
||||||
|
import com.bms.price.domain.vo.PrcProfitReportProductRow;
|
||||||
|
import com.bms.price.domain.vo.PrcProfitReportQuery;
|
||||||
|
import com.bms.price.domain.vo.PrcProfitReportSummary;
|
||||||
|
import com.bms.price.mapper.PrcProfitReportMapper;
|
||||||
|
import com.bms.price.service.impl.PrcProfitReportServiceImpl;
|
||||||
|
import com.github.pagehelper.Page;
|
||||||
|
import com.github.pagehelper.PageHelper;
|
||||||
|
|
||||||
|
class ProfitReportAreaFilterTest
|
||||||
|
{
|
||||||
|
@AfterEach
|
||||||
|
void clearPage()
|
||||||
|
{
|
||||||
|
PageHelper.clearPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void customerLookupPreservesPaginationAndUsesOnlyServerResolvedIds()
|
||||||
|
{
|
||||||
|
AtomicReference<List<Long>> ids = new AtomicReference<>(List.of(2L, 3L));
|
||||||
|
AtomicReference<PrcProfitReportQuery> seen = new AtomicReference<>();
|
||||||
|
Page<?> page = PageHelper.startPage(2, 10);
|
||||||
|
PrcProfitReportMapper mapper = mapper(ids, seen, page);
|
||||||
|
PrcProfitReportServiceImpl service = service(mapper, true, 2);
|
||||||
|
PrcProfitReportQuery query = new PrcProfitReportQuery();
|
||||||
|
query.setCustomerArea(" C ");
|
||||||
|
query.setAreaCustomerIds(List.of(999L));
|
||||||
|
|
||||||
|
service.selectOrderRows(query);
|
||||||
|
assertSame(query, seen.get());
|
||||||
|
assertEquals(List.of(2L, 3L), query.getAreaCustomerIds());
|
||||||
|
assertSame(page, PageHelper.getLocalPage());
|
||||||
|
|
||||||
|
ids.set(List.of());
|
||||||
|
service.selectSummary(query);
|
||||||
|
assertEquals(List.of(), query.getAreaCustomerIds());
|
||||||
|
|
||||||
|
ids.set(List.of(1L, 2L, 3L));
|
||||||
|
service.selectProductRows(query);
|
||||||
|
assertNull(query.getAreaCustomerIds());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void customerLookupFailureClearsPageContext()
|
||||||
|
{
|
||||||
|
PrcProfitReportMapper mapper = (PrcProfitReportMapper) Proxy.newProxyInstance(
|
||||||
|
getClass().getClassLoader(), new Class<?>[] { PrcProfitReportMapper.class },
|
||||||
|
(proxy, method, args) -> { throw new IllegalStateException("lookup failed"); });
|
||||||
|
PrcProfitReportServiceImpl service = service(mapper, true, 2);
|
||||||
|
PrcProfitReportQuery query = new PrcProfitReportQuery();
|
||||||
|
query.setCustomerArea("C");
|
||||||
|
PageHelper.startPage(1, 10);
|
||||||
|
assertThrows(IllegalStateException.class, () -> service.selectOrderRows(query));
|
||||||
|
assertNull(PageHelper.getLocalPage());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void sqlUsesAreaJoinOrCustomerIdsAndEmptyIdsMatchNothing() throws Exception
|
||||||
|
{
|
||||||
|
Configuration config = new Configuration();
|
||||||
|
for (Class<?> type : new Class<?>[] { PrcProfitReportExport.class, PrcProfitReportOrderRow.class,
|
||||||
|
PrcProfitReportProductRow.class, PrcProfitReportSummary.class })
|
||||||
|
{
|
||||||
|
config.getTypeAliasRegistry().registerAlias(type);
|
||||||
|
}
|
||||||
|
String resource = "mapper/price/PrcProfitReportMapper.xml";
|
||||||
|
try (InputStream input = getClass().getClassLoader().getResourceAsStream(resource))
|
||||||
|
{
|
||||||
|
assertNotNull(input);
|
||||||
|
new XMLMapperBuilder(input, config, resource, config.getSqlFragments()).parse();
|
||||||
|
}
|
||||||
|
PrcProfitReportQuery query = new PrcProfitReportQuery();
|
||||||
|
query.setCustomerArea("C");
|
||||||
|
for (String id : List.of("selectOrderRows", "selectProductRows", "selectSummary"))
|
||||||
|
{
|
||||||
|
var statement = config.getMappedStatement("com.bms.price.mapper.PrcProfitReportMapper." + id);
|
||||||
|
query.setAreaCustomerIds(null);
|
||||||
|
String joinSql = statement.getBoundSql(query).getSql();
|
||||||
|
assertTrue(joinSql.contains("join ctr_customer c"));
|
||||||
|
assertTrue(joinSql.contains("c.customer_area = ?"));
|
||||||
|
assertTrue(joinSql.contains("c.del_flag = '0'"));
|
||||||
|
|
||||||
|
query.setAreaCustomerIds(List.of(2L, 3L));
|
||||||
|
String inSql = statement.getBoundSql(query).getSql();
|
||||||
|
assertFalse(inSql.contains("join ctr_customer c"));
|
||||||
|
assertTrue(inSql.contains("p.customer_id in"));
|
||||||
|
|
||||||
|
query.setAreaCustomerIds(List.of());
|
||||||
|
String emptySql = statement.getBoundSql(query).getSql();
|
||||||
|
assertFalse(emptySql.contains("join ctr_customer c"));
|
||||||
|
assertTrue(emptySql.contains("and 1 = 0"));
|
||||||
|
|
||||||
|
query.setAreaCustomerIds(null);
|
||||||
|
query.setProductKeyword("EXP");
|
||||||
|
String productSql = statement.getBoundSql(query).getSql();
|
||||||
|
assertTrue(productSql.contains("p.product_code like concat('%', ?, '%')"));
|
||||||
|
assertTrue(productSql.contains("p.product_name like concat('%', ?, '%')"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private PrcProfitReportServiceImpl service(PrcProfitReportMapper mapper, boolean enabled, int max)
|
||||||
|
{
|
||||||
|
PrcProfitReportServiceImpl service = new PrcProfitReportServiceImpl();
|
||||||
|
ReflectionTestUtils.setField(service, "profitReportMapper", mapper);
|
||||||
|
ReflectionTestUtils.setField(service, "customerIdFilterEnabled", enabled);
|
||||||
|
ReflectionTestUtils.setField(service, "maxCustomerIds", max);
|
||||||
|
return service;
|
||||||
|
}
|
||||||
|
|
||||||
|
private PrcProfitReportMapper mapper(AtomicReference<List<Long>> ids,
|
||||||
|
AtomicReference<PrcProfitReportQuery> seen, Page<?> page)
|
||||||
|
{
|
||||||
|
return (PrcProfitReportMapper) Proxy.newProxyInstance(getClass().getClassLoader(),
|
||||||
|
new Class<?>[] { PrcProfitReportMapper.class }, (proxy, method, args) -> {
|
||||||
|
if (method.getName().equals("selectAreaCustomerIds"))
|
||||||
|
{
|
||||||
|
assertNull(PageHelper.getLocalPage());
|
||||||
|
assertEquals("C", args[0]);
|
||||||
|
assertEquals(3, args[1]);
|
||||||
|
return ids.get();
|
||||||
|
}
|
||||||
|
assertSame(page, PageHelper.getLocalPage());
|
||||||
|
seen.set((PrcProfitReportQuery) args[0]);
|
||||||
|
return List.of();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,324 @@
|
|||||||
|
package com.bms.report;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.lang.reflect.Proxy;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.attribute.FileTime;
|
||||||
|
import java.time.Instant;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.TimeZone;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
import java.util.function.Function;
|
||||||
|
import java.util.zip.ZipFile;
|
||||||
|
import javax.xml.stream.XMLInputFactory;
|
||||||
|
import javax.xml.stream.XMLStreamReader;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import org.apache.poi.ss.usermodel.Row;
|
||||||
|
import org.apache.poi.ss.usermodel.Workbook;
|
||||||
|
import org.apache.poi.ss.usermodel.WorkbookFactory;
|
||||||
|
import org.junit.jupiter.api.AfterEach;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.io.TempDir;
|
||||||
|
import org.springframework.core.task.TaskRejectedException;
|
||||||
|
import org.springframework.mock.web.MockHttpServletResponse;
|
||||||
|
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
||||||
|
import com.bms.common.config.BmsConfig;
|
||||||
|
import com.bms.common.core.redis.RedisCache;
|
||||||
|
import com.bms.common.exception.ServiceException;
|
||||||
|
import com.bms.common.utils.poi.ExcelUtil;
|
||||||
|
import com.bms.price.domain.PrcProfitReportExportTask;
|
||||||
|
import com.bms.price.domain.vo.PrcProfitReportOrderRow;
|
||||||
|
import com.bms.price.domain.vo.PrcProfitReportQuery;
|
||||||
|
import com.bms.price.enums.ProfitAreaRule;
|
||||||
|
import com.bms.price.service.IPrcProfitReportService;
|
||||||
|
import com.bms.price.task.PrcProfitReportExportRunner;
|
||||||
|
import com.github.pagehelper.PageHelper;
|
||||||
|
|
||||||
|
class ProfitReportAsyncExportTest
|
||||||
|
{
|
||||||
|
@TempDir
|
||||||
|
Path tempDir;
|
||||||
|
private String previousProfile;
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void useTempProfile()
|
||||||
|
{
|
||||||
|
previousProfile = BmsConfig.getProfile();
|
||||||
|
new BmsConfig().setProfile(tempDir.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterEach
|
||||||
|
void restoreProfile()
|
||||||
|
{
|
||||||
|
new BmsConfig().setProfile(previousProfile);
|
||||||
|
PageHelper.clearPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void submissionQueuesWorkAndExportsAllRowsUsingTheSubmittedFiltersAndRegionColumns() throws Exception
|
||||||
|
{
|
||||||
|
for (String area : List.of("C", "GZ"))
|
||||||
|
{
|
||||||
|
AtomicInteger calls = new AtomicInteger();
|
||||||
|
HoldingExecutor executor = new HoldingExecutor();
|
||||||
|
PrcProfitReportExportRunner runner = new PrcProfitReportExportRunner(service(query -> {
|
||||||
|
calls.incrementAndGet();
|
||||||
|
assertNull(PageHelper.getLocalPage());
|
||||||
|
assertEquals(area, query.getCustomerArea());
|
||||||
|
assertEquals("UNBILLED", query.getArBillStatus());
|
||||||
|
assertEquals("P1", query.getProductCode());
|
||||||
|
query.setProfitRule(ProfitAreaRule.fromCustomerArea(area).name());
|
||||||
|
return List.of(row("ORDER-A"), row("ORDER-B"));
|
||||||
|
}), new MemoryRedis(), executor);
|
||||||
|
PrcProfitReportQuery query = query(area);
|
||||||
|
query.setProductCode("P1");
|
||||||
|
String taskId = runner.submit(query, 1L);
|
||||||
|
|
||||||
|
assertEquals(0, calls.get());
|
||||||
|
assertEquals("PENDING", runner.getTask(taskId, 1L).getStatus());
|
||||||
|
assertThrows(ServiceException.class, () -> runner.download(taskId, 1L, new MockHttpServletResponse()));
|
||||||
|
query.setProductCode("CHANGED-AFTER-SUBMIT");
|
||||||
|
PageHelper.startPage(2, 1);
|
||||||
|
executor.work.run();
|
||||||
|
|
||||||
|
PrcProfitReportExportTask task = runner.getTask(taskId, 1L);
|
||||||
|
assertEquals("SUCCESS", task.getStatus());
|
||||||
|
assertEquals(100, task.getPercent());
|
||||||
|
assertEquals(2, task.getRowCount());
|
||||||
|
assertEquals(1, calls.get());
|
||||||
|
assertNull(PageHelper.getLocalPage());
|
||||||
|
assertThrows(ServiceException.class, () -> runner.getTask(taskId, 2L));
|
||||||
|
assertThrows(ServiceException.class, () -> runner.download(taskId, 2L, new MockHttpServletResponse()));
|
||||||
|
Path file = tempDir.resolve("download").resolve(task.getStorageKey());
|
||||||
|
try (InputStream input = Files.newInputStream(file); Workbook workbook = WorkbookFactory.create(input))
|
||||||
|
{
|
||||||
|
var sheet = workbook.getSheetAt(0);
|
||||||
|
assertEquals(2, sheet.getLastRowNum());
|
||||||
|
Row header = sheet.getRow(0);
|
||||||
|
assertEquals(area.equals("C"), hasColumn(header, "产品价(目录价)"));
|
||||||
|
assertEquals(area.equals("C"), hasColumn(header, "红线毛利"));
|
||||||
|
assertTrue(hasColumn(header, "销售价"));
|
||||||
|
}
|
||||||
|
MockHttpServletResponse response = new MockHttpServletResponse();
|
||||||
|
runner.download(taskId, 1L, response);
|
||||||
|
assertArrayEquals(Files.readAllBytes(file), response.getContentAsByteArray());
|
||||||
|
assertTrue(response.getHeader("Content-Disposition").contains(".xlsx"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void rejectedExecutionAndQueryFailuresBecomeVisibleFailedTasks() throws Exception
|
||||||
|
{
|
||||||
|
ThreadPoolTaskExecutor rejected = new ThreadPoolTaskExecutor() {
|
||||||
|
@Override
|
||||||
|
public void execute(Runnable task) { throw new TaskRejectedException("busy"); }
|
||||||
|
};
|
||||||
|
PrcProfitReportExportRunner runner = new PrcProfitReportExportRunner(service(query -> {
|
||||||
|
fail("Rejected tasks must not query orders");
|
||||||
|
return List.of();
|
||||||
|
}), new MemoryRedis(), rejected);
|
||||||
|
String rejectedId = runner.submit(query("C"), 1L);
|
||||||
|
assertEquals("FAIL", runner.getTask(rejectedId, 1L).getStatus());
|
||||||
|
assertEquals("导出任务较多,请稍后重试", runner.getTask(rejectedId, 1L).getError());
|
||||||
|
|
||||||
|
HoldingExecutor executor = new HoldingExecutor();
|
||||||
|
PrcProfitReportExportRunner failing = new PrcProfitReportExportRunner(service(query -> {
|
||||||
|
throw new ServiceException("该客户区域未配置毛利规则");
|
||||||
|
}), new MemoryRedis(), executor);
|
||||||
|
String failedId = failing.submit(query("INVALID"), 1L);
|
||||||
|
executor.work.run();
|
||||||
|
PrcProfitReportExportTask failed = failing.getTask(failedId, 1L);
|
||||||
|
assertEquals("FAIL", failed.getStatus());
|
||||||
|
assertEquals("该客户区域未配置毛利规则", failed.getError());
|
||||||
|
assertNull(failed.getStorageKey());
|
||||||
|
assertThrows(ServiceException.class, () -> failing.download(failedId, 1L, new MockHttpServletResponse()));
|
||||||
|
assertFalse(Files.exists(tempDir.resolve("download/profitReportExport/" + failedId + ".xlsx")));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void exportsMoreThanLegacySheetLimitIntoOneSheet() throws Exception
|
||||||
|
{
|
||||||
|
int rowCount = ExcelUtil.sheetSize + 1;
|
||||||
|
List<PrcProfitReportOrderRow> rows = Collections.nCopies(rowCount, row("ORDER-LARGE"));
|
||||||
|
HoldingExecutor executor = new HoldingExecutor();
|
||||||
|
PrcProfitReportExportRunner runner = new PrcProfitReportExportRunner(service(query -> rows),
|
||||||
|
new MemoryRedis(), executor);
|
||||||
|
String taskId = runner.submit(query("C"), 1L);
|
||||||
|
executor.work.run();
|
||||||
|
|
||||||
|
PrcProfitReportExportTask task = runner.getTask(taskId, 1L);
|
||||||
|
assertEquals("SUCCESS", task.getStatus());
|
||||||
|
assertEquals(rowCount, task.getRowCount());
|
||||||
|
Path file = tempDir.resolve("download").resolve(task.getStorageKey());
|
||||||
|
assertEquals(1, countWorkbookSheets(file));
|
||||||
|
assertEquals(rowCount + 1, lastWorksheetRowNumber(file));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void rejectsRowsBeyondTheSingleSheetLimit()
|
||||||
|
{
|
||||||
|
List<PrcProfitReportOrderRow> rows = Collections.nCopies(ExcelUtil.XLSX_MAX_ROW_COUNT, row("ORDER-LARGE"));
|
||||||
|
HoldingExecutor executor = new HoldingExecutor();
|
||||||
|
PrcProfitReportExportRunner runner = new PrcProfitReportExportRunner(service(query -> rows),
|
||||||
|
new MemoryRedis(), executor);
|
||||||
|
String taskId = runner.submit(query("C"), 1L);
|
||||||
|
executor.work.run();
|
||||||
|
|
||||||
|
PrcProfitReportExportTask task = runner.getTask(taskId, 1L);
|
||||||
|
assertEquals("FAIL", task.getStatus());
|
||||||
|
assertTrue(task.getError().contains("单个工作表最多支持1048575条订单"));
|
||||||
|
assertFalse(Files.exists(tempDir.resolve("download/profitReportExport/" + taskId + ".xlsx")));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void cleanupRemovesOnlyExpiredExportFiles() throws Exception
|
||||||
|
{
|
||||||
|
Path dir = Files.createDirectories(tempDir.resolve("download/profitReportExport"));
|
||||||
|
Path old = Files.writeString(dir.resolve("a".repeat(32) + ".xlsx"), "old");
|
||||||
|
Path recent = Files.writeString(dir.resolve("b".repeat(32) + ".xlsx"), "new");
|
||||||
|
Path other = Files.writeString(dir.resolve("unrelated.xlsx"), "other");
|
||||||
|
FileTime expired = FileTime.from(Instant.now().minusSeconds(TimeUnit.HOURS.toSeconds(25)));
|
||||||
|
Files.setLastModifiedTime(old, expired);
|
||||||
|
Files.setLastModifiedTime(other, expired);
|
||||||
|
PrcProfitReportExportRunner runner = new PrcProfitReportExportRunner(service(query -> List.of()),
|
||||||
|
new MemoryRedis(), new HoldingExecutor());
|
||||||
|
runner.cleanupExpiredFiles();
|
||||||
|
assertFalse(Files.exists(old));
|
||||||
|
assertTrue(Files.exists(recent));
|
||||||
|
assertTrue(Files.exists(other));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void jsonSubmissionRetainsTheListDateRangeAndFilters() throws Exception
|
||||||
|
{
|
||||||
|
ObjectMapper mapper = new ObjectMapper();
|
||||||
|
mapper.setTimeZone(TimeZone.getTimeZone("GMT+8"));
|
||||||
|
PrcProfitReportQuery query = mapper.readValue("""
|
||||||
|
{"customerArea":"C", "beginBizDate":"2026-10-18 00:00:00",
|
||||||
|
"endBizDate":"2026-11-17 23:59:59", "arBillStatus":"UNBILLED", "orderNo":"A\\nB"}
|
||||||
|
""", PrcProfitReportQuery.class);
|
||||||
|
assertEquals(Instant.parse("2026-10-17T16:00:00Z"), query.getBeginBizDate().toInstant());
|
||||||
|
assertEquals(Instant.parse("2026-11-17T15:59:59Z"), query.getEndBizDate().toInstant());
|
||||||
|
assertEquals("A\nB", query.getOrderNo());
|
||||||
|
assertEquals("UNBILLED", query.getArBillStatus());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PrcProfitReportQuery query(String area)
|
||||||
|
{
|
||||||
|
PrcProfitReportQuery query = new PrcProfitReportQuery();
|
||||||
|
query.setCustomerArea(area);
|
||||||
|
query.setArBillStatus("UNBILLED");
|
||||||
|
return query;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PrcProfitReportOrderRow row(String orderNo)
|
||||||
|
{
|
||||||
|
PrcProfitReportOrderRow row = new PrcProfitReportOrderRow();
|
||||||
|
row.setOrderNo(orderNo);
|
||||||
|
row.setSalesAmount(new BigDecimal("26.60"));
|
||||||
|
row.setArBillStatus("UNBILLED");
|
||||||
|
return row;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean hasColumn(Row header, String name)
|
||||||
|
{
|
||||||
|
for (var cell : header) if (name.equals(cell.getStringCellValue())) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int countWorkbookSheets(Path file) throws Exception
|
||||||
|
{
|
||||||
|
try (ZipFile workbook = new ZipFile(file.toFile());
|
||||||
|
InputStream input = workbook.getInputStream(workbook.getEntry("xl/workbook.xml")))
|
||||||
|
{
|
||||||
|
XMLStreamReader reader = xmlInputFactory().createXMLStreamReader(input);
|
||||||
|
int count = 0;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
while (reader.hasNext())
|
||||||
|
{
|
||||||
|
if (reader.next() == XMLStreamReader.START_ELEMENT && "sheet".equals(reader.getLocalName()))
|
||||||
|
{
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
reader.close();
|
||||||
|
}
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int lastWorksheetRowNumber(Path file) throws Exception
|
||||||
|
{
|
||||||
|
try (ZipFile workbook = new ZipFile(file.toFile());
|
||||||
|
InputStream input = workbook.getInputStream(workbook.getEntry("xl/worksheets/sheet1.xml")))
|
||||||
|
{
|
||||||
|
XMLStreamReader reader = xmlInputFactory().createXMLStreamReader(input);
|
||||||
|
int lastRowNumber = 0;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
while (reader.hasNext())
|
||||||
|
{
|
||||||
|
if (reader.next() == XMLStreamReader.START_ELEMENT && "row".equals(reader.getLocalName()))
|
||||||
|
{
|
||||||
|
lastRowNumber = Integer.parseInt(reader.getAttributeValue(null, "r"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
reader.close();
|
||||||
|
}
|
||||||
|
return lastRowNumber;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static XMLInputFactory xmlInputFactory()
|
||||||
|
{
|
||||||
|
XMLInputFactory factory = XMLInputFactory.newFactory();
|
||||||
|
factory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
|
||||||
|
factory.setProperty("javax.xml.stream.isSupportingExternalEntities", false);
|
||||||
|
return factory;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static IPrcProfitReportService service(Function<PrcProfitReportQuery, List<PrcProfitReportOrderRow>> query)
|
||||||
|
{
|
||||||
|
return (IPrcProfitReportService) Proxy.newProxyInstance(ProfitReportAsyncExportTest.class.getClassLoader(),
|
||||||
|
new Class<?>[] { IPrcProfitReportService.class }, (proxy, method, args) -> {
|
||||||
|
if ("selectOrderRows".equals(method.getName())) return query.apply((PrcProfitReportQuery) args[0]);
|
||||||
|
throw new AssertionError("Unexpected service call: " + method.getName());
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class HoldingExecutor extends ThreadPoolTaskExecutor
|
||||||
|
{
|
||||||
|
private Runnable work;
|
||||||
|
@Override
|
||||||
|
public void execute(Runnable task) { work = task; }
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class MemoryRedis extends RedisCache
|
||||||
|
{
|
||||||
|
private final Map<String, Object> values = new HashMap<>();
|
||||||
|
@Override
|
||||||
|
public <T> void setCacheObject(String key, T value, Integer timeout, TimeUnit unit)
|
||||||
|
{
|
||||||
|
values.put(key, value);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public <T> T getCacheObject(String key) { return (T) values.get(key); }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -151,7 +151,7 @@ public class LoginUser implements UserDetails
|
|||||||
@Override
|
@Override
|
||||||
public String getUsername()
|
public String getUsername()
|
||||||
{
|
{
|
||||||
return user.getUserName();
|
return user == null ? null : user.getUserName();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ public enum PaymentMesEnum
|
|||||||
BMS_PAY_PICK_CH("BMS_PAY_PICK_CH", "渠道绑定产品", "请先勾选渠道"),
|
BMS_PAY_PICK_CH("BMS_PAY_PICK_CH", "渠道绑定产品", "请先勾选渠道"),
|
||||||
BMS_PAY_PICK_SIDE("BMS_PAY_PICK_SIDE", "渠道绑定产品", "请至少选择应付或应收产品"),
|
BMS_PAY_PICK_SIDE("BMS_PAY_PICK_SIDE", "渠道绑定产品", "请至少选择应付或应收产品"),
|
||||||
BMS_PAY_BIND_NONE("BMS_PAY_BIND_NONE", "渠道绑定产品", "没有可绑定的渠道"),
|
BMS_PAY_BIND_NONE("BMS_PAY_BIND_NONE", "渠道绑定产品", "没有可绑定的渠道"),
|
||||||
BMS_PAY_CH_PROD("BMS_PAY_CH_PROD", "渠道应付产品", "渠道还没有选择应付产品"),
|
BMS_PAY_CH_PROD("BMS_PAY_CH_PROD", "渠道应付价卡", "渠道还没有选择应付价卡"),
|
||||||
BMS_PAY_OUT_TERM("BMS_PAY_OUT_TERM", "应付价格有效期", "订单时间没有落在价格有效期内"),
|
BMS_PAY_OUT_TERM("BMS_PAY_OUT_TERM", "应付价格有效期", "订单时间没有落在价格有效期内"),
|
||||||
BMS_PAY_TWO_VER("BMS_PAY_TWO_VER", "应付价格对比", "请选择两个价格版本"),
|
BMS_PAY_TWO_VER("BMS_PAY_TWO_VER", "应付价格对比", "请选择两个价格版本"),
|
||||||
BMS_PAY_AR_AP("BMS_PAY_AR_AP", "收付类型", "收付类型只能是应收AR或应付AP"),
|
BMS_PAY_AR_AP("BMS_PAY_AR_AP", "收付类型", "收付类型只能是应收AR或应付AP"),
|
||||||
@@ -117,7 +117,49 @@ public enum PaymentMesEnum
|
|||||||
BMS_PAY_CUR_DICT("BMS_PAY_CUR_DICT", "提单费用校验币种", "收费币种不在币种字典中"),
|
BMS_PAY_CUR_DICT("BMS_PAY_CUR_DICT", "提单费用校验币种", "收费币种不在币种字典中"),
|
||||||
BMS_PAY_REMARK("BMS_PAY_REMARK", "提单费用校验备注", "备注不能超过500字"),
|
BMS_PAY_REMARK("BMS_PAY_REMARK", "提单费用校验备注", "备注不能超过500字"),
|
||||||
BMS_PAY_LAD_BLANK("BMS_PAY_LAD_BLANK", "提单费用校验提单", "提单号不能为空"),
|
BMS_PAY_LAD_BLANK("BMS_PAY_LAD_BLANK", "提单费用校验提单", "提单号不能为空"),
|
||||||
BMS_PAY_LAD_MISS("BMS_PAY_LAD_MISS", "提单费用校验提单", "提单不存在");
|
BMS_PAY_LAD_MISS("BMS_PAY_LAD_MISS", "提单费用校验提单", "提单不存在"),
|
||||||
|
|
||||||
|
BMS_PAY_USE_AUDIT("BMS_PAY_USE_AUDIT", "应付账单确认", "请先提交审核,审核通过后账单才确认"),
|
||||||
|
BMS_PAY_USE_PAY("BMS_PAY_USE_PAY", "应付账单付款", "请到应付付款登记付款并核销"),
|
||||||
|
BMS_PAY_SUBMIT("BMS_PAY_SUBMIT", "应付账单提交", "只有草稿可以提交审核"),
|
||||||
|
BMS_PAY_DIFF_OPEN("BMS_PAY_DIFF_OPEN", "应付账单提交", "还有未处理的对账差异"),
|
||||||
|
BMS_PAY_NO_LINE("BMS_PAY_NO_LINE", "应付账单提交", "账单没有费用行"),
|
||||||
|
BMS_PAY_PENDING("BMS_PAY_PENDING", "应付账单审核", "只有待审核的账单可以审核"),
|
||||||
|
BMS_PAY_NO_FILE("BMS_PAY_NO_FILE", "应付账单审核", "请先上传发票或对账凭证"),
|
||||||
|
BMS_PAY_REJECT_WHY("BMS_PAY_REJECT_WHY", "应付账单审核", "请填写驳回意见"),
|
||||||
|
BMS_PAY_LINE_MISS("BMS_PAY_LINE_MISS", "应付账单差异", "费用行不存在"),
|
||||||
|
BMS_PAY_LINE_LOCK("BMS_PAY_LINE_LOCK", "应付账单差异", "只有草稿可以调整费用行"),
|
||||||
|
BMS_PAY_NO_DIFF("BMS_PAY_NO_DIFF", "应付账单差异", "这行没有待处理的差异"),
|
||||||
|
BMS_PAY_NO_VOID("BMS_PAY_NO_VOID", "应付账单作废", "已确认的账单不能直接作废,请做红字"),
|
||||||
|
BMS_PAY_FEE_TAKEN("BMS_PAY_FEE_TAKEN", "应付账单生成", "费用已经进入其他账单"),
|
||||||
|
BMS_PAY_RED_STAT("BMS_PAY_RED_STAT", "应付账单红字", "只有已确认或部分付款的账单可以红冲"),
|
||||||
|
BMS_PAY_RED_PAID("BMS_PAY_RED_PAID", "应付账单红字", "账单已有付款,请先处理付款后再红冲"),
|
||||||
|
BMS_PAY_RED_KIND("BMS_PAY_RED_KIND", "应付账单红字", "红字账单不能再红冲"),
|
||||||
|
BMS_PAY_FILE_NEED("BMS_PAY_FILE_NEED", "应付凭证", "请先上传文件"),
|
||||||
|
BMS_PAY_FILE_MISS("BMS_PAY_FILE_MISS", "应付凭证", "凭证不存在"),
|
||||||
|
BMS_PAY_FILE_LOCK("BMS_PAY_FILE_LOCK", "应付凭证", "已确认的账单不能删除凭证"),
|
||||||
|
BMS_PAY_PAY_MISS("BMS_PAY_PAY_MISS", "应付付款", "付款单不存在"),
|
||||||
|
BMS_PAY_PAY_DRAFT("BMS_PAY_PAY_DRAFT", "应付付款", "只有草稿付款单可以确认或作废"),
|
||||||
|
BMS_PAY_PAY_DATE("BMS_PAY_PAY_DATE", "应付付款", "请填写付款日期"),
|
||||||
|
BMS_PAY_PAY_AMT("BMS_PAY_PAY_AMT", "应付付款", "请填写付款金额"),
|
||||||
|
BMS_PAY_ALLOC_NEED("BMS_PAY_ALLOC_NEED", "应付付款", "请填写本次核销金额"),
|
||||||
|
BMS_PAY_ALLOC_AMT("BMS_PAY_ALLOC_AMT", "应付付款", "核销金额超过账单未付金额"),
|
||||||
|
BMS_PAY_ALLOC_DUP("BMS_PAY_ALLOC_DUP", "应付付款", "同一张账单不能重复核销"),
|
||||||
|
BMS_PAY_ALLOC_OVER("BMS_PAY_ALLOC_OVER", "应付付款", "核销合计不能超过付款金额"),
|
||||||
|
BMS_PAY_PAY_BILL("BMS_PAY_PAY_BILL", "应付付款", "只能核销已确认或部分付款的账单"),
|
||||||
|
BMS_PAY_PAY_SAME("BMS_PAY_PAY_SAME", "应付付款", "付款单和账单的供应商、币种需要一致"),
|
||||||
|
BMS_PAY_SAME_USER("BMS_PAY_SAME_USER", "应付审核", "提交人和审核人不能是同一人"),
|
||||||
|
BMS_PAY_SAME_PAY("BMS_PAY_SAME_PAY", "应付付款", "登记人和确认人不能是同一人"),
|
||||||
|
BMS_PAY_INV_NEED("BMS_PAY_INV_NEED", "应付发票", "审核通过前请上传发票,并填写发票号和价税合计"),
|
||||||
|
BMS_PAY_INV_AMT("BMS_PAY_INV_AMT", "应付发票", "发票价税合计与账单金额不一致"),
|
||||||
|
BMS_PAY_INV_TAX("BMS_PAY_INV_TAX", "应付发票", "发票税额与账单税额不一致"),
|
||||||
|
BMS_PAY_INV_DUP("BMS_PAY_INV_DUP", "应付发票", "这张发票号已经在该供应商下勾稽过"),
|
||||||
|
BMS_PAY_INV_NO("BMS_PAY_INV_NO", "应付发票", "请填写发票号"),
|
||||||
|
BMS_PAY_TAX_RATE("BMS_PAY_TAX_RATE", "应付价税", "税率要在 0 到 1 之间,例如 0.06"),
|
||||||
|
BMS_PAY_RATE("BMS_PAY_RATE", "应付汇率", "请填写大于 0 的汇率"),
|
||||||
|
BMS_PAY_NO_REVERSE("BMS_PAY_NO_REVERSE", "应付付款", "只有已付款的单据可以反核销或退款"),
|
||||||
|
BMS_PAY_NO_BACK("BMS_PAY_NO_BACK", "应付付款", "没有可冲回的核销"),
|
||||||
|
BMS_PAY_XLS_LINE("BMS_PAY_XLS_LINE", "应付对账单", "对账单里没有可导入的行号");
|
||||||
|
|
||||||
private static final Map<String, PaymentMesEnum> BY_CODE = new HashMap<>();
|
private static final Map<String, PaymentMesEnum> BY_CODE = new HashMap<>();
|
||||||
|
|
||||||
|
|||||||
@@ -170,7 +170,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 规范化目的地邮编,用于分区匹配/持久化。
|
* 规范化目的地邮编,用于分区匹配/持久化。
|
||||||
* 移除所有 Unicode 空白字符(包括 NBSP / U+2005)和 ASCII 空格;
|
* 仅去掉两端 Unicode 空白(含 NBSP / U+2005),保留中间空格;
|
||||||
* 去除纯数字末尾 Excel 风格的 ".0"。
|
* 去除纯数字末尾 Excel 风格的 ".0"。
|
||||||
*/
|
*/
|
||||||
public static String normalizePostcode(String postcode)
|
public static String normalizePostcode(String postcode)
|
||||||
@@ -179,17 +179,27 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
|
|||||||
{
|
{
|
||||||
return postcode;
|
return postcode;
|
||||||
}
|
}
|
||||||
StringBuilder sb = new StringBuilder(postcode.length());
|
int startIdx = 0;
|
||||||
for (int i = 0; i < postcode.length(); )
|
int endIdx = postcode.length();
|
||||||
|
while (startIdx < endIdx)
|
||||||
{
|
{
|
||||||
int cp = postcode.codePointAt(i);
|
int cp = postcode.codePointAt(startIdx);
|
||||||
if (!Character.isWhitespace(cp))
|
if (!Character.isWhitespace(cp))
|
||||||
{
|
{
|
||||||
sb.appendCodePoint(cp);
|
break;
|
||||||
}
|
}
|
||||||
i += Character.charCount(cp);
|
startIdx += Character.charCount(cp);
|
||||||
}
|
}
|
||||||
String n = sb.toString();
|
while (endIdx > startIdx)
|
||||||
|
{
|
||||||
|
int cp = postcode.codePointBefore(endIdx);
|
||||||
|
if (!Character.isWhitespace(cp))
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
endIdx -= Character.charCount(cp);
|
||||||
|
}
|
||||||
|
String n = postcode.substring(startIdx, endIdx);
|
||||||
if (n.endsWith(".0") && n.matches("\\d+\\.0"))
|
if (n.endsWith(".0") && n.matches("\\d+\\.0"))
|
||||||
{
|
{
|
||||||
return n.substring(0, n.length() - 2);
|
return n.substring(0, n.length() - 2);
|
||||||
|
|||||||
@@ -111,11 +111,12 @@ public class ExcelUtil<T>
|
|||||||
*/
|
*/
|
||||||
private Map<String, CellStyle> cellStyleCache = new HashMap<String, CellStyle>();
|
private Map<String, CellStyle> cellStyleCache = new HashMap<String, CellStyle>();
|
||||||
|
|
||||||
/**
|
/** 通用导出的默认每个工作表数据行数;单工作表 XLSX 导出使用 XLSX 实际上限。 */
|
||||||
* Excel sheet最大行数,默认65536
|
|
||||||
*/
|
|
||||||
public static final int sheetSize = 65536;
|
public static final int sheetSize = 65536;
|
||||||
|
|
||||||
|
/** XLSX 工作表的最大行数。 */
|
||||||
|
public static final int XLSX_MAX_ROW_COUNT = 1_048_576;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 工作表名称
|
* 工作表名称
|
||||||
*/
|
*/
|
||||||
@@ -796,6 +797,28 @@ public class ExcelUtil<T>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 写入单个 XLSX 工作表;超出 Excel 行数上限时返回明确错误。 */
|
||||||
|
public void exportExcelToSingleSheetStream(List<T> list, String sheetName, OutputStream output) throws IOException
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
this.init(list, sheetName, StringUtils.EMPTY, Type.EXPORT);
|
||||||
|
int reservedRows = rownum + 1 + (hasStatisticsColumns() ? 1 : 0);
|
||||||
|
int maxDataRows = XLSX_MAX_ROW_COUNT - reservedRows;
|
||||||
|
if (this.list.size() > maxDataRows)
|
||||||
|
{
|
||||||
|
throw new IOException(StringUtils.format("单个工作表最多支持{}条数据,当前{}条,请缩小查询范围",
|
||||||
|
maxDataRows, this.list.size()));
|
||||||
|
}
|
||||||
|
writeSheet(maxDataRows);
|
||||||
|
wb.write(output);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
IOUtils.closeQuietly(wb);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** 对 list 数据源生成本地 Excel 文件,返回文件名。 */
|
/** 对 list 数据源生成本地 Excel 文件,返回文件名。 */
|
||||||
public AjaxResult exportExcel()
|
public AjaxResult exportExcel()
|
||||||
{
|
{
|
||||||
@@ -824,9 +847,14 @@ public class ExcelUtil<T>
|
|||||||
* 创建写入数据到Sheet
|
* 创建写入数据到Sheet
|
||||||
*/
|
*/
|
||||||
public void writeSheet()
|
public void writeSheet()
|
||||||
|
{
|
||||||
|
writeSheet(sheetSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void writeSheet(int rowsPerSheet)
|
||||||
{
|
{
|
||||||
// 取出一共有多少个sheet.
|
// 取出一共有多少个sheet.
|
||||||
int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize));
|
int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / rowsPerSheet));
|
||||||
for (int index = 0; index < sheetNo; index++)
|
for (int index = 0; index < sheetNo; index++)
|
||||||
{
|
{
|
||||||
createSheet(sheetNo, index);
|
createSheet(sheetNo, index);
|
||||||
@@ -855,7 +883,7 @@ public class ExcelUtil<T>
|
|||||||
}
|
}
|
||||||
if (Type.EXPORT.equals(type))
|
if (Type.EXPORT.equals(type))
|
||||||
{
|
{
|
||||||
fillExcelData(index);
|
fillExcelData(index, rowsPerSheet);
|
||||||
addStatisticsRow();
|
addStatisticsRow();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -869,8 +897,13 @@ public class ExcelUtil<T>
|
|||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public void fillExcelData(int index)
|
public void fillExcelData(int index)
|
||||||
{
|
{
|
||||||
int startNo = index * sheetSize;
|
fillExcelData(index, sheetSize);
|
||||||
int endNo = Math.min(startNo + sheetSize, list.size());
|
}
|
||||||
|
|
||||||
|
private void fillExcelData(int index, int rowsPerSheet)
|
||||||
|
{
|
||||||
|
int startNo = index * rowsPerSheet;
|
||||||
|
int endNo = Math.min(startNo + rowsPerSheet, list.size());
|
||||||
int currentRowNum = rownum + 1; // 从标题行后开始
|
int currentRowNum = rownum + 1; // 从标题行后开始
|
||||||
|
|
||||||
for (int i = startNo; i < endNo; i++)
|
for (int i = startNo; i < endNo; i++)
|
||||||
@@ -931,6 +964,18 @@ public class ExcelUtil<T>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private boolean hasStatisticsColumns()
|
||||||
|
{
|
||||||
|
for (Object[] field : fields)
|
||||||
|
{
|
||||||
|
if (((Excel) field[1]).isStatistics())
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取子列表最大数
|
* 获取子列表最大数
|
||||||
*/
|
*/
|
||||||
|
|||||||
+4
@@ -136,6 +136,10 @@ public class BmsSupplier extends BaseEntity
|
|||||||
@Excel(name = "合作状态", readConverterExp = "0=正常,1=暂停,2=终止")
|
@Excel(name = "合作状态", readConverterExp = "0=正常,1=暂停,2=终止")
|
||||||
private String cooperationStatus;
|
private String cooperationStatus;
|
||||||
|
|
||||||
|
/** 数据来源,字典 bms_supplier_data_source。空表示未填写 */
|
||||||
|
@Excel(name = "数据来源", dictType = "bms_supplier_data_source")
|
||||||
|
private String dataSource;
|
||||||
|
|
||||||
/** 绑定的渠道/服务ID */
|
/** 绑定的渠道/服务ID */
|
||||||
private String channelIds;
|
private String channelIds;
|
||||||
|
|
||||||
|
|||||||
+3
@@ -26,6 +26,9 @@ public interface BmsSupplierMapper
|
|||||||
/** 修改供应商 */
|
/** 修改供应商 */
|
||||||
public int updateBmsSupplier(BmsSupplier bmsSupplier);
|
public int updateBmsSupplier(BmsSupplier bmsSupplier);
|
||||||
|
|
||||||
|
/** 只更新供应商绑定的渠道编码。 */
|
||||||
|
public int updateSupplierChannels(BmsSupplier bmsSupplier);
|
||||||
|
|
||||||
/** 删除供应商 */
|
/** 删除供应商 */
|
||||||
public int deleteBmsSupplierBySupplierId(Long supplierId);
|
public int deleteBmsSupplierBySupplierId(Long supplierId);
|
||||||
|
|
||||||
|
|||||||
+3
@@ -26,6 +26,9 @@ public interface IBmsSupplierService
|
|||||||
/** 修改供应商 */
|
/** 修改供应商 */
|
||||||
public int updateBmsSupplier(BmsSupplier bmsSupplier);
|
public int updateBmsSupplier(BmsSupplier bmsSupplier);
|
||||||
|
|
||||||
|
/** 只改这一家供应商绑定的渠道,其它资料不动。 */
|
||||||
|
public int bindChannels(Long supplierId, String channelIds);
|
||||||
|
|
||||||
/** 批量删除供应商 */
|
/** 批量删除供应商 */
|
||||||
public int deleteBmsSupplierBySupplierIds(Long[] supplierIds);
|
public int deleteBmsSupplierBySupplierIds(Long[] supplierIds);
|
||||||
|
|
||||||
|
|||||||
+56
@@ -1,6 +1,7 @@
|
|||||||
package com.bms.customer.supplierinfo.service.impl;
|
package com.bms.customer.supplierinfo.service.impl;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.bms.common.annotation.DataScope;
|
import com.bms.common.annotation.DataScope;
|
||||||
@@ -302,6 +303,61 @@ public class BmsSupplierServiceImpl implements IBmsSupplierService
|
|||||||
return bmsSupplierMapper.updateBmsSupplier(bmsSupplier);
|
return bmsSupplierMapper.updateBmsSupplier(bmsSupplier);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 只改绑定渠道。不走整单修改,避免把附件、采购员和合同日期清掉。
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public int bindChannels(Long supplierId, String channelIds)
|
||||||
|
{
|
||||||
|
if (supplierId == null)
|
||||||
|
{
|
||||||
|
throw new ServiceException("请选择供应商");
|
||||||
|
}
|
||||||
|
if (bmsSupplierMapper.selectBmsSupplierBySupplierId(supplierId) == null)
|
||||||
|
{
|
||||||
|
throw new ServiceException("供应商不存在");
|
||||||
|
}
|
||||||
|
String value = joinChannels(channelIds);
|
||||||
|
if (value.length() > 1000)
|
||||||
|
{
|
||||||
|
throw new ServiceException("绑定的渠道过多,请减少后再保存");
|
||||||
|
}
|
||||||
|
BmsSupplier row = new BmsSupplier();
|
||||||
|
row.setSupplierId(supplierId);
|
||||||
|
row.setChannelIds(value);
|
||||||
|
row.setUpdateBy(SecurityUtils.getUsername());
|
||||||
|
row.setUpdateTime(DateUtils.getNowDate());
|
||||||
|
int rows = bmsSupplierMapper.updateSupplierChannels(row);
|
||||||
|
if (rows == 0)
|
||||||
|
{
|
||||||
|
throw new ServiceException("供应商不存在");
|
||||||
|
}
|
||||||
|
return rows;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 渠道编码去空白、去重,仍按选择顺序用逗号拼起来。 */
|
||||||
|
private static String joinChannels(String channelIds)
|
||||||
|
{
|
||||||
|
if (StringUtils.isEmpty(channelIds))
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
LinkedHashSet<String> codes = new LinkedHashSet<>();
|
||||||
|
for (String part : channelIds.split(","))
|
||||||
|
{
|
||||||
|
if (part == null)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
String code = part.trim();
|
||||||
|
if (!code.isEmpty())
|
||||||
|
{
|
||||||
|
codes.add(code);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return String.join(",", codes);
|
||||||
|
}
|
||||||
|
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
@Override
|
@Override
|
||||||
public int deleteBmsSupplierBySupplierIds(Long[] supplierIds)
|
public int deleteBmsSupplierBySupplierIds(Long[] supplierIds)
|
||||||
|
|||||||
+8
-1
@@ -1,6 +1,7 @@
|
|||||||
package com.bms.price.airbill.domain;
|
package com.bms.price.airbill.domain;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/** 待分摊的一条提单费用,供费用处理弹框展示。 */
|
/** 待分摊的一条提单费用,供费用处理弹框展示。 */
|
||||||
@@ -11,7 +12,7 @@ public class SrvBillAirAllocFee
|
|||||||
|
|
||||||
private String billCode;
|
private String billCode;
|
||||||
|
|
||||||
/** 提单主键 srv_bill_air.guid,写入订单费用的 source_id */
|
/** 提单主键 srv_bill_air.guid */
|
||||||
private String ladingId;
|
private String ladingId;
|
||||||
|
|
||||||
/** 费用阶段,字典 bms_fee_level */
|
/** 费用阶段,字典 bms_fee_level */
|
||||||
@@ -20,12 +21,18 @@ public class SrvBillAirAllocFee
|
|||||||
/** 费用状态,字典 bill_fee_status */
|
/** 费用状态,字典 bill_fee_status */
|
||||||
private String billFeeStatus;
|
private String billFeeStatus;
|
||||||
|
|
||||||
|
/** 费用类型,字典 bms_fee_type 的英文编码 */
|
||||||
|
private String feeType;
|
||||||
|
|
||||||
private String feeName;
|
private String feeName;
|
||||||
|
|
||||||
private BigDecimal price;
|
private BigDecimal price;
|
||||||
|
|
||||||
private String currency;
|
private String currency;
|
||||||
|
|
||||||
|
/** 费用录入时间,用来取汇率 */
|
||||||
|
private Date createTime;
|
||||||
|
|
||||||
/** 分摊维度:1订单 2重量 */
|
/** 分摊维度:1订单 2重量 */
|
||||||
private String allocDim;
|
private String allocDim;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ public class SrvBillAirAllocOrder
|
|||||||
private String orderNo;
|
private String orderNo;
|
||||||
|
|
||||||
/** 计费订单 ID,对应 prc_order_bill.bill_id */
|
/** 计费订单 ID,对应 prc_order_bill.bill_id */
|
||||||
private String billId;
|
private Long billId;
|
||||||
|
|
||||||
/** 计费重,没有计费重时依次取实际重量、收货重量 */
|
/** 计费重,没有计费重时依次取实际重量、收货重量 */
|
||||||
private BigDecimal chargeWeight;
|
private BigDecimal chargeWeight;
|
||||||
|
|||||||
@@ -15,9 +15,12 @@ public class SrvBillAirFee
|
|||||||
|
|
||||||
private String billCode;
|
private String billCode;
|
||||||
|
|
||||||
/** 附加费编号 prc_surcharge.sc_id */
|
/** 费用类型,字典 bms_fee_type 的英文编码 */
|
||||||
private String feeType;
|
private String feeType;
|
||||||
|
|
||||||
|
/** 附加费配置ID,对应 prc_surcharge.sc_id */
|
||||||
|
private Long scId;
|
||||||
|
|
||||||
/** 附加费名称,仅展示,不入库 */
|
/** 附加费名称,仅展示,不入库 */
|
||||||
private String feeName;
|
private String feeName;
|
||||||
|
|
||||||
|
|||||||
+23
@@ -0,0 +1,23 @@
|
|||||||
|
package com.bms.price.config;
|
||||||
|
|
||||||
|
import java.util.concurrent.ThreadPoolExecutor;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
||||||
|
|
||||||
|
/** 毛利分析导出专用线程池,限制全量订单查询与 Excel 生成的并发。 */
|
||||||
|
@Configuration
|
||||||
|
public class ProfitReportExportTaskConfig
|
||||||
|
{
|
||||||
|
@Bean(name = "profitReportExportTaskExecutor")
|
||||||
|
public ThreadPoolTaskExecutor profitReportExportTaskExecutor()
|
||||||
|
{
|
||||||
|
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
|
||||||
|
executor.setCorePoolSize(1);
|
||||||
|
executor.setMaxPoolSize(1);
|
||||||
|
executor.setQueueCapacity(2);
|
||||||
|
executor.setThreadNamePrefix("profit-report-export-");
|
||||||
|
executor.setRejectedExecutionHandler(new ThreadPoolExecutor.AbortPolicy());
|
||||||
|
return executor;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打单重量段计费条件(字典 lbl_charge_mode)。
|
||||||
|
*/
|
||||||
|
public final class LblChargeMode
|
||||||
|
{
|
||||||
|
private LblChargeMode()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 按票 */
|
||||||
|
public static final String ITEM = "ITEM";
|
||||||
|
|
||||||
|
/** 单价*公斤数 */
|
||||||
|
public static final String PER_KG = "PER_KG";
|
||||||
|
|
||||||
|
/** 首重+续重 */
|
||||||
|
public static final String EXTRA_KG = "EXTRA_KG";
|
||||||
|
|
||||||
|
/** 邮编 */
|
||||||
|
public static final String POSTCODE = "POSTCODE";
|
||||||
|
|
||||||
|
/** @deprecated 映射为 ITEM */
|
||||||
|
@Deprecated
|
||||||
|
public static final String ALWAYS = "ALWAYS";
|
||||||
|
|
||||||
|
/** @deprecated 映射为 ITEM(分区用 zone 列过滤) */
|
||||||
|
@Deprecated
|
||||||
|
public static final String ZONE = "ZONE";
|
||||||
|
|
||||||
|
/** @deprecated 映射为 ITEM */
|
||||||
|
@Deprecated
|
||||||
|
public static final String FLAT = "FLAT";
|
||||||
|
|
||||||
|
/** @deprecated 映射为 PER_KG */
|
||||||
|
@Deprecated
|
||||||
|
public static final String UNIT_PLUS_HANDLE = "UNIT_PLUS_HANDLE";
|
||||||
|
|
||||||
|
/** @deprecated 映射为 EXTRA_KG */
|
||||||
|
@Deprecated
|
||||||
|
public static final String FIRST_EXTRA = "FIRST_EXTRA";
|
||||||
|
|
||||||
|
/** @deprecated */
|
||||||
|
@Deprecated
|
||||||
|
public static final String WEIGHT = "WEIGHT";
|
||||||
|
|
||||||
|
/** @deprecated */
|
||||||
|
@Deprecated
|
||||||
|
public static final String SIZE = "SIZE";
|
||||||
|
|
||||||
|
/** @deprecated */
|
||||||
|
@Deprecated
|
||||||
|
public static final String RETURN = "RETURN";
|
||||||
|
|
||||||
|
/** @deprecated */
|
||||||
|
@Deprecated
|
||||||
|
public static final String MANUAL = "MANUAL";
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打单解析过程中的邮编/配置原文行(二期落库;当前仅预览内存态)。
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class LblExtraLine
|
||||||
|
{
|
||||||
|
private Long lineId;
|
||||||
|
|
||||||
|
private Long productId;
|
||||||
|
|
||||||
|
private Long versionId;
|
||||||
|
|
||||||
|
private String lineType;
|
||||||
|
|
||||||
|
private String lineText;
|
||||||
|
|
||||||
|
private Integer sortNo;
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打单重量段费用类型(字典 bms_fee_type)。
|
||||||
|
*/
|
||||||
|
public final class LblFeeType
|
||||||
|
{
|
||||||
|
private LblFeeType()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 运费 */
|
||||||
|
public static final String FREIGHT = "FREIGHT";
|
||||||
|
|
||||||
|
/** 处理费/挂号 */
|
||||||
|
public static final String REGISTRATION = "REGISTRATION";
|
||||||
|
|
||||||
|
/** 偏远费 */
|
||||||
|
public static final String REMOTE = "REMOTE";
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打单价卡导入预览。
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class LblPreview
|
||||||
|
{
|
||||||
|
private String sourceFile;
|
||||||
|
|
||||||
|
private String filePath;
|
||||||
|
|
||||||
|
private String fileMd5;
|
||||||
|
|
||||||
|
private String supplierName;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||||
|
private Date effectiveDate;
|
||||||
|
|
||||||
|
private List<LblProduct> products = new ArrayList<>();
|
||||||
|
|
||||||
|
private List<String> skippedSheets = new ArrayList<>();
|
||||||
|
}
|
||||||
@@ -0,0 +1,113 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import com.bms.common.annotation.Excel;
|
||||||
|
import com.bms.common.core.domain.BaseEntity;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打单价卡产品主数据。
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
public class LblProduct extends BaseEntity
|
||||||
|
{
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
private Long productId;
|
||||||
|
|
||||||
|
@Excel(name = "产品名称", width = 24)
|
||||||
|
private String productName;
|
||||||
|
|
||||||
|
private String dictValue;
|
||||||
|
|
||||||
|
private Long versionId;
|
||||||
|
|
||||||
|
private Integer versionNo;
|
||||||
|
|
||||||
|
private String versionStatus;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||||
|
private Date versionStart;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||||
|
private Date versionEnd;
|
||||||
|
|
||||||
|
private String countryScope;
|
||||||
|
|
||||||
|
private String chargeType;
|
||||||
|
|
||||||
|
private String extraPerKg;
|
||||||
|
|
||||||
|
private String serviceType;
|
||||||
|
|
||||||
|
private String classification;
|
||||||
|
|
||||||
|
private String catalogRemark;
|
||||||
|
|
||||||
|
private String updateContent;
|
||||||
|
|
||||||
|
private String weightLimit;
|
||||||
|
|
||||||
|
private String sheetName;
|
||||||
|
|
||||||
|
private String relatedSheet;
|
||||||
|
|
||||||
|
private String sourceFile;
|
||||||
|
|
||||||
|
private String filePath;
|
||||||
|
|
||||||
|
private String fileMd5;
|
||||||
|
|
||||||
|
private String supplierName;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||||
|
private Date effectiveDate;
|
||||||
|
|
||||||
|
private String currency;
|
||||||
|
|
||||||
|
private String serviceNote;
|
||||||
|
|
||||||
|
private String parseStatus;
|
||||||
|
|
||||||
|
private Integer weightCount;
|
||||||
|
|
||||||
|
private Integer surchargeCount;
|
||||||
|
|
||||||
|
private Integer extraCount;
|
||||||
|
|
||||||
|
private String boundChannelText;
|
||||||
|
|
||||||
|
private Integer boundChannelCount;
|
||||||
|
|
||||||
|
private Boolean duplicated;
|
||||||
|
|
||||||
|
private Long existsId;
|
||||||
|
|
||||||
|
private List<LblWeightBand> weightBands;
|
||||||
|
|
||||||
|
private List<LblSurcharge> surcharges;
|
||||||
|
|
||||||
|
/** 兼容旧前端 termId,等同 versionId */
|
||||||
|
public Long getTermId()
|
||||||
|
{
|
||||||
|
return versionId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTermId(Long termId)
|
||||||
|
{
|
||||||
|
this.versionId = termId;
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<LblExtraLine> extraLines;
|
||||||
|
|
||||||
|
/** 邮编→分区(保存时按产品同步到 prc_zone LABEL,不落产品子表) */
|
||||||
|
private Map<String, List<String>> zonePostcodes;
|
||||||
|
|
||||||
|
/** 编辑保存删除标记(不落库) */
|
||||||
|
private Boolean deleted;
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
import com.bms.common.core.domain.BaseEntity;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打单价卡产品版本周期。
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
public class LblProductVersion extends BaseEntity
|
||||||
|
{
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
private Long versionId;
|
||||||
|
|
||||||
|
private Long priceSetId;
|
||||||
|
|
||||||
|
private Long productId;
|
||||||
|
|
||||||
|
private String dictValue;
|
||||||
|
|
||||||
|
private Integer versionNo;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||||
|
private Date effectiveStart;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||||
|
private Date effectiveEnd;
|
||||||
|
|
||||||
|
private String filePath;
|
||||||
|
|
||||||
|
/** 0待生效 1生效 2已失效 */
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
private String productName;
|
||||||
|
|
||||||
|
private String sourceFile;
|
||||||
|
|
||||||
|
private Integer weightCount;
|
||||||
|
|
||||||
|
private Integer surchargeCount;
|
||||||
|
|
||||||
|
private String currency;
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打单价卡预览确认后的保存请求。
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class LblSaveCommand
|
||||||
|
{
|
||||||
|
private boolean overwrite;
|
||||||
|
|
||||||
|
private Long priceSetId;
|
||||||
|
|
||||||
|
private String priceSetName;
|
||||||
|
|
||||||
|
private String priceSetNote;
|
||||||
|
|
||||||
|
private Integer versionNo;
|
||||||
|
|
||||||
|
private List<LblProduct> products = new ArrayList<>();
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打单价卡异步保存进度(Redis)。
|
||||||
|
*/
|
||||||
|
public class LblSaveTask implements Serializable
|
||||||
|
{
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
public static final String STATUS_PENDING = "PENDING";
|
||||||
|
public static final String STATUS_RUNNING = "RUNNING";
|
||||||
|
public static final String STATUS_SUCCESS = "SUCCESS";
|
||||||
|
public static final String STATUS_FAIL = "FAIL";
|
||||||
|
|
||||||
|
private String taskId;
|
||||||
|
private String status;
|
||||||
|
private int percent;
|
||||||
|
private String message;
|
||||||
|
private Long priceSetId;
|
||||||
|
private String error;
|
||||||
|
|
||||||
|
public String getTaskId()
|
||||||
|
{
|
||||||
|
return taskId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTaskId(String taskId)
|
||||||
|
{
|
||||||
|
this.taskId = taskId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStatus()
|
||||||
|
{
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStatus(String status)
|
||||||
|
{
|
||||||
|
this.status = status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getPercent()
|
||||||
|
{
|
||||||
|
return percent;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPercent(int percent)
|
||||||
|
{
|
||||||
|
this.percent = percent;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMessage()
|
||||||
|
{
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMessage(String message)
|
||||||
|
{
|
||||||
|
this.message = message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getPriceSetId()
|
||||||
|
{
|
||||||
|
return priceSetId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPriceSetId(Long priceSetId)
|
||||||
|
{
|
||||||
|
this.priceSetId = priceSetId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getError()
|
||||||
|
{
|
||||||
|
return error;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setError(String error)
|
||||||
|
{
|
||||||
|
this.error = error;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打单价卡附加费(超重/超尺寸/% 等;偏远重量价不进本表)。
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class LblSurcharge
|
||||||
|
{
|
||||||
|
private Long surchargeId;
|
||||||
|
|
||||||
|
private Long productId;
|
||||||
|
|
||||||
|
private Long versionId;
|
||||||
|
|
||||||
|
/** 解析中间态区块名,不落库 */
|
||||||
|
private String sectionName;
|
||||||
|
|
||||||
|
private String feeName;
|
||||||
|
|
||||||
|
private Long scId;
|
||||||
|
|
||||||
|
private String zoneCode;
|
||||||
|
|
||||||
|
private String zoneName;
|
||||||
|
|
||||||
|
private String chargeText;
|
||||||
|
|
||||||
|
private BigDecimal amount;
|
||||||
|
|
||||||
|
private String currency;
|
||||||
|
|
||||||
|
private String priceUnit;
|
||||||
|
|
||||||
|
private String feeDesc;
|
||||||
|
|
||||||
|
private String periodText;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||||
|
private Date effectiveStart;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||||
|
private Date effectiveEnd;
|
||||||
|
|
||||||
|
private String chargeTiming;
|
||||||
|
|
||||||
|
private String calcRule;
|
||||||
|
|
||||||
|
private String calcParam;
|
||||||
|
|
||||||
|
private String postcodeParam;
|
||||||
|
|
||||||
|
private BigDecimal weightMin;
|
||||||
|
|
||||||
|
private BigDecimal weightMax;
|
||||||
|
|
||||||
|
private Integer sortNo;
|
||||||
|
|
||||||
|
/** 编辑保存删除标记(不落库) */
|
||||||
|
private Boolean deleted;
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打单价卡重量段明细。
|
||||||
|
* 维度:产品+国家+分区+重量段+fee_type;无 handle 字段。
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class LblWeightBand
|
||||||
|
{
|
||||||
|
private Long bandId;
|
||||||
|
|
||||||
|
private Long productId;
|
||||||
|
|
||||||
|
private Long versionId;
|
||||||
|
|
||||||
|
/** 解析中间态区块名,不落库 */
|
||||||
|
private String sectionName;
|
||||||
|
|
||||||
|
/** FREIGHT / REGISTRATION / REMOTE */
|
||||||
|
private String feeType;
|
||||||
|
|
||||||
|
private String countryName;
|
||||||
|
|
||||||
|
private String countryCode;
|
||||||
|
|
||||||
|
private String zoneCode;
|
||||||
|
|
||||||
|
private String zoneName;
|
||||||
|
|
||||||
|
private String postcodeParam;
|
||||||
|
|
||||||
|
private String weightLabel;
|
||||||
|
|
||||||
|
private BigDecimal weightMin;
|
||||||
|
|
||||||
|
private BigDecimal weightMax;
|
||||||
|
|
||||||
|
private String volumeText;
|
||||||
|
|
||||||
|
private String chargeName;
|
||||||
|
|
||||||
|
/** 字典 lbl_charge_mode:ITEM/PER_KG/EXTRA_KG/POSTCODE */
|
||||||
|
private String chargeMode;
|
||||||
|
|
||||||
|
/** 条件参数(如首重KG、尺寸表达) */
|
||||||
|
private String calcParam;
|
||||||
|
|
||||||
|
private BigDecimal price;
|
||||||
|
|
||||||
|
private String priceUnit;
|
||||||
|
|
||||||
|
private BigDecimal extraPrice;
|
||||||
|
|
||||||
|
private String extraPriceUnit;
|
||||||
|
|
||||||
|
private Integer sortNo;
|
||||||
|
|
||||||
|
/** 编辑保存删除标记(不落库) */
|
||||||
|
private Boolean deleted;
|
||||||
|
}
|
||||||
@@ -33,9 +33,23 @@ public class PayBill
|
|||||||
|
|
||||||
private BigDecimal totalAmount;
|
private BigDecimal totalAmount;
|
||||||
|
|
||||||
/** DRAFT CONFIRMED PAID VOID */
|
private BigDecimal supplierAmount;
|
||||||
|
|
||||||
|
private BigDecimal diffAmount;
|
||||||
|
|
||||||
|
private BigDecimal paidAmount;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||||
|
private Date dueDate;
|
||||||
|
|
||||||
|
/** DRAFT PENDING CONFIRMED PARTIAL PAID RED VOID */
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
|
/** BLUE 蓝字,RED 红字 */
|
||||||
|
private String billKind;
|
||||||
|
|
||||||
|
private Long originalBillId;
|
||||||
|
|
||||||
private String voidReason;
|
private String voidReason;
|
||||||
|
|
||||||
private String voidBy;
|
private String voidBy;
|
||||||
@@ -43,6 +57,29 @@ public class PayBill
|
|||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date voidTime;
|
private Date voidTime;
|
||||||
|
|
||||||
|
private String confirmBy;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
|
private Date confirmTime;
|
||||||
|
|
||||||
|
/** 0.06 表示 6% */
|
||||||
|
private BigDecimal taxRate;
|
||||||
|
|
||||||
|
private BigDecimal amountNet;
|
||||||
|
|
||||||
|
private BigDecimal taxAmount;
|
||||||
|
|
||||||
|
private BigDecimal exchangeRate;
|
||||||
|
|
||||||
|
private BigDecimal baseAmount;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||||
|
private Date rateDate;
|
||||||
|
|
||||||
|
private Integer termDays;
|
||||||
|
|
||||||
|
private String submitBy;
|
||||||
|
|
||||||
private String createBy;
|
private String createBy;
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
@@ -58,4 +95,10 @@ public class PayBill
|
|||||||
private List<PayBillLine> lines;
|
private List<PayBillLine> lines;
|
||||||
|
|
||||||
private List<PayBillLog> logs;
|
private List<PayBillLog> logs;
|
||||||
|
|
||||||
|
private List<PayBillDiff> diffs;
|
||||||
|
|
||||||
|
private List<PayBillFile> files;
|
||||||
|
|
||||||
|
private List<PayBillApproval> approvals;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 应付账单审核记录。 */
|
||||||
|
@Data
|
||||||
|
public class PayBillApproval
|
||||||
|
{
|
||||||
|
private Long approvalId;
|
||||||
|
|
||||||
|
private Long billId;
|
||||||
|
|
||||||
|
/** SUBMIT APPROVE REJECT */
|
||||||
|
private String action;
|
||||||
|
|
||||||
|
private String opinion;
|
||||||
|
|
||||||
|
private String operatorName;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
|
private Date createTime;
|
||||||
|
}
|
||||||
@@ -32,4 +32,34 @@ public class PayBillCommand
|
|||||||
|
|
||||||
/** 要作废的应付账单ID */
|
/** 要作废的应付账单ID */
|
||||||
private Long billId;
|
private Long billId;
|
||||||
|
|
||||||
|
/** 到期日,yyyy-MM-dd */
|
||||||
|
private String dueDate;
|
||||||
|
|
||||||
|
/** 账单费用行。登记对方金额时使用 */
|
||||||
|
private java.util.List<PayBillLine> lines;
|
||||||
|
|
||||||
|
/** 要处理的账单行 */
|
||||||
|
private Long lineId;
|
||||||
|
|
||||||
|
/** 对方金额 */
|
||||||
|
private java.math.BigDecimal supplierAmount;
|
||||||
|
|
||||||
|
/** OURS 接受我方,THEIRS 接受对方 */
|
||||||
|
private String handleType;
|
||||||
|
|
||||||
|
/** 差异原因或红字原因 */
|
||||||
|
private String reason;
|
||||||
|
|
||||||
|
/** 驳回意见 */
|
||||||
|
private String opinion;
|
||||||
|
|
||||||
|
/** 税率,0.06 表示 6% */
|
||||||
|
private java.math.BigDecimal taxRate;
|
||||||
|
|
||||||
|
/** 折人民币汇率 */
|
||||||
|
private java.math.BigDecimal exchangeRate;
|
||||||
|
|
||||||
|
/** 汇率日期,yyyy-MM-dd */
|
||||||
|
private String rateDate;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 应付账单上的一行对账差异。 */
|
||||||
|
@Data
|
||||||
|
public class PayBillDiff
|
||||||
|
{
|
||||||
|
private Long diffId;
|
||||||
|
|
||||||
|
private Long billId;
|
||||||
|
|
||||||
|
private Long lineId;
|
||||||
|
|
||||||
|
private String feeId;
|
||||||
|
|
||||||
|
private BigDecimal ourAmount;
|
||||||
|
|
||||||
|
private BigDecimal supplierAmount;
|
||||||
|
|
||||||
|
private BigDecimal diffAmount;
|
||||||
|
|
||||||
|
private String reason;
|
||||||
|
|
||||||
|
/** OPEN ACCEPT_OURS ACCEPT_THEIRS */
|
||||||
|
private String handleType;
|
||||||
|
|
||||||
|
private String adjustFeeId;
|
||||||
|
|
||||||
|
private String createBy;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
|
private Date createTime;
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 应付凭证。发票、对账单或费用通知挂在应付账单上。 */
|
||||||
|
@Data
|
||||||
|
public class PayBillFile
|
||||||
|
{
|
||||||
|
private Long fileId;
|
||||||
|
|
||||||
|
private Long billId;
|
||||||
|
|
||||||
|
private String billNo;
|
||||||
|
|
||||||
|
private String supplierName;
|
||||||
|
|
||||||
|
/** INVOICE STATEMENT DEBIT OTHER */
|
||||||
|
private String fileType;
|
||||||
|
|
||||||
|
private String invoiceNo;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||||
|
private Date invoiceDate;
|
||||||
|
|
||||||
|
private BigDecimal amount;
|
||||||
|
|
||||||
|
private BigDecimal taxAmount;
|
||||||
|
|
||||||
|
private BigDecimal amountNet;
|
||||||
|
|
||||||
|
private String sellerName;
|
||||||
|
|
||||||
|
private BigDecimal matchedAmount;
|
||||||
|
|
||||||
|
private String currency;
|
||||||
|
|
||||||
|
private String fileName;
|
||||||
|
|
||||||
|
private String fileUrl;
|
||||||
|
|
||||||
|
private String deleted;
|
||||||
|
|
||||||
|
private String createBy;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
|
private Date createTime;
|
||||||
|
}
|
||||||
@@ -13,7 +13,10 @@ public class PayBillLine
|
|||||||
|
|
||||||
private Long billId;
|
private Long billId;
|
||||||
|
|
||||||
private String orderBillId;
|
private String feeId;
|
||||||
|
|
||||||
|
/** 计费订单ID,对应 prc_order_bill.bill_id */
|
||||||
|
private Long orderBillId;
|
||||||
|
|
||||||
private String orderNo;
|
private String orderNo;
|
||||||
|
|
||||||
@@ -23,8 +26,27 @@ public class PayBillLine
|
|||||||
|
|
||||||
private String feeName;
|
private String feeName;
|
||||||
|
|
||||||
|
private String feeSource;
|
||||||
|
|
||||||
|
private String feeLevel;
|
||||||
|
|
||||||
private BigDecimal amount;
|
private BigDecimal amount;
|
||||||
|
|
||||||
|
private BigDecimal supplierAmount;
|
||||||
|
|
||||||
|
private BigDecimal diffAmount;
|
||||||
|
|
||||||
|
/** NONE OPEN ACCEPT_OURS ACCEPT_THEIRS */
|
||||||
|
private String diffStatus;
|
||||||
|
|
||||||
|
private BigDecimal taxRate;
|
||||||
|
|
||||||
|
private BigDecimal amountNet;
|
||||||
|
|
||||||
|
private BigDecimal taxAmount;
|
||||||
|
|
||||||
|
private BigDecimal baseAmount;
|
||||||
|
|
||||||
private String currency;
|
private String currency;
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.bms.price.domain;
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -12,6 +13,14 @@ public class PayBillLog
|
|||||||
|
|
||||||
private Long billId;
|
private Long billId;
|
||||||
|
|
||||||
|
private String bizType;
|
||||||
|
|
||||||
|
private Long bizId;
|
||||||
|
|
||||||
|
private Long lineId;
|
||||||
|
|
||||||
|
private String feeId;
|
||||||
|
|
||||||
private String operationType;
|
private String operationType;
|
||||||
|
|
||||||
private String fromStatus;
|
private String fromStatus;
|
||||||
@@ -20,6 +29,10 @@ public class PayBillLog
|
|||||||
|
|
||||||
private String operationDesc;
|
private String operationDesc;
|
||||||
|
|
||||||
|
private BigDecimal amountBefore;
|
||||||
|
|
||||||
|
private BigDecimal amountAfter;
|
||||||
|
|
||||||
private String operatorName;
|
private String operatorName;
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ import lombok.Data;
|
|||||||
@Data
|
@Data
|
||||||
public class PayBillOrder
|
public class PayBillOrder
|
||||||
{
|
{
|
||||||
private String billId;
|
/** 计费订单ID,对应 prc_order_bill.bill_id */
|
||||||
|
private Long billId;
|
||||||
|
|
||||||
private String orderNo;
|
private String orderNo;
|
||||||
|
|
||||||
@@ -45,4 +46,10 @@ public class PayBillOrder
|
|||||||
|
|
||||||
/** 已挂在未作废账单上时的账单号 */
|
/** 已挂在未作废账单上时的账单号 */
|
||||||
private String occupiedBillNo;
|
private String occupiedBillNo;
|
||||||
|
|
||||||
|
/** 未删除费用行数 */
|
||||||
|
private Integer feeCount;
|
||||||
|
|
||||||
|
/** 还没进入未作废账单的费用行数 */
|
||||||
|
private Integer unbilledCount;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,13 +2,14 @@ package com.bms.price.domain;
|
|||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/** 按订单生成应付的结果。skipped 是价卡里有、但这票算不了的附加费。 */
|
/** 按订单生成应付的结果。skipped 是价卡里有、但这票算不了的附加费。 */
|
||||||
@Data
|
@Data
|
||||||
public class PayOrderCostResult
|
public class PayOrderCostResult
|
||||||
{
|
{
|
||||||
private String billId;
|
private Long billId;
|
||||||
|
|
||||||
private String channelId;
|
private String channelId;
|
||||||
|
|
||||||
@@ -29,4 +30,12 @@ public class PayOrderCostResult
|
|||||||
private List<PayCostLine> fees;
|
private List<PayCostLine> fees;
|
||||||
|
|
||||||
private List<String> skipped;
|
private List<String> skipped;
|
||||||
|
|
||||||
|
/** 本次落库的应付费用,供提交成功后写日志。不返回给页面。 */
|
||||||
|
@JsonIgnore
|
||||||
|
private transient List<PrcPayBillFee> loggedFees;
|
||||||
|
|
||||||
|
/** 本次费用日志的操作类型,字典 bms_pay_fee_log_type */
|
||||||
|
@JsonIgnore
|
||||||
|
private transient String feeLogType;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 一票订单的应付费用,按 abcd 四段排好。 */
|
||||||
|
@Data
|
||||||
|
public class PayOrderFeeBoard
|
||||||
|
{
|
||||||
|
private String billId;
|
||||||
|
|
||||||
|
private String orderNo;
|
||||||
|
|
||||||
|
private String ladingNo;
|
||||||
|
|
||||||
|
private List<PayOrderFeeSection> sections = new ArrayList<>();
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 应付列表费用弹框里的一条费用。 */
|
||||||
|
@Data
|
||||||
|
public class PayOrderFeeLine
|
||||||
|
{
|
||||||
|
/** 费用明细 ID。新增时为空 */
|
||||||
|
private String feeId;
|
||||||
|
|
||||||
|
/** 费用类型,字典 bms_fee_type 的英文编码。手输名称放不下时记 MANUAL */
|
||||||
|
private String feeType;
|
||||||
|
|
||||||
|
/** 费用项名称。手工费用按填写的名称保存 */
|
||||||
|
private String feeName;
|
||||||
|
|
||||||
|
/** 1A 2B 3C 4D */
|
||||||
|
private String level;
|
||||||
|
|
||||||
|
private BigDecimal amount;
|
||||||
|
|
||||||
|
private String currency;
|
||||||
|
|
||||||
|
/** CALC 尾程计算,LADING 提单分摊,MANUAL 手工 */
|
||||||
|
private String feeSource;
|
||||||
|
|
||||||
|
private String remark;
|
||||||
|
|
||||||
|
/** 已进入应付账单时不能删除 */
|
||||||
|
private Long statementLineId;
|
||||||
|
|
||||||
|
/** 创建人 */
|
||||||
|
private String createBy;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
|
private Date createTime;
|
||||||
|
|
||||||
|
/** 更新人 */
|
||||||
|
private String updateBy;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
|
private Date updateTime;
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 应付费用的一个阶段。1A 头程仓储,2B 提单运输,3C 清关,4D 尾程。 */
|
||||||
|
@Data
|
||||||
|
public class PayOrderFeeSection
|
||||||
|
{
|
||||||
|
private String level;
|
||||||
|
|
||||||
|
private String title;
|
||||||
|
|
||||||
|
private List<PayOrderFeeLine> fees = new ArrayList<>();
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 应付列表查询条件。 */
|
||||||
|
@Data
|
||||||
|
public class PayOrderQuery
|
||||||
|
{
|
||||||
|
private String orderNo;
|
||||||
|
|
||||||
|
/** 多个订单号。由服务按逗号、空格或换行拆开。 */
|
||||||
|
private java.util.List<String> orderNos;
|
||||||
|
|
||||||
|
private String ladingNo;
|
||||||
|
|
||||||
|
private String customerName;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 应付列表上的费用重算条件。一次只按订单号或提单号其中一种。 */
|
||||||
|
@Data
|
||||||
|
public class PayOrderRecalcCommand
|
||||||
|
{
|
||||||
|
/** ORDER 按订单号,LADING 按提单号 */
|
||||||
|
private String sourceType;
|
||||||
|
|
||||||
|
/** 单号原文。可用逗号、空格或换行分隔 */
|
||||||
|
private String text;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 费用重算里的一票结果。 */
|
||||||
|
@Data
|
||||||
|
public class PayOrderRecalcLine
|
||||||
|
{
|
||||||
|
private String billId;
|
||||||
|
|
||||||
|
private String orderNo;
|
||||||
|
|
||||||
|
private String ladingNo;
|
||||||
|
|
||||||
|
/** 这一条是否已经处理完 */
|
||||||
|
private boolean finished;
|
||||||
|
|
||||||
|
/** 这一票是否已经生成应付费用 */
|
||||||
|
private boolean success;
|
||||||
|
|
||||||
|
/** 失败原因。成功时为空 */
|
||||||
|
private String message;
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 一次费用重算的结果。失败行不影响已经成功的订单。 */
|
||||||
|
@Data
|
||||||
|
public class PayOrderRecalcResult
|
||||||
|
{
|
||||||
|
/** 计费成功的订单数 */
|
||||||
|
private int successCount;
|
||||||
|
|
||||||
|
/** 未生成费用的订单数,含找不到的单号 */
|
||||||
|
private int failCount;
|
||||||
|
|
||||||
|
/** 每一票或每一个没对上的单号 */
|
||||||
|
private List<PayOrderRecalcLine> lines = new ArrayList<>();
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 应付费用重算任务。待处理订单和进度都放在 Redis。 */
|
||||||
|
@Data
|
||||||
|
public class PayOrderRecalcTask implements Serializable
|
||||||
|
{
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
public static final String PENDING = "PENDING";
|
||||||
|
|
||||||
|
public static final String RUNNING = "RUNNING";
|
||||||
|
|
||||||
|
public static final String SUCCESS = "SUCCESS";
|
||||||
|
|
||||||
|
public static final String FAIL = "FAIL";
|
||||||
|
|
||||||
|
public static final String CANCELLED = "CANCELLED";
|
||||||
|
|
||||||
|
private String taskId;
|
||||||
|
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
private int percent;
|
||||||
|
|
||||||
|
private String message;
|
||||||
|
|
||||||
|
private int total;
|
||||||
|
|
||||||
|
private int successCount;
|
||||||
|
|
||||||
|
private int failCount;
|
||||||
|
|
||||||
|
/** 查出来的订单,以及没对上的单号。处理完一条就更新这一条。 */
|
||||||
|
private List<PayOrderRecalcLine> lines = new ArrayList<>();
|
||||||
|
}
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 应付列表里的一票订单。提单号来自订单扩展上的空运单号。 */
|
||||||
|
@Data
|
||||||
|
public class PayOrderRow
|
||||||
|
{
|
||||||
|
private String billId;
|
||||||
|
|
||||||
|
private String orderNo;
|
||||||
|
|
||||||
|
private String ladingNo;
|
||||||
|
|
||||||
|
private String trackingNo;
|
||||||
|
|
||||||
|
private String customerName;
|
||||||
|
|
||||||
|
private String productName;
|
||||||
|
|
||||||
|
private String countryName;
|
||||||
|
|
||||||
|
/** 收件邮编,来自 prc_order_bill.dest_postcode */
|
||||||
|
private String destPostcode;
|
||||||
|
|
||||||
|
private String channelName;
|
||||||
|
|
||||||
|
private BigDecimal chargeWeight;
|
||||||
|
|
||||||
|
private BigDecimal payTotal;
|
||||||
|
|
||||||
|
private String currency;
|
||||||
|
|
||||||
|
/** 应付计费状态,字典 bms_pay_calc_status:1计费成功,2计费失败 */
|
||||||
|
private Integer payCalcStatus;
|
||||||
|
|
||||||
|
/** 计费失败原因 */
|
||||||
|
private String payCalcMsg;
|
||||||
|
|
||||||
|
/** 应付主表更新人 */
|
||||||
|
private String updateBy;
|
||||||
|
|
||||||
|
/** 应付主表更新时间 */
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
|
private Date updateTime;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
|
private Date bizDate;
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 应付付款单。一张付款可以核销多张已确认账单。 */
|
||||||
|
@Data
|
||||||
|
public class PayPayment
|
||||||
|
{
|
||||||
|
private Long paymentId;
|
||||||
|
|
||||||
|
private String paymentNo;
|
||||||
|
|
||||||
|
private Long supplierId;
|
||||||
|
|
||||||
|
private String supplierName;
|
||||||
|
|
||||||
|
private String currency;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||||
|
private Date payDate;
|
||||||
|
|
||||||
|
/** BANK CASH OTHER */
|
||||||
|
private String payMethod;
|
||||||
|
|
||||||
|
private String bankAccount;
|
||||||
|
|
||||||
|
private BigDecimal amount;
|
||||||
|
|
||||||
|
private BigDecimal bankFee;
|
||||||
|
|
||||||
|
private BigDecimal exchangeRate;
|
||||||
|
|
||||||
|
private BigDecimal baseAmount;
|
||||||
|
|
||||||
|
private BigDecimal allocAmount;
|
||||||
|
|
||||||
|
/** DRAFT PAID VOID REFUNDED */
|
||||||
|
private String status;
|
||||||
|
|
||||||
|
private String remark;
|
||||||
|
|
||||||
|
private String createBy;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
|
private Date createTime;
|
||||||
|
|
||||||
|
private String confirmBy;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
|
private Date confirmTime;
|
||||||
|
|
||||||
|
private List<PayPaymentAlloc> allocs;
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 应付付款核销到一张账单的金额。 */
|
||||||
|
@Data
|
||||||
|
public class PayPaymentAlloc
|
||||||
|
{
|
||||||
|
private Long allocId;
|
||||||
|
|
||||||
|
private Long paymentId;
|
||||||
|
|
||||||
|
private Long billId;
|
||||||
|
|
||||||
|
private String billNo;
|
||||||
|
|
||||||
|
private BigDecimal allocAmount;
|
||||||
|
|
||||||
|
/** ACTIVE REVERSED */
|
||||||
|
private String allocStatus;
|
||||||
|
|
||||||
|
/** 账单未核销金额,只在查询未付账单时带出 */
|
||||||
|
private BigDecimal openAmount;
|
||||||
|
|
||||||
|
private String currency;
|
||||||
|
|
||||||
|
private Long supplierId;
|
||||||
|
|
||||||
|
private String supplierName;
|
||||||
|
}
|
||||||
@@ -34,6 +34,12 @@ public class PayPostcodeGroup extends BaseEntity
|
|||||||
/** 渠道名称,从表头识别,可在页面修改 */
|
/** 渠道名称,从表头识别,可在页面修改 */
|
||||||
private String channelName;
|
private String channelName;
|
||||||
|
|
||||||
|
/** 修改渠道名称前的原名称。分区维护按这个渠道收窄 */
|
||||||
|
private String oldChannelName;
|
||||||
|
|
||||||
|
/** 为 true 时国家下的全部分区都查出来,不按渠道收窄 */
|
||||||
|
private Boolean allChannels;
|
||||||
|
|
||||||
/** 目录里的服务类型,和报价产品对应 */
|
/** 目录里的服务类型,和报价产品对应 */
|
||||||
private String serviceType;
|
private String serviceType;
|
||||||
|
|
||||||
@@ -59,6 +65,15 @@ public class PayPostcodeGroup extends BaseEntity
|
|||||||
/** 查询条件:邮编 */
|
/** 查询条件:邮编 */
|
||||||
private String postcode;
|
private String postcode;
|
||||||
|
|
||||||
|
/** 国家下的分区名,例如 mainland。列表按国家归拢后,分区在抽屉里维护 */
|
||||||
|
private String zoneName;
|
||||||
|
|
||||||
|
/** 修改分区时的原名称 */
|
||||||
|
private String oldZoneName;
|
||||||
|
|
||||||
|
/** 这个国家下的分区个数 */
|
||||||
|
private Integer zoneCount;
|
||||||
|
|
||||||
/** 导入时挂上的明细,列表查询不填充 */
|
/** 导入时挂上的明细,列表查询不填充 */
|
||||||
private List<PayPostcodeLine> lines = new ArrayList<>();
|
private List<PayPostcodeLine> lines = new ArrayList<>();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,9 @@ public class PayPostcodeLine implements Serializable
|
|||||||
|
|
||||||
private String countryCode;
|
private String countryCode;
|
||||||
|
|
||||||
|
/** 查询条件:只看这个渠道下的邮编 */
|
||||||
|
private String channelName;
|
||||||
|
|
||||||
private String regionName;
|
private String regionName;
|
||||||
|
|
||||||
private String regionNameCn;
|
private String regionNameCn;
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ public class PayProduct extends BaseEntity
|
|||||||
@Excel(name = "国家/口岸", width = 18)
|
@Excel(name = "国家/口岸", width = 18)
|
||||||
private String countryScope;
|
private String countryScope;
|
||||||
|
|
||||||
/** 字典 order_charge_type:续重计费、单票价、常规计重价 */
|
/** 字典 order_charge_type:PER_KG 常规计费、FLAT 一口价、EXTRA 续重价 */
|
||||||
@Excel(name = "费用类型", width = 14)
|
@Excel(name = "费用类型", width = 14)
|
||||||
private String chargeType;
|
private String chargeType;
|
||||||
|
|
||||||
@@ -151,5 +151,8 @@ public class PayProduct extends BaseEntity
|
|||||||
|
|
||||||
private List<PaySurcharge> surcharges;
|
private List<PaySurcharge> surcharges;
|
||||||
|
|
||||||
|
/** 这一版附加费配置。只在计费时带上,不入库 */
|
||||||
|
private List<PaySurchargeRule> billingRules;
|
||||||
|
|
||||||
private List<PayExtraLine> extraLines;
|
private List<PayExtraLine> extraLines;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,9 +63,30 @@ public class PaySurcharge
|
|||||||
/** 邮编列表、重量阈值或尺寸表达式。续重时这里是公斤阈值 */
|
/** 邮编列表、重量阈值或尺寸表达式。续重时这里是公斤阈值 */
|
||||||
private String calcParam;
|
private String calcParam;
|
||||||
|
|
||||||
/** 偏远邮编规则。续重行的阈值在 calcParam,邮编放这里,避免互相覆盖 */
|
/** 偏远邮编规则。导入价卡仍可能把邮编写在这里 */
|
||||||
private String postcodeParam;
|
private String postcodeParam;
|
||||||
|
|
||||||
|
/** 来自附加费配置的长,厘米。本表不保存 */
|
||||||
|
private BigDecimal lengthCm;
|
||||||
|
|
||||||
|
/** 来自附加费配置的宽,厘米。本表不保存 */
|
||||||
|
private BigDecimal widthCm;
|
||||||
|
|
||||||
|
/** 来自附加费配置的高,厘米。本表不保存 */
|
||||||
|
private BigDecimal heightCm;
|
||||||
|
|
||||||
|
/** 来自附加费配置的超重阈值,公斤。本表不保存 */
|
||||||
|
private BigDecimal overWeightKg;
|
||||||
|
|
||||||
|
/** 来自附加费配置的续重起始重量,公斤。本表不保存 */
|
||||||
|
private BigDecimal extraWeightKg;
|
||||||
|
|
||||||
|
/** 来自附加费配置的命中邮编。本表不保存 */
|
||||||
|
private String postcodeText;
|
||||||
|
|
||||||
|
/** 来自附加费配置的适用国家。本表不保存 */
|
||||||
|
private String countryCode;
|
||||||
|
|
||||||
/** 适用重量下限,空表示不限。首重从 0 开始 */
|
/** 适用重量下限,空表示不限。首重从 0 开始 */
|
||||||
private BigDecimal weightMin;
|
private BigDecimal weightMin;
|
||||||
|
|
||||||
@@ -73,10 +94,4 @@ public class PaySurcharge
|
|||||||
private BigDecimal weightMax;
|
private BigDecimal weightMax;
|
||||||
|
|
||||||
private Integer sortNo;
|
private Integer sortNo;
|
||||||
|
|
||||||
/**
|
|
||||||
* 是否计费并落库:false 不写入 pay_surcharge;null/缺省视为要计费(兼容应付全量保存)。
|
|
||||||
* 仅作为前端传参,不落库字段。
|
|
||||||
*/
|
|
||||||
private Boolean needBill;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Map;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应付附加费计费条件。同一产品版本的全部条件都在这张表,用 calcRule 区分列表。
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class PaySurchargeRule
|
||||||
|
{
|
||||||
|
private Long ruleId;
|
||||||
|
|
||||||
|
/** 这一版应付产品 */
|
||||||
|
private Long productId;
|
||||||
|
|
||||||
|
/** 价卡版本周期 */
|
||||||
|
private Long termId;
|
||||||
|
|
||||||
|
private Integer versionNo;
|
||||||
|
|
||||||
|
/** ALWAYS、POSTCODE、ZONE、EXTRA_KG、WEIGHT、SIZE、RETURN */
|
||||||
|
private String calcRule;
|
||||||
|
|
||||||
|
/** 1开 0关 */
|
||||||
|
private String enabled;
|
||||||
|
|
||||||
|
/** 条件摘要,由明细生成 */
|
||||||
|
private String calcParam;
|
||||||
|
|
||||||
|
/** 条件明细 JSON。接口不直接收发这一列,用 detail */
|
||||||
|
@JsonIgnore
|
||||||
|
private String ruleDetail;
|
||||||
|
|
||||||
|
/** 这一条规则的结构化参数。超尺寸含长宽高、围长、体积、加收比例和命中方式 */
|
||||||
|
private Map<String, Object> detail;
|
||||||
|
|
||||||
|
/** 续重行的邮编 */
|
||||||
|
private String postcodeParam;
|
||||||
|
|
||||||
|
private String zoneName;
|
||||||
|
|
||||||
|
private BigDecimal weightMin;
|
||||||
|
|
||||||
|
private BigDecimal weightMax;
|
||||||
|
|
||||||
|
private Integer sortNo;
|
||||||
|
|
||||||
|
private String createBy;
|
||||||
|
|
||||||
|
private String updateBy;
|
||||||
|
}
|
||||||
@@ -26,7 +26,8 @@ public class PrcBillingTask extends BaseEntity
|
|||||||
/** 移动端传入的计费时间(非 Oracle 订单时间;回写时不会被覆盖) */
|
/** 移动端传入的计费时间(非 Oracle 订单时间;回写时不会被覆盖) */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date billTime;
|
private Date billTime;
|
||||||
private String billId;
|
/** 对应 prc_order_bill.bill_id */
|
||||||
|
private Long orderId;
|
||||||
/** 用于查询的稳定失败码,例如 NO_CUSTOMER_PACKAGE */
|
/** 用于查询的稳定失败码,例如 NO_CUSTOMER_PACKAGE */
|
||||||
private String failCode;
|
private String failCode;
|
||||||
private String errorMessage;
|
private String errorMessage;
|
||||||
|
|||||||
@@ -13,9 +13,9 @@ public class PrcIncomeBill implements Serializable
|
|||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
/** 应收主表ID */
|
/** 应收主表ID */
|
||||||
private String incomeBillId;
|
private Long incomeBillId;
|
||||||
/** 计费订单ID */
|
/** 计费订单ID */
|
||||||
private String billId;
|
private Long billId;
|
||||||
/** 币种 */
|
/** 币种 */
|
||||||
private String currency;
|
private String currency;
|
||||||
/** 产品价合计 */
|
/** 产品价合计 */
|
||||||
|
|||||||
@@ -12,10 +12,10 @@ public class PrcIncomeBillFee implements Serializable
|
|||||||
{
|
{
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
private String feeId;
|
private Long feeId;
|
||||||
private String billId;
|
private Long billId;
|
||||||
/** 应收主表ID */
|
/** 应收主表ID */
|
||||||
private String incomeBillId;
|
private Long incomeBillId;
|
||||||
private String feeType;
|
private String feeType;
|
||||||
private String feeName;
|
private String feeName;
|
||||||
private Long scId;
|
private Long scId;
|
||||||
|
|||||||
@@ -15,9 +15,9 @@ public class PrcOrderBill extends BaseEntity
|
|||||||
{
|
{
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
private String billId;
|
private Long billId;
|
||||||
/** 批量查询:多个账单ID精确匹配(仅查询用,非表字段) */
|
/** 批量查询:多个账单ID精确匹配(仅查询用,非表字段) */
|
||||||
private List<String> billIds;
|
private List<Long> billIds;
|
||||||
private String billKey;
|
private String billKey;
|
||||||
private String orderNo;
|
private String orderNo;
|
||||||
/** 批量查询:多个订单号精确匹配(仅查询用,非表字段) */
|
/** 批量查询:多个订单号精确匹配(仅查询用,非表字段) */
|
||||||
@@ -129,6 +129,8 @@ public class PrcOrderBill extends BaseEntity
|
|||||||
private String errorMessage;
|
private String errorMessage;
|
||||||
/** 批量查询:多个计费失败状态(仅查询用,非表字段) */
|
/** 批量查询:多个计费失败状态(仅查询用,非表字段) */
|
||||||
private List<Integer> billingFailStatuses;
|
private List<Integer> billingFailStatuses;
|
||||||
|
/** 计费列表:仅返回 prc_income_bill 存在的订单(仅查询用,非表字段) */
|
||||||
|
private Boolean requireIncomeBill;
|
||||||
private String roundMode;
|
private String roundMode;
|
||||||
|
|
||||||
private List<PrcIncomeBillFee> incomeFees;
|
private List<PrcIncomeBillFee> incomeFees;
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ public class PrcOrderBillExt implements Serializable
|
|||||||
{
|
{
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
private String billId;
|
private Long billId;
|
||||||
private String orderNo;
|
private String orderNo;
|
||||||
private String upstreamId;
|
private String upstreamId;
|
||||||
private String lineNo;
|
private String lineNo;
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ public class PrcPayBill implements Serializable
|
|||||||
|
|
||||||
/** 应付主表ID */
|
/** 应付主表ID */
|
||||||
private String payBillId;
|
private String payBillId;
|
||||||
/** 计费订单ID */
|
/** 计费订单ID,对应 prc_order_bill.bill_id */
|
||||||
private String billId;
|
private Long billId;
|
||||||
/** 币种 */
|
/** 币种 */
|
||||||
private String currency;
|
private String currency;
|
||||||
/** 产品价合计 */
|
/** 产品价合计 */
|
||||||
@@ -24,8 +24,15 @@ public class PrcPayBill implements Serializable
|
|||||||
private BigDecimal redlineAmount;
|
private BigDecimal redlineAmount;
|
||||||
/** 成本价合计(当前计费结果) */
|
/** 成本价合计(当前计费结果) */
|
||||||
private BigDecimal costAmount;
|
private BigDecimal costAmount;
|
||||||
/** 应付合计(当前等于成本价) */
|
/** 应付合计(当前等于成本价,落库后按全部未删除明细重算) */
|
||||||
private BigDecimal payTotal;
|
private BigDecimal payTotal;
|
||||||
|
|
||||||
|
/** 应付计费状态,字典 bms_pay_calc_status:1计费成功,2计费失败 */
|
||||||
|
private Integer payCalcStatus;
|
||||||
|
|
||||||
|
/** 计费失败原因,最长 100 字 */
|
||||||
|
private String payCalcMsg;
|
||||||
|
|
||||||
/** 业务员/销售员 */
|
/** 业务员/销售员 */
|
||||||
private String belongSaler;
|
private String belongSaler;
|
||||||
/** 销售员编码 */
|
/** 销售员编码 */
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import java.io.Serializable;
|
|||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/** 应付费用明细 prc_pay_bill_fee */
|
/** 应付费用明细 prc_pay_bill_fee */
|
||||||
@@ -13,11 +14,17 @@ public class PrcPayBillFee implements Serializable
|
|||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
private String feeId;
|
private String feeId;
|
||||||
private String billId;
|
/** 计费订单ID,对应 prc_order_bill.bill_id */
|
||||||
|
private Long billId;
|
||||||
/** 应付主表ID */
|
/** 应付主表ID */
|
||||||
private String payBillId;
|
private String payBillId;
|
||||||
|
/** 费用类型,字典 bms_fee_type 的英文编码 */
|
||||||
private String feeType;
|
private String feeType;
|
||||||
|
|
||||||
|
/** 展示用的费用项名称,不入库。附加费取配置名称,其余取字典标签 */
|
||||||
private String feeName;
|
private String feeName;
|
||||||
|
|
||||||
|
/** 尾程计算时是附加费配置ID。提单分摊时是 srv_bill_air_fee.id */
|
||||||
private Long scId;
|
private Long scId;
|
||||||
|
|
||||||
/** 费用所属阶段:1 a段,2 b段,3 c段,4 d段 */
|
/** 费用所属阶段:1 a段,2 b段,3 c段,4 d段 */
|
||||||
@@ -30,11 +37,49 @@ public class PrcPayBillFee implements Serializable
|
|||||||
/** CALC 计算,LADING 提单分摊,MANUAL 人工 */
|
/** CALC 计算,LADING 提单分摊,MANUAL 人工 */
|
||||||
private String feeSource;
|
private String feeSource;
|
||||||
|
|
||||||
/** 来源数据id */
|
/** 来源数据id。提单分摊时为 srv_bill_air_fee.id */
|
||||||
private String sourceId;
|
private String sourceId;
|
||||||
|
|
||||||
/** 是否删除:0未删除 1已删除 */
|
/** 是否删除:0未删除 1已删除 */
|
||||||
private String isDeleted;
|
private String isDeleted;
|
||||||
|
|
||||||
|
/** 已进入的应付账单行。空表示还没出账 */
|
||||||
|
private Long statementLineId;
|
||||||
|
|
||||||
|
/** 结算供应商。空表示还没标明付款对象 */
|
||||||
|
private Long settleSupplierId;
|
||||||
|
|
||||||
|
private String settleSupplierName;
|
||||||
|
|
||||||
|
/** 创建人 */
|
||||||
|
private String createBy;
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date createTime;
|
private Date createTime;
|
||||||
|
|
||||||
|
/** 更新人 */
|
||||||
|
private String updateBy;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date updateTime;
|
||||||
|
|
||||||
|
/** 订单计费日,只在折算汇率时使用,不入库 */
|
||||||
|
@JsonIgnore
|
||||||
|
private Date bizDate;
|
||||||
|
|
||||||
|
/** 写日志时带上的变更前费用项,不入库 */
|
||||||
|
@JsonIgnore
|
||||||
|
private String logBeforeName;
|
||||||
|
|
||||||
|
/** 写日志时带上的变更前金额,不入库 */
|
||||||
|
@JsonIgnore
|
||||||
|
private BigDecimal logBeforeAmount;
|
||||||
|
|
||||||
|
/** 写日志时带上的变更前币种,不入库 */
|
||||||
|
@JsonIgnore
|
||||||
|
private String logBeforeCurrency;
|
||||||
|
|
||||||
|
/** 为 true 时日志只记变更前。重算后消失的计算费用用,不入库 */
|
||||||
|
@JsonIgnore
|
||||||
|
private Boolean logAfterBlank;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 应付费用日志 prc_pay_bill_fee_log */
|
||||||
|
@Data
|
||||||
|
public class PrcPayBillFeeLog implements Serializable
|
||||||
|
{
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
private Long logId;
|
||||||
|
|
||||||
|
private String feeId;
|
||||||
|
|
||||||
|
private Long billId;
|
||||||
|
|
||||||
|
/** 费用项 */
|
||||||
|
private String feeName;
|
||||||
|
|
||||||
|
private BigDecimal amount;
|
||||||
|
|
||||||
|
private String currency;
|
||||||
|
|
||||||
|
/** 变更前费用项 */
|
||||||
|
private String beforeFeeName;
|
||||||
|
|
||||||
|
/** 变更前金额 */
|
||||||
|
private BigDecimal beforeAmount;
|
||||||
|
|
||||||
|
/** 变更前币种 */
|
||||||
|
private String beforeCurrency;
|
||||||
|
|
||||||
|
/** 变更后费用项 */
|
||||||
|
private String afterFeeName;
|
||||||
|
|
||||||
|
/** 变更后金额 */
|
||||||
|
private BigDecimal afterAmount;
|
||||||
|
|
||||||
|
/** 变更后币种 */
|
||||||
|
private String afterCurrency;
|
||||||
|
|
||||||
|
/** 操作类型,字典 bms_pay_fee_log_type */
|
||||||
|
private String operationType;
|
||||||
|
|
||||||
|
/** 备注。费用重算失败时写入失败原因 */
|
||||||
|
private String remark;
|
||||||
|
|
||||||
|
/** 操作人 */
|
||||||
|
private String createBy;
|
||||||
|
|
||||||
|
/** 操作时间 */
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date createTime;
|
||||||
|
}
|
||||||
@@ -39,6 +39,8 @@ public class PrcPriceSet extends BaseEntity
|
|||||||
private Date expireDate;
|
private Date expireDate;
|
||||||
/** D/A/E/R/S */
|
/** D/A/E/R/S */
|
||||||
private String status;
|
private String status;
|
||||||
|
/** 仅查询用:状态多选(如 D、E) */
|
||||||
|
private List<String> statuses;
|
||||||
private Long tmsId;
|
private Long tmsId;
|
||||||
|
|
||||||
private Integer productCount;
|
private Integer productCount;
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 毛利分析订单异步导出任务的临时状态。 */
|
||||||
|
@Data
|
||||||
|
public class PrcProfitReportExportTask implements Serializable
|
||||||
|
{
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
private String taskId;
|
||||||
|
private Long userId;
|
||||||
|
private String status;
|
||||||
|
private int percent;
|
||||||
|
private String message;
|
||||||
|
private String error;
|
||||||
|
private int rowCount;
|
||||||
|
private String fileName;
|
||||||
|
private String storageKey;
|
||||||
|
}
|
||||||
@@ -21,6 +21,18 @@ public class PrcSurcharge extends BaseEntity
|
|||||||
/** 渠道产品(字典 payment_product_type.dict_value) */
|
/** 渠道产品(字典 payment_product_type.dict_value) */
|
||||||
private String dictValue;
|
private String dictValue;
|
||||||
private BigDecimal chargeValue;
|
private BigDecimal chargeValue;
|
||||||
|
/** 超尺寸长,厘米 */
|
||||||
|
private BigDecimal lengthCm;
|
||||||
|
/** 超尺寸宽,厘米 */
|
||||||
|
private BigDecimal widthCm;
|
||||||
|
/** 超尺寸高,厘米 */
|
||||||
|
private BigDecimal heightCm;
|
||||||
|
/** 超重阈值,公斤 */
|
||||||
|
private BigDecimal overWeightKg;
|
||||||
|
/** 超重续收起始重量,公斤 */
|
||||||
|
private BigDecimal extraWeightKg;
|
||||||
|
/** 命中邮编,多个用逗号分隔 */
|
||||||
|
private String postcodeText;
|
||||||
private String currency;
|
private String currency;
|
||||||
/** 字典 bms_round_mode:UP / DOWN / HALF_UP */
|
/** 字典 bms_round_mode:UP / DOWN / HALF_UP */
|
||||||
private String roundMode;
|
private String roundMode;
|
||||||
|
|||||||
@@ -0,0 +1,70 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 产品与附加费配置的关联。应付、应收以及后续类型都按产品编号和类型查询。
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class PrcSurchargeBind
|
||||||
|
{
|
||||||
|
public static final String TYPE_AP = "AP";
|
||||||
|
|
||||||
|
public static final String TYPE_AR = "AR";
|
||||||
|
|
||||||
|
private Long bindId;
|
||||||
|
|
||||||
|
private Long productId;
|
||||||
|
|
||||||
|
/** AP 应付,AR 应收,以及后续其它类型 */
|
||||||
|
private String productType;
|
||||||
|
|
||||||
|
private Long scId;
|
||||||
|
|
||||||
|
private Integer sortNo;
|
||||||
|
|
||||||
|
private String createdBy;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
|
private Date createTime;
|
||||||
|
|
||||||
|
private String updatedBy;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
|
private Date updateTime;
|
||||||
|
|
||||||
|
/** 关联查询带出的附加费配置 */
|
||||||
|
private String scName;
|
||||||
|
|
||||||
|
private String chargeType;
|
||||||
|
|
||||||
|
private BigDecimal chargeValue;
|
||||||
|
|
||||||
|
private String currency;
|
||||||
|
|
||||||
|
/** on 启用,of 停用,vd 作废 */
|
||||||
|
private String ssCode;
|
||||||
|
|
||||||
|
private String blockTitle;
|
||||||
|
|
||||||
|
private String countryCode;
|
||||||
|
|
||||||
|
private String feeType;
|
||||||
|
|
||||||
|
private String scNote;
|
||||||
|
|
||||||
|
private BigDecimal lengthCm;
|
||||||
|
|
||||||
|
private BigDecimal widthCm;
|
||||||
|
|
||||||
|
private BigDecimal heightCm;
|
||||||
|
|
||||||
|
private BigDecimal overWeightKg;
|
||||||
|
|
||||||
|
private BigDecimal extraWeightKg;
|
||||||
|
|
||||||
|
private String postcodeText;
|
||||||
|
}
|
||||||
@@ -51,6 +51,18 @@ public class PrcSurchargeRel extends BaseEntity
|
|||||||
private String roundMode;
|
private String roundMode;
|
||||||
private String ssCode;
|
private String ssCode;
|
||||||
private String scNote;
|
private String scNote;
|
||||||
|
/** 命中邮编(来自 prc_surcharge.postcode_text) */
|
||||||
|
private String postcodeText;
|
||||||
|
/** 超尺寸长/宽/高(厘米) */
|
||||||
|
private BigDecimal lengthCm;
|
||||||
|
private BigDecimal widthCm;
|
||||||
|
private BigDecimal heightCm;
|
||||||
|
/** 超重阈值(公斤) */
|
||||||
|
private BigDecimal overWeightKg;
|
||||||
|
/** 续重起始重量(公斤) */
|
||||||
|
private BigDecimal extraWeightKg;
|
||||||
|
/** 命中分区(block_title) */
|
||||||
|
private String blockTitle;
|
||||||
|
|
||||||
/** 明细展示字段(PRODUCT/REDLINE LEFT JOIN product_country) */
|
/** 明细展示字段(PRODUCT/REDLINE LEFT JOIN product_country) */
|
||||||
private String countryName;
|
private String countryName;
|
||||||
|
|||||||
@@ -5,14 +5,23 @@ import java.util.Date;
|
|||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/** 国家下的分区:prc_zone */
|
/** 国家/打单产品下的分区:prc_zone */
|
||||||
@Data
|
@Data
|
||||||
public class PrcZone implements Serializable
|
public class PrcZone implements Serializable
|
||||||
{
|
{
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
/** 常规计费(按国家) */
|
||||||
|
public static final String TYPE_REGULAR = "REGULAR";
|
||||||
|
/** 打单计费(按产品) */
|
||||||
|
public static final String TYPE_LABEL = "LABEL";
|
||||||
|
|
||||||
private Long zoneId;
|
private Long zoneId;
|
||||||
|
/** REGULAR / LABEL */
|
||||||
|
private String zoneType;
|
||||||
private Long regionId;
|
private Long regionId;
|
||||||
|
/** 打单分区关联 prc_label_product.product_id;常规为 null */
|
||||||
|
private Long productId;
|
||||||
/** 存储在 prc_zone 上的 ISO2 国家代码 */
|
/** 存储在 prc_zone 上的 ISO2 国家代码 */
|
||||||
private String countryCode;
|
private String countryCode;
|
||||||
private String zoneCode;
|
private String zoneCode;
|
||||||
@@ -27,4 +36,6 @@ public class PrcZone implements Serializable
|
|||||||
private Integer detailCount;
|
private Integer detailCount;
|
||||||
/** 列表展示,来源于 region */
|
/** 列表展示,来源于 region */
|
||||||
private String countryNameCn;
|
private String countryNameCn;
|
||||||
|
/** 打单产品名,非表字段 */
|
||||||
|
private String productName;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package com.bms.price.domain;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/** 打单计费分区:产品汇总行 */
|
||||||
|
@Data
|
||||||
|
public class PrcZoneLabelProduct implements Serializable
|
||||||
|
{
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
private Long productId;
|
||||||
|
private String productName;
|
||||||
|
private String dictValue;
|
||||||
|
private Integer zoneCount;
|
||||||
|
private Integer detailCount;
|
||||||
|
}
|
||||||
+2
-3
@@ -2,7 +2,6 @@ package com.bms.price.domain.vo;
|
|||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@@ -12,8 +11,8 @@ public class AddIncomeBillFeeRequest implements Serializable
|
|||||||
{
|
{
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
@NotBlank(message = "billId required")
|
@NotNull(message = "billId required")
|
||||||
private String billId;
|
private Long billId;
|
||||||
|
|
||||||
/** 附加费配置ID(prc_surcharge.sc_id)。 */
|
/** 附加费配置ID(prc_surcharge.sc_id)。 */
|
||||||
@NotNull(message = "scId required")
|
@NotNull(message = "scId required")
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@ public class BatchAddIncomeBillFeeRequest implements Serializable
|
|||||||
private String scopeMode;
|
private String scopeMode;
|
||||||
|
|
||||||
/** scopeMode=SELECTED 时选中的账单ID。 */
|
/** scopeMode=SELECTED 时选中的账单ID。 */
|
||||||
private List<String> billIds;
|
private List<Long> billIds;
|
||||||
|
|
||||||
/** 与计费列表搜索相同的筛选条件。 */
|
/** 与计费列表搜索相同的筛选条件。 */
|
||||||
private List<String> orderNos;
|
private List<String> orderNos;
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class LocalRebillRequest implements Serializable
|
|||||||
|
|
||||||
/** ALL | SELECTED */
|
/** ALL | SELECTED */
|
||||||
private String scopeMode;
|
private String scopeMode;
|
||||||
private List<String> billIds;
|
private List<Long> billIds;
|
||||||
private List<String> orderNos;
|
private List<String> orderNos;
|
||||||
private List<String> trackingNos;
|
private List<String> trackingNos;
|
||||||
private List<String> transferNos;
|
private List<String> transferNos;
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@ public class OrderBillFailReasonVo implements Serializable
|
|||||||
{
|
{
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
private String billId;
|
private Long billId;
|
||||||
private String orderNo;
|
private String orderNo;
|
||||||
private String transferNo;
|
private String transferNo;
|
||||||
private String trackingNo;
|
private String trackingNo;
|
||||||
|
|||||||
+2
-2
@@ -33,9 +33,9 @@ public class PrcBillingBillListExportRow implements Serializable
|
|||||||
private String countryName;
|
private String countryName;
|
||||||
@Excel(name = "件数", width = 10)
|
@Excel(name = "件数", width = 10)
|
||||||
private Integer pieces;
|
private Integer pieces;
|
||||||
@Excel(name = "计费重", scale = 3, width = 12)
|
@Excel(name = "客户确认重", scale = 3, width = 12)
|
||||||
private BigDecimal chargeWeight;
|
private BigDecimal chargeWeight;
|
||||||
@Excel(name = "原计费重", scale = 3, width = 12)
|
@Excel(name = "计费重", scale = 3, width = 12)
|
||||||
private BigDecimal weight;
|
private BigDecimal weight;
|
||||||
@Excel(name = "收货重", scale = 3, width = 12)
|
@Excel(name = "收货重", scale = 3, width = 12)
|
||||||
private BigDecimal receiveWeight;
|
private BigDecimal receiveWeight;
|
||||||
|
|||||||
+2
@@ -35,6 +35,8 @@ public class PrcOrderBillListExportRow implements Serializable
|
|||||||
private Integer pieces;
|
private Integer pieces;
|
||||||
@Excel(name = "计费重", scale = 3, width = 12)
|
@Excel(name = "计费重", scale = 3, width = 12)
|
||||||
private BigDecimal weight;
|
private BigDecimal weight;
|
||||||
|
@Excel(name = "客户确认重", scale = 3, width = 12)
|
||||||
|
private BigDecimal chargeWeight;
|
||||||
@Excel(name = "体积重", scale = 3, width = 12)
|
@Excel(name = "体积重", scale = 3, width = 12)
|
||||||
private BigDecimal volumeWeight;
|
private BigDecimal volumeWeight;
|
||||||
@Excel(name = "实重", scale = 3, width = 12)
|
@Excel(name = "实重", scale = 3, width = 12)
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.bms.price.domain.vo;
|
|||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
import com.bms.common.core.domain.BaseEntity;
|
import com.bms.common.core.domain.BaseEntity;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -15,8 +16,10 @@ public class PrcProfitReportQuery extends BaseEntity
|
|||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date beginBizDate;
|
private Date beginBizDate;
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date endBizDate;
|
private Date endBizDate;
|
||||||
private String orderNo;
|
private String orderNo;
|
||||||
/** 订单号拆分后的多值查询条件。 */
|
/** 订单号拆分后的多值查询条件。 */
|
||||||
@@ -26,14 +29,20 @@ public class PrcProfitReportQuery extends BaseEntity
|
|||||||
private List<String> customerCodes;
|
private List<String> customerCodes;
|
||||||
/** 按客户当前区域筛选。 */
|
/** 按客户当前区域筛选。 */
|
||||||
private String customerArea;
|
private String customerArea;
|
||||||
|
/** 服务端解析的区域客户 ID;null 表示使用客户表关联,空列表表示无匹配客户。 */
|
||||||
|
private List<Long> areaCustomerIds;
|
||||||
/** 服务端根据客户区域确定的计算规则。 */
|
/** 服务端根据客户区域确定的计算规则。 */
|
||||||
private String profitRule;
|
private String profitRule;
|
||||||
private String customerName;
|
private String customerName;
|
||||||
/** 客户名称拆分后的多值查询条件。 */
|
/** 客户名称拆分后的多值查询条件。 */
|
||||||
private List<String> customerNames;
|
private List<String> customerNames;
|
||||||
private String belongSalerCode;
|
private String belongSalerCode;
|
||||||
|
/** 产品代码或产品名称的统一模糊查询关键字。 */
|
||||||
|
private String productKeyword;
|
||||||
private String productCode;
|
private String productCode;
|
||||||
|
private String productName;
|
||||||
private String countryCode;
|
private String countryCode;
|
||||||
|
private String countryName;
|
||||||
private String currency;
|
private String currency;
|
||||||
/** 订单维度应收状态筛选:UNBILLED、PARTIAL、BILLED。 */
|
/** 订单维度应收状态筛选:UNBILLED、PARTIAL、BILLED。 */
|
||||||
private String arBillStatus;
|
private String arBillStatus;
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@ public class RecalcBillPriceRequest implements Serializable
|
|||||||
|
|
||||||
/** ALL = 筛选条件;SELECTED = billIds。 */
|
/** ALL = 筛选条件;SELECTED = billIds。 */
|
||||||
private String scopeMode;
|
private String scopeMode;
|
||||||
private List<String> billIds;
|
private List<Long> billIds;
|
||||||
private List<String> orderNos;
|
private List<String> orderNos;
|
||||||
private List<String> trackingNos;
|
private List<String> trackingNos;
|
||||||
private List<String> transferNos;
|
private List<String> transferNos;
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ public class TmsOrderBillStatusResult {
|
|||||||
/**
|
/**
|
||||||
* 计费订单标识,仅在唯一命中时返回。
|
* 计费订单标识,仅在唯一命中时返回。
|
||||||
*/
|
*/
|
||||||
private String billId;
|
private Long billId;
|
||||||
|
|
||||||
private String orderNo;
|
private String orderNo;
|
||||||
private String trackingNo;
|
private String trackingNo;
|
||||||
|
|||||||
@@ -42,6 +42,8 @@ public class TmsPriceBillRequest extends TmsPriceQuoteRequest
|
|||||||
private BigDecimal actualWeight;
|
private BigDecimal actualWeight;
|
||||||
/** 上游 TAB_ORDER.WEIGHT(收货重量) */
|
/** 上游 TAB_ORDER.WEIGHT(收货重量) */
|
||||||
private BigDecimal receiveWeight;
|
private BigDecimal receiveWeight;
|
||||||
|
/** 计费重覆盖:上游 CONFIRM_WEIGHT(客户确认重)或本地人工修改;无值则为 null */
|
||||||
|
private BigDecimal chargeWeight;
|
||||||
private BigDecimal volume;
|
private BigDecimal volume;
|
||||||
private BigDecimal volumeWeight;
|
private BigDecimal volumeWeight;
|
||||||
private BigDecimal pkgLength;
|
private BigDecimal pkgLength;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ public class TmsPriceQuoteFeeLine implements Serializable
|
|||||||
{
|
{
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
private String feeId;
|
private Long feeId;
|
||||||
private String feeType;
|
private String feeType;
|
||||||
private String feeName;
|
private String feeName;
|
||||||
/** 附加费配置ID,运费/挂号费为 0 */
|
/** 附加费配置ID,运费/挂号费为 0 */
|
||||||
@@ -23,6 +23,8 @@ public class TmsPriceQuoteFeeLine implements Serializable
|
|||||||
private String currency;
|
private String currency;
|
||||||
private String roundMode;
|
private String roundMode;
|
||||||
private String remark;
|
private String remark;
|
||||||
|
/** CALC 计算,LADING 提单分摊,MANUAL 手工 */
|
||||||
|
private String feeSource;
|
||||||
/** UNBILLED / BILLED */
|
/** UNBILLED / BILLED */
|
||||||
private String arBillStatus;
|
private String arBillStatus;
|
||||||
/** 0=系统 1=人工 */
|
/** 0=系统 1=人工 */
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ public class TmsPriceQuoteResult implements Serializable
|
|||||||
/** 应付费用明细 */
|
/** 应付费用明细 */
|
||||||
private List<TmsPriceQuoteFeeLine> payFeeDetails;
|
private List<TmsPriceQuoteFeeLine> payFeeDetails;
|
||||||
private String quoteId;
|
private String quoteId;
|
||||||
private String billId;
|
private Long billId;
|
||||||
private String orderNo;
|
private String orderNo;
|
||||||
private String trackingNo;
|
private String trackingNo;
|
||||||
/** 转单号 */
|
/** 转单号 */
|
||||||
|
|||||||
+2
-3
@@ -3,7 +3,6 @@ package com.bms.price.domain.vo;
|
|||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import jakarta.validation.constraints.DecimalMin;
|
import jakarta.validation.constraints.DecimalMin;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@@ -13,8 +12,8 @@ public class UpdateChargeWeightRequest implements Serializable
|
|||||||
{
|
{
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
@NotBlank(message = "billId is required")
|
@NotNull(message = "billId is required")
|
||||||
private String billId;
|
private Long billId;
|
||||||
|
|
||||||
@NotNull(message = "chargeWeight is required")
|
@NotNull(message = "chargeWeight is required")
|
||||||
@DecimalMin(value = "0.001", message = "chargeWeight must be > 0")
|
@DecimalMin(value = "0.001", message = "chargeWeight must be > 0")
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user