Merge branch 'dev' into pre-production

blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java

@@ -20,7 +20,7 @@ public class RedisKeyConstant {
 
 	public static final String BASIC_DATA_WAREHOUSE_LIST_KEY ="cache:basic-data-warehouse-list:";
 	public static final String USER_NAME_PHONE_KEY ="cache:user:id:";
-
+	public static final String FINAL_CLIENT_CODE ="final:client:code:";
 
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java

@@ -108,70 +108,6 @@ public class BasicdataClientController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicdataClient")
 	public R<IPage<BasicdataClientVO>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataClient, Query query) {
-
-		Object o = basicdataClient.get("contractStartTime");
-		Object o1 = basicdataClient.get("contractEntTime");
-		Object o2 = basicdataClient.get("pid");
-		basicdataClient.put("contractStartTime", null);
-		basicdataClient.put("contractEntTime", null);
-		QueryWrapper<BasicdataClientEntity> queryWrapper = Condition.getQueryWrapper(basicdataClient, BasicdataClientEntity.class);
-/*		queryWrapper.apply(o != null,
-				"date_format (contract_start_time,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", o)
-			.apply(o1 != null,
-				"date_format (contract_ent_time,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", o1);*/
-		if (ObjectUtils.isNotNull(o)) {
-			queryWrapper.between("contract_start_time", o, o1);
-
-		}
-		if (ObjectUtils.isNotNull(o2)) {
-			queryWrapper.eq("pid", o2);
-		} else {
-			queryWrapper.eq("pid", "0");
-		}
-		queryWrapper.orderByDesc("create_time");
-		IPage<BasicdataClientEntity> pages = basicdataClientService.page(Condition.getPage(query), queryWrapper);
-		pages.getRecords().forEach(i -> {
-			List<BasicdataStoreBusinessEntity> list = basicdataStoreBusinessService.list(Wrappers.<BasicdataStoreBusinessEntity>query().lambda()
-				.eq(BasicdataStoreBusinessEntity::getClientId, i.getId()));
-			i.setTypeServiceBusiness(list);
-			//查询客户绑定第一位联系人
-			List<BasicdataStoreContactEntity> listed = basicdataStoreContactService.list(Wrappers.<BasicdataStoreContactEntity>query().lambda()
-				.eq(BasicdataStoreContactEntity::getShopId, i.getId())
-				.eq(BasicdataStoreContactEntity::getDefaultType, true));
-			if (Func.isNotEmpty(listed)) {
-				List<BasicdataStoreContactEntity> collect = listed.stream().filter(f -> Func.isEmpty(f.getCreateTime())).collect(Collectors.toList());
-				if (Func.isNotEmpty(collect)){
-					System.out.println("客户无创建时间"+collect);
-				}
-				String string = listed.stream().sorted(Comparator.comparing(BasicdataStoreContactEntity::getCreateTime)).findFirst().map(BasicdataStoreContactEntity::getLinkman).get();
-				String phone = listed.stream().sorted(Comparator.comparing(BasicdataStoreContactEntity::getCreateTime)).findFirst().map(BasicdataStoreContactEntity::getPhone).get();
-				i.setLinkman(string);
-				i.setPhone(phone);
-			}
-			List<String> collect = list.stream().filter(f -> Func.isNotEmpty(f.getMold())).map(BasicdataStoreBusinessEntity::getMold).collect(Collectors.toList());
-			if (collect.size() > 0) {
-				//进行
-				String s = collect.get(0);
-				switch (s) {
-					case "1":
-						i.setTypeServiceName("商配");
-						break;
-					case "2":
-						i.setTypeServiceName("市配");
-						break;
-					case "3":
-						i.setTypeServiceName("自提");
-						break;
-					case "4":
-						i.setTypeServiceName("三方中转");
-						break;
-				}
-			}
-			//处理客户的配送类型
-		});
-
-
-
 		IPage<BasicdataClientVO> basicdataClientVOIPage = basicdataClientService.pageList(Condition.getPage(query), basicdataClient);
 		if (!basicdataClientVOIPage.getRecords().isEmpty()) {
 			for (BasicdataClientVO record : basicdataClientVOIPage.getRecords()) {
@@ -194,6 +130,18 @@ public class BasicdataClientController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 查询最后一位客户编码
+	 * @return
+	 */
+	@GetMapping("/getFinallyClientCode")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "查询最后一位客户编码", notes = "传入basicdataClient")
+	public R<String> getFinallyClientCode() {
+		String code = basicdataClientService.getFinallyClientCode();
+		return R.data(code);
+	}
+
 	/**
 	 * 基础客户表查询
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java

@@ -71,4 +71,10 @@ public interface BasicdataClientMapper extends BaseMapper<BasicdataClientEntity>
 	 */
     IPage<BasicdataClientVO> pageList(IPage<BasicdataClientVO> page,@Param("param") Map<String, Object> basicdataClient);
 
+	/**
+	 * 查询规则生成的客户编码列表
+	 * @return
+	 */
+    List<String> getFinallyClientCode();
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml

@@ -117,6 +117,7 @@
         WHEN 4 THEN '三方中转'
         END typeServiceName,
         lbhc.file_name,
+        lbhc.lease_accessories,
         DATE_FORMAT(lbc.contract_start_time, '%Y-%m-%d') AS contractStartTime,
         DATE_FORMAT(lbc.contract_ent_time, '%Y-%m-%d') AS contractEntTime,
         t.aaa AS brandName
@@ -170,5 +171,8 @@
         lbc.create_time
         DESC
     </select>
+    <select id="getFinallyClientCode" resultType="java.lang.String">
+        SELECT client_code FROM `logpm_basicdata_client` WHERE is_deleted = 0 AND client_code LIKE 'HT%' AND LENGTH(client_code) = 9 ORDER BY client_code DESC
+    </select>
 
 </mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java

@@ -111,4 +111,10 @@ public interface IBasicdataClientService extends BaseService<BasicdataClientEnti
 	 */
 	IPage<BasicdataClientVO> pageList(IPage<BasicdataClientVO> page, Map<String, Object> basicdataClient);
 
+	/**
+	 * 查询客户编码
+	 * @return
+	 */
+	String getFinallyClientCode();
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -50,9 +50,11 @@ import com.logpm.basicdata.vo.BasicdataClientVO;
 import com.logpm.basicdata.vo.ClientInfoVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
+import org.springblade.common.constant.RedisKeyConstant;
 import org.springblade.common.model.dto.NameDTO;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -102,6 +104,9 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 	@Autowired
 	private IUserClient userClient;
 
+	@Autowired
+	private BladeRedis redis;
+
 	@Override
 	public IPage<BasicdataClientVO> selectBasicdataClientPage(IPage<BasicdataClientVO> page, BasicdataClientVO basicdataClient) {
 		return page.setRecords(baseMapper.selectBasicdataClientPage(page, basicdataClient));
@@ -238,6 +243,17 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 			return false;
 		}
 		if (ObjectUtils.isNotNull(basicdataClient.getLeaseAccessories())) {
+			//查询原历史合同和当前合同是否发生变更  发生变更才会进行保存
+			List<BasicdataHistoricalContractEntity> list = basicdataHistoricalContractService.list(Wrappers.<BasicdataHistoricalContractEntity>query().lambda()
+				.eq(BasicdataHistoricalContractEntity::getClientId, basicdataClient.getId())
+			);
+			boolean flag;
+			if (list.isEmpty()) {
+				flag = true;
+			} else {
+				flag = list.stream().anyMatch(f -> !f.getLeaseAccessories().equals(basicdataClient.getLeaseAccessories()));
+			}
+			if (flag) {
 				//添加历史合同
 				BasicdataHistoricalContractEntity basicdataHistoricalContract = new BasicdataHistoricalContractEntity();
 				basicdataHistoricalContract.setClientId(basicdataClient.getId().toString());
@@ -246,6 +262,8 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 				basicdataHistoricalContract.setLeaseAccessories(basicdataClient.getLeaseAccessories());
 				basicdataHistoricalContract.setFileName(basicdataClient.getFileName());
 				basicdataHistoricalContractService.save(basicdataHistoricalContract);
+				basicdataHistoricalContractService.removeBatchByIds(list);
+			}
 		}
 
 		return true;
@@ -650,5 +668,18 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 		return baseMapper.pageList(page, basicdataClient);
 	}
 
+	@Override
+	public String getFinallyClientCode() {
+		String finaClientCode = redis.get(RedisKeyConstant.FINAL_CLIENT_CODE + AuthUtil.getTenantId());
+		if (StringUtils.isBlank(finaClientCode)) {
+			List<String> str = baseMapper.getFinallyClientCode();
+			finaClientCode = str.get(0);
+			redis.set(RedisKeyConstant.FINAL_CLIENT_CODE + AuthUtil.getTenantId(), finaClientCode);
+		}
+		String num = finaClientCode.replaceAll("HT", "");
+		int anInt = Integer.parseInt(num) + 1;
+		return "HT" + anInt;
+	}
+
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -858,7 +858,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						log.info("#########!!!!!!!!!!!!!!!!!---------    55555555555 distrilbutionloadingscanDTO={}", distrilbutionloadingscanDTO);
 						if (Func.isNotEmpty(distrilbutionloadingscanDTO.getReservationId())) {
 							//存在客户  这里就是针对客户进行的整托装车
-//							List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId());
 							Map<Long, DistributionParcelListEntity> parcelListEntityMap = parcelListEntityList.stream().collect(Collectors.toMap(DistributionParcelListEntity::getId, Function.identity(), (k1, k2) -> k2));
 							boolean reservationFlag = parcelListEntities.stream().allMatch(p -> Func.isNotEmpty(parcelListEntityMap.get(p.getId())));
 							log.info("#########!!!!!!!!!!!!!!!!!---------    6666666666 reservationFlag={}", reservationFlag);

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/DeliveryNoteServiceImpl.java

@@ -53,6 +53,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 	@Override
 	@LogpmAsync("asyncExecutor")
 	public void buildAdvance(DeliveryNoteVO vo) {
+		log.info("林氏新系统生成暂存单：{}", JSONUtil.toJsonStr(vo));
 		// 新起线程构建暂存单发送mq
 		Long startWarehouseId = null;
 		String startWarehouseName = null;
@@ -134,7 +135,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceDetailEntity.setOrderPackageCode(orderPackageDTO.getBarcode());
 			advanceDetailEntity.setTrainNumber(StrUtil.replace(DateUtil.today(), "-", ""));
 			advanceDetailEntity.setServiceNum(vo.getCustomizedBillCode());
-			advanceDetailEntity.setWaybillNo("");
+//			advanceDetailEntity.setWaybillNo("");
 			advanceDetailEntity.setPackageStatus("0");
 			advanceDetailEntity.setWeight(StrUtil.isNotBlank(orderPackageDTO.getWeight()) ? new BigDecimal(orderPackageDTO.getWeight()) : BigDecimal.ZERO);
 			advanceDetailEntity.setVolume(StrUtil.isNotBlank(orderPackageDTO.getVolume()) ? new BigDecimal(orderPackageDTO.getVolume()) : BigDecimal.ZERO);