diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index 15be75764..6396be032 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -674,46 +674,38 @@ public class IoCollectOrderBackupService extends ServiceImpl 0) { BaseResponse> baseResponse = erpBasicClient.getBuyType("thirdId"); if (baseResponse.getCode() == 20000) { buyTypeMap = baseResponse.getData(); } Map map = new HashMap(); - for (IoCollectOrderResponse collectOrderResponse : list) { - for (Map.Entry entry : buyTypeMap.entrySet()) { - String key = entry.getKey(); - if(ArrayUtil.isEmpty(entry.getValue())){ - continue; - } - String result = String.join(", ", entry.getValue()); - if (result.contains(collectOrderResponse.getBusType())) { - int count = 0; - if (collectOrderResponse.getRelCodeCount() != null && collectOrderResponse.getRelCodeCount() > 0) { - count += collectOrderResponse.getRelCodeCount(); - } else { - count++; + for (Map.Entry entry : buyTypeMap.entrySet()) { + String key = entry.getKey(); + if (ArrayUtil.isEmpty(entry.getValue())) { + continue; + } + String result = String.join(", ", entry.getValue()); + int sumCount = 0; + int okCount = 0; - } + for (IoCollectOrderResponse collectOrderResponse : list) { + if (result.contains(collectOrderResponse.getBusType())) { + if (collectOrderResponse.getRelCodeCount() != null) { if (2 == collectOrderResponse.getUploadStatus()) { - - map.put(key, count); + okCount += collectOrderResponse.getRelCodeCount(); } - map.put(key+sum, count); + sumCount += collectOrderResponse.getRelCodeCount(); } - - + } } - if (collectOrderResponse.getRelCodeCount() != null && collectOrderResponse.getRelCodeCount() > 0) { - codeCount += collectOrderResponse.getRelCodeCount(); - } else { - codeCount++; + map.put(key , okCount); + map.put(key + sum, sumCount); - } } // 数据做处理 @@ -736,17 +728,17 @@ public class IoCollectOrderBackupService extends ServiceImpl SELECT - bac.*,(SELECT - sum(IF( relCodeCount > 0, relCodeCount, 1 )) FROM io_collect_code_backup code_ba - LEFT JOIN io_collect_order_backup bac ON code_ba.billNo = bac.billNo ) as relCodeCount + bac.*,(SELECT sum(IF( relCodeCount > 0, relCodeCount, 1 )) FROM + io_collect_code_backup code_ba where code_ba.billNo = bac.billNo ) as relCodeCount FROM io_collect_order_backup bac