CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
van
2026-04-11 22:55:40 +08:00
parent 52b8f13b2d
commit 1446ea2432
6 changed files with 33 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/JDOrderMapper.java
View File

@@ -46,11 +46,6 @@ public interface JDOrderMapper {
*/
JDOrder selectJDOrderByThirdPartyOrderNo(String thirdPartyOrderNo);
/**
* 腾讯文档「单号」列：与订单号(order_id)或客户/第三方单号(third_party_order_no)任一完全相等则命中
*/
JDOrder selectJDOrderByOrderIdOrThirdPartyOrderNo(String orderKey);
/**
* 后返备注 JSON 中含指定 uploadRecordId 的订单主键（撤销导入时用）
*/

5
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IJDOrderService.java
View File

@@ -43,11 +43,6 @@ public interface IJDOrderService {
/** 根据第三方单号查询订单 */
JDOrder selectJDOrderByThirdPartyOrderNo(String thirdPartyOrderNo);
/**
* 按订单号或客户/第三方单号（与表 jd_order.order_id、third_party_order_no 完全匹配）
*/
JDOrder selectJDOrderByOrderIdOrThirdPartyOrderNo(String orderKey);
/** 批量删除（根据主键ID） */
int deleteJDOrderByIds(Long[] ids);

8
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/JDOrderServiceImpl.java
View File

@@ -69,14 +69,6 @@ public class JDOrderServiceImpl implements IJDOrderService {
return jdOrderMapper.selectJDOrderByThirdPartyOrderNo(thirdPartyOrderNo);
}
@Override
public JDOrder selectJDOrderByOrderIdOrThirdPartyOrderNo(String orderKey) {
if (orderKey == null || orderKey.trim().isEmpty()) {
return null;
}
return jdOrderMapper.selectJDOrderByOrderIdOrThirdPartyOrderNo(orderKey.trim());
}
@Override
public int deleteJDOrderByIds(Long[] ids) {
if (ids == null || ids.length == 0) {

4
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/TencentDocServiceImpl.java
View File

@@ -229,6 +229,8 @@ public class TencentDocServiceImpl implements ITencentDocService {
companyColumn = i;
} else if (TencentDocDataParser.headerEquals(cellText, "单号")) {
orderNoColumn = i;
} else if (orderNoColumn == null && TencentDocDataParser.headerEquals(cellText, "客户单号")) {
orderNoColumn = i;
} else if (orderNoColumn == null && TencentDocDataParser.headerEquals(cellText, "第三方单号")) {
orderNoColumn = i;
} else if (cellText.contains("型号")) {
@@ -255,7 +257,7 @@ public class TencentDocServiceImpl implements ITencentDocService {
}
if (orderNoColumn == null) {
throw new RuntimeException("未找到'单号'列，请检查表头配置");
throw new RuntimeException("未找到「单号」「客户单号」或「第三方单号」列，请检查表头配置");
}
log.info("表头识别完成 - 单号列: {}, 京东下单订单号列: {}, 物流列: {}", orderNoColumn, jdPlaceOrderNoColumn, logisticsColumn);

7
ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
View File

@@ -262,13 +262,6 @@
limit 1
</select>
<select id="selectJDOrderByOrderIdOrThirdPartyOrderNo" parameterType="string" resultMap="JDOrderResult">
<include refid="selectJDOrderBase"/>
where order_id = #{orderKey} or third_party_order_no = #{orderKey}
order by order_time desc
limit 1
</select>
<select id="selectOrderIdsByRebateRemarkUploadRecordId" parameterType="long" resultType="long">
select id from jd_order
where rebate_remark_json is not null