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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/workorder/OrderBaseVO.java

@@ -19,4 +19,8 @@ public class OrderBaseVO extends PgOrderBase {
 
     private boolean needSlave = false;
 
+
+    @ApiModelProperty(value="网点属性")
+    private String attr ;
+
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/workorder/PgOrderBaseDetailVO.java

@@ -25,4 +25,7 @@ public class PgOrderBaseDetailVO extends PgOrderBase {
 
     @ApiModelProperty("是否需要小工")
     private boolean needSlave = false;
+
+    @ApiModelProperty("网点属性")
+    private String attr  ;
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -246,7 +246,6 @@ public class OrderBaseLogic {
                 .or(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"))
                                 .eq(CollectionUtils.isNotEmpty(orderStatusList) && orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,false)
                 )
-                .in(CollectionUtils.isNotEmpty(orderStatusList) && !orderStatusList.contains("DJD"),PgOrderBase::getIsMeet,true)
                 .eq(StringUtils.equals(orderStatus, OrderBaseStatusEnum.YCD.getKey()),PgOrderBase::getIsException,true)
                 .between(!StringUtils.equals(orderStatus, OrderBaseStatusEnum.YWG.getKey())
                         && StringUtils.isNoneBlank(startTime, endTime) && (byDay == null || byDay != 3), PgOrderBase::getDispatchTime, startTime, endTime)
@@ -297,6 +296,8 @@ public class OrderBaseLogic {
                 orderBaseVO.setAddress(orderBaseVO.getProvince()+orderBaseVO.getCity()+orderBaseVO.getArea()+orderBaseVO.getStreet()+"****");
             }
             final String attr = adminWebsitMap.get(orderBaseVO.getWebsitId());
+
+            orderBaseVO.setAttr(attr);
             if (StringUtils.isNotBlank(attr)
                     && attr.equals(WebsitAttrEnum.SELF.getKey())
                     && "安装, 拆移机".contains(orderBaseVO.getOrderSmallTypeText())) {
@@ -398,6 +399,8 @@ public class OrderBaseLogic {
 
         final AdminWebsit adminWebsit = adminWebsitService.getById(pgOrderBase.getWebsitId());
         if (Objects.nonNull(adminWebsit)) {
+            pgOrderBaseDetailVO.setAttr(adminWebsit.getAttr());
+
             if (adminWebsit.getAttr().equals(WebsitAttrEnum.SELF.getKey())
                     && "安装, 拆移机".contains(pgOrderBase.getOrderSmallTypeText())) {
                 pgOrderBaseDetailVO.setNeedSlave(true);