预订单详情加字段

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/QueryOrderFormDetailRes.java

@@ -46,6 +46,15 @@ public class QueryOrderFormDetailRes implements Serializable {
     @ApiModelProperty("描述")
     private String description;
 
+    @ApiModelProperty("状态 1-已创建 2-已绑定")
+    private Integer type;
+
+    @ApiModelProperty("啤酒厂名称")
+    private String factoryBeerName;
+
+    @Schema(name = "sap订单号")
+    private String sapOrderNo;
+
     @ApiModelProperty("关联码包列表")
     List<QueryPackageDetailBean> queryPackageDetailBean;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageBookingOrderServiceImpl.java

@@ -18,7 +18,9 @@ import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.utils.PojoConverterUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.sun.xml.internal.bind.v2.TODO;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -110,15 +112,36 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
         //关联码包信息
         List<QueryOrderFormDetailVO> queryQueryOrderFormDetailVO= qrPackageBookingOrderMapper.queryOrderFormDetail(queryOrderFormDetailReq);
 
+        //查询关联的码包信息
+        QueryWrapper<QrPackage> qrPackageQw = new QueryWrapper<>();
+        qrPackageQw.eq("booking_order",qrPackageBookingOrder.getBookingOrder());
+        qrPackageQw.eq("is_delete",0);
+        List<QrPackage> qrPackageList = qrPackageMapper.selectList(qrPackageQw);
+        //状态 1-已创建 2-已绑定
+        int type = CollectionUtil.isNotEmpty(qrPackageList)? 2 : 1;
+        //如果绑定了sap单号再额外查询啤酒厂名称
+        String factoryBeerName = "";
+        if(CollectionUtil.isNotEmpty(qrPackageList)){
+            QrPackage qrPackage = qrPackageList.get(0);
+            if(StringUtils.isNotBlank(qrPackage.getSapOrderNo())){
+                BaseFactory beerFactory = baseFactoryMapper.selectById(qrPackage.getFactoryBeerId());
+                factoryBeerName = beerFactory.getFactoryName();
+            }
+        }
+
         // 封装出参
         QueryOrderFormDetailRes orderFormDetailRes = PojoConverterUtils.copy(qrPackageBookingOrder, QueryOrderFormDetailRes.class);
         if(!ObjectUtils.isEmpty(queryQueryOrderFormDetailVO)){
             List<QueryOrderFormDetailRes.QueryPackageDetailBean> queryOrderFormDetailBeans = PojoConverterUtils.copyList(queryQueryOrderFormDetailVO, QueryOrderFormDetailRes.QueryPackageDetailBean.class);
             orderFormDetailRes.setQueryPackageDetailBean(queryOrderFormDetailBeans);
         }
+        //包材厂
         if(!ObjectUtils.isEmpty(baseFactory)){
             orderFormDetailRes.setFactoryCoverName(baseFactory.getFactoryName());
         }
+        //啤酒厂和状态
+        orderFormDetailRes.setType(type);
+        orderFormDetailRes.setFactoryBeerName(factoryBeerName);
 
         return orderFormDetailRes;
     }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrBoxMappingMapper.xml

@@ -78,7 +78,8 @@
                 AND package_id = #{req.packageId}
             </if>
             <if test="req.qrIndex != null and req.qrIndex != '' ">
-                AND index_begin &lt;= #{req.qrIndex} AND index_end >= #{req.qrIndex}
+                AND index_end >= #{req.qrIndex}
+                AND index_begin &lt;= #{req.qrIndex}
             </if>
         </where>
         AND is_delete = 0