2024年10月17日17:14:40

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/dto/FeeCenterReports.java

@@ -114,5 +114,10 @@ public class FeeCenterReports implements Serializable {
 	 */
 	private String cntrNo;
 
+	/**
+	 * 汇率
+	 */
+	private BigDecimal exrate;
+
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/trade/entity/AdvanceChargeItem.java

@@ -151,5 +151,17 @@ public class AdvanceChargeItem implements Serializable {
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
 	private Integer isDeleted;
 
+	/**
+	 * 金额收
+	 */
+	@ApiModelProperty(value = "金额收")
+	private BigDecimal amountD;
+
+	/**
+	 * 金额付
+	 */
+	@ApiModelProperty(value = "金额付")
+	private BigDecimal amountC;
+
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/trade/entity/Agent.java

@@ -274,6 +274,16 @@ public class Agent implements Serializable {
 	@ApiModelProperty(value = "业务员")
 	private String salesmanName;
 	/**
+	 * 操作员id
+	 */
+	@TableField(exist = false)
+	private Long operatorId;
+	/**
+	 * 操作员
+	 */
+	@TableField(exist = false)
+	private String operatorName;
+	/**
 	 * 总金额
 	 */
 	@ApiModelProperty(value = "总金额")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/trade/entity/AgentItems.java

@@ -291,5 +291,16 @@ public class AgentItems implements Serializable {
 	@ApiModelProperty(value = "是否申请付款尾款")
 	private String applyForPaymentBalance;
 
+	/**
+	 * 操作员id
+	 */
+	@ApiModelProperty(value = "操作员id")
+	private Long operatorId;
+	/**
+	 * 操作员
+	 */
+	@ApiModelProperty(value = "操作员")
+	private String operatorName;
+
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/trade/entity/AgentView.java

@@ -448,6 +448,16 @@ public class AgentView implements Serializable {
 	 */
 	@ApiModelProperty(value = "业务员")
 	private String salesmanName;
+	/**
+	 * 操作员id
+	 */
+	@ApiModelProperty(value = "操作员id")
+	private Long operatorId;
+	/**
+	 * 操作员
+	 */
+	@ApiModelProperty(value = "操作员")
+	private String operatorName;
 
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -837,6 +837,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmountLocD(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
+					feeCenterReports.setExrate(item.getExrate());
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				bills.setFeeCenterList(feeCenterReportsList);
@@ -955,6 +956,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					feeCenterReports.setAmountLocC(item.getAmountLoc());
 					feeCenterReports.setHblno(item.getHblno());
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
+					feeCenterReports.setExrate(item.getExrate());
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				bills.setFeeCenterList(feeCenterReportsList);

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/TradeBillsController.java

@@ -123,15 +123,19 @@ public class TradeBillsController extends BladeController {
 			lambdaQueryWrapper.ge(Bills::getEtd, bills.getEtdList().get(0));
 			lambdaQueryWrapper.le(Bills::getEtd, bills.getEtdList().get(1));
 		}
-		if (!AuthUtil.getUserRole().contains("admin")) {
-			if (AuthUtil.getUserRole().contains("业务员")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("允许修改他人业务") && !AuthUtil.getUserRole().contains("secondaryAdmin")) {
+			if (AuthUtil.getUserRole().contains("业务员") || AuthUtil.getUserRole().contains("操作员")) {
+				lambdaQueryWrapper.and(i -> i.eq(Bills::getSrcId, AuthUtil.getUserId()).or()
+					.eq(Bills::getOperatorId, AuthUtil.getUserId()));
 				lambdaQueryWrapper.eq(Bills::getSrcId, AuthUtil.getUserId());
 			} else {
-				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getSrcType()), Bills::getSrcType, bills.getSrcType())
-					.and(ObjectUtils.isNotNull(bills.getSrcCnName()), i -> i.like(Bills::getSrcCnName, bills.getSrcCnName()).or()
-						.like(Bills::getSrcEnName, bills.getSrcCnName()));
 				lambdaQueryWrapper.eq(Bills::getCreateUser, AuthUtil.getUserId());
 			}
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getSrcType()), Bills::getSrcType, bills.getSrcType())
+				.and(ObjectUtils.isNotNull(bills.getSrcCnName()), i -> i.like(Bills::getSrcCnName, bills.getSrcCnName()).or()
+					.like(Bills::getSrcEnName, bills.getSrcCnName()))
+				.like(ObjectUtils.isNotNull(bills.getOperatorName()), Bills::getOperatorName, bills.getOperatorName());
 		}
 		lambdaQueryWrapper.eq(Bills::getBranchId, deptUtils.getDeptPid());
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getBillType()), Bills::getBillType, bills.getBillType())
@@ -222,8 +226,8 @@ public class TradeBillsController extends BladeController {
 	 */
 	@GetMapping("/retreatPledge")
 	@RepeatSubmit
-	public R retreatPledge(@RequestParam("ids") String ids,@RequestParam("type") String type) {
-		return billsService.retreatPledge(ids,type);
+	public R retreatPledge(@RequestParam("ids") String ids, @RequestParam("type") String type) {
+		return billsService.retreatPledge(ids, type);
 	}
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -2585,7 +2585,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		this.updateById(bills);
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(bills.getEta());
-		calendar.add(Calendar.DAY_OF_MONTH, Integer.parseInt(bills.getIqNo()));
+		calendar.add(Calendar.DAY_OF_MONTH, Integer.parseInt(bills.getIqNo()) - 1);
 		Date newDate = calendar.getTime();
 		if (ObjectUtils.isNotNull(bills.getDispatchVehiclesList())) {
 			for (DispatchVehicles item : bills.getDispatchVehiclesList()) {
@@ -2911,6 +2911,12 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		List<FinAccBills> finAccBills = new ArrayList<>();
 		List<FeeCenter> feeCenterArrayList = new ArrayList<>();
 		for (FeeCenter item : feeCenterList) {
+			/*if (1 != item.getStlStatus()) {
+				throw new RuntimeException("费用未结算，操作失败");
+			}*/
+			if (1 == item.getStatus()) {
+				throw new RuntimeException("已转押，操作失败");
+			}
 			FeeCenter feeCenter = new FeeCenter();
 			BeanUtil.copyProperties(item, feeCenter);
 			feeCenter.setSrcItemId(item.getId());
@@ -2961,70 +2967,66 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			feeCenter.setRefno(bills.getRefno());
 			feeCenter.setBookingNo(bills.getBookingNo());
 			feeCenter.setCntrNo(bills.getQuantityCntrTypesDescr());
-			if ("D".equals(item.getDc())) {
-				item.setUnsettledAmount(new BigDecimal("0.00"));
-				item.setStlTtlAmount(item.getAmount());
-				if (!finAccBillsList.isEmpty()) {
-					FinAccBills accBills = finAccBillsList.stream().filter(e -> e.getId().equals(item.getAccBillId())).findFirst().orElse(null);
-					if (accBills != null) {
-						accBills.setStlAmountDr(ObjectUtils.isNotNull(accBills.getStlAmountDr()) ? accBills.getStlAmountDr() : new BigDecimal("0.00"));
-						accBills.setStlAmountDrLoc(ObjectUtils.isNotNull(accBills.getStlAmountDrLoc()) ? accBills.getStlAmountDrLoc() : new BigDecimal("0.00"));
-						accBills.setStlAmountDrUsd(ObjectUtils.isNotNull(accBills.getStlAmountDrUsd()) ? accBills.getStlAmountDrUsd() : new BigDecimal("0.00"));
-						accBills.setStlAmountCr(ObjectUtils.isNotNull(accBills.getStlAmountCr()) ? accBills.getStlAmountCr() : new BigDecimal("0.00"));
-						accBills.setStlAmountCrLoc(ObjectUtils.isNotNull(accBills.getStlAmountCrLoc()) ? accBills.getStlAmountCrLoc() : new BigDecimal("0.00"));
-						accBills.setStlAmountCrUsd(ObjectUtils.isNotNull(accBills.getStlAmountCrUsd()) ? accBills.getStlAmountCrUsd() : new BigDecimal("0.00"));
-						if ("CNY".equals(item.getCurCode())) {
+//			if ("D".equals(item.getDc())) {
+			item.setUnsettledAmount(new BigDecimal("0.00"));
+			item.setStlTtlAmount(item.getAmount());
+			if (!finAccBillsList.isEmpty()) {
+				FinAccBills accBills = finAccBillsList.stream().filter(e -> e.getId().equals(item.getAccBillId())).findFirst().orElse(null);
+				if (accBills != null) {
+					accBills.setStlAmountDr(ObjectUtils.isNotNull(accBills.getStlAmountDr()) ? accBills.getAmountDr() : new BigDecimal("0.00"));
+					accBills.setStlAmountDrLoc(ObjectUtils.isNotNull(accBills.getStlAmountDrLoc()) ? accBills.getAmountDrLoc() : new BigDecimal("0.00"));
+					accBills.setStlAmountDrUsd(ObjectUtils.isNotNull(accBills.getStlAmountDrUsd()) ? accBills.getAmountDrUsd() : new BigDecimal("0.00"));
+					accBills.setStlAmountCr(ObjectUtils.isNotNull(accBills.getStlAmountCr()) ? accBills.getAmountCr() : new BigDecimal("0.00"));
+					accBills.setStlAmountCrLoc(ObjectUtils.isNotNull(accBills.getStlAmountCrLoc()) ? accBills.getAmountCrLoc() : new BigDecimal("0.00"));
+					accBills.setStlAmountCrUsd(ObjectUtils.isNotNull(accBills.getStlAmountCrUsd()) ? accBills.getAmountCrUsd() : new BigDecimal("0.00"));
+						/*if ("CNY".equals(item.getCurCode())) {
 							accBills.setStlAmountDr(accBills.getStlAmountDr());
 							accBills.setStlAmountDrLoc(accBills.getStlAmountDrLoc());
 						} else {
 							accBills.setStlAmountDrUsd(accBills.getStlAmountDrUsd());
 							BigDecimal cny = bCurrencyService.converterCny(item.getCurCode(), accBills.getStlAmountDrUsd(), "D", "2");
 							accBills.setStlAmountDrLoc(accBills.getStlAmountDrLoc().add(cny));
-						}
-						accBills.setIsCleared(9);
-						accBills.setStlDate(new Date());
-						accBills.setUpdateUser(AuthUtil.getUserId());
-						accBills.setUpdateTime(new Date());
-						accBills.setUpdateUserName(AuthUtil.getUserName());
-						finAccBills.add(accBills);
-					}
+						}*/
+					accBills.setIsCleared(9);
+					accBills.setStlDate(new Date());
+					accBills.setUpdateUser(AuthUtil.getUserId());
+					accBills.setUpdateTime(new Date());
+					accBills.setUpdateUserName(AuthUtil.getUserName());
+					finAccBills.add(accBills);
 				}
-				feeCenter.setAccountDate(null);
-				feeCenter.setAccBillId(null);
-				feeCenter.setAccBillNo("");
-				feeCenter.setAccDate(null);
+			}
+			feeCenter.setAccountDate(null);
+			feeCenter.setAccBillId(null);
+			feeCenter.setAccBillNo("");
+			feeCenter.setAccDate(null);
+			feeCenter.setAccStatus(0);
+			feeCenter.setAccById(0L);
+			feeCenter.setAccByName("");
+			feeCenter.setStlBillId(0L);
+			feeCenter.setStlBillNo("");
+			feeCenter.setStlDate(null);
+			feeCenter.setStlOrgAmount(new BigDecimal("0.00"));
+			feeCenter.setStlCurCode("");
+			feeCenter.setStlExrate(new BigDecimal("0.00"));
+			feeCenter.setStlExrateLoc(new BigDecimal("0.00"));
+			feeCenter.setStlAmount(new BigDecimal("0.00"));
+			feeCenter.setStlAmountLoc(new BigDecimal("0.00"));
+			feeCenter.setStlStatus(0);
+			feeCenter.setStlById(0L);
+			feeCenter.setStlByName("");
+			feeCenter.setStlTtlAmount(new BigDecimal("0.00"));
+			feeCenter.setUnsettledAmount(item.getAmount());
+			feeCenter.setAuditStatus("0");
+			feeCenter.setRemarks("押箱来源提单号：" + item.getMblno());
+			/*} else {
+
 				feeCenter.setAccStatus(0);
-				feeCenter.setAccById(0L);
-				feeCenter.setAccByName("");
-				feeCenter.setStlBillId(0L);
-				feeCenter.setStlBillNo("");
-				feeCenter.setStlDate(null);
-				feeCenter.setStlOrgAmount(new BigDecimal("0.00"));
-				feeCenter.setStlCurCode("");
-				feeCenter.setStlExrate(new BigDecimal("0.00"));
-				feeCenter.setStlExrateLoc(new BigDecimal("0.00"));
-				feeCenter.setStlAmount(new BigDecimal("0.00"));
-				feeCenter.setStlAmountLoc(new BigDecimal("0.00"));
 				feeCenter.setStlStatus(0);
-				feeCenter.setStlById(0L);
-				feeCenter.setStlByName("");
-				feeCenter.setStlTtlAmount(new BigDecimal("0.00"));
-				feeCenter.setUnsettledAmount(item.getAmount());
-				feeCenter.setAuditStatus("0");
-			} else {
-				if (1 != item.getStlStatus()) {
-					throw new RuntimeException("费用未结算，操作失败");
-				}
-				if (1 == item.getStatus()) {
-					throw new RuntimeException("已转押，操作失败");
-				}
-				feeCenter.setAccStatus(1);
-				feeCenter.setStlStatus(1);
 				feeCenter.setStlTtlAmount(item.getAmount());
 				feeCenter.setUnsettledAmount(new BigDecimal("0.00"));
 				feeCenter.setAuditStatus("0");
 				feeCenter.setRemarks("押箱来源提单号：" + item.getMblno());
-			}
+			}*/
 			item.setRemarks("押箱转入提单号:" + bills.getMblno());
 			item.setStatus(1);
 			feeCenterArrayList.add(item);
@@ -3086,45 +3088,27 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			if (0 == item.getStatus()) {
 				throw new RuntimeException("已撤销，操作失败");
 			}
-			if ("D".equals(item.getDc())) {
-				if (!finAccBillsList.isEmpty()) {
-					FinAccBills accBills = finAccBillsList.stream().filter(e -> e.getId().equals(item.getAccBillId())).findFirst().orElse(null);
-					if (accBills != null) {
-						accBills.setStlAmountDr(ObjectUtils.isNotNull(accBills.getStlAmountDr()) ? accBills.getStlAmountDr() : new BigDecimal("0.00"));
-						accBills.setStlAmountDrLoc(ObjectUtils.isNotNull(accBills.getStlAmountDrLoc()) ? accBills.getStlAmountDrLoc() : new BigDecimal("0.00"));
-						accBills.setStlAmountDrUsd(ObjectUtils.isNotNull(accBills.getStlAmountDrUsd()) ? accBills.getStlAmountDrUsd() : new BigDecimal("0.00"));
-						accBills.setStlAmountCr(ObjectUtils.isNotNull(accBills.getStlAmountCr()) ? accBills.getStlAmountCr() : new BigDecimal("0.00"));
-						accBills.setStlAmountCrLoc(ObjectUtils.isNotNull(accBills.getStlAmountCrLoc()) ? accBills.getStlAmountCrLoc() : new BigDecimal("0.00"));
-						accBills.setStlAmountCrUsd(ObjectUtils.isNotNull(accBills.getStlAmountCrUsd()) ? accBills.getStlAmountCrUsd() : new BigDecimal("0.00"));
-						if ("D".equals(item.getDc())) {
-							if ("CNY".equals(item.getCurCode())) {
-								accBills.setStlAmountDr(new BigDecimal("0.00"));
-								accBills.setStlAmountDrLoc(new BigDecimal("0.00"));
-							} else {
-								accBills.setStlAmountDrUsd(new BigDecimal("0.00"));
-								accBills.setStlAmountDrLoc(new BigDecimal("0.00"));
-							}
-						} else if ("C".equals(item.getDc())) {
-							if ("CNY".equals(item.getCurCode())) {
-								accBills.setStlAmountCr(new BigDecimal("0.00"));
-								accBills.setStlAmountCrLoc(new BigDecimal("0.00"));
-							} else {
-								accBills.setStlAmountCrUsd(new BigDecimal("0.00"));
-								accBills.setStlAmountCrLoc(new BigDecimal("0.00"));
-							}
-							accBills.setIsCleared(0);
-							accBills.setStlDate(null);
-							accBills.setUpdateUser(AuthUtil.getUserId());
-							accBills.setUpdateTime(new Date());
-							accBills.setUpdateUserName(AuthUtil.getUserName());
-							finAccBills.add(accBills);
-						}
-					}
+			if (!finAccBillsList.isEmpty()) {
+				FinAccBills accBills = finAccBillsList.stream().filter(e -> e.getId().equals(item.getAccBillId())).findFirst().orElse(null);
+				if (accBills != null) {
+					accBills.setStlAmountDr(new BigDecimal("0.00"));
+					accBills.setStlAmountDrLoc(new BigDecimal("0.00"));
+					accBills.setStlAmountDrUsd(new BigDecimal("0.00"));
+					accBills.setStlAmountCr(new BigDecimal("0.00"));
+					accBills.setStlAmountCrLoc(new BigDecimal("0.00"));
+					accBills.setStlAmountCrUsd(new BigDecimal("0.00"));
+					accBills.setStlAmountCrLoc(new BigDecimal("0.00"));
+					accBills.setIsCleared(0);
+					accBills.setStlDate(null);
+					accBills.setUpdateUser(AuthUtil.getUserId());
+					accBills.setUpdateTime(new Date());
+					accBills.setUpdateUserName(AuthUtil.getUserName());
+					finAccBills.add(accBills);
 				}
-				item.setUnsettledAmount(item.getAmount());
-				item.setStlTtlAmount(new BigDecimal("0.00"));
-				item.setStlStatus(0);
 			}
+			item.setUnsettledAmount(item.getAmount());
+			item.setStlTtlAmount(new BigDecimal("0.00"));
+			item.setStlStatus(0);
 			item.setRemarks("");
 			item.setStatus(0);
 			feeCenterArrayList.add(item);

blade-service/blade-los/src/main/java/org/springblade/los/trade/controller/AgentViewController.java

@@ -81,6 +81,7 @@ public class AgentViewController extends BladeController {
 		lambdaQueryWrapper.eq(AgentView::getTenantId, AuthUtil.getTenantId())
 			.eq(AgentView::getIsDeleted, 0)
 			.eq(ObjectUtils.isNotNull(agentView.getCorpId()), AgentView::getCorpId, agentView.getCorpId())
+			.eq(ObjectUtils.isNotNull(agentView.getOperatorId()), AgentView::getOperatorId, agentView.getOperatorId())
 			.eq(ObjectUtils.isNotNull(agentView.getAbroadConsignorId()), AgentView::getAbroadConsignorId, agentView.getAbroadConsignorId())
 			.eq(ObjectUtils.isNotNull(agentView.getDomesticConsigneeId()), AgentView::getDomesticConsigneeId, agentView.getDomesticConsigneeId())
 			.eq(ObjectUtils.isNotNull(agentView.getBusinessStatus()), AgentView::getBusinessStatus, agentView.getBusinessStatus())

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

@@ -22,14 +22,12 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.Message;
 import org.springblade.client.feign.IMessageClient;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.los.Util.IDeptUtils;
 import org.springblade.los.Util.MagicValues;
 import org.springblade.los.basic.business.entity.BusinessType;
@@ -524,9 +522,18 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 		}
 		String serviceCharge = sysClient.getParamServiceByDept("service.charge", AuthUtil.getTenantId(), AuthUtil.getDeptId());
 		if ("MYDL-STL".equals(agent.getBusinessType())) {
+			if ("D".equals(agent.getDc())) {
+				if (ObjectUtils.isNotNull(agent.getFeeCenterListD()) && !agent.getFeeCenterListD().isEmpty()) {
+					agent.setGoodsValue(agent.getFeeCenterListD().stream().filter(e -> "SFK,WK".contains(e.getFeeCode())).map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+				}
+			} else {
+				if (ObjectUtils.isNotNull(agent.getFeeCenterListC()) && !agent.getFeeCenterListC().isEmpty()) {
+					agent.setGoodsValue(agent.getFeeCenterListC().stream().filter(e -> "SFK,WK".contains(e.getFeeCode())).map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+				}
+			}
 			if (ObjectUtils.isNotNull(serviceCharge)) {
 				BigDecimal serviceChargeAmount = new BigDecimal("1").divide(new BigDecimal(serviceCharge), serviceCharge.length(), RoundingMode.HALF_UP);
-				BigDecimal amount = serviceChargeAmount.multiply(agent.getActualAmount()).setScale(2, RoundingMode.HALF_UP);
+				BigDecimal amount = serviceChargeAmount.multiply(agent.getGoodsValue()).setScale(2, RoundingMode.HALF_UP);
 				if (amount.compareTo(new BigDecimal("1000")) > 0) {
 					agent.setServiceCharge(new BigDecimal("1000"));
 				} else if (amount.compareTo(new BigDecimal("50")) < 0) {
@@ -537,6 +544,17 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			} else {
 				agent.setServiceCharge(new BigDecimal("0.00"));
 			}
+			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)));
+				} else {
+					agent.setActualAmount(agent.getGoodsValue().add(agent.getPostElectricFee()).add(agent.getServiceCharge()));
+				}
+			} else {
+				agent.setActualAmount(agent.getGoodsValue().add(agent.getPostElectricFee()).add(agent.getServiceCharge()));
+			}
 		}
 		List<FeeCenter> feeCenterList = new ArrayList<>();
 		if (ObjectUtils.isNotNull(agent.getFeeCenterListC()) && !agent.getFeeCenterListC().isEmpty()) {
@@ -557,7 +575,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				}
 				agent.setPaymentInUsd(agent.getFeeCenterListC().stream().filter(e -> "SFK,WK".contains(e.getFeeCode()))
 					.map(FeeCenter::getAmountLoc).reduce(BigDecimal.ZERO, BigDecimal::add));
-				agent.setActualAmount(agent.getExchangeRate().multiply(agent.getPaymentInUsd()));
 				ydfCount = agent.getFeeCenterListC().stream().filter(e -> "YDF".equals(e.getFeeCode())).count();
 				sxfCount = agent.getFeeCenterListC().stream().filter(e -> "SXF".equals(e.getFeeCode())).count();
 			}
@@ -666,10 +683,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				}
 				agent.setPaymentInUsd(agent.getFeeCenterListD().stream().filter(e -> "SFK,WK".contains(e.getFeeCode()))
 					.map(FeeCenter::getAmountLoc).reduce(BigDecimal.ZERO, BigDecimal::add));
-//				agent.setActualAmount(agent.getExchangeRate().multiply(agent.getPaymentInUsd()));
-				agent.setActualAmount(agent.getExchangeRate().multiply(agent.getPaymentInUsd())
-					.subtract(agent.getFeeCenterListD().stream().filter(e -> "YFK".contains(e.getFeeCode()))
-						.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));
 				ydfCount = agent.getFeeCenterListD().stream().filter(e -> "YDF".equals(e.getFeeCode())).count();
 				sxfCount = agent.getFeeCenterListD().stream().filter(e -> "SXF".equals(e.getFeeCode())).count();
 			}
@@ -1374,8 +1387,9 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				advanceChargeItem.setCreateDeptName(deptName);
 				advanceChargeItem.setSrcId(agent.getId());
 				advanceChargeItem.setSrcPid(agent.getId());
-				advanceChargeItem.setOrderNo(agent.getBusinessNo());
+				advanceChargeItem.setOrderNo(agent.getContractNo());
 				advanceChargeItem.setOverpayment(advanceChargeAmount);
+				advanceChargeItem.setAmountD(advanceChargeAmount);
 				advanceChargeItem.setOverpaymentType(1);
 				advanceChargeItem.setSrcOrderNo(agent.getOrderNoJoin());
 				advanceChargeItem.setBillNo(agent.getBillNoJoin());
@@ -1800,10 +1814,10 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				auditProecessDTO.setCorpId(declare.getCorpId());
 				auditProecessDTO.setSalesCompanyId(deptUtils.getDeptPid());
 				auditProecessDTO.setSalesCompanyName(declare.getCreateDeptName());
-				if ("D".equals(declare.getDc())){
-					auditProecessDTO.setReceivableAmount(declare.getActualAmount());
-				}else{
-					auditProecessDTO.setPayAmount(declare.getActualAmount());
+				if ("D".equals(declare.getDc())) {
+					auditProecessDTO.setReceivableAmount(feeCentersList.stream().map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+				} else {
+					auditProecessDTO.setPayAmount(feeCentersList.stream().map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
 				}
 				auditProecessDTO.setGrossProfit(declare.getProfit());
 				R financeProcess = auditProecessService.createFinanceProcess(auditProecessDTO);
@@ -1925,12 +1939,14 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				advanceChargeItem.setCreateDeptName(deptName);
 				advanceChargeItem.setSrcId(agent.getId());
 				advanceChargeItem.setSrcPid(agent.getId());
-				advanceChargeItem.setOrderNo(agent.getBusinessNo());
+				advanceChargeItem.setOrderNo(agent.getContractNo());
 				advanceChargeItem.setOverpayment(amountSub);
 				advanceChargeItem.setOverpaymentType(0);
 				advanceChargeItem.setSrcOrderNo(agent.getBusinessNo());
-				advanceChargeItem.setBillNo(agent.getBusinessNo());
+				advanceChargeItem.setBillNo(agent.getBillNoJoin());
 				advanceChargeItem.setIdentifier(0);
+				advanceChargeItem.setAmountC(amountC);
+				advanceChargeItem.setAmountD(amountD);
 				if (amountSub.compareTo(new BigDecimal("0")) > 0) {
 					advanceCharge.setAdvancePaymentBalance(advanceCharge.getAdvancePaymentBalance().add(amountSub));
 					advanceCharge.setInOverpayment(advanceCharge.getInOverpayment().add(amountSub));
@@ -2345,6 +2361,8 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			item.setUpdateTime(new Date());
 			item.setUpdateUser(AuthUtil.getUserId());
 			item.setUpdateUserName(AuthUtil.getUserName());
+			item.setOperatorId(agent.getOperatorId());
+			item.setOperatorName(agent.getOperatorName());
 			if (ObjectUtils.isNotNull(item.getBillNo())) {
 				if (!count.isEmpty()) {
 					throw new RuntimeException("提单号不允许重复:" + item.getBillNo());
@@ -2396,6 +2414,8 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			bills.setSrcCnName(agent.getSalesmanName());
 			bills.setMblno(item.getBillNo());
 			bills.setMshipperCntyName(agent.getTradeMode());
+			bills.setOperatorId(agent.getOperatorId());
+			bills.setOperatorName(agent.getOperatorName());
 			List<AgentItems> itemsList = agentItemsList.stream().filter(e -> e.getBillNo().equals(item.getBillNo())).collect(Collectors.toList());
 			if (!itemsList.isEmpty()) {
 				bills.setQuantity(agentItemsList.stream().map(AgentItems::getQuantity).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
@@ -2860,6 +2880,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			throw new RuntimeException("请先维护费用信息");
 		}
 		Agent declare = baseMapper.selectById(agent.getId());
+		declare.setExchangeRate(agent.getExchangeRate());
 		List<FeeCenter> feeCenterList = new ArrayList<>();
 		if ("FFSQ-SK".equals(agent.getPaidApplication())) {
 			declare.setApplyForPayment("1");
@@ -3080,7 +3101,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 			List<String> contractNoList = Arrays.stream(contractNo.split(",")).collect(Collectors.toList());
 			stlAgent.setContractNo(contractNoList.stream().distinct().collect(Collectors.joining(",")));
 		}
-		stlAgent.setGoodsValue(feeCenterList.stream().map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+		stlAgent.setGoodsValue(feeCenterList.stream().filter(e -> "SFK,WK".contains(e.getFeeCode())).map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
 		stlAgent.setPaymentInUsd(feeCenterList.stream().filter(e -> "SFK,WK".contains(e.getFeeCode()))
 			.map(FeeCenter::getAmountLoc).reduce(BigDecimal.ZERO, BigDecimal::add));
 		if (ObjectUtils.isNull(stlAgent.getExchangeRate())) {
@@ -3109,14 +3130,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				stlAgent.setExchangeRate(bCurExrate.getExratePayment());
 			}
 		}
-		if ("D".equals(stlAgent.getDc())) {
-			stlAgent.setActualAmount(stlAgent.getExchangeRate().multiply(stlAgent.getPaymentInUsd())
-				.subtract(feeCenterList.stream().filter(e -> "YFK".contains(e.getFeeCode()))
-					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));
-		} else {
-			stlAgent.setActualAmount(stlAgent.getExchangeRate().multiply(stlAgent.getPaymentInUsd()));
-		}
-
 		String postElectricFee = sysClient.getParamServiceByDept("post.electric.fee", AuthUtil.getTenantId(), AuthUtil.getDeptId());
 		if (ObjectUtils.isNotNull(postElectricFee)) {
 			BigDecimal postElectricFeeAmount = new BigDecimal(postElectricFee);
@@ -3127,7 +3140,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 		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);
-			BigDecimal amount = serviceChargeAmount.multiply(stlAgent.getActualAmount());
+			BigDecimal amount = serviceChargeAmount.multiply(stlAgent.getGoodsValue());
 			if (amount.compareTo(new BigDecimal("1000")) > 0) {
 				stlAgent.setServiceCharge(new BigDecimal("1000"));
 			} else if (amount.compareTo(new BigDecimal("50")) < 0) {
@@ -3138,7 +3151,13 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 		} else {
 			stlAgent.setServiceCharge(new BigDecimal("0.00"));
 		}
-
+		if ("D".equals(stlAgent.getDc())) {
+			stlAgent.setActualAmount(stlAgent.getGoodsValue().add(stlAgent.getPostElectricFee()).add(stlAgent.getServiceCharge())
+				.subtract(feeCenterList.stream().filter(e -> "YFK".contains(e.getFeeCode()))
+					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));
+		} else {
+			stlAgent.setActualAmount(stlAgent.getGoodsValue().add(stlAgent.getPostElectricFee()).add(stlAgent.getServiceCharge()));
+		}
 		BusinessBillNo businessBillNo = new BusinessBillNo();
 		businessBillNo.setBusinessTypeId(businessType.getId());
 		businessBillNo.setCode("MYDL-STL");
@@ -3420,8 +3439,18 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				agentReport.setContractNo(agent.getContractNo());
 				// todo 发票
 				List<AgentFpReport> agentFpReportList = new ArrayList<>();
-				AgentFpReport agentFpReport = new AgentFpReport();
-				agentFpReportList.add(agentFpReport);
+				List<AgentItems> agentItemsList = agentItemsService.list(new LambdaQueryWrapper<AgentItems>()
+					.eq(AgentItems::getIsDeleted, 0)
+					.eq(AgentItems::getTenantId, AuthUtil.getTenantId())
+					.eq(AgentItems::getPid, billId));
+				for (AgentItems item :agentItemsList){
+					AgentFpReport agentFpReport = new AgentFpReport();
+					agentFpReport.setInvoiceNumber(item.getInvoiceNo());
+					agentFpReport.setProduct(item.getLabelProductName());
+					agentFpReport.setQuantity(item.getNetWeight());
+					agentFpReport.setMoney(item.getAmount());
+					agentFpReportList.add(agentFpReport);
+				}
 				agentReport.setAgentFpReportList(agentFpReportList);
 				List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
 					.eq(FeeCenter::getPid, agent.getId())
@@ -3760,7 +3789,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				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);
-					BigDecimal amount = serviceChargeAmount.multiply(discountAmount);
+					BigDecimal amount = serviceChargeAmount.multiply(discountAmount).setScale(2,RoundingMode.HALF_UP);
 					if (amount.compareTo(new BigDecimal("1000")) > 0) {
 						agentFeeReport.setReportServiceCharge(new BigDecimal("1000"));
 					} else if (amount.compareTo(new BigDecimal("50")) < 0) {
@@ -3869,6 +3898,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					feeCenterReports.setHblno(item.getMblno());
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReports.setCntrNo(item.getCntrNo());
+					feeCenterReports.setExrate(item.getStlExrate());
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				agent.setFeeCenterReportsList(feeCenterReportsList);
@@ -3952,6 +3982,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					feeCenterReports.setHblno(item.getMblno());
 					feeCenterReports.setAmount(item.getQuantity() + "*" + item.getPrice());
 					feeCenterReports.setCntrNo(item.getCntrNo());
+					feeCenterReports.setExrate(item.getStlExrate());
 					feeCenterReportsList.add(feeCenterReports);
 				}
 				agent.setFeeCenterReportsList(feeCenterReportsList);
@@ -4055,11 +4086,12 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				advanceChargeItem.setUpdateTime(new Date());
 				advanceChargeItem.setSrcId(agent.getId());
 				advanceChargeItem.setSrcPid(agent.getId());
-				advanceChargeItem.setOrderNo(agent.getBusinessNo());
+				advanceChargeItem.setOrderNo(agent.getContractNo());
 				advanceChargeItem.setOverpayment(advanceChargeAmount);
+				advanceChargeItem.setAmountD(advanceChargeAmount);
 				advanceChargeItem.setOverpaymentType(0);
 				advanceChargeItem.setSrcOrderNo(agent.getBusinessNo());
-				advanceChargeItem.setBillNo(agent.getBusinessNo());
+				advanceChargeItem.setBillNo(agent.getBillNoJoin());
 				advanceChargeItem.setIdentifier(0);
 				advanceChargeItem.setPid(advanceCharge.getId());
 				advanceChargeItemService.save(advanceChargeItem);
@@ -4202,12 +4234,14 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				advanceChargeItem.setPid(advanceCharge.getId());
 				advanceChargeItem.setSrcId(agent.getId());
 				advanceChargeItem.setSrcPid(agent.getId());
-				advanceChargeItem.setOrderNo(agent.getBusinessNo());
+				advanceChargeItem.setOrderNo(agent.getContractNo());
 				advanceChargeItem.setOverpayment(amountSub);
 				advanceChargeItem.setOverpaymentType(1);
 				advanceChargeItem.setSrcOrderNo(agent.getBusinessNo());
-				advanceChargeItem.setBillNo(agent.getBusinessNo());
+				advanceChargeItem.setBillNo(agent.getBillNoJoin());
 				advanceChargeItem.setIdentifier(0);
+				advanceChargeItem.setAmountC(amountC);
+				advanceChargeItem.setAmountD(amountD);
 				advanceChargeItemService.save(advanceChargeItem);
 			} else if (amountSub.compareTo(new BigDecimal("0")) < 0) {
 				FeeCenter feeCenter = feeCenterService.getOne(new LambdaQueryWrapper<FeeCenter>()

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/feign/PaymentClient.java

@@ -63,6 +63,7 @@ public class PaymentClient implements IPaymentClient {
 		try {
 			System.out.println("支付函数数据======》" + paymentDTO.toString());
 			String status = sysClient.getParamServiceNew("cashier.payment");
+			System.out.println("支付函数数据status======》" + status);
 			if ("1".equals(status)) {
 				Map<String, String> map = service.payNew(paymentDTO.getTrxamt(), paymentDTO.getReqsn(), paymentDTO.getPaytype(),
 					paymentDTO.getBody(), paymentDTO.getRemark(), paymentDTO.getAcct(), paymentDTO.getValidtime(), paymentDTO.getNotify_url(),
@@ -129,6 +130,8 @@ public class PaymentClient implements IPaymentClient {
 						resultObj.put("signType", AnalysisMapUtils.getString("signType", mapType));
 						resultObj.put("partnerid", AnalysisMapUtils.getString("cusid", map));
 						resultObj.put("prepayId", AnalysisMapUtils.getString("reqsn", map));
+						resultObj.put("chnltrxid", AnalysisMapUtils.getString("chnltrxid", map));
+//						resultObj.put("chnltrxid", "");
 						String paySign = AnalysisMapUtils.getString("paySign", mapType);
 						resultObj.put("paySign", paySign);
 					}

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/utils/SybPayService.java

@@ -289,6 +289,7 @@ public class SybPayService {
 	public static Map<String, String> handleResult(String result, String transactionType, String sybRsacusprikey, String sybSmpprivatekey, String sybMdAppkey) throws Exception {
 		System.out.println("ret:" + result);
 		Map map = SybUtil.json2Obj(result, Map.class);
+		System.out.println("返回数据map:" + map);
 		if (map == null) {
 			throw new RuntimeException("返回数据错误");
 		}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/brand/service/impl/BrandDescServiceImpl.java

@@ -33,7 +33,6 @@ import org.springblade.salesPart.brand.service.IBrandFilesService;
 import org.springblade.salesPart.entity.BrandFigure;
 import org.springblade.salesPart.entity.PjBrandDesc;
 import org.springblade.salesPart.entity.PjBrandFiles;
-import org.springblade.salesPart.entity.PjGoodsDesc;
 import org.springblade.salesPart.vo.BrandDescVO;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
@@ -90,13 +89,13 @@ public class BrandDescServiceImpl extends ServiceImpl<BrandDescMapper, PjBrandDe
 	 */
 	@Override
 	public PjBrandDesc saveMessage(PjBrandDesc brandDesc) {
-		Integer count = baseMapper.selectCount(Wrappers.<PjBrandDesc>lambdaQuery()
-			.eq(PjBrandDesc::getCname, brandDesc.getCname())
-			.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
-			.eq(PjBrandDesc::getIsDeleted, 0)
-		);
+
 		if (brandDesc.getId() != null) {
-			if (count > 0) {
+			if (baseMapper.selectCount(Wrappers.<PjBrandDesc>lambdaQuery()
+				.eq(PjBrandDesc::getCname, brandDesc.getCname())
+				.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
+				.apply("id != " + brandDesc.getId())
+				.eq(PjBrandDesc::getIsDeleted, 0)) > 0) {
 				throw new ServiceException("品牌已存在");
 			}
 			if (!brandDesc.getCreateDept().equals(Long.valueOf(AuthUtil.getDeptId()))) {
@@ -108,7 +107,10 @@ public class BrandDescServiceImpl extends ServiceImpl<BrandDescMapper, PjBrandDe
 			brandDesc.setEnableOrNot(1);
 			baseMapper.updateById(brandDesc);
 		} else {
-			if (count > 1) {
+			if (baseMapper.selectCount(Wrappers.<PjBrandDesc>lambdaQuery()
+				.eq(PjBrandDesc::getCname, brandDesc.getCname())
+				.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
+				.eq(PjBrandDesc::getIsDeleted, 0)) > 0) {
 				throw new ServiceException("品牌已存在");
 			}
 			//获得所属公司

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -4142,8 +4142,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 							//如果请求成功，解析数据
 							if (responsePhone.isSuccessful()) {
 								String bodyShip = responsePhone.body().string();
+								System.err.println("发送发货通知返回body内容：" + bodyShip);
 								//得到一个JSON对象
 								JSONObject objectShip = JSON.parseObject(bodyShip);
+								System.err.println("发送发货通知返回objectShip内容：" + objectShip);
 								String status = objectShip.getString("errmsg");
 								if ("ok".equals(status)) {
 									return R.data("操作成功");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/payMethod/PayServiceImpl.java

@@ -82,7 +82,6 @@ public class PayServiceImpl implements PayService {
 		try {
 
 			String count = sysClient.getParamServiceNew("cashier.payment");
-
 			PaymentDTO paymentDTO = new PaymentDTO();
 			paymentDTO.setTrxamt(amount.multiply(new BigDecimal(100)).intValue());
 			paymentDTO.setReqsn(serialNumber);
@@ -120,7 +119,8 @@ public class PayServiceImpl implements PayService {
 				paymentDTO.setOrgid(parameters.getOrgid());
 			}
 			//交易类型
-			paymentDTO.setTransactionType(parameters.getTransactionType());
+//			paymentDTO.setTransactionType(parameters.getTransactionType());
+			paymentDTO.setTransactionType("MD5");
 			//MD5交易密钥
 			paymentDTO.setSybMdAppkey(parameters.getSybMdAppkey());
 			//RSA私钥

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -128,7 +128,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R generateOrder(String address, List<Map<String, Object>> list, String payType) {
-
 		StringBuilder ids = new StringBuilder();
 		StringBuilder goodsName = new StringBuilder();
 		StringBuilder shortcutJoin = new StringBuilder();