修改

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

@@ -20,6 +20,7 @@ import java.math.BigDecimal;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
@@ -118,6 +119,18 @@ public class BusinessOverpayment implements Serializable {
 	 */
 		@ApiModelProperty(value = "租户id")
 		private String tenantId;
+	/**
+	 * 创建人中文名
+	 */
+	@ApiModelProperty(value = "创建人中文名")
+	@TableField(exist = false)
+	private String createUserName;
+	/**
+	 * 修改人中文名
+	 */
+	@ApiModelProperty(value = "修改人中文名")
+	@TableField(exist = false)
+	private String updateUserName;
 
 
 }

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

@@ -20,6 +20,7 @@ import java.math.BigDecimal;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
@@ -128,6 +129,18 @@ public class BusinessOverpaymentItem implements Serializable {
 	 */
 		@ApiModelProperty(value = "租户id")
 		private String tenantId;
+	/**
+	 * 创建人中文名
+	 */
+	@ApiModelProperty(value = "创建人中文名")
+	@TableField(exist = false)
+	private String createUserName;
+	/**
+	 * 修改人中文名
+	 */
+	@ApiModelProperty(value = "修改人中文名")
+	@TableField(exist = false)
+	private String updateUserName;
 
 
 }

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

@@ -20,6 +20,7 @@ import java.math.BigDecimal;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
@@ -118,6 +119,18 @@ public class BusinessPoints implements Serializable {
 	 */
 		@ApiModelProperty(value = "租户id")
 		private String tenantId;
+	/**
+	 * 创建人中文名
+	 */
+	@ApiModelProperty(value = "创建人中文名")
+	@TableField(exist = false)
+	private String createUserName;
+	/**
+	 * 修改人中文名
+	 */
+	@ApiModelProperty(value = "修改人中文名")
+	@TableField(exist = false)
+	private String updateUserName;
 
 
 }

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

@@ -20,6 +20,7 @@ import java.math.BigDecimal;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
@@ -128,6 +129,18 @@ public class BusinessPointsItem implements Serializable {
 	 */
 		@ApiModelProperty(value = "租户id")
 		private String tenantId;
+	/**
+	 * 创建人中文名
+	 */
+	@ApiModelProperty(value = "创建人中文名")
+	@TableField(exist = false)
+	private String createUserName;
+	/**
+	 * 修改人中文名
+	 */
+	@ApiModelProperty(value = "修改人中文名")
+	@TableField(exist = false)
+	private String updateUserName;
 
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -16,6 +16,7 @@ import org.springblade.client.corps.excel.CorpsExcel;
 import org.springblade.client.corps.excel.CorpsImport;
 import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.goods.excel.GoodsExcel;
 import org.springblade.client.vo.CorpsDescVO;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -203,9 +204,18 @@ public class CorpsDescController extends BladeController {
 		if (StringUtils.isBlank(corpsDesc.getCorpType())){
 			throw new SecurityException("缺少必要的参数，客户类型");
 		}
-		corpsDesc.setIsDeleted(0);//默认查有效的
-		corpsDesc.setTenantId(SecureUtil.getTenantId());
-		return R.data(corpsDescService.list(new QueryWrapper<CorpsDesc>().setEntity(corpsDesc)));
+		LambdaQueryWrapper<CorpsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		if (corpsDesc.getCorpType().equals("KG")){
+			lambdaQueryWrapper.in(CorpsDesc::getCorpType,"KH","GYS");
+		}else{
+			lambdaQueryWrapper.eq(CorpsDesc::getCorpType,corpsDesc.getCorpType());
+		}
+		lambdaQueryWrapper.like(Func.isNotEmpty(corpsDesc.getCname()),CorpsDesc::getCname,corpsDesc.getCname());
+		lambdaQueryWrapper.like(Func.isNotEmpty(corpsDesc.getCode()),CorpsDesc::getCode,corpsDesc.getCode());
+		lambdaQueryWrapper.eq(CorpsDesc::getIsDeleted,0);
+		lambdaQueryWrapper.eq(CorpsDesc::getTenantId,SecureUtil.getTenantId());
+
+		return R.data(corpsDescService.list(lambdaQueryWrapper));
 	}
 
 

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.mocha.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -28,6 +29,8 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.mocha.entity.BusinessOverpayment;
@@ -46,6 +49,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RequestMapping("/businessoverpayment")
 @Api(value = "客户溢付款主表", tags = "客户溢付款主表接口")
 public class BusinessOverpaymentController extends BladeController {
+	private final IUserClient userClient;
 
 	private final IBusinessOverpaymentService businessOverpaymentService;
 
@@ -69,6 +73,14 @@ public class BusinessOverpaymentController extends BladeController {
 	public R<IPage<BusinessOverpayment>> list(BusinessOverpayment businessOverpayment, Query query) {
 		businessOverpayment.setTenantId(SecureUtil.getTenantId());
 		IPage<BusinessOverpayment> pages = businessOverpaymentService.page(Condition.getPage(query), Condition.getQueryWrapper(businessOverpayment));
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().stream().forEach(item ->{
+				R<User> user = userClient.userInfoById(item.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					item.setCreateUserName(user.getData().getName());
+				}
+			});
+		}
 		return R.data(pages);
 	}
 

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.toolkit.CollectionUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -25,8 +26,11 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.mocha.entity.BusinessOverpaymentItem;
@@ -45,6 +49,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RequestMapping("/businessoverpaymentitem")
 @Api(value = "溢付款明细表", tags = "溢付款明细表接口")
 public class BusinessOverpaymentItemController extends BladeController {
+	private final IUserClient userClient;
 
 	private final IBusinessOverpaymentItemService businessOverpaymentItemService;
 
@@ -66,7 +71,16 @@ public class BusinessOverpaymentItemController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入businessOverpaymentItem")
 	public R<IPage<BusinessOverpaymentItem>> list(BusinessOverpaymentItem businessOverpaymentItem, Query query) {
+		businessOverpaymentItem.setTenantId(SecureUtil.getTenantId());
 		IPage<BusinessOverpaymentItem> pages = businessOverpaymentItemService.page(Condition.getPage(query), Condition.getQueryWrapper(businessOverpaymentItem));
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().stream().forEach(item ->{
+				R<User> user = userClient.userInfoById(item.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					item.setCreateUserName(user.getData().getName());
+				}
+			});
+		}
 		return R.data(pages);
 	}
 
@@ -111,7 +125,7 @@ public class BusinessOverpaymentItemController extends BladeController {
 		return R.status(businessOverpaymentItemService.saveOrUpdate(businessOverpaymentItem));
 	}
 
-	
+
 	/**
 	 * 删除 溢付款明细表
 	 */
@@ -122,5 +136,5 @@ public class BusinessOverpaymentItemController extends BladeController {
 		return R.status(businessOverpaymentItemService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.mocha.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -28,6 +29,8 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.mocha.entity.BusinessPoints;
@@ -46,6 +49,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RequestMapping("/businesspoints")
 @Api(value = "客户积分主表", tags = "客户积分主表接口")
 public class BusinessPointsController extends BladeController {
+	private final IUserClient userClient;
 
 	private final IBusinessPointsService businessPointsService;
 
@@ -69,6 +73,14 @@ public class BusinessPointsController extends BladeController {
 	public R<IPage<BusinessPoints>> list(BusinessPoints businessPoints, Query query) {
 		businessPoints.setTenantId(SecureUtil.getTenantId());
 		IPage<BusinessPoints> pages = businessPointsService.page(Condition.getPage(query), Condition.getQueryWrapper(businessPoints));
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().stream().forEach(item ->{
+				R<User> user = userClient.userInfoById(item.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					item.setCreateUserName(user.getData().getName());
+				}
+			});
+		}
 		return R.data(pages);
 	}
 

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.mocha.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -25,8 +26,11 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.mocha.entity.BusinessPointsItem;
@@ -45,6 +49,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RequestMapping("/businesspointsitem")
 @Api(value = "积分明细表", tags = "积分明细表接口")
 public class BusinessPointsItemController extends BladeController {
+	private final IUserClient userClient;
 
 	private final IBusinessPointsItemService businessPointsItemService;
 
@@ -66,7 +71,16 @@ public class BusinessPointsItemController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入businessPointsItem")
 	public R<IPage<BusinessPointsItem>> list(BusinessPointsItem businessPointsItem, Query query) {
+		businessPointsItem.setTenantId(SecureUtil.getTenantId());
 		IPage<BusinessPointsItem> pages = businessPointsItemService.page(Condition.getPage(query), Condition.getQueryWrapper(businessPointsItem));
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().stream().forEach(item ->{
+				R<User> user = userClient.userInfoById(item.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					item.setCreateUserName(user.getData().getName());
+				}
+			});
+		}
 		return R.data(pages);
 	}
 
@@ -111,7 +125,7 @@ public class BusinessPointsItemController extends BladeController {
 		return R.status(businessPointsItemService.saveOrUpdate(businessPointsItem));
 	}
 
-	
+
 	/**
 	 * 删除 积分明细表
 	 */
@@ -122,5 +136,5 @@ public class BusinessPointsItemController extends BladeController {
 		return R.status(businessPointsItemService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }