大件

blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/LandOrder.java

@@ -325,6 +325,12 @@ public class LandOrder implements Serializable {
 	@ApiModelProperty(value = "货物")
 	private String goods;
 
+	/**
+	 * 揽货员Id
+	 */
+	@ApiModelProperty(value = "揽货员Id")
+	private Long pickUpGoodsUserId;
+
 
 	@TableField(exist = false)
 	private List<OrderItem> itemList;
@@ -447,4 +453,10 @@ public class LandOrder implements Serializable {
 	//同步账单（0否1是）
 	@TableField(exist = false)
 	private String synchronization;
+
+	//揽货员
+	@TableField(exist = false)
+	private String pickUpGoodsUserName;
+
+
 }

blade-service-api/blade-land-api/src/main/java/org/springblade/land/vo/OrderAcctVO.java

@@ -1,5 +1,6 @@
 package org.springblade.land.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -118,4 +119,7 @@ public class OrderAcctVO {
 
 	private String goods;
 
+	//揽货员
+	private String pickUpGoodsUserName;
+
 }

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

@@ -1338,6 +1338,12 @@ public class Order implements Serializable {
 	private String courierCorporation;
 
 	/**
+	 * 运输类型
+	 */
+	@ApiModelProperty(value = "运输类型")
+	private Integer courierType;
+
+	/**
 	 * 商品名称集合
 	 */
 	@ApiModelProperty(value = "商品名称集合")
@@ -1439,6 +1445,19 @@ public class Order implements Serializable {
 	private String wagonNumberTwo;
 
 	/**
+	 * 客户开户行id
+	 */
+	@TableField(exist = false)
+	private Long corpsBankId;
+
+	/**
+	 * 客户开户行账户名
+	 */
+	@TableField(exist = false)
+	private String corpsBankName;
+
+
+	/**
 	 * 会员结算余额
 	 */
 	@TableField(exist = false)

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

@@ -56,6 +56,8 @@ public interface IUserClient {
 	String LIST_USER_BY_ROLE_ID = API_PREFIX + "/listUserByRoleId";
 	String GET_USER_PAGE = API_PREFIX + "/getUserPage";
 	String USER_BY_IDS = API_PREFIX + "/selectUserIds";
+
+	String USER_BY_NAME = API_PREFIX + "/selectUserByName";
 	String USER_ALL = API_PREFIX + "/selectUserAll";
 	String LOGIN_BY_ACCOUNT = API_PREFIX + "/loginByAccount";
 	String UPDATE_OPEN_ID = API_PREFIX + "/updateOpenId";
@@ -103,6 +105,15 @@ public interface IUserClient {
 	List<User> selectUserIds(@RequestParam("userIds") String userIds);
 
 	/**
+	 * 根据用户名查询数据
+	 *
+	 * @param name
+	 * @return
+	 */
+	@GetMapping(USER_BY_NAME)
+	List<User> selectUserByName(@RequestParam("name") String name);
+
+	/**
 	 * 获取用户信息
 	 *
 	 * @param userId 用户id

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

@@ -1,5 +1,6 @@
 package org.springblade.client.corps.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -7,6 +8,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.client.corps.service.ICorpsBankService;
+import org.springblade.client.entity.CorpsAttn;
 import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.vo.CorpsBankVO;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -17,6 +19,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 客户银行 控制器
@@ -66,6 +69,18 @@ public class CorpsBankController extends BladeController {
 	}
 
 	/**
+	 * 根据客户id查询list
+	 */
+	@GetMapping("/list/{id}")
+	public R<CorpsBank> getById(@PathVariable("id") Long id) {
+		List<CorpsBank> list = corpsBankService.list(new QueryWrapper<CorpsBank>().eq("pid", id).eq("is_deleted", 0).eq("status", 0));
+		if (!list.isEmpty()) {
+			return R.data(list.get(0));
+		}
+		return null;
+	}
+
+	/**
 	 * 新增 客户银行
 	 */
 	@PostMapping("/save")

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderMapper.xml

@@ -99,7 +99,8 @@
             t2.remarks
             ELSE
             t1.remarks
-            END) as remarks
+            END) as remarks,
+            t9.name as pickUpGoodsUserName
         from land_order t1
                  left join land_order_item t2 on t1.id = t2.order_id
                  left join basic_corps_desc t3 on t1.corp_id = t3.id
@@ -108,6 +109,7 @@
                  left join blade_user t5 on t1.salesman = t5.id
                  left join blade_dept t6 on t1.dispatch_dept = t6.id
                  left join blade_user t7 on t1.dispatcher = t7.id
+                 left join blade_user t9 on t1.pick_up_goods_user_id = t9.id
         <where>
             t1.tenant_id = #{acct.tenantId}
             and t1.is_deleted = 0
@@ -116,6 +118,7 @@
             <if test="acct.corpName != null and acct.corpName != ''">and t3.cname like concat('%', #{acct.corpName}, '%')</if>
             <if test="acct.corpId != null and acct.corpId != ''">and t1.corp_id like concat('%', #{acct.corpId}, '%')</if>
             <if test="acct.salesmanName != null and acct.salesmanName != ''">and t5.name like concat('%', #{acct.salesmanName}, '%')</if>
+            <if test="acct.pickUpGoodsUserName != null and acct.pickUpGoodsUserName != ''">and t9.name like concat('%', #{acct.pickUpGoodsUserName}, '%')</if>
             <if test="acct.corpShortName != null and acct.corpShortName != ''">and t3.short_name like concat('%', #{acct.corpShortName}, '%')</if>
             <if test="acct.station != null and acct.station != '' and acct.shippingMode != '散货'">and t1.station like concat('%', #{acct.station}, '%')</if>
             <if test="acct.fleetId != null and acct.fleetId != '' and acct.shippingMode != '散货'">and t2.fleet_id = #{acct.fleetId}</if>

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

@@ -53,6 +53,7 @@ import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springblade.system.user.feign.IUserSearchClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -240,6 +241,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 				return new Page<>();
 			}
 		}
+		List<User> userList = null;
+		if (order.getPickUpGoodsUserName() != null && !"".equals(order.getPickUpGoodsUserName())) {
+			userList = userClient.selectUserByName(order.getPickUpGoodsUserName());
+		}
 
 		orderQueryWrapper.in(CollectionUtil.isNotEmpty(orderIdList), LandOrder::getId, orderIdList)
 			.eq(ObjectUtil.isNotEmpty(order.getCorpId()), LandOrder::getCorpId, order.getCorpId())
@@ -261,6 +266,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 			.eq(ObjectUtils.isNotNull(order.getShippingMode()), LandOrder::getShippingMode, order.getShippingMode())
 			.orderByDesc(LandOrder::getArrivalTime);
 
+
+
 		if (order.getKind() == 2) {
 			orderQueryWrapper.ne(LandOrder::getStatus, 0);
 		}
@@ -272,12 +279,19 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 			}
 		}
 
+		if (userList != null && !userList.isEmpty()) {
+
+			List<Long> idLIst = userList.stream().map(User::getId).collect(Collectors.toList());
+				orderQueryWrapper.in(LandOrder::getPickUpGoodsUserId, idLIst);
+		}
+
 		IPage<LandOrder> pages = baseMapper.selectPage(Condition.getPage(query), orderQueryWrapper);
 		String corpIds = "";//客户
 		String createUserIds = "";//创建人
 		String salesmanIds = "";//业务员
 		String dispatcherIds = "";//调度员
 		String dispatchDeptIds = "";//调度部门
+		String pickUpGoodsUserIds = "";//揽货员
 		for (LandOrder orderOne : pages.getRecords()) {
 			if (ObjectUtil.isNotEmpty(orderOne.getCorpId())) {
 				corpIds = corpIds + orderOne.getCorpId() + ",";
@@ -294,12 +308,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 			if (ObjectUtil.isNotEmpty(orderOne.getDispatchDept())) {
 				dispatchDeptIds = dispatchDeptIds + orderOne.getDispatchDept() + ",";
 			}
+			if (ObjectUtil.isNotEmpty(orderOne.getPickUpGoodsUserId())) {
+				pickUpGoodsUserIds = pickUpGoodsUserIds + orderOne.getPickUpGoodsUserId() + ",";
+			}
 		}
 		List<CorpsDesc> corpsList = corpsDescClient.selectByCorpIds(corpIds);
 		List<User> createUserList = userClient.selectUserIds(createUserIds);
 		List<User> salesmanList = userClient.selectUserIds(salesmanIds);
 		List<User> dispatcherList = userClient.selectUserIds(dispatcherIds);
 		R<List<Dept>> dispatchDeptList = sysClient.selectByDeptIds(dispatchDeptIds);
+		List<User> pickUpGoodsUserList = userClient.selectUserIds(pickUpGoodsUserIds);
 		pages.getRecords().forEach(record -> {
 			if (!ObjectUtil.isEmpty(record.getCorpId())) {
 				if (ObjectUtil.isNotEmpty(corpsList)) {
@@ -328,6 +346,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 					record.setDispatchDeptName(dispatchDeptList.getData().stream().filter(e -> e.getId().equals(record.getDispatchDept())).findFirst().orElse(new Dept()).getDeptName());
 				}
 			}
+			if (!ObjectUtil.isEmpty(record.getPickUpGoodsUserId())) {
+				if (ObjectUtil.isNotEmpty(pickUpGoodsUserList)) {
+					record.setPickUpGoodsUserName(pickUpGoodsUserList.stream().filter(e -> e.getId().equals(record.getPickUpGoodsUserId())).findFirst().orElse(new User()).getName());
+				}
+			}
 
 			// 列表箱量显示处理
 			if (record.getStatus() == 0) {
@@ -1686,10 +1709,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 					if (feesMessage.isSuccess() && feesMessage.getData() != null) {
 						fee.setFeeName(feesMessage.getData().getCname());
 					}
-
+					CorpsDesc corp = corpsDescClient.getCorpId(fee.getCorpId());
 					if (fee.getType() == 1) {
+						if (corp != null) {
+							extraAmountItemD.append("客户名称").append("：").append(corp.getCname()).append(" >>>> ");
+						}
 						extraAmountItemD.append(fee.getFeeName()).append("：").append(fee.getAmount()).append("\n");
 					} else {
+						if (corp != null) {
+							extraAmountItemC.append("车队名称").append("：").append(corp.getCname()).append(" >>>> ");
+						}
 						extraAmountItemC.append(fee.getFeeName()).append("：").append(fee.getAmount()).append("\n");
 					}
 				}

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

@@ -17,6 +17,7 @@
 package org.springblade.system.user.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
@@ -86,6 +87,14 @@ public class UserClient implements IUserClient {
 	}
 
 	@Override
+	@GetMapping(USER_BY_NAME)
+	public List<User> selectUserByName(String name) {
+		LambdaQueryWrapper<User> qw = new LambdaQueryWrapper<>();
+		qw.like(User::getRealName, name).eq(User::getIsDeleted, 0);
+		return service.list(qw);
+	}
+
+	@Override
 	@GetMapping(USER_INFO_BY_NAME)
 	public List<User> userInfoByName(String userName, String tenantId) {
 		LambdaQueryWrapper<User> userLambdaQueryWrapper = new LambdaQueryWrapper<>();