禅道修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/CorpListVo.java

@@ -29,6 +29,11 @@ public class CorpListVo {
 	@ApiModelProperty(value = "客户名称")
 	private String cname;
 	/**
+	 * 客户简称
+	 */
+	@ApiModelProperty(value = "客户简称")
+	private String shortName;
+	/**
 	 * 英文名
 	 */
 	@ApiModelProperty(value = "英文名")

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/DatasetVO.java

@@ -22,6 +22,8 @@ public class DatasetVO {
 
 	private String belongCompany;
 
+	private String goodsCode;
+
 	private String goodsName;
 
 	private String typeNo;

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -634,6 +634,15 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				// 应收费用金额
 				BigDecimal ar = deliveryFeesList.stream().filter(e -> e.getFeesType() == 1).reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getAmount()), BigDecimal::add);
 				gathering = gathering.subtract(ar);
+				// 返利
+				Order temp = new Order();
+				temp.setOrderNo(srcOrderNo);
+				Order order = orderDescClient.getByOrder(temp);
+				if (ObjectUtil.isEmpty(order)) {
+					throw new RuntimeException("获取原订单返利失败");
+				}
+				BigDecimal usedProfit = order.getThisUsedProfit();
+				gathering = gathering.add(usedProfit);
 
 				// 原来的判断 条件 : if (gathering.subtract(newDelivery.add(oldDelivery)).compareTo(BigDecimal.ZERO) <= 0){
 				if (gathering.subtract(newDelivery.add(oldDelivery)).compareTo(BigDecimal.ZERO) < 0) {

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -733,6 +733,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(orderItem.getFleetId());
 				if (corpMessage.isSuccess() && corpMessage.getData() != null) {
 					orderItem.setFleetName(corpMessage.getData().getCname());
+					orderItem.setFleetShortName(corpMessage.getData().getShortName());
 				}
 			}
 

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/SettlementController.java

@@ -454,5 +454,20 @@ public class SettlementController extends BladeController {
 		return R.data(settlementService.count(settlementLambdaQueryWrapper));
 	}
 
+	/**
+	 * 分页 结算表
+	 */
+	@GetMapping("/getApplyAmount")
+	public R getApplyAmount(Settlement settlement) {
+		LambdaQueryWrapper<Settlement> wrapper = new LambdaQueryWrapper<>();
+		wrapper.select(Settlement::getAmount)
+			.eq(Settlement::getSrcBillId, settlement.getSrcBillId())
+			.eq(Settlement::getBillType, settlement.getBillType())
+			.eq(Settlement::getTenantId, AuthUtil.getTenantId())
+			.eq(Settlement::getIsDeleted, 0);
+		List<Settlement> settlementList = settlementService.list(wrapper);
+		BigDecimal allAmount = settlementList.stream().filter(e -> ObjectUtil.isNotEmpty(e.getAmount())).reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getAmount()), BigDecimal::add);
+		return R.data(allAmount);
+	}
 
 }