2023年8月9日11:38:42

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -392,6 +392,17 @@ public class GoodsDesc implements Serializable {
 	 */
 	@ApiModelProperty("业务员积分")
 	private BigDecimal salesmanIntegral;
+
+	/**
+	 * 出场日期
+	 */
+	@ApiModelProperty("出场日期")
+	private Date exitDate;
+	/**
+	 * 维修日期
+	 */
+	@ApiModelProperty("维修日期")
+	private Date maintenanceDate;
 	/**
 	 * 销售金额
 	 */

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java

@@ -189,7 +189,7 @@ public interface IUserClient {
 	 * 根据租户id获取用户信息
 	 */
 	@GetMapping(GAIN_USER)
-	R<List<Map<String, Object>>> gainUser();
+	R<List<Map<String, Object>>> gainUser(@RequestParam(value = "roleName",required = false) String roleName);
 
 	/**
 	 * 获取用户

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

@@ -384,8 +384,8 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				}
 			}
 			tradingBox.setTradingBoxItemsList(tradingBoxItemList);
+			tradingBox.setBoxNumber(tradingBoxItemList.size());
 		}
-		tradingBox.setBoxNumber(tradingBoxItemList.size());
 		baseMapper.updateById(tradingBox);
 		//费用明细
 		List<TradingBoxFees> tradingBoxFeesList = tradingBox.getTradingBoxFeesList();

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

@@ -258,8 +258,8 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 				}
 			}
 			transport.setTransportItemList(transportItemList);
+			transport.setBoxNumber(transportItemList.size());
 		}
-		transport.setBoxNumber(transportItemList.size());
 		baseMapper.updateById(transport);
 		//费用明细
 		List<TransportItemFees> transportItemFeesList = transport.getTransportItemFeesList();

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -703,13 +703,30 @@ public class GoodsDescController extends BladeController {
 			lambdaQueryWrapper.in(GoodsDesc::getGoodsTypeId, goodsIdList);
 		}
 		String shoppingMall = "";
-		if (ObjectUtils.isNotNull(Long.parseLong(corpId))){
+		if (ObjectUtils.isNotNull(corpId)){
 			CorpsDesc corpsDesc = corpsDescService.getById(Long.parseLong(corpId));
 			if (ObjectUtils.isNull(corpsDesc)) {
 				throw new RuntimeException("未查到用户信息");
 			} else {
 				shoppingMall = corpsDesc.getShoppingMall();
 			}
+		}else{
+			if (AuthUtil.getUserRole().equals("客户")) {
+				CorpsAttn corpsAttn = corpsAttnService.getOne(new LambdaQueryWrapper<CorpsAttn>()
+					.eq(CorpsAttn::getIsDeleted,0)
+					.eq(CorpsAttn::getTenantId,AuthUtil.getTenantId())
+					.eq(CorpsAttn::getUserId,AuthUtil.getUserId()));
+				if (ObjectUtils.isNull(corpsAttn)) {
+					throw new RuntimeException("未查到用户信息");
+				} else {
+					CorpsDesc corpsDesc = corpsDescService.getCorpId(corpsAttn.getPid());
+					if (ObjectUtils.isNull(corpsDesc)) {
+						throw new RuntimeException("未查到用户信息");
+					} else {
+						shoppingMall = corpsDesc.getShoppingMall();
+					}
+				}
+			}
 		}
 		if (StringUtils.isNotBlank(belongToCorpId)) {
 			LambdaQueryWrapper<CorpsDesc> gysIdListQueryWrapper = new LambdaQueryWrapper<>();

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescPartsController.java

@@ -24,12 +24,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.client.corps.service.ICorpsAttnService;
 import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.dto.GoodsDescDto;
-import org.springblade.client.entity.CorpsDesc;
-import org.springblade.client.entity.GoodsDesc;
-import org.springblade.client.entity.GoodsFiles;
-import org.springblade.client.entity.GoodsType;
+import org.springblade.client.entity.*;
 import org.springblade.client.feign.IRedisClient;
 import org.springblade.client.goods.excel.GoodsInfoPartsExcel;
 import org.springblade.client.goods.service.IGoodsDescService;
@@ -37,6 +35,7 @@ import org.springblade.client.goods.service.IGoodsFilesService;
 import org.springblade.client.goods.service.IGoodsTypeService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
@@ -71,6 +70,7 @@ public class GoodsDescPartsController extends BladeController {
 
 	private final IGoodsDescService goodsDescService;
 	private final ICorpsDescService corpsDescService;
+	private final ICorpsAttnService corpsAttnService;
 
 	private final IRedisClient redisClient;//redis缓存处理
 	private final IStockGoodsClient stockGoodsClient;//库存
@@ -105,13 +105,30 @@ public class GoodsDescPartsController extends BladeController {
 						  @RequestParam(name = "corpId", required = false) String corpId) {
 		GoodsDesc goodsDesc = goodsDescService.getById(goodsId);
 		String shoppingMall = "";
-		if (ObjectUtils.isNotNull(Long.parseLong(corpId))){
+		if (ObjectUtils.isNotNull(corpId)){
 			CorpsDesc corpsDesc = corpsDescService.getById(Long.parseLong(corpId));
 			if (ObjectUtils.isNull(corpsDesc)) {
 				throw new RuntimeException("未查到用户信息");
 			} else {
 				shoppingMall = corpsDesc.getShoppingMall();
 			}
+		}else{
+			if (AuthUtil.getUserRole().equals("客户")) {
+				CorpsAttn corpsAttn = corpsAttnService.getOne(new LambdaQueryWrapper<CorpsAttn>()
+				.eq(CorpsAttn::getIsDeleted,0)
+				.eq(CorpsAttn::getTenantId,AuthUtil.getTenantId())
+				.eq(CorpsAttn::getUserId,AuthUtil.getUserId()));
+				if (ObjectUtils.isNull(corpsAttn)) {
+					throw new RuntimeException("未查到用户信息");
+				} else {
+					CorpsDesc corpsDesc = corpsDescService.getCorpId(corpsAttn.getPid());
+					if (ObjectUtils.isNull(corpsDesc)) {
+						throw new RuntimeException("未查到用户信息");
+					} else {
+						shoppingMall = corpsDesc.getShoppingMall();
+					}
+				}
+			}
 		}
 		if (ObjectUtils.isNotNull(goodsDesc.getGoodsTypeId())) {
 			String typeId = goodsDesc.getGoodsTypeId();

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

@@ -475,8 +475,6 @@ public class DeliveryController extends BladeController {
 	@PostMapping("/submitWagonNumber")
 	@RepeatSubmit
 	public R submitWagonNumber(@Valid @RequestBody Delivery delivery) {
-		delivery.setBillType(OrderTypeEnum.SHIP.getType());
-		delivery.setTradeType(OrderTypeEnum.DOMESTIC.getType());
 		return deliveryService.submitWagonNumber(delivery);
 	}
 
@@ -486,8 +484,6 @@ public class DeliveryController extends BladeController {
 	@PostMapping("/revokeWagonNumber")
 	@RepeatSubmit
 	public R revokeWagonNumber(@Valid @RequestBody Delivery delivery) {
-		delivery.setBillType(OrderTypeEnum.SHIP.getType());
-		delivery.setTradeType(OrderTypeEnum.DOMESTIC.getType());
 		return deliveryService.revokeWagonNumber(delivery);
 	}
 

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -179,8 +179,8 @@ public class UserClient implements IUserClient {
 
 	@Override
 	@GetMapping(GAIN_USER)
-	public R<List<Map<String, Object>>> gainUser() {
-		return R.data(service.gainUser(SecureUtil.getTenantId()));
+	public R<List<Map<String, Object>>> gainUser(String roleName) {
+		return R.data(service.gainUser(SecureUtil.getTenantId(),roleName));
 	}
 
 	@Override

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -66,7 +66,7 @@ public interface UserMapper extends BaseMapper<User> {
 	 * @param tenantId
 	 * @return
 	 */
-	List<Map<String,Object>>  gainUser(@Param("tenantId")String tenantId,@Param("deptId")String deptId);
+	List<Map<String,Object>>  gainUser(@Param("tenantId")String tenantId,@Param("deptId")String deptId,@Param("roleName")String roleName);
 
 	/**
 	 * 根据客户ID获取用户ID

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -90,6 +90,9 @@
         <if test="deptId !=null and deptId != ''">
             and find_in_set(dept_id,#{deptId})
         </if>
+        <if test="roleName !=null and roleName != ''">
+            and find_in_set(role_id,#{roleName})
+        </if>
     </select>
 
     <select id="getUserIdByCorpId" resultType="long">

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

@@ -221,7 +221,7 @@ public interface IUserService extends BaseService<User> {
 	 * @param tenantId
 	 * @return
 	 */
-	List<Map<String,Object>> gainUser(String tenantId);
+	List<Map<String,Object>> gainUser(String tenantId,String roleName);
 
 	/**
 	 * 根据客户ID获取用户ID

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -442,12 +442,18 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	}
 
 	@Override
-	public List<Map<String, Object>> gainUser(String tenantId) {
+	public List<Map<String, Object>> gainUser(String tenantId, String roleName) {
 		String status = sysClient.getParamService("mall.data");
+		if (ObjectUtils.isNotNull(roleName)) {
+			R<String> res = sysClient.getRoleIds(tenantId, roleName);
+			if (res.isSuccess()) {
+				roleName = res.getData();
+			}
+		}
 		if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
-			return baseMapper.gainUser(tenantId, AuthUtil.getDeptId());
+			return baseMapper.gainUser(tenantId, AuthUtil.getDeptId(), roleName);
 		} else {
-			return baseMapper.gainUser(tenantId, null);
+			return baseMapper.gainUser(tenantId, null, roleName);
 		}
 	}