Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/service/impl/AmendsServiceImpl.java

@@ -181,6 +181,10 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 			for (FeeCenter item : amends.getFeeCenterList()) {
 				item.setBillNo(amends.getBillNo());
 				item.setBillDate(amends.getBillDate());
+				item.setSrcType(amends.getSrcType());
+				item.setSrcId(amends.getSrcId());
+				item.setSrcEnName(amends.getSrcEnName());
+				item.setSrcCnName(amends.getSrcCnName());
 				item.setPid(amends.getId());
 			}
 			feeCenterService.submitList(amends.getFeeCenterList());

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/mapper/BillsMapper.xml

@@ -407,28 +407,28 @@
             and find_in_set(fee.hblno,#{acc.hblno})
         </if>
         <if test="acc.billDateStart != null and acc.billDateStart != ''">
-            and acc.bill_date &gt;= #{acc.billDateStart}
+            and DATE_FORMAT(acc.bill_date,'%Y-%m-%d') &gt;= DATE_FORMAT(#{acc.billDateStart},'%Y-%m-%d')
         </if>
         <if test="acc.billDateEnd != null and acc.billDateEnd != ''">
-            and acc.bill_date &lt;= #{acc.billDateEnd}
+            and DATE_FORMAT(acc.bill_date,'%Y-%m-%d') &lt;= DATE_FORMAT(#{acc.billDateEnd},'%Y-%m-%d')
         </if>
         <if test="acc.businessDateStart != null and acc.businessDateStart != ''">
-            and acc.business_date &gt;= #{acc.businessDateStart}
+            and DATE_FORMAT(acc.business_date,'%Y-%m-%d') &gt;= DATE_FORMAT(#{acc.businessDateStart},'%Y-%m-%d')
         </if>
         <if test="acc.businessDateEnd != null and acc.businessDateEnd != ''">
-            and acc.business_date &lt;= #{acc.businessDateEnd}
+            and DATE_FORMAT(acc.business_date,'%Y-%m-%d') &lt;= DATE_FORMAT(#{acc.businessDateEnd},'%Y-%m-%d')
         </if>
         <if test="acc.approveTimeStart != null and acc.approveTimeStart != ''">
-            and fee.approve_time &gt;= #{acc.approveTimeStart}
+            and DATE_FORMAT(acc.approve_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{acc.approveTimeStart},'%Y-%m-%d')
         </if>
         <if test="acc.approveTimeEnd != null and acc.approveTimeEnd != ''">
-            and fee.approve_time &lt;= #{acc.approveTimeEnd}
+            and DATE_FORMAT(acc.approve_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{acc.approveTimeEnd},'%Y-%m-%d')
         </if>
         <if test="acc.signforDateStart != null and acc.signforDateStart != '' ">
-            and fee.signfor_date &gt;= #{acc.signforDateStart}
+            and DATE_FORMAT(acc.signfor_date,'%Y-%m-%d') &gt;= DATE_FORMAT(#{acc.signforDateStart},'%Y-%m-%d')
         </if>
         <if test="acc.signforDateEnd != null and acc.signforDateEnd != '' ">
-            and fee.signfor_date &lt;= #{acc.signforDateEnd}
+            and DATE_FORMAT(acc.signfor_date,'%Y-%m-%d') &lt;= DATE_FORMAT(#{acc.signforDateEnd},'%Y-%m-%d')
         </if>
         <if test="acc.queryAmount != null and acc.queryAmount != ''">
             and (acc.amount_dr_loc = #{acc.queryAmount} or acc.amount_cr_loc = #{acc.queryAmount})

blade-service/blade-los/src/main/java/org/springblade/los/trade/service/impl/AgentServiceImpl.java

@@ -526,9 +526,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			}
 			if ("D".equals(agent.getDc())) {
 				if (ObjectUtils.isNotNull(agent.getFeeCenterListD()) && !agent.getFeeCenterListD().isEmpty()) {
-					agent.setActualAmount(agent.getGoodsValue().add(agent.getPostElectricFee()).add(agent.getServiceCharge())
-						.subtract(agent.getFeeCenterListD().stream().filter(e -> "YFK".contains(e.getFeeCode()))
-							.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add).abs()));
+					agent.setActualAmount(agent.getGoodsValue().add(agent.getPostElectricFee()).add(agent.getServiceCharge()));
 				} else {
 					agent.setActualAmount(agent.getGoodsValue().add(agent.getPostElectricFee()).add(agent.getServiceCharge()));
 				}
@@ -3783,7 +3781,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					agentFeeReport.setRemainingAmount(new BigDecimal("0.00"));
 					agentFeeReport.setBeforeRepairAmount(new BigDecimal("0.00"));
 				}
-				BigDecimal ampuntSum = agentFeeReport.getRealitySumAmount();
 				agentFeeReport.setRealitySumAmount(agentFeeReport.getRealitySumAmount().add(agentFeeReport.getRealityOtherAmount())
 					.add(agentFeeReport.getRealityTariff()).add(agentFeeReport.getRealityTradeAgencyAmount())
 					.add(agentFeeReport.getRealityValueAddedTax()).add(agentFeeReport.getBeforeRepairAmount())
@@ -3794,7 +3791,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				agentFeeReport.setTariff(agent.getTariff());
 				agentFeeReport.setValueAddedTax(agent.getValueAddedTax());
 				agentFeeReport.setTradeAgencyAmount(agent.getTradeAgencyAmount());
-				agentFeeReport.setSumAmount(ampuntSum.add(agent.getOtherAmount()).add(agent.getTariff())
+				agentFeeReport.setSumAmount(agent.getActualAmount().add(agent.getOtherAmount()).add(agent.getTariff())
 					.add(agent.getValueAddedTax()).add(agent.getTradeAgencyAmount()).add(agentFeeReport.getBeforeRepairAmount())
 					.subtract(agentFeeReport.getRemainingAmount()));
 				agentFeeReport.setRepairAmount(agentFeeReport.getRealitySumAmount().subtract(agentFeeReport.getSumAmount()));
@@ -3829,7 +3826,15 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				}
 				agentFeeReport.setReportSumAmount(discountAmount.add(agentFeeReport.getReportPostElectricFee())
 					.add(agentFeeReport.getReportServiceCharge()));
-				agentFeeReport.setDiscountAmountSub(agentFeeReport.getRealitySumAmount().subtract(agentFeeReport.getReportSumAmount()));
+				if (!feeCenterListC.isEmpty()) {
+					agentFeeReport.setDiscountAmountSub(agentFeeReport.getRealitySumAmount().subtract(agentFeeReport.getReportSumAmount()));
+				} else {
+					agentFeeReport.setDiscountAmountSub(new BigDecimal("0.00"));
+					agentFeeReport.setReportPostElectricFee(new BigDecimal("0.00"));
+					agentFeeReport.setReportServiceCharge(new BigDecimal("0.00"));
+					agentFeeReport.setReportSumAmount(new BigDecimal("0.00"));
+					agentFeeReport.setRealitySumAmount(new BigDecimal("0.00"));
+				}
 				agentFeeReport.setDept(dept);
 				agentFeeReport.setReportList(reportList);
 				List<AgentFeeItemsReport> agentFeeItemsReports = new ArrayList<>();
@@ -3892,7 +3897,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 					.eq(FeeCenter::getIsDeleted, 0));
 				if (feeCenterList.isEmpty()) {
-					throw new RuntimeException("请先维护首款费用信息");
+					throw new RuntimeException("请先维护应收费用信息");
 				}
 				List<Long> ids = feeCenterList.stream().map(FeeCenter::getPid).filter(Objects::nonNull).collect(Collectors.toList());
 				List<FeeCenter> feeCenterListC = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
@@ -3901,22 +3906,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					.apply("stl_pid is not null")
 					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 					.eq(FeeCenter::getIsDeleted, 0));
-				boolean status = false;
 				if (!feeCenterListC.isEmpty()) {
-					List<Long> stlPidC = feeCenterListC.stream().map(FeeCenter::getStlPid).filter(Objects::nonNull).collect(Collectors.toList());
-					if (!stlPidC.isEmpty()) {
-						List<Agent> agentList = baseMapper.selectList(new LambdaQueryWrapper<Agent>()
-							.eq(Agent::getTenantId, AuthUtil.getTenantId())
-							.eq(Agent::getIsDeleted, 0)
-							.eq(Agent::getBusinessType, "MYDL-STL")
-							.eq(Agent::getDc, "C")
-							.in(Agent::getId, stlPidC));
-						for (Agent item : agentList) {
-							if ("已确认".equals(item.getOrderStatus())) {
-								status = true;
-							}
-						}
-					}
 					agentFeeReport.setRealityOtherAmount(feeCenterListC.stream().filter(e -> !"SXF,YDF,YFK,WK,SFK,DLF,ZZS,GS".contains(e.getFeeCode()))
 						.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
 					agentFeeReport.setRealityTariff(feeCenterListC.stream().filter(e -> "GS".equals(e.getFeeCode()))
@@ -3997,6 +3987,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 							agentFeeItemsReport.setRealityExchangeRate(null);
 							agentFeeItemsReport.setRealityAmount(null);
 						}
+
 						agentFeeItemsReportList.add(agentFeeItemsReport);
 					}
 					if (!feeCenterListC.isEmpty()) {
@@ -4123,7 +4114,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				}
 				BigDecimal remainingAmount = feeCenterList.stream().filter(e -> e.getFeeCode().equals("YFK")).map(FeeCenter::getAmount).filter(Objects::nonNull)
 					.reduce(BigDecimal.ZERO, BigDecimal::add);
-				agentFeeReport.setRemainingAmount(remainingAmount);
 				if (new BigDecimal("0.00").compareTo(remainingAmount) > 0) {
 					agentFeeReport.setRemainingAmount(remainingAmount.abs());
 					agentFeeReport.setBeforeRepairAmount(new BigDecimal("0.00"));
@@ -4134,7 +4124,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					agentFeeReport.setRemainingAmount(new BigDecimal("0.00"));
 					agentFeeReport.setBeforeRepairAmount(new BigDecimal("0.00"));
 				}
-				BigDecimal ampuntSum = agentFeeReport.getRealitySumAmount();
 				agentFeeReport.setRealitySumAmount(agentFeeReport.getRealitySumAmount().add(agentFeeReport.getRealityOtherAmount())
 					.add(agentFeeReport.getRealityTariff()).add(agentFeeReport.getRealityTradeAgencyAmount())
 					.add(agentFeeReport.getRealityValueAddedTax()).add(agentFeeReport.getBeforeRepairAmount())
@@ -4145,7 +4134,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				agentFeeReport.setTariff(agent.getTariff());
 				agentFeeReport.setValueAddedTax(agent.getValueAddedTax());
 				agentFeeReport.setTradeAgencyAmount(agent.getTradeAgencyAmount());
-				agentFeeReport.setSumAmount(ampuntSum.add(agent.getOtherAmount()).add(agent.getTariff())
+				agentFeeReport.setSumAmount(agent.getActualAmount().add(agent.getOtherAmount()).add(agent.getTariff())
 					.add(agent.getValueAddedTax()).add(agent.getTradeAgencyAmount()).add(agentFeeReport.getBeforeRepairAmount())
 					.subtract(agentFeeReport.getRemainingAmount()));
 				agentFeeReport.setRepairAmount(agentFeeReport.getRealitySumAmount().subtract(agentFeeReport.getSumAmount()));
@@ -4158,10 +4147,12 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				}
 				agentFeeReport.setDate(dateFormat.format(agent.getBusinessDate()));
 				agentFeeReport.setPaymentMethod(agent.getAdvanceRatio());
-
 				agentFeeReport.setReportPostElectricFee(agentFeeReport.getRealityPostElectricFee());
-				BigDecimal discountAmount = reportList.stream().map(AgentRecordReport::getDiscountAmount)
-					.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+				BigDecimal discountAmount = new BigDecimal("0.00");
+				if (!reportList.isEmpty()) {
+					discountAmount = reportList.stream().map(AgentRecordReport::getDiscountAmount)
+						.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+				}
 				String serviceCharge = sysClient.getParamServiceByDept("service.charge", AuthUtil.getTenantId(), AuthUtil.getDeptId());
 				if (ObjectUtils.isNotNull(serviceCharge)) {
 					BigDecimal serviceChargeAmount = new BigDecimal("1").divide(new BigDecimal(serviceCharge), serviceCharge.length(), RoundingMode.HALF_UP);
@@ -4178,7 +4169,15 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				}
 				agentFeeReport.setReportSumAmount(discountAmount.add(agentFeeReport.getReportPostElectricFee())
 					.add(agentFeeReport.getReportServiceCharge()));
-				agentFeeReport.setDiscountAmountSub(agentFeeReport.getRealitySumAmount().subtract(agentFeeReport.getReportSumAmount()));
+				if (!feeCenterListC.isEmpty()) {
+					agentFeeReport.setDiscountAmountSub(agentFeeReport.getRealitySumAmount().subtract(agentFeeReport.getReportSumAmount()));
+				} else {
+					agentFeeReport.setDiscountAmountSub(new BigDecimal("0.00"));
+					agentFeeReport.setReportPostElectricFee(new BigDecimal("0.00"));
+					agentFeeReport.setReportServiceCharge(new BigDecimal("0.00"));
+					agentFeeReport.setReportSumAmount(new BigDecimal("0.00"));
+					agentFeeReport.setRealitySumAmount(new BigDecimal("0.00"));
+				}
 				agentFeeReport.setDept(dept);
 				agentFeeReport.setReportList(reportList);
 				List<AgentFeeItemsReport> agentFeeItemsReports = new ArrayList<>();
@@ -4209,12 +4208,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					}
 				}
 				agentFeeReport.setSkItemsReports(agentFeeItemsReports);
-				if (!status) {
-					agentFeeReport.setRealitySumAmount(new BigDecimal("0.00"));
-					agentFeeReport.setRemainingAmount(new BigDecimal("0.00"));
-					agentFeeReport.setSurplusAmount(new BigDecimal("0.00"));
-					agentFeeReport.setRepairAmount(new BigDecimal("0.00"));
-				}
 				map.put(MagicValues.DATA, agentFeeReport);
 			} else {
 				map.put(MagicValues.DATA, new AgentFeeReport());
@@ -5029,7 +5022,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 		feeCenter.setFeeCnName(feesSFK.getCnName());
 		feeCenter.setFeeEnName(feesSFK.getEnName());
 		feeCenter.setDc("D");
-		feeCenter.setCurCode(feesSFK.getCurNo());
 		feeCenter.setSort(sort);
 		feeCenter.setElementsId(feesSFK.getAccElementId());
 		feeCenter.setElementsCode(feesSFK.getElementsCode());
@@ -5044,6 +5036,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			throw new RuntimeException("请先维护订单明细");
 		}
 		if ("SFK".equals(type)) {
+			feeCenter.setCurCode(detail.getCurrency());
 			feeCenter.setQuantity(new BigDecimal("1"));
 			feeCenter.setAmountLoc(detail.getPrepaidAmount());
 			if (ObjectUtils.isNotNull(detail.getExchangeRate())) {
@@ -5055,6 +5048,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			}
 			return feeCenter;
 		} else if ("YDF".equals(type)) {
+			feeCenter.setCurCode("CNY");
 			feeCenter.setQuantity(new BigDecimal("1"));
 			feeCenter.setExrate(new BigDecimal("1"));
 			feeCenter.setDiscountExrate(new BigDecimal("1"));
@@ -5069,6 +5063,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			}
 			return feeCenter;
 		} else if ("SXF".equals(type)) {
+			feeCenter.setCurCode("CNY");
 			feeCenter.setQuantity(new BigDecimal("1"));
 //			feeCenter.setStlExrate(detail.getExchangeRate());
 			feeCenter.setExrate(new BigDecimal("1"));
@@ -5104,6 +5099,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			}
 			return feeCenter;
 		} else if ("YFK".equals(type)) {
+			feeCenter.setCurCode("CNY");
 			feeCenter.setExrate(new BigDecimal("1"));
 			feeCenter.setDiscountExrate(new BigDecimal("1"));
 			feeCenter.setQuantity(new BigDecimal("1"));
@@ -5161,7 +5157,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 		feeCenter.setFeeCnName(feesSFK.getCnName());
 		feeCenter.setFeeEnName(feesSFK.getEnName());
 		feeCenter.setDc("D");
-		feeCenter.setCurCode(feesSFK.getCurNo());
 		feeCenter.setSort(sort);
 		feeCenter.setElementsId(feesSFK.getAccElementId());
 		feeCenter.setElementsCode(feesSFK.getElementsCode());
@@ -5181,6 +5176,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			throw new RuntimeException("请先维护订单明细");
 		}
 		if ("WK".equals(type)) {
+			feeCenter.setCurCode(detail.getCurrency());
 			BigDecimal amount = agentItemsRList.stream().map(AgentItemsR::getThisSettlementAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 			feeCenter.setQuantity(new BigDecimal("1"));
 			feeCenter.setAmountLoc(amount);
@@ -5193,6 +5189,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			}
 			return feeCenter;
 		} else if ("YDF".equals(type)) {
+			feeCenter.setCurCode("CNY");
 			feeCenter.setQuantity(new BigDecimal("1"));
 			feeCenter.setExrate(new BigDecimal("1"));
 			feeCenter.setDiscountExrate(new BigDecimal("1"));
@@ -5207,6 +5204,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			}
 			return feeCenter;
 		} else if ("SXF".equals(type)) {
+			feeCenter.setCurCode("CNY");
 			feeCenter.setQuantity(new BigDecimal("1"));
 			BigDecimal amount = agentItemsRList.stream().map(AgentItemsR::getThisSettlementAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 			BigDecimal prepaidAmount = amount.multiply(detail.getExchangeRate());
@@ -5243,6 +5241,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			}
 			return feeCenter;
 		} else if ("YFK".equals(type)) {
+			feeCenter.setCurCode("CNY");
 			feeCenter.setQuantity(new BigDecimal("1"));
 			feeCenter.setExrate(new BigDecimal("1"));
 			feeCenter.setDiscountExrate(new BigDecimal("1"));
@@ -5300,7 +5299,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 		feeCenter.setFeeCnName(feesSFK.getCnName());
 		feeCenter.setFeeEnName(feesSFK.getEnName());
 		feeCenter.setDc("C");
-		feeCenter.setCurCode(feesSFK.getCurNo());
 		feeCenter.setSort(sort);
 		feeCenter.setElementsId(feesSFK.getAccElementId());
 		feeCenter.setElementsCode(feesSFK.getElementsCode());
@@ -5315,6 +5313,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			throw new RuntimeException("请先维护订单明细");
 		}
 		if ("SFK".equals(type)) {
+			feeCenter.setCurCode(detail.getCurrency());
 			feeCenter.setQuantity(new BigDecimal("1"));
 			feeCenter.setAmountLoc(detail.getPrepaidAmount());
 			if (ObjectUtils.isNotNull(detail.getExchangeRate())) {
@@ -5326,6 +5325,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			}
 			return feeCenter;
 		} else if ("YDF".equals(type)) {
+			feeCenter.setCurCode("CNY");
 			feeCenter.setQuantity(new BigDecimal("1"));
 			feeCenter.setExrate(new BigDecimal("1"));
 			feeCenter.setDiscountExrate(new BigDecimal("1"));
@@ -5340,6 +5340,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			}
 			return feeCenter;
 		} else if ("SXF".equals(type)) {
+			feeCenter.setCurCode("CNY");
 			feeCenter.setQuantity(new BigDecimal("1"));
 			BigDecimal prepaidAmount = detail.getPrepaidAmount().multiply(detail.getExchangeRate());
 //			feeCenter.setStlExrate(detail.getExchangeRate());
@@ -5375,6 +5376,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			}
 			return feeCenter;
 		} else if ("YFK".equals(type)) {
+			feeCenter.setCurCode("CNY");
 			feeCenter.setQuantity(new BigDecimal("1"));
 			feeCenter.setExrate(new BigDecimal("1"));
 			feeCenter.setDiscountExrate(new BigDecimal("1"));
@@ -5432,7 +5434,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 		feeCenter.setFeeCnName(feesSFK.getCnName());
 		feeCenter.setFeeEnName(feesSFK.getEnName());
 		feeCenter.setDc("C");
-		feeCenter.setCurCode(feesSFK.getCurNo());
 		feeCenter.setSort(sort);
 		feeCenter.setElementsId(feesSFK.getAccElementId());
 		feeCenter.setElementsCode(feesSFK.getElementsCode());
@@ -5452,6 +5453,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			throw new RuntimeException("请先维护订单明细");
 		}
 		if ("WK".equals(type)) {
+			feeCenter.setCurCode(detail.getCurrency());
 			BigDecimal amount = agentItemsRList.stream().map(AgentItemsR::getThisSettlementAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 			feeCenter.setQuantity(new BigDecimal("1"));
 			feeCenter.setAmountLoc(amount);
@@ -5464,6 +5466,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			}
 			return feeCenter;
 		} else if ("YDF".equals(type)) {
+			feeCenter.setCurCode("CNY");
 			feeCenter.setQuantity(new BigDecimal("1"));
 			feeCenter.setExrate(new BigDecimal("1"));
 			feeCenter.setDiscountExrate(new BigDecimal("1"));
@@ -5478,6 +5481,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			}
 			return feeCenter;
 		} else if ("SXF".equals(type)) {
+			feeCenter.setCurCode("CNY");
 			feeCenter.setQuantity(new BigDecimal("1"));
 			BigDecimal amount = agentItemsRList.stream().map(AgentItemsR::getThisSettlementAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 			BigDecimal prepaidAmount = amount.multiply(detail.getExchangeRate());
@@ -5514,6 +5518,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			}
 			return feeCenter;
 		} else if ("YFK".equals(type)) {
+			feeCenter.setCurCode("CNY");
 			feeCenter.setQuantity(new BigDecimal("1"));
 			feeCenter.setExrate(new BigDecimal("1"));
 			feeCenter.setDiscountExrate(new BigDecimal("1"));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderItemsMapper.xml

@@ -308,7 +308,7 @@
             and not FIND_IN_SET(po.`status`,'退款请核,已取消,已退款,售后中')
         </if>
         <if test='saleDetailDto.isContain !=null and saleDetailDto.isContain !="" and saleDetailDto.isContain == "1"'>
-            and ( (FIND_IN_SET(po.bs_type,'XS,CG,RZCG') and FIND_IN_SET(po.`status`,'待确认,待发货,已发货,退款请核,已取消,已退款,售后中,已收货'))
+            and ( (FIND_IN_SET(po.bs_type,'XS,CG,RZCG') and FIND_IN_SET(po.`status`,'待确认,待发货,已发货,退款请核,已取消,已退款,售后中,已收货,待收货'))
             or (FIND_IN_SET(po.bs_type,'TKXS,TKCG') and FIND_IN_SET(po.`status`,'已完成')) )
         </if>
         <if test='saleDetailDto.isContain !=null and saleDetailDto.isContain !="" and saleDetailDto.isContain == "0"'>