20230222 17:40

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/Delivery.java

@@ -659,4 +659,10 @@ public class Delivery implements Serializable {
 	@ApiModelProperty(value = "联系人电话")
 	private String corpTel;
 
+	/**
+	 * 本次使用返利
+	 */
+	@ApiModelProperty(value = "本次使用返利")
+	private BigDecimal thisUsedProfit;
+
 }

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/BusinessOverpaymentItem.java

@@ -142,5 +142,10 @@ public class BusinessOverpaymentItem implements Serializable {
 	@TableField(exist = false)
 	private String updateUserName;
 
+	/**
+	 * 客户id
+	 */
+	@TableField(exist = false)
+	private Long corpId;
 
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/Acc.java

@@ -585,4 +585,10 @@ public class Acc implements Serializable {
 	 */
 	@TableField(exist = false)
 	private Long userId;
+
+	/**
+	 * 销售订单id
+	 */
+	@TableField(exist = false)
+	private Long orderId;
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/annualBudget/controller/AnnualBudgetItemController.java

@@ -47,7 +47,7 @@ public class AnnualBudgetItemController extends BladeController {
 	}
 
 	/**
-	 * 分页 协议管理文件表
+	 * 分页 年度预算明细表
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -58,7 +58,7 @@ public class AnnualBudgetItemController extends BladeController {
 	}
 
 	/**
-	 * 自定义分页 协议管理文件表
+	 * 自定义分页 年度预算明细表
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -69,7 +69,7 @@ public class AnnualBudgetItemController extends BladeController {
 	}
 
 	/**
-	 * 新增 协议管理文件表
+	 * 新增 年度预算明细表
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -79,7 +79,7 @@ public class AnnualBudgetItemController extends BladeController {
 	}
 
 	/**
-	 * 修改 协议管理文件表
+	 * 修改 年度预算明细表
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -89,7 +89,7 @@ public class AnnualBudgetItemController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 协议管理文件表
+	 * 新增或修改 年度预算明细表
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -100,7 +100,7 @@ public class AnnualBudgetItemController extends BladeController {
 
 
 	/**
-	 * 删除 协议管理文件表
+	 * 删除 年度预算明细表
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 8)

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/annualBudget/service/impl/AnnualBudgetServiceImpl.java

@@ -94,7 +94,7 @@ public class AnnualBudgetServiceImpl extends ServiceImpl<AnnualBudgetMapper, Ann
 			baseMapper.updateById(annualBudget);
 		}
 
-		//主表附件
+		//主表明细
 		List<AnnualBudgetItem> itemList = annualBudget.getItemList();
 		if (ObjectUtils.isNotNull(itemList) && itemList.size() > 0) {
 			for (AnnualBudgetItem item : itemList) {

blade-service/blade-client/src/main/java/org/springblade/client/goods/feign/GoodsDescClient.java

@@ -264,9 +264,9 @@ public class GoodsDescClient implements IGoodsDescClient {
 	@Override
 	public List<GoodsDesc> getGoodsIds(String cname) {
 		LambdaQueryWrapper<GoodsDesc> goodsDescLambdaQueryWrapper = new LambdaQueryWrapper<>();
-		goodsDescLambdaQueryWrapper.like(GoodsDesc::getCname, cname).or().like(GoodsDesc::getCnameInt, cname)
-			.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId())
-			.eq(GoodsDesc::getIsDeleted, 0);
+		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId())
+			.eq(GoodsDesc::getIsDeleted, 0)
+			.and(i ->i.eq(GoodsDesc::getCname,cname).or().eq(GoodsDesc::getCnameInt,cname));
 
 		return goodsDescService.list(goodsDescLambdaQueryWrapper);
 	}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryController.java

@@ -178,11 +178,11 @@ public class DeliveryController extends BladeController {
 
 				List<DeliveryItems> itemsList = deliveryItemsService.list(itemsLambdaQueryWrapper);
 				//实际到货数量
-				item.setActualArrivalQuantity(itemsList.stream().map(DeliveryItems::getArrivalQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+				item.setActualArrivalQuantity(itemsList.stream().map(DeliveryItems::getArrivalQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2,BigDecimal.ROUND_HALF_UP));
 				//实际到货金额
 				item.setActualArrivalAmount(itemsList.stream().reduce(BigDecimal.ZERO, (x, y) -> {
 					return x.add(y.getArrivalQuantity().multiply(y.getPrice()));
-				},BigDecimal::add));
+				},BigDecimal::add).setScale(2,BigDecimal.ROUND_HALF_UP));
 
 			});
 		}

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

@@ -198,6 +198,12 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					orderDescClient.updateOrder(orderTemp);
 				}
 			}
+			//获得销售订单本次使用返利
+			Order order = new Order();
+			order.setId(delivery.getOrgId());
+			Order order1 = orderDescClient.getByOrder(order);
+			delivery.setThisUsedProfit(order1.getThisUsedProfit());
+			baseMapper.updateById(delivery);
 		} else {
 			if (0 == delivery.getLogisticsConfirm() || 0 == delivery.getAssistantConfirm()) {
 				Delivery temp = baseMapper.selectById(delivery.getId());

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/BusinessOverpaymentItemController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.mocha.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,9 +27,13 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.mocha.entity.BusinessOverpayment;
+import org.springblade.mocha.service.IBusinessOverpaymentService;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
@@ -38,6 +43,7 @@ import org.springblade.mocha.vo.BusinessOverpaymentItemVO;
 import org.springblade.mocha.service.IBusinessOverpaymentItemService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -53,6 +59,7 @@ import java.util.List;
 public class BusinessOverpaymentItemController extends BladeController {
 	private final IUserClient userClient;
 
+	private final IBusinessOverpaymentService businessOverpaymentService;
 	private final IBusinessOverpaymentItemService businessOverpaymentItemService;
 
 	/**
@@ -138,5 +145,38 @@ public class BusinessOverpaymentItemController extends BladeController {
 		return R.status(businessOverpaymentItemService.removeByIds(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 溢付款明细
+	 */
+	@GetMapping("/itemList")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "溢付款明细", notes = "传入businessOverpaymentItem")
+	public R<List<BusinessOverpaymentItem>> itemList(BusinessOverpaymentItem businessOverpaymentItem) {
+		LambdaQueryWrapper<BusinessOverpayment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(BusinessOverpayment::getTenantId, AuthUtil.getTenantId())
+			.eq(BusinessOverpayment::getIsDeleted, 0)
+			.eq(BusinessOverpayment::getCorpId, businessOverpaymentItem.getCorpId());
+		BusinessOverpayment businessOverpayment = businessOverpaymentService.getOne(lambdaQueryWrapper);
+
+		List<BusinessOverpaymentItem> list = new ArrayList<>();
+
+		if (ObjectUtil.isNotEmpty(businessOverpayment)){
+			LambdaQueryWrapper<BusinessOverpaymentItem> itemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			itemLambdaQueryWrapper.eq(BusinessOverpaymentItem::getTenantId, AuthUtil.getTenantId())
+				.eq(BusinessOverpaymentItem::getIsDeleted, 0)
+				.eq(BusinessOverpaymentItem::getPid, businessOverpayment.getId());
+
+			list = businessOverpaymentItemService.list(itemLambdaQueryWrapper);
+			if (CollectionUtils.isNotEmpty(list)){
+				list.forEach(item ->{
+					R<User> user = userClient.userInfoById(item.getCreateUser());
+					if (user.isSuccess() && user.getData() != null){
+						item.setCreateUserName(user.getData().getName());
+					}
+				});
+			}
+		}
+		return R.data(list);
+	}
 
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/SalesPolicyItemController.java

@@ -36,6 +36,7 @@ import org.springblade.mocha.service.ISalesPolicyItemService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 销售政策明细表 控制器
@@ -149,10 +150,10 @@ public class SalesPolicyItemController extends BladeController {
 	 */
 	@GetMapping("/selCnameList")
 	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "分页", notes = "传入salesPolicyItem")
-	public R<IPage<SalesPolicyItem>> selCnameList(SalesPolicyItem salesPolicyItem, Query query) {
-		IPage<SalesPolicyItem> pages = salesPolicyItemService.selCnameList(query, salesPolicyItem);
-		return R.data(pages);
+	@ApiOperation(value = "销售政策明细查询", notes = "传入salesPolicyItem")
+	public R<List<SalesPolicyItem>> selCnameList(SalesPolicyItem salesPolicyItem) {
+		List<SalesPolicyItem> list = salesPolicyItemService.selCnameList(salesPolicyItem);
+		return R.data(list);
 	}
 
 

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/ISalesPolicyItemService.java

@@ -22,6 +22,8 @@ import org.springblade.mocha.vo.SalesPolicyItemVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 销售政策明细表 服务类
  *
@@ -42,5 +44,5 @@ public interface ISalesPolicyItemService extends IService<SalesPolicyItem> {
 	/**
 	 * 销售政策明细查询
 	 */
-	IPage<SalesPolicyItem> selCnameList(Query query, SalesPolicyItem item);
+	List<SalesPolicyItem> selCnameList(SalesPolicyItem item);
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/SalesPolicyItemServiceImpl.java

@@ -24,6 +24,7 @@ import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.mocha.entity.SalesPolicyItem;
 import org.springblade.mocha.vo.SalesPolicyItemVO;
@@ -36,6 +37,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -67,7 +69,7 @@ public class SalesPolicyItemServiceImpl extends ServiceImpl<SalesPolicyItemMappe
 	 * 销售政策明细查询
 	 */
 	@Override
-	public IPage<SalesPolicyItem> selCnameList(Query query, SalesPolicyItem item) {
+	public List<SalesPolicyItem> selCnameList(SalesPolicyItem item) {
 		if (item.getPid() == null){
 			throw new SecurityException("缺少必要参数,查询失败");
 		}
@@ -75,21 +77,24 @@ public class SalesPolicyItemServiceImpl extends ServiceImpl<SalesPolicyItemMappe
 		LambdaQueryWrapper<SalesPolicyItem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(SalesPolicyItem::getTenantId, AuthUtil.getTenantId())
 			.eq(SalesPolicyItem::getIsDeleted, 0)
-			.eq(SalesPolicyItem::getSalesType, 1)
 			.eq(SalesPolicyItem::getPid, item.getPid());
 
 		if (ObjectUtil.isNotEmpty(item.getCname())){//获得产品信息
 			List<GoodsDesc> goodsDescList = goodsDescClient.getGoodsIds(item.getCname());
-			List<Long> goodsIds = goodsDescList.stream().map(GoodsDesc::getId).collect(Collectors.toList());
-			lambdaQueryWrapper.in(SalesPolicyItem::getItemId, goodsIds);
+			if (ObjectUtil.isNotEmpty(goodsDescList)){
+				List<Long> goodsIds = goodsDescList.stream().map(GoodsDesc::getId).collect(Collectors.toList());
+				lambdaQueryWrapper.in(SalesPolicyItem::getItemId, goodsIds);
+			}else {
+				return new ArrayList<>();
+			}
 		}
 
-		IPage<SalesPolicyItem> iPage = baseMapper.selectPage(Condition.getPage(query), lambdaQueryWrapper);
+		List<SalesPolicyItem> list = baseMapper.selectList(lambdaQueryWrapper);
 
-		if (!CollectionUtils.isEmpty(iPage.getRecords())){
+		if (!CollectionUtils.isEmpty(list)){
 			String updateUserIds = "";//修改人id拼接
 			String createUserIds = "";//创建人id拼接
-			for (SalesPolicyItem items : iPage.getRecords()){
+			for (SalesPolicyItem items : list){
 				if (ObjectUtil.isNotEmpty(items.getUpdateUser())){
 					updateUserIds = updateUserIds + items.getUpdateUser() + ",";
 				}
@@ -103,7 +108,7 @@ public class SalesPolicyItemServiceImpl extends ServiceImpl<SalesPolicyItemMappe
 			//获得创建人信息
 			List<User> createUserList = userClient.selectUserIds(createUserIds);
 
-			iPage.getRecords().forEach(salesPolicyItem -> {
+			list.forEach(salesPolicyItem -> {
 				if (ObjectUtil.isNotEmpty(updateUserList)) {
 					salesPolicyItem.setUpdateUserName(updateUserList.stream().filter(e -> e.getId().equals(salesPolicyItem.getUpdateUser())).findFirst().get().getName());
 				}
@@ -114,7 +119,7 @@ public class SalesPolicyItemServiceImpl extends ServiceImpl<SalesPolicyItemMappe
 			});
 		}
 
-		return iPage;
+		return list;
 	}
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/feign/OrderDescClient.java

@@ -108,6 +108,7 @@ public class OrderDescClient implements IOrderDescClient {
 		orderLambdaQueryWrapper.eq(Order::getIsDeleted, 0);
 		orderLambdaQueryWrapper.eq(ObjectUtils.isNotNull(order.getOrderNo()), Order::getOrderNo, order.getOrderNo());
 		orderLambdaQueryWrapper.eq(ObjectUtils.isNotNull(order.getSysNo()), Order::getSysNo, order.getSysNo());
+		orderLambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(order.getId()), Order::getId, order.getId());
 		return iOrderService.getOne(orderLambdaQueryWrapper, false);
 	}
 

blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/AccMapper.xml

@@ -138,18 +138,20 @@
 
     <select id="SelChargeItem" resultType="org.springblade.finance.vojo.Acc">
         SELECT
+        FA.Src_parent_id AS orderId,
         FA.AccSysNo AS accSysNo,
         FA.quantity AS quantity,
         FA.Amount AS amount,
         FA.create_time AS createTime,
         BO.actualQuantity AS actualQuantity,
-        BO.arrivalAmount AS arrivalAmount
+        BO.arrivalAmount - BO.thisUsedProfit AS arrivalAmount
         FROM finance_acc FA
         LEFT JOIN (
             SELECT
                 BO.id,
                 IFNULL( SUM(BOI.actual_quantity), 0) AS actualQuantity,
-                IFNULL( SUM( BOI.actual_quantity * BOI.price ), 0 ) AS arrivalAmount
+                IFNULL( SUM( BOI.actual_quantity * BOI.price ) , 0 ) AS arrivalAmount,
+                IFNULL( BO.this_used_profit, 0 ) AS thisUsedProfit
             FROM business_order BO
             LEFT JOIN business_order_items BOI ON BOI.pid = BO.id
             WHERE
@@ -182,6 +184,7 @@
 
     <select id="SelPayItem" resultType="org.springblade.finance.vojo.Acc">
         SELECT
+        FS.id AS id,
         FI.src_orderNo AS accSysNo,
         FI.quantity AS quantity,
         FI.this_amount AS amount,

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -838,7 +838,9 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			if (srcParentId == null) {
 				throw new SecurityException("操作失败,未获取到原业务信息");
 			}
-			Order client = orderDescClient.getById(srcParentId);
+			Order order = new Order();
+			order.setId(srcParentId);
+			Order client = orderDescClient.getByOrder(order);
 			if (client == null) {
 				throw new SecurityException("修改原单据失败");
 			}