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

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/product/impl/ProductPriceServiceImpl.java

@@ -552,6 +552,8 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
         dbItem.setValidateStartDate(productPrice.getValidateStartDate());
         dbItem.setValidateEndDate(productPrice.getValidateEndDate());
 
+        dbItem.setNeedOrderInquiry(productPrice.getNeedOrderInquiry());
+
         dbItem.setNeedBook(productPrice.getNeedBook());
         dbItem.setDayLimit(productPrice.getDayLimit());
         dbItem.setContainerLocation(productPrice.getContainerLocation());

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -1674,6 +1674,15 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
                     templateParams.put("marks", marks);
                     switch (smsSceneEnum) {
                         case SHIPMENT_CABINET:
+                            BoxCabinetDO boxCabinetDO = boxCabinetService.getByShipmentId(boxDO.getId());
+                            if (Objects.nonNull(boxCabinetDO) && Objects.nonNull(boxCabinetDO.getLdBoxTime())) {
+                                DateTime ldBoxTime = DateTime.of(boxCabinetDO.getLdBoxTime());
+                                // 这里需要重置时间参数，这里的时间参数为填写的实际装柜时间
+                                templateParams.put("date", DateUtils.formatDateTime(ldBoxTime));
+                                templateParams.put("year", ldBoxTime.year());
+                                templateParams.put("month", ldBoxTime.month() + 1);
+                                templateParams.put("day", ldBoxTime.dayOfMonth());
+                            }
                             // 装柜通知
                             if (orderNoList.size() > 1) {
                                 templateCode = SmsSceneEnum.SHIPMENT_CABINETS.getTemplateCode();