Merge remote-tracking branch 'origin/dev' into dev

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

@@ -14,65 +14,65 @@ public interface ModuleNameConstant {
 	/**
 	 * 工厂对接服务名称
 	 */
-	String APPLICATION_FACTORY_NAME = "logpm-factory"+DEVAUTH;
+	String APPLICATION_FACTORY_NAME = "logpm-factory" + DEVAUTH;
 
 	/**
 	 * 工厂对接服务名称
 	 */
-	String APPLICATION_OLDPROJECT_NAME = "logpm-old-project"+DEVAUTH;
+	String APPLICATION_OLDPROJECT_NAME = "logpm-old-project" + DEVAUTH;
 
 	/**
 	 * 基础信息服务名称
 	 */
-	String APPLICATION_BASIC_NAME = "logpm-basic"+DEVAUTH;
+	String APPLICATION_BASIC_NAME = "logpm-basic" + DEVAUTH;
 
 	/**
 	 * 基础信息data服务名称
 	 */
-	String APPLICATION_BASICDATA_NAME = "logpm-basicdata"+DEVAUTH;
+	String APPLICATION_BASICDATA_NAME = "logpm-basicdata" + DEVAUTH;
 
 
 	/**
 	 * 干线服务名称
 	 */
-	String APPLICATION_TRUNKLINE_NAME = "logpm-trunkline"+DEVAUTH;
+	String APPLICATION_TRUNKLINE_NAME = "logpm-trunkline" + DEVAUTH;
 
 	/**
 	 * 售后服务名称
 	 */
-	String APPLICATION_AFTERSALES_NAME = "logpm-aftersales"+DEVAUTH;
+	String APPLICATION_AFTERSALES_NAME = "logpm-aftersales" + DEVAUTH;
 
-	String APPLICATION_XXLJOB_NAME = "blade-xxljob"+DEVAUTH;
+	String APPLICATION_XXLJOB_NAME = "blade-xxljob" + DEVAUTH;
 
 
 	/**
 	 * 仓库服务名称
 	 */
-	String APPLICATION_WAREHOUSE_NAME = "logpm-warehouse"+DEVAUTH;
+	String APPLICATION_WAREHOUSE_NAME = "logpm-warehouse" + DEVAUTH;
 	/**
 	 * 仓库服务名称
 	 */
-	String APPLICATION_WEBSTOCKET_NAME = "logpm-webstocket"+DEVAUTH;
+	String APPLICATION_WEBSTOCKET_NAME = "logpm-webstocket" + DEVAUTH;
 
 	/**
 	 * 配送签收服务名称
 	 */
-	String APPLICATION_DISTRIBUTION_NAME = "logpm-distribution"+DEVAUTH;
+	String APPLICATION_DISTRIBUTION_NAME = "logpm-distribution" + DEVAUTH;
 
 	/**
 	 * 网关
 	 */
-	String APPLICATION_GATEWAY_NAME = "blade-gateway"+DEVAUTH;
+	String APPLICATION_GATEWAY_NAME = "blade-gateway" + DEVAUTH;
 
 	/**
 	 * 补丁服务名称
 	 */
-	String APPLICATION_PATCH_NAME = "logpm-patch"+DEVAUTH;
+	String APPLICATION_PATCH_NAME = "logpm-patch" + DEVAUTH;
 
 	/**
 	 * 督察模块
 	 */
-	String APPLICATION_SUPERVISE_NAME = "logpm-supervise"+DEVAUTH;
+	String APPLICATION_SUPERVISE_NAME = "logpm-supervise" + DEVAUTH;
 
 	/**
 	 * 报表模块

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/FullVehicleTypeEnums.java

@@ -11,8 +11,8 @@ import org.springblade.common.model.IDict;
 public enum FullVehicleTypeEnums implements IDict<Integer> {
 
 	PICK_UP(1, "提货整车"),
-	TRUNK_LINE(2, "配送干线整车"),
-	DISPATCH(4, "整车"),
+	TRUNK_LINE(2, "干线整车"),
+	DISPATCH(4, "配送整车"),
 	;
 
 	FullVehicleTypeEnums(Integer code, String text) {

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

@@ -147,7 +147,7 @@ public class BasicdataPriceRouteServiceImpl extends BaseServiceImpl<BasicdataPri
 		// 最低计费
 		if (ObjectUtil.isNotEmpty(vo.getMinCost())) {
 			List<BasicdataPriceGeneralEntity> priceGeneralEntities = new ArrayList<>();
-			biuldGeneral(route.getId(), generalServiceTypeEnums.getCode(), vo.getMinCost(), vo.getAdditionalCost(), priceGeneralEntities);
+			biuldGeneral(route, generalServiceTypeEnums.getCode(), vo.getMinCost(), vo.getAdditionalCost(), priceGeneralEntities);
 			generalService.saveOrUpdateBatch(priceGeneralEntities);
 		}
 		return route.getId();
@@ -263,16 +263,16 @@ public class BasicdataPriceRouteServiceImpl extends BaseServiceImpl<BasicdataPri
 		}
 	}
 
-	private void biuldGeneral(Long priceId, Integer code, Double minCost, Double additionalCost, List<BasicdataPriceGeneralEntity> generalList) {
+	private void biuldGeneral(BasicdataPriceRouteEntity routeEntity, Integer code, Double minCost, Double additionalCost, List<BasicdataPriceGeneralEntity> generalList) {
 		// 1 最低计费一个价格体系一个服务类型只存在一条
 		BasicdataPriceGeneralEntity generalEntity = generalService.getOne(Wrappers.<BasicdataPriceGeneralEntity>lambdaQuery()
-			.eq(BasicdataPriceGeneralEntity::getBoId, priceId)
+			.eq(BasicdataPriceGeneralEntity::getBoId, routeEntity.getId())
 			.eq(BasicdataPriceGeneralEntity::getServiceType, code)
 		);
 		if (ObjectUtil.isEmpty(generalEntity)) {
 			generalEntity = new BasicdataPriceGeneralEntity();
-			generalEntity.setBoId(priceId);
-			generalEntity.setPriceId(priceId);
+			generalEntity.setBoId(routeEntity.getId());
+			generalEntity.setPriceId(routeEntity.getPriceId());
 			generalEntity.setServiceType(code);
 		}
 		// 设置最低计费和加算价格

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

@@ -307,8 +307,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		if (StrUtil.contains(serviceType, ServiceTypeEnums.PICK_UP.getCode().toString())) {
 			// 提货不按区域计费
 			Integer pickupIsUnifyAreaBill = templateEntity.getPickupIsUnifyAreaBill();
-			if (ObjectUtil.equal(pickupIsUnifyAreaBill, BooleanZeroOneEnums.NO.getCode())) {
-				priceClientVO.setPickup(initPickUp(priceEntity, templateEntity, fullMap.get(1), basicMap.get(1), generalMap.get(1)));
+			if (ObjectUtil.equal(pickupIsUnifyAreaBill, BooleanZeroOneEnums.YES.getCode())) {
+				priceClientVO.setPickup(initPickUp(priceEntity, templateEntity, fullMap.get(FullVehicleTypeEnums.PICK_UP.getCode()), basicMap.get(ServiceTypeEnums.PICK_UP.getCode()), generalMap.get(GeneralServiceTypeEnums.PICK_UP.getCode())));
 			} else {
 				// 按区域计费，查询路径，返回价格
 				List<BasicdataPriceRouteEntity> routeEntities = basicdataPriceRouteService.list(Wrappers.<BasicdataPriceRouteEntity>lambdaQuery()
@@ -336,7 +336,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 			Integer trunklineIsUnifyAreaBill = templateEntity.getTrunklineIsUnifyAreaBill();
 			// 干线不按区域计费
 			if (ObjectUtil.equal(trunklineIsUnifyAreaBill, BooleanZeroOneEnums.NO.getCode())) {
-				priceClientVO.setTrunkLine(initTrunkLine(priceEntity, templateEntity, fullMap.get(2), basicMap.get(3), generalMap.get(3)));
+				priceClientVO.setTrunkLine(initTrunkLine(priceEntity, templateEntity, fullMap.get(FullVehicleTypeEnums.TRUNK_LINE.getCode()),
+					basicMap.get(ServiceTypeEnums.TRUNK_LINE.getCode()), generalMap.get(GeneralServiceTypeEnums.TRUNK_LINE.getCode())));
 			} else {
 				// 按区域计费，查询路径，返回价格
 				List<BasicdataPriceRouteEntity> routeEntities = basicdataPriceRouteService.list(Wrappers.<BasicdataPriceRouteEntity>lambdaQuery()
@@ -365,7 +366,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		}
 		// 配送费
 		if (StrUtil.contains(serviceType, ServiceTypeEnums.DISPATCH.getCode().toString())) {
-			priceClientVO.setDispatch(initDispatch(priceEntity, templateEntity, fullMap.get(3), dispatchMap, generalMap.get(5), generalMap.get(6)));
+			priceClientVO.setDispatch(initDispatch(priceEntity, templateEntity, fullMap.get(FullVehicleTypeEnums.DISPATCH.getCode()),
+				dispatchMap, generalMap.get(GeneralServiceTypeEnums.DISPATCH.getCode()), generalMap.get(GeneralServiceTypeEnums.DISPATCH_LEAVE_BEHIND.getCode())));
 		}
 		priceClientVO.setTemplate(templateEntity);
 		return priceClientVO;
@@ -455,7 +457,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		String dispatchPricingType = templateEntity.getDispatchPricingType();
 		//品类
 		Map<Integer, List<BasicdataPriceCategoryDispatchEntity>> categoryBasicMap = new HashMap<>();
-		List<BasicdataPriceCategoryDispatchEntity> dispatchEntities = dispatchMap.get(1);
+		List<BasicdataPriceCategoryDispatchEntity> dispatchEntities = dispatchMap.get(CostTypeEnums.NOMAL.getCode());
 		if (CollUtil.isNotEmpty(dispatchEntities)) {
 			// 将数据放到categoryBasicMap中
 			dispatchEntities.forEach(item -> {
@@ -560,7 +562,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 			priceDispatchVO.setTonKilometerCost(basicVOList);
 		}
 		//附加费
-		List<BasicdataPriceCategoryDispatchEntity> dispatchEntities1 = dispatchMap.get(2);
+		List<BasicdataPriceCategoryDispatchEntity> dispatchEntities1 = dispatchMap.get(CostTypeEnums.ADD.getCode());
 		if (CollUtil.isNotEmpty(dispatchEntities1)) {
 			List<PriceDispatchAdditionalVO> basicVOList = new ArrayList<>();
 			dispatchEntities1.forEach(item -> {
@@ -592,7 +594,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		PriceWarehouseVO priceWarehouseVO = new PriceWarehouseVO();
 		Integer warehousePricingType = templateEntity.getWarehousePricingType();
 		Map<Integer, List<BasicdataPriceCategoryWarehouseEntity>> categoryBasicMap = new HashMap<>();
-		List<BasicdataPriceCategoryWarehouseEntity> warehouseEntities = warehouseMap.get(1);
+		List<BasicdataPriceCategoryWarehouseEntity> warehouseEntities = warehouseMap.get(CostTypeEnums.NOMAL.getCode());
 		if (CollUtil.isNotEmpty(warehouseEntities)) {
 			warehouseEntities.forEach(item -> {
 				Integer type = item.getType();
@@ -647,7 +649,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 			}
 		}
 		// 附加费
-		List<BasicdataPriceCategoryWarehouseEntity> warehouseEntities1 = warehouseMap.get(2);
+		List<BasicdataPriceCategoryWarehouseEntity> warehouseEntities1 = warehouseMap.get(CostTypeEnums.ADD.getCode());
 		if (CollUtil.isNotEmpty(warehouseEntities1)) {
 			List<PriceWarehouseAdditionalVO> additionalVOS = warehouseEntities1.stream().map(item -> {
 				PriceWarehouseAdditionalVO additionalVO = new PriceWarehouseAdditionalVO();

blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapeer.java

@@ -3,6 +3,7 @@ package com.logpm.datasharing.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.logpm.datasharing.dto.MerchantOrderDTO;
 import com.logpm.datasharing.vo.MerchantPackageVO;
+import com.logpm.datasharing.vo.MerchantZeroDispatchVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -41,4 +42,6 @@ public interface MerchantMapeer extends BaseMapper {
 	 */
 	List<MerchantPackageVO> findPackage(@Param("contractNumber") String contractNumber);
 
+	List<MerchantZeroDispatchVO> findZeroPackage(@Param("contractNumber") String contractNumber);
+
 }

blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/mapper/MerchantMapper.xml

@@ -54,5 +54,30 @@
             group by lddl.id order by null) driver on driver.id = lddl.id
         where t.order_code = #{contractNumber}
     </select>
+    <select id="findZeroPackage" resultType="com.logpm.datasharing.vo.MerchantZeroDispatchVO">
+        select lww.shipper_address,
+               t.waybill_number,
+               lds.received_quantity,
+               ifnull(driver.lname, driver.ltname)   distributionName,
+               ifnull(driver.lphone, driver.ltphone) distributionPhone
+        from logpm_distribution_stock_article t
+                 left join logpm_distribution_reservation_stockarticle ldrs
+                           on ldrs.stock_article_id = t.id and ldrs.stock_article_status != 2
+         left join logpm_distribution_reservation ldr
+        on ldr.id = ldrs.reservation_id and ldr.reservation_status != 40
+            left join logpm_warehouse_waybill lww on lww.waybill_no = t.waybill_number
+            left join logpm_distribution_signfor lds on lds.reservation_id = ldr.id
+            left join logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id
+            left join (select lddl.id,
+            group_concat(ldd.driver_name) lname,
+            group_concat(lddt.driver_name) ltname,
+            group_concat(ldd.driver_phone) lphone,
+            group_concat(lddt.driver_phone) ltphone
+            from logpm_distribution_delivery_list lddl
+            left join logpm_distribution_delivery_self ldd on ldd.delivery_id = lddl.id
+            left join logpm_distribution_delivery_tripartite lddt on lddt.delivery_id = lddl.id
+            group by lddl.id) driver on driver.id = lddl.id
+        where t.order_code = #{contractNumber}
+    </select>
 
 </mapper>