修改bug

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/ProductOrderController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.core.domain.R;
 import com.ylx.common.core.domain.model.WxLoginUser;
+import com.ylx.common.utils.SecurityUtils;
 import com.ylx.massage.domain.ProductOrderInfo;
 import com.ylx.massage.domain.dto.*;
 import com.ylx.massage.domain.vo.*;
@@ -85,13 +86,15 @@ public class ProductOrderController extends BaseController {
     /**
      * 查询商品订单详情
      *
-     * @param openId  用户openId
      * @param orderNo 订单编号
      * @return R<ProductOrderDetailResponse> 订单详情
      */
     @GetMapping("/detail")
-    public R<ProductOrderDetailResponse> getProductOrderDetail(@RequestParam("openId") String openId, @RequestParam("orderNo") String orderNo) {
+    public R<ProductOrderDetailResponse> getProductOrderDetail(@RequestParam("orderNo") String orderNo) {
         try {
+            // 当前登录用户信息
+            WxLoginUser wxLoginUser = SecurityUtils.getWxLoginUser();
+            String openId = wxLoginUser.getCOpenid();
             log.info("查询商品订单详情，openId：{}，订单编号：{}", openId, orderNo);
             ProductOrderDetailResponse detail = productOrderInfoService.getProductOrderDetail(orderNo, openId);
             return R.ok(detail);

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/ProductInfoVo.java

@@ -42,4 +42,9 @@ public class ProductInfoVo implements Serializable {
      * 商品的服务承诺
      */
     private List<String> servicePromise;
+
+    /**
+     * 承诺发货时间
+     */
+    private String deliveryTime;
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/ProductOrderInfoServiceImpl.java

@@ -420,6 +420,7 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
             productInfo.setPaymentType(product.getPaymentType());
         }
         productInfo.setServicePromise(product.getServicePromise());
+        productInfo.setDeliveryTime(product.getDeliveryTime());
         return productInfo;
     }