2023年9月4日12:49:12

blade-service-api/blade-payment-api/src/main/java/org/springblade/pay/tonglianPayment/entity/WechatMark.java

@@ -121,5 +121,16 @@ public class WechatMark implements Serializable {
 	@ApiModelProperty(value = "类型")
 	private String type;
 
+	/**
+	 * 所属公司id
+	 */
+	@ApiModelProperty(value = "所属公司id")
+	private Long salesCompanyId;
+	/**
+	 * 所属公司名称
+	 */
+	@ApiModelProperty(value = "所属公司名称")
+	private String salesCompanyName;
+
 
 }

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/controller/WechatMarkController.java

@@ -76,6 +76,7 @@ public class WechatMarkController extends BladeController {
 		lambdaQueryWrapper.eq(WechatMark::getIsDeleted, 0)
 			.eq(WechatMark::getTenantId, AuthUtil.getTenantId())
 			.eq(ObjectUtils.isNotNull(wechatMark.getType()), WechatMark::getType, wechatMark.getType())
+			.eq(ObjectUtils.isNotNull(wechatMark.getSalesCompanyId()), WechatMark::getSalesCompanyId, wechatMark.getSalesCompanyId())
 			.like(ObjectUtils.isNotNull(wechatMark.getSerialNumber()), WechatMark::getSerialNumber, wechatMark.getSerialNumber())
 			.eq(ObjectUtils.isNotNull(wechatMark.getStatus()), WechatMark::getStatus, wechatMark.getStatus());
 		String status = sysClient.getParamService("mall.data");

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/service/impl/PaymentServiceImpl.java

@@ -579,6 +579,8 @@ public class PaymentServiceImpl implements IPaymentService {
 							selectOrder.setStatus(OrderTypeEnum.XSDQR.getType());
 							selectOrder.setXcxStatus(OrderTypeEnum.XSDFH.getType());
 							wechatMark.setBillNo(selectOrder.getOrdNo());
+							wechatMark.setSalesCompanyId(selectOrder.getSalesCompanyId());
+							wechatMark.setSalesCompanyName(selectOrder.getSalesCompanyName());
 							ipjOrderClient.updateBySrcOrgId(selectOrder.getId() + "");
 							LocalDateTime now = LocalDateTime.now();
 							DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

blade-service/blade-stock/src/main/java/org/springblade/stock/feign/StockGoodsClient.java

@@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.StorageDesc;
+import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.client.feign.IRedisClient;
 import org.springblade.client.feign.IStorageClient;
@@ -56,6 +58,8 @@ public class StockGoodsClient implements IStockGoodsClient {
 
 	//商品信息
 	private IGoodsDescClient goodsDescClient;
+
+	private ICorpsDescClient corpsDescClient;
 	//redis缓存处理
 	private final IRedisClient redisClient;
 
@@ -221,13 +225,18 @@ public class StockGoodsClient implements IStockGoodsClient {
 		stockGoods.setIsDeleted(0);
 		List<StockGoods> list = stockGoodsService.list(new QueryWrapper<StockGoods>().setEntity(stockGoods));
 		StringBuilder ids = new StringBuilder();
+		StringBuilder corpIds = new StringBuilder();
 		list.forEach(item -> {
 			ids.append(item.getStorageId()).append(",");
+			corpIds.append(item.getCorpId()).append(",");
 		});
 		List<StorageDesc> storageDescList = storageClient.selectStorageIds(ids.toString());
+		List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(corpIds.toString());
 		for (StockGoods stockGoods1 : list) {
 			String name = storageDescList.stream().filter(e -> stockGoods1.getStorageId().equals(e.getId())).findFirst().orElse(new StorageDesc()).getCname();
+			String corpName = corpsDescList.stream().filter(e -> stockGoods1.getCorpId().equals(e.getId())).findFirst().orElse(new CorpsDesc()).getCname();
 			stockGoods1.setStorageName(name);
+			stockGoods1.setCorpName(corpName);
 		}
 		/*BigDecimal reduce = null;
 		if (CollectionUtils.isNotEmpty(list)) {

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -19,6 +19,7 @@ package org.springblade.system.user.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.ApiImplicitParam;
@@ -80,6 +81,7 @@ public class UserController {
 	private final IUserSearchClient userSearchClient;
 
 	private final IRedisClient redisClient;
+
 	/**
 	 * 查询单条
 	 */
@@ -88,8 +90,13 @@ public class UserController {
 	@GetMapping("/detail")
 	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R<UserVO> detail(User user) {
-		User detail = userService.getOne(Condition.getQueryWrapper(user));
-		return R.data(UserWrapper.build().entityVO(detail));
+		if (ObjectUtils.isNotNull(user.getId())) {
+			User detail = userService.getOne(Condition.getQueryWrapper(user));
+			return R.data(UserWrapper.build().entityVO(detail));
+		} else {
+			return R.data(new UserVO());
+		}
+
 	}
 
 	/**
@@ -110,10 +117,10 @@ public class UserController {
 
 	@GetMapping("/userList")
 	public R userList(UserVO userVO) {
-		if (AuthUtil.getTenantId().equals("234557") && StringUtil.isBlank(userVO.getRoleAlias())){
+		if (AuthUtil.getTenantId().equals("234557") && StringUtil.isBlank(userVO.getRoleAlias())) {
 			userVO.setRoleAlias("业务员");
 		}
-		if (AuthUtil.getTenantId().equals("119111") && StringUtil.isBlank(userVO.getRoleAlias())){
+		if (AuthUtil.getTenantId().equals("119111") && StringUtil.isBlank(userVO.getRoleAlias())) {
 			userVO.setRoleAlias("业务员");
 		}
 		LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -137,7 +144,7 @@ public class UserController {
 			List<Long> userIdList = userService.getUserIdByCorpId(Long.parseLong(userVO.getUserExt()));
 			if (CollectionUtil.isNotEmpty(userIdList)) {
 				lambdaQueryWrapper.in(User::getId, userIdList);
-			}else{
+			} else {
 				return R.data(new ArrayList<>());
 			}
 		}
@@ -159,7 +166,7 @@ public class UserController {
 	 */
 	@GetMapping("/deptUserList")
 	public R deptUserList(UserVO userVO) {
-		if (ObjectUtil.isEmpty(userVO.getDeptPid())){
+		if (ObjectUtil.isEmpty(userVO.getDeptPid())) {
 			return R.data(new ArrayList<>());
 		}
 		LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -169,9 +176,9 @@ public class UserController {
 			.eq(User::getIsDeleted, 0);
 
 		if (ObjectUtil.isNotEmpty(userVO.getDeptPid())) {
-			if ("1504336886057963521".equals(userVO.getDeptPid())){
+			if ("1504336886057963521".equals(userVO.getDeptPid())) {
 				userVO.setRoleAlias("分管调度");
-			}else{
+			} else {
 				userVO.setRoleAlias("大件调度");
 			}
 		}
@@ -477,7 +484,7 @@ public class UserController {
 	@GetMapping("/MCSelectList")
 	@ApiOperationSupport(order = 3)
 	public R<List<User>> list() {
-		return userSearchClient.listByRole(SysCache.getRoleIds(AuthUtil.getTenantId(),"库管员"));
+		return userSearchClient.listByRole(SysCache.getRoleIds(AuthUtil.getTenantId(), "库管员"));
 	}
 
 	/**
@@ -485,7 +492,7 @@ public class UserController {
 	 */
 	@GetMapping("/stockClerkList")
 	public R<List<User>> stockClerkList() {
-		return userSearchClient.listByRole(SysCache.getRoleIds(AuthUtil.getTenantId(),"库管"));
+		return userSearchClient.listByRole(SysCache.getRoleIds(AuthUtil.getTenantId(), "库管"));
 	}
 
 	/**
@@ -493,7 +500,7 @@ public class UserController {
 	 */
 	@GetMapping("/financeList")
 	public R<List<User>> financeList() {
-		return userSearchClient.listByRole(SysCache.getRoleIds(AuthUtil.getTenantId(),"财务"));
+		return userSearchClient.listByRole(SysCache.getRoleIds(AuthUtil.getTenantId(), "财务"));
 	}
 
 	/**
@@ -501,7 +508,7 @@ public class UserController {
 	 */
 	@GetMapping("/salerList")
 	public R<List<User>> salerList() {
-		return userSearchClient.listByRole(SysCache.getRoleIds(AuthUtil.getTenantId(),"财务"));
+		return userSearchClient.listByRole(SysCache.getRoleIds(AuthUtil.getTenantId(), "财务"));
 	}
 
 	/**
@@ -509,7 +516,7 @@ public class UserController {
 	 */
 	@GetMapping("/getWarehouseKeeper")
 	public R<List<User>> getWarehouseKeeper(@RequestParam("salesCompanyId") String salesCompanyId) {
-		return userSearchClient.getWarehouseKeeper(SysCache.getRoleIds(AuthUtil.getTenantId(),"库管"),salesCompanyId);
+		return userSearchClient.getWarehouseKeeper(SysCache.getRoleIds(AuthUtil.getTenantId(), "库管"), salesCompanyId);
 	}
 
 }