24282 пре 7 месеци
родитељ
комит
3a3337e812

+ 7 - 3
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdRefundServiceImpl.java

@@ -255,13 +255,18 @@ public class JdRefundServiceImpl extends ServiceImpl<JdRefundMapper, JdRefund> i
 
             @Override
             public void invoke(Map<Integer, String> map, AnalysisContext analysisContext) {
-                partCodeList.add(map.get(0));
+                String value = map.get(0);
+                if (StrUtil.isBlank(value)) {
+                    return;
+                }
+                partCodeList.add(value.toUpperCase().trim());
             }
 
             @Override
             public void doAfterAllAnalysed(AnalysisContext context) {
                 //数据读取完毕
             }
+
         }).headRowNumber(1).doRead();
 
         if (partCodeList.isEmpty()) {
@@ -269,8 +274,7 @@ public class JdRefundServiceImpl extends ServiceImpl<JdRefundMapper, JdRefund> i
         }
 
         Map<String, Long> map = jdRefundDetailService.list(q -> q.in(JdRefundDetail::getPartCode, partCodeList))
-                .stream().collect(Collectors.toMap(JdRefundDetail::getPartCode, JdRefundDetail::getId));
-
+                .stream().collect(Collectors.toMap(item -> item.getPartCode().toUpperCase().trim(), JdRefundDetail::getId));
 
         for (String partCode : partCodeList) {
             Long id = map.get(partCode);