1、文创好物订单详情修改

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java

@@ -46,6 +46,7 @@ import org.jeecg.modules.travelVolunteer.entity.TravelVolunteer;
 import org.jeecg.modules.travelVolunteer.service.ITravelVolunteerService;
 import org.jeecg.modules.travelWares.entity.TravelWares;
 import org.jeecg.modules.travelWares.service.ITravelWaresService;
+import org.jeecg.modules.travelWares.service.impl.TravelWaresServiceImpl;
 import org.jeecg.modules.travelWaresOrder.entity.TravelWaresOrder;
 import org.jeecg.modules.travelWaresOrder.service.ITravelWaresOrderService;
 import org.springframework.stereotype.Service;
@@ -1227,7 +1228,7 @@ public class IndexApiServiceImpl implements IndexApiService {
         int listCount = waresOrderApiBeans.size();
         if(listCount < 1){
             //没有数据
-            Result.OK("没有订单，请先去创建订单！", pageList);
+            return Result.OK("没有订单，请先去创建订单！", pageList);
         }
         //总页数
         int pageCount = listCount%pageSize==0?listCount/pageSize:listCount/pageSize+1;
@@ -1256,12 +1257,22 @@ public class IndexApiServiceImpl implements IndexApiService {
     public Result<?> queryWaresOrderById(String token, String waresOrderId) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
-        TravelWares one = travelWaresService
+        TravelWaresOrder waresOrder = travelWaresOrderService
                 .lambdaQuery()
-                .eq(TravelWares::getId, waresOrderId)
+                .eq(TravelWaresOrder::getId, waresOrderId)
                 .one();
 
-        return Result.OK("文创好物详情", one);
+        TravelWares wares = travelWaresService
+                .lambdaQuery()
+                .eq(TravelWares::getId, waresOrder.getWaresId())
+                .one();
+
+        WaresOrderApiBean waresOrderApiBean = new WaresOrderApiBean();
+        waresOrderApiBean.setTravelWares(wares);
+        waresOrderApiBean.setTravelWaresOrder(waresOrder);
+
+
+        return Result.OK("文创好物订单详情", waresOrderApiBean);
     }
 
     //创建文创好物订单