Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -351,6 +351,8 @@ public class BaseOrderController extends CommonBaseController {
                 "6--已完成")
         private Integer status;
 
+        private String multiStatus;
+
         @ApiModelProperty(value = "是否有使用会员权益")
         private Integer hasMemberRight;
 

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -62,6 +62,14 @@
             <if test="hasMemberRight != null">
                 and has_member_right = #{hasMemberRight}
             </if>
+            <if test="multiStatus != null">
+                and
+                (
+                <foreach collection="multiStatus.split(',')" index="sIndex" item="statusEntity" separator=" or ">
+                     status = #{statusEntity}
+                </foreach>
+                )
+            </if>
         </where>
         order by crt_time desc
     </select>