20230214 22:21

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/AnnualBudgetItem.java

@@ -1,5 +1,6 @@
 package org.springblade.box.tube.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -87,6 +88,12 @@ public class AnnualBudgetItem implements Serializable {
 	private Long corpId;
 
 	/**
+	 * 客户ids
+	 */
+	@TableField(exist = false)
+	private String corpIds;
+
+	/**
 	 * 年
 	 */
 	@ApiModelProperty(value = "年")
@@ -105,24 +112,72 @@ public class AnnualBudgetItem implements Serializable {
 	private BigDecimal keter;
 
 	/**
+	 * 欧记订单数量
+	 */
+	@TableField(exist = false)
+	private BigDecimal keterOrdQuantity;
+
+	/**
+	 * 欧记发货数量
+	 */
+	@TableField(exist = false)
+	private BigDecimal keterDeliverQuantity;
+
+	/**
 	 * 艾特路计划量
 	 */
 	@ApiModelProperty(value = "艾特路计划量")
 	private BigDecimal xcentway;
 
 	/**
+	 * 艾特路订单数量
+	 */
+	@TableField(exist = false)
+	private BigDecimal xcentwayOrdQuantity;
+
+	/**
+	 * 艾特路发货数量
+	 */
+	@TableField(exist = false)
+	private BigDecimal xcentwayDeliverQuantity;
+
+	/**
 	 * 路迈计划量
 	 */
 	@ApiModelProperty(value = "路迈计划量")
 	private BigDecimal luxxan;
 
 	/**
+	 * 路迈订单数量
+	 */
+	@TableField(exist = false)
+	private BigDecimal luxxanOrdQuantity;
+
+	/**
+	 * 路迈发货数量
+	 */
+	@TableField(exist = false)
+	private BigDecimal luxxanDeliverQuantity;
+
+	/**
 	 * 登马计划量
 	 */
 	@ApiModelProperty(value = "登马计划量")
 	private BigDecimal drivemaster;
 
 	/**
+	 * 登马订单数量
+	 */
+	@TableField(exist = false)
+	private BigDecimal drivemasterOrdQuantity;
+
+	/**
+	 * 登马发货数量
+	 */
+	@TableField(exist = false)
+	private BigDecimal drivemasterDeliverQuantity;
+
+	/**
 	 * 预留品牌字段
 	 */
 	@ApiModelProperty(value = "预留品牌字段")

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.purchase.sales.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -855,6 +856,7 @@ public class Order implements Serializable {
 	 */
 	@ApiModelProperty(value = "生成采购时间")
 	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Date createPurchaseTime;
 	/**
 	 * 生成收发货
@@ -876,6 +878,7 @@ public class Order implements Serializable {
 	 */
 	@ApiModelProperty(value = "生成收发货时间")
 	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Date createFreightTime;
 
 	/**

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/feign/IFinanceClient.java

@@ -156,9 +156,15 @@ public interface IFinanceClient {
 	R<List<Acc>> selectByCorpId(@RequestParam("corpId") Long corpId);
 
 	/**
-	 * 查询账单详情（通过单据id）
+	 * 删除账单明细信息（通过单据id）
 	 */
 	@PostMapping("/acc/remove")
 	R remove(@RequestParam("ids") String ids);
 
+	/**
+	 * 查询账单详情（通过单据id）
+	 */
+	@GetMapping("/acc/selectByParentId")
+	Acc selectByParentId(@RequestParam("parentId") Long parentId);
+
 }

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

@@ -8,7 +8,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.box.tube.annualBudget.service.IAnnualBudgetService;
-import org.springblade.box.tube.entity.Agreement;
 import org.springblade.box.tube.entity.AnnualBudget;
 import org.springblade.box.tube.vo.AnnualBudgetVO;
 import org.springblade.core.boot.ctrl.BladeController;

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

@@ -0,0 +1,112 @@
+package org.springblade.box.tube.annualBudget.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.box.tube.annualBudget.service.IAnnualBudgetItemService;
+import org.springblade.box.tube.entity.AgreementFiles;
+import org.springblade.box.tube.entity.AnnualBudget;
+import org.springblade.box.tube.entity.AnnualBudgetItem;
+import org.springblade.box.tube.vo.AgreementFilesVO;
+import org.springblade.box.tube.vo.AnnualBudgetItemVO;
+import org.springblade.core.boot.ctrl.BladeController;
+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.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * 年度预算明细控制器
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/annualItem")
+@Api(value = "年度预算明细表", tags = "年度预算明细表")
+public class AnnualBudgetItemController extends BladeController {
+
+	private final IAnnualBudgetItemService annualBudgetItemService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入annualBudgetItem")
+	public R<AnnualBudgetItem> detail(AnnualBudgetItem annualBudgetItem) {
+		AnnualBudgetItem detail = annualBudgetItemService.getOne(Condition.getQueryWrapper(annualBudgetItem));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 协议管理文件表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入annualBudgetItem")
+	public R<IPage<AnnualBudgetItem>> list(AnnualBudgetItem annualBudgetItem, Query query) {
+		IPage<AnnualBudgetItem> pages = annualBudgetItemService.page(Condition.getPage(query), Condition.getQueryWrapper(annualBudgetItem));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 协议管理文件表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入annualBudgetItem")
+	public R<IPage<AnnualBudgetItemVO>> page(AnnualBudgetItemVO annualBudgetItem, Query query) {
+		IPage<AnnualBudgetItemVO> pages = annualBudgetItemService.selectAnnualBudgetItemPage(Condition.getPage(query), annualBudgetItem);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 协议管理文件表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入annualBudgetItem")
+	public R save(@Valid @RequestBody AnnualBudgetItem annualBudgetItem) {
+		return R.status(annualBudgetItemService.save(annualBudgetItem));
+	}
+
+	/**
+	 * 修改 协议管理文件表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入annualBudgetItem")
+	public R update(@Valid @RequestBody AnnualBudgetItem annualBudgetItem) {
+		return R.status(annualBudgetItemService.updateById(annualBudgetItem));
+	}
+
+	/**
+	 * 新增或修改 协议管理文件表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入annualBudgetItem")
+	public R submit(@Valid @RequestBody AnnualBudgetItem annualBudgetItem) {
+		return R.status(annualBudgetItemService.saveOrUpdate(annualBudgetItem));
+	}
+
+
+	/**
+	 * 删除 协议管理文件表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(annualBudgetItemService.removeByIds(Func.toLongList(ids)));
+	}
+
+}

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

@@ -0,0 +1,24 @@
+package org.springblade.box.tube.annualBudget.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.box.tube.entity.AnnualBudgetItem;
+import org.springblade.box.tube.vo.AnnualBudgetItemVO;
+
+/**
+ * 年度预算明细表 服务类
+ *
+ * @author BladeX
+ * @since 2023-02-13
+ */
+public interface IAnnualBudgetItemService extends IService<AnnualBudgetItem> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param itemVO
+	 * @return
+	 */
+	IPage<AnnualBudgetItemVO> selectAnnualBudgetItemPage(IPage<AnnualBudgetItemVO> page, AnnualBudgetItemVO itemVO);
+}

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

@@ -2,9 +2,7 @@ package org.springblade.box.tube.annualBudget.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.box.tube.entity.Agreement;
 import org.springblade.box.tube.entity.AnnualBudget;
-import org.springblade.box.tube.vo.AgreementVO;
 import org.springblade.box.tube.vo.AnnualBudgetVO;
 
 /**

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

@@ -0,0 +1,29 @@
+package org.springblade.box.tube.annualBudget.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springblade.box.tube.annualBudget.mapper.AnnualBudgetItemMapper;
+import org.springblade.box.tube.annualBudget.service.IAnnualBudgetItemService;
+import org.springblade.box.tube.entity.AnnualBudgetItem;
+import org.springblade.box.tube.vo.AnnualBudgetItemVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * 年度预算明细表 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-02-13
+ */
+@Service
+@AllArgsConstructor
+public class AnnualBudgetItemServiceImpl extends ServiceImpl<AnnualBudgetItemMapper, AnnualBudgetItem> implements IAnnualBudgetItemService {
+
+	/**
+	 * 自定义分页
+	 */
+	@Override
+	public IPage<AnnualBudgetItemVO> selectAnnualBudgetItemPage(IPage<AnnualBudgetItemVO> page, AnnualBudgetItemVO itemVO) {
+		return page.setRecords(baseMapper.selectAnnualBudgetItemPage(page, itemVO));
+	}
+}

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
-
 import org.springblade.box.tube.annualBudget.mapper.AnnualBudgetItemMapper;
 import org.springblade.box.tube.annualBudget.mapper.AnnualBudgetMapper;
 import org.springblade.box.tube.annualBudget.service.IAnnualBudgetService;
@@ -20,7 +19,6 @@ import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
 import java.util.Date;
 import java.util.List;
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -199,9 +199,10 @@ public class OrderController extends BladeController {
 
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {
 			page.getRecords().stream().forEach(item -> {
-				if (item.getCorpId() != null) {
-					if (ObjectUtil.isNotEmpty(corpsDescList)) {
-						item.setCorpsName(corpsDescList.stream().filter(e -> e.getId().equals(item.getCorpId())).findFirst().get().getCname());
+				if (ObjectUtil.isNotEmpty(corpsDescList)) {
+					CorpsDesc corpsDesc = corpsDescList.stream().filter(d -> d.getId().equals(item.getCorpId())).findFirst().orElse(null);
+					if (ObjectUtils.isNotNull(corpsDesc)) {
+						item.setCorpsName(corpsDesc.getCname());
 					}
 				}
 				if (item.getBelongToCorpId() != null) {

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

@@ -1189,7 +1189,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 
 			//增加审批类型
-			auditProecessDTO.setProcessType("退单审批");
+			auditProecessDTO.setProcessType("销售退单");
 
 			LambdaQueryWrapper<OrderItems> orderItemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			orderItemsLambdaQueryWrapper
@@ -1533,11 +1533,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						throw new SecurityException("撤销失败: " + oneStock.getCode() + "更新库存失败");
 					}
 
-					//删除明细
-					int res = orderItemsMapper.deleteById(e.getId());
-					if (res != 1) {
-						throw new SecurityException("撤销失败,明细错误");
-					}
 				});
 			}
 		}
@@ -1555,32 +1550,28 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			basicCorpsProfitChange.setCreateUser(AuthUtil.getUserId());
 			// 有返利
 			if (orderMessage.getThisUsedProfit() != null && orderMessage.getThisUsedProfit().compareTo(BigDecimal.ZERO) > 0) {
-				// 增加客户的已用返利
+				// 减少客户的已用返利
 				basicCorpsProfitChange.setChangeUsedProfit(orderMessage.getThisUsedProfit());
-				// 减少客户的可用返利
+				// 增加客户的可用返利
 				basicCorpsProfitChange.setChangeSurplusProfit(orderMessage.getThisUsedProfit().negate());
 			}
 			// 检查是否含有产生返利,如果有, 需要增加客户的本月待到账返利
 			if (orderMessage.getCreateProfit() != null && orderMessage.getCreateProfit().compareTo(BigDecimal.ZERO) > 0) {
-				// 增加客户的月返利
+				// 减少客户的月返利
 				basicCorpsProfitChange.setChangeMonthProfit(orderMessage.getCreateProfit());
 
 			}
-			// 新增返利变动记录
-			R save = corpsProfitChangeClient.save(basicCorpsProfitChange);
-			if (!save.isSuccess()) {
-				throw new SecurityException("保存返利变动记录失败");
-			}
+
 			// 修改客户返利
 			R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(orderMessage.getCorpId());
 			if (!corpMessage.isSuccess() || corpMessage.getData() == null) {
 				throw new SecurityException("未查到客户记录");
 			}
 			CorpsDesc corpsDesc = corpMessage.getData();
-			corpsDesc.setProfitReturn(basicCorpsProfitChange.getChangeProfitReturn() == null ? new BigDecimal("0").subtract(corpsDesc.getProfitReturn()) : basicCorpsProfitChange.getChangeProfitReturn().subtract(corpsDesc.getProfitReturn()));
-			corpsDesc.setUsedProfit(basicCorpsProfitChange.getChangeUsedProfit() == null ? new BigDecimal("0").subtract(corpsDesc.getUsedProfit()) : basicCorpsProfitChange.getChangeUsedProfit().subtract(corpsDesc.getUsedProfit()));
-			corpsDesc.setSurplusProfit(basicCorpsProfitChange.getChangeSurplusProfit() == null ? new BigDecimal("0").subtract(corpsDesc.getSurplusProfit()) : basicCorpsProfitChange.getChangeSurplusProfit().subtract(corpsDesc.getSurplusProfit()));
-			corpsDesc.setMonthProfit(basicCorpsProfitChange.getChangeMonthProfit() == null ? new BigDecimal("0").subtract(corpsDesc.getMonthProfit()) : basicCorpsProfitChange.getChangeMonthProfit().subtract(corpsDesc.getMonthProfit()));
+			corpsDesc.setProfitReturn(basicCorpsProfitChange.getChangeProfitReturn() == null ? corpsDesc.getProfitReturn().subtract(new BigDecimal("0")) : corpsDesc.getProfitReturn().subtract(basicCorpsProfitChange.getChangeProfitReturn()));
+			corpsDesc.setUsedProfit(basicCorpsProfitChange.getChangeUsedProfit() == null ? corpsDesc.getUsedProfit().subtract(new BigDecimal("0")) : corpsDesc.getUsedProfit().subtract(basicCorpsProfitChange.getChangeUsedProfit()));
+			corpsDesc.setSurplusProfit(basicCorpsProfitChange.getChangeSurplusProfit() == null ? corpsDesc.getSurplusProfit().subtract(new BigDecimal("0")) : corpsDesc.getSurplusProfit().subtract(basicCorpsProfitChange.getChangeSurplusProfit()));
+			corpsDesc.setMonthProfit(basicCorpsProfitChange.getChangeMonthProfit() == null ? corpsDesc.getMonthProfit().subtract(new BigDecimal("0")) : corpsDesc.getMonthProfit().subtract(basicCorpsProfitChange.getChangeMonthProfit()));
 
 			if (corpsDesc.getProfitReturn().compareTo(new BigDecimal("0")) < 0) {
 				throw new SecurityException("修改客户返利失败:总返利不能为负数");
@@ -1599,12 +1590,36 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			if (!corpsUpdate.isSuccess()) {
 				throw new SecurityException("更新客户返利信息失败");
 			}
+
+			basicCorpsProfitChange.setChangeUsedProfit(orderMessage.getThisUsedProfit().negate());
+			basicCorpsProfitChange.setChangeSurplusProfit(orderMessage.getThisUsedProfit());
+			basicCorpsProfitChange.setChangeMonthProfit(orderMessage.getCreateProfit().negate());
+
+			// 新增返利变动记录
+			R save = corpsProfitChangeClient.save(basicCorpsProfitChange);
+			if (!save.isSuccess()) {
+				throw new SecurityException("保存返利变动记录失败");
+			}
 		}
 		/**===========================End撤销操作返利信息=============================*/
 
+		//删除账单明细
+		Acc acc = financeClient.selectByParentId(orderMessage.getId());
+		if (ObjectUtil.isNotEmpty(acc)){
+			financeClient.remove(acc.getId().toString());
+		}
+
 		//删除审批记录
 		iCheckClient.deteleByBillId(orderMessage.getId());
 		orderMessage.setStatus(0);
+		orderMessage.setCreatePurchase(0);
+		orderMessage.setCreatePurchaseName("否");
+		orderMessage.setCreatePurchaseUser("");
+		orderMessage.setCreatePurchaseTime(null);
+		orderMessage.setCreateFreight(0);
+		orderMessage.setCreateFreightName("否");
+		orderMessage.setCreateFreightUser("");
+		orderMessage.setCreateFreightTime(null);
 		orderMessage.setOrderStatus(OrderStatusEnum.ENTERING.getType());
 		orderMessage.setChargebackStatus(3);
 		baseMapper.updateById(orderMessage);

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

@@ -956,4 +956,19 @@ public class AccController extends BladeController {
 		return R.data(detail);
 	}
 
+	/**
+	 * 查询账单详情（通过单据id）
+	 */
+	@GetMapping("/selectByParentId")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入acc")
+	public Acc selectByParentId(@RequestParam("parentId") Long parentId) {
+		Acc acc = new Acc();
+		acc.setIsDeleted(0);
+		acc.setSrcParentId(parentId);
+		acc.setTenantId(SecureUtil.getTenantId());
+		Acc detail = accService.getOne(Condition.getQueryWrapper(acc));
+		return detail;
+	}
+
 }