diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java
index 9427729..acc200f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java
@@ -1,17 +1,11 @@
 package com.ruoyi.web.controller.jarvis;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/SuperAdminController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/SuperAdminController.java
index 676de6f..4c76f2f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/SuperAdminController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/SuperAdminController.java
@@ -107,7 +107,7 @@ public class SuperAdminController extends BaseController
         superAdmin.setIsActive(1); // 只查询激活的管理员
         List<SuperAdmin> list = superAdminService.selectSuperAdminList(superAdmin);
         List<Map<String, Object>> optionList = list.stream()
-                .map(item -> {
+                .filter(item -> item.getUnionId() != null ).map(item -> {
                     Map<String, Object> map = new HashMap<>();
                     map.put("label", item.getName());
                     map.put("value", item.getUnionId());
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index f514d3d..5eb8a6a 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -22,7 +22,12 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java
index 520ec3d..2cc5031 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/OrderRows.java
@@ -2,12 +2,15 @@ package com.ruoyi.jarvis.domain;
 
 import java.util.Date;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.springframework.data.annotation.Transient;
 
 /**
  * 京粉订单对象 order_rows
  *
  * @author ruoyi
  */
+@Data
 public class OrderRows extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -84,6 +87,10 @@ public class OrderRows extends BaseEntity
     /** 有效性 */
     private Integer validCode;
 
+    /** 有效性多选值 */
+    @Transient
+    private Integer[] validCodes;
+
     /** 跟踪类型 */
     private Integer traceType;
 
@@ -168,523 +175,4 @@ public class OrderRows extends BaseEntity
     /** 订单标签 */
     private String orderTag;
 
-    public String getId()
-    {
-        return id;
-    }
-
-    public void setId(String id)
-    {
-        this.id = id;
-    }
-
-    public Long getOrderId()
-    {
-        return orderId;
-    }
-
-    public void setOrderId(Long orderId)
-    {
-        this.orderId = orderId;
-    }
-
-    public Long getParentId()
-    {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId)
-    {
-        this.parentId = parentId;
-    }
-
-    public Date getOrderTime()
-    {
-        return orderTime;
-    }
-
-    public void setOrderTime(Date orderTime)
-    {
-        this.orderTime = orderTime;
-    }
-
-    public Date getFinishTime()
-    {
-        return finishTime;
-    }
-
-    public void setFinishTime(Date finishTime)
-    {
-        this.finishTime = finishTime;
-    }
-
-    public Date getModifyTime()
-    {
-        return modifyTime;
-    }
-
-    public void setModifyTime(Date modifyTime)
-    {
-        this.modifyTime = modifyTime;
-    }
-
-    public Integer getOrderEmt()
-    {
-        return orderEmt;
-    }
-
-    public void setOrderEmt(Integer orderEmt)
-    {
-        this.orderEmt = orderEmt;
-    }
-
-    public Integer getPlus()
-    {
-        return plus;
-    }
-
-    public void setPlus(Integer plus)
-    {
-        this.plus = plus;
-    }
-
-    public Long getUnionId()
-    {
-        return unionId;
-    }
-
-    public void setUnionId(Long unionId)
-    {
-        this.unionId = unionId;
-    }
-
-    public Long getSkuId()
-    {
-        return skuId;
-    }
-
-    public void setSkuId(Long skuId)
-    {
-        this.skuId = skuId;
-    }
-
-    public String getSkuName()
-    {
-        return skuName;
-    }
-
-    public void setSkuName(String skuName)
-    {
-        this.skuName = skuName;
-    }
-
-    public Integer getSkuNum()
-    {
-        return skuNum;
-    }
-
-    public void setSkuNum(Integer skuNum)
-    {
-        this.skuNum = skuNum;
-    }
-
-    public Integer getSkuReturnNum()
-    {
-        return skuReturnNum;
-    }
-
-    public void setSkuReturnNum(Integer skuReturnNum)
-    {
-        this.skuReturnNum = skuReturnNum;
-    }
-
-    public Integer getSkuFrozenNum()
-    {
-        return skuFrozenNum;
-    }
-
-    public void setSkuFrozenNum(Integer skuFrozenNum)
-    {
-        this.skuFrozenNum = skuFrozenNum;
-    }
-
-    public Double getPrice()
-    {
-        return price;
-    }
-
-    public void setPrice(Double price)
-    {
-        this.price = price;
-    }
-
-    public Double getCommissionRate()
-    {
-        return commissionRate;
-    }
-
-    public void setCommissionRate(Double commissionRate)
-    {
-        this.commissionRate = commissionRate;
-    }
-
-    public Double getSubSideRate()
-    {
-        return subSideRate;
-    }
-
-    public void setSubSideRate(Double subSideRate)
-    {
-        this.subSideRate = subSideRate;
-    }
-
-    public Double getSubsidyRate()
-    {
-        return subsidyRate;
-    }
-
-    public void setSubsidyRate(Double subsidyRate)
-    {
-        this.subsidyRate = subsidyRate;
-    }
-
-    public Double getFinalRate()
-    {
-        return finalRate;
-    }
-
-    public void setFinalRate(Double finalRate)
-    {
-        this.finalRate = finalRate;
-    }
-
-    public Double getEstimateCosPrice()
-    {
-        return estimateCosPrice;
-    }
-
-    public void setEstimateCosPrice(Double estimateCosPrice)
-    {
-        this.estimateCosPrice = estimateCosPrice;
-    }
-
-    public Double getEstimateFee()
-    {
-        return estimateFee;
-    }
-
-    public void setEstimateFee(Double estimateFee)
-    {
-        this.estimateFee = estimateFee;
-    }
-
-    public Double getActualCosPrice()
-    {
-        return actualCosPrice;
-    }
-
-    public void setActualCosPrice(Double actualCosPrice)
-    {
-        this.actualCosPrice = actualCosPrice;
-    }
-
-    public Double getActualFee()
-    {
-        return actualFee;
-    }
-
-    public void setActualFee(Double actualFee)
-    {
-        this.actualFee = actualFee;
-    }
-
-    public Integer getValidCode()
-    {
-        return validCode;
-    }
-
-    public void setValidCode(Integer validCode)
-    {
-        this.validCode = validCode;
-    }
-
-    public Integer getTraceType()
-    {
-        return traceType;
-    }
-
-    public void setTraceType(Integer traceType)
-    {
-        this.traceType = traceType;
-    }
-
-    public Long getPositionId()
-    {
-        return positionId;
-    }
-
-    public void setPositionId(Long positionId)
-    {
-        this.positionId = positionId;
-    }
-
-    public Long getSiteId()
-    {
-        return siteId;
-    }
-
-    public void setSiteId(Long siteId)
-    {
-        this.siteId = siteId;
-    }
-
-    public String getUnionAlias()
-    {
-        return unionAlias;
-    }
-
-    public void setUnionAlias(String unionAlias)
-    {
-        this.unionAlias = unionAlias;
-    }
-
-    public String getPid()
-    {
-        return pid;
-    }
-
-    public void setPid(String pid)
-    {
-        this.pid = pid;
-    }
-
-    public Long getCid1()
-    {
-        return cid1;
-    }
-
-    public void setCid1(Long cid1)
-    {
-        this.cid1 = cid1;
-    }
-
-    public Long getCid2()
-    {
-        return cid2;
-    }
-
-    public void setCid2(Long cid2)
-    {
-        this.cid2 = cid2;
-    }
-
-    public Long getCid3()
-    {
-        return cid3;
-    }
-
-    public void setCid3(Long cid3)
-    {
-        this.cid3 = cid3;
-    }
-
-    public String getSubUnionId()
-    {
-        return subUnionId;
-    }
-
-    public void setSubUnionId(String subUnionId)
-    {
-        this.subUnionId = subUnionId;
-    }
-
-    public String getUnionTag()
-    {
-        return unionTag;
-    }
-
-    public void setUnionTag(String unionTag)
-    {
-        this.unionTag = unionTag;
-    }
-
-    public Long getPopId()
-    {
-        return popId;
-    }
-
-    public void setPopId(Long popId)
-    {
-        this.popId = popId;
-    }
-
-    public String getExt1()
-    {
-        return ext1;
-    }
-
-    public void setExt1(String ext1)
-    {
-        this.ext1 = ext1;
-    }
-
-    public String getPayMonth()
-    {
-        return payMonth;
-    }
-
-    public void setPayMonth(String payMonth)
-    {
-        this.payMonth = payMonth;
-    }
-
-    public Long getCpActId()
-    {
-        return cpActId;
-    }
-
-    public void setCpActId(Long cpActId)
-    {
-        this.cpActId = cpActId;
-    }
-
-    public Integer getUnionRole()
-    {
-        return unionRole;
-    }
-
-    public void setUnionRole(Integer unionRole)
-    {
-        this.unionRole = unionRole;
-    }
-
-    public Double getGiftCouponOcsAmount()
-    {
-        return giftCouponOcsAmount;
-    }
-
-    public void setGiftCouponOcsAmount(Double giftCouponOcsAmount)
-    {
-        this.giftCouponOcsAmount = giftCouponOcsAmount;
-    }
-
-    public String getGiftCouponKey()
-    {
-        return giftCouponKey;
-    }
-
-    public void setGiftCouponKey(String giftCouponKey)
-    {
-        this.giftCouponKey = giftCouponKey;
-    }
-
-    public String getBalanceExt()
-    {
-        return balanceExt;
-    }
-
-    public void setBalanceExt(String balanceExt)
-    {
-        this.balanceExt = balanceExt;
-    }
-
-    public String getSign()
-    {
-        return sign;
-    }
-
-    public void setSign(String sign)
-    {
-        this.sign = sign;
-    }
-
-    public Double getProPriceAmount()
-    {
-        return proPriceAmount;
-    }
-
-    public void setProPriceAmount(Double proPriceAmount)
-    {
-        this.proPriceAmount = proPriceAmount;
-    }
-
-    public Long getRid()
-    {
-        return rid;
-    }
-
-    public void setRid(Long rid)
-    {
-        this.rid = rid;
-    }
-
-    public Long getGoodsInfoId()
-    {
-        return goodsInfoId;
-    }
-
-    public void setGoodsInfoId(Long goodsInfoId)
-    {
-        this.goodsInfoId = goodsInfoId;
-    }
-
-    public Integer getExpressStatus()
-    {
-        return expressStatus;
-    }
-
-    public void setExpressStatus(Integer expressStatus)
-    {
-        this.expressStatus = expressStatus;
-    }
-
-    public Long getChannelId()
-    {
-        return channelId;
-    }
-
-    public void setChannelId(Long channelId)
-    {
-        this.channelId = channelId;
-    }
-
-    public String getSkuTag()
-    {
-        return skuTag;
-    }
-
-    public void setSkuTag(String skuTag)
-    {
-        this.skuTag = skuTag;
-    }
-
-    public String getItemId()
-    {
-        return itemId;
-    }
-
-    public void setItemId(String itemId)
-    {
-        this.itemId = itemId;
-    }
-
-    public String getCallerItemId()
-    {
-        return callerItemId;
-    }
-
-    public void setCallerItemId(String callerItemId)
-    {
-        this.callerItemId = callerItemId;
-    }
-
-    public String getOrderTag()
-    {
-        return orderTag;
-    }
-
-    public void setOrderTag(String orderTag)
-    {
-        this.orderTag = orderTag;
-    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml
index 27dc4f7..b575fb3 100644
--- a/ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml
@@ -61,63 +61,71 @@
         select id, order_id, parent_id, order_time, finish_time, modify_time, order_emt, plus, union_id, sku_id, sku_name, sku_num, sku_return_num, sku_frozen_num, price, commission_rate, sub_side_rate, subsidy_rate, final_rate, estimate_cos_price, estimate_fee, actual_cos_price, actual_fee, valid_code, trace_type, position_id, site_id, union_alias, pid, cid1, cid2, cid3, sub_union_id, union_tag, pop_id, ext1, pay_month, cp_act_id, union_role, gift_coupon_ocs_amount, gift_coupon_key, balance_ext, sign, pro_price_amount, rid, goods_info_id, express_status, channel_id, sku_tag, item_id, caller_item_id, order_tag from order_rows
     </sql>
 
-    <select id="selectOrderRowsList" parameterType="OrderRows" resultMap="OrderRowsResult">
-        <include refid="selectOrderRowsVo"/>
-        <where>
-            <if test="orderId != null "> and order_id = #{orderId}</if>
-            <if test="parentId != null "> and parent_id = #{parentId}</if>
-            <if test="orderTime != null "> and order_time = #{orderTime}</if>
-            <if test="finishTime != null "> and finish_time = #{finishTime}</if>
-            <if test="modifyTime != null "> and modify_time = #{modifyTime}</if>
-            <if test="orderEmt != null "> and order_emt = #{orderEmt}</if>
-            <if test="plus != null "> and plus = #{plus}</if>
-            <if test="unionId != null "> and union_id = #{unionId}</if>
-            <if test="skuId != null "> and sku_id = #{skuId}</if>
-            <if test="skuName != null  and skuName != ''"> and sku_name like concat('%', #{skuName}, '%')</if>
-            <if test="skuNum != null "> and sku_num = #{skuNum}</if>
-            <if test="skuReturnNum != null "> and sku_return_num = #{skuReturnNum}</if>
-            <if test="skuFrozenNum != null "> and sku_frozen_num = #{skuFrozenNum}</if>
-            <if test="price != null "> and price = #{price}</if>
-            <if test="commissionRate != null "> and commission_rate = #{commissionRate}</if>
-            <if test="subSideRate != null "> and sub_side_rate = #{subSideRate}</if>
-            <if test="subsidyRate != null "> and subsidy_rate = #{subsidyRate}</if>
-            <if test="finalRate != null "> and final_rate = #{finalRate}</if>
-            <if test="estimateCosPrice != null "> and estimate_cos_price = #{estimateCosPrice}</if>
-            <if test="estimateFee != null "> and estimate_fee = #{estimateFee}</if>
-            <if test="actualCosPrice != null "> and actual_cos_price = #{actualCosPrice}</if>
-            <if test="actualFee != null "> and actual_fee = #{actualFee}</if>
-            <if test="validCode != null "> and valid_code = #{validCode}</if>
-            <if test="traceType != null "> and trace_type = #{traceType}</if>
-            <if test="positionId != null "> and position_id = #{positionId}</if>
-            <if test="siteId != null "> and site_id = #{siteId}</if>
-            <if test="unionAlias != null  and unionAlias != ''"> and union_alias like concat('%', #{unionAlias}, '%')</if>
-            <if test="pid != null  and pid != ''"> and pid = #{pid}</if>
-            <if test="cid1 != null "> and cid1 = #{cid1}</if>
-            <if test="cid2 != null "> and cid2 = #{cid2}</if>
-            <if test="cid3 != null "> and cid3 = #{cid3}</if>
-            <if test="subUnionId != null  and subUnionId != ''"> and sub_union_id = #{subUnionId}</if>
-            <if test="unionTag != null  and unionTag != ''"> and union_tag = #{unionTag}</if>
-            <if test="popId != null "> and pop_id = #{popId}</if>
-            <if test="ext1 != null  and ext1 != ''"> and ext1 = #{ext1}</if>
-            <if test="payMonth != null  and payMonth != ''"> and pay_month = #{payMonth}</if>
-            <if test="cpActId != null "> and cp_act_id = #{cpActId}</if>
-            <if test="unionRole != null "> and union_role = #{unionRole}</if>
-            <if test="giftCouponOcsAmount != null "> and gift_coupon_ocs_amount = #{giftCouponOcsAmount}</if>
-            <if test="giftCouponKey != null  and giftCouponKey != ''"> and gift_coupon_key = #{giftCouponKey}</if>
-            <if test="balanceExt != null  and balanceExt != ''"> and balance_ext = #{balanceExt}</if>
-            <if test="sign != null  and sign != ''"> and sign = #{sign}</if>
-            <if test="proPriceAmount != null "> and pro_price_amount = #{proPriceAmount}</if>
-            <if test="rid != null "> and rid = #{rid}</if>
-            <if test="goodsInfoId != null "> and goods_info_id = #{goodsInfoId}</if>
-            <if test="expressStatus != null "> and express_status = #{expressStatus}</if>
-            <if test="channelId != null "> and channel_id = #{channelId}</if>
-            <if test="skuTag != null  and skuTag != ''"> and sku_tag = #{skuTag}</if>
-            <if test="itemId != null  and itemId != ''"> and item_id = #{itemId}</if>
-            <if test="callerItemId != null  and callerItemId != ''"> and caller_item_id = #{callerItemId}</if>
-            <if test="orderTag != null  and orderTag != ''"> and order_tag = #{orderTag}</if>
-        </where>
-        order by order_time desc
-    </select>
+<select id="selectOrderRowsList" parameterType="OrderRows" resultMap="OrderRowsResult">
+    <include refid="selectOrderRowsVo"/>
+    <where>
+        <if test="orderId != null "> and order_id = #{orderId}</if>
+        <if test="parentId != null "> and parent_id = #{parentId}</if>
+        <if test="orderTime != null "> and order_time = #{orderTime}</if>
+        <if test="finishTime != null "> and finish_time = #{finishTime}</if>
+        <if test="modifyTime != null "> and modify_time = #{modifyTime}</if>
+        <if test="orderEmt != null "> and order_emt = #{orderEmt}</if>
+        <if test="plus != null "> and plus = #{plus}</if>
+        <if test="unionId != null "> and union_id = #{unionId}</if>
+        <if test="skuId != null "> and sku_id = #{skuId}</if>
+        <if test="skuName != null  and skuName != ''"> and sku_name like concat('%', #{skuName}, '%')</if>
+        <if test="skuNum != null "> and sku_num = #{skuNum}</if>
+        <if test="skuReturnNum != null "> and sku_return_num = #{skuReturnNum}</if>
+        <if test="skuFrozenNum != null "> and sku_frozen_num = #{skuFrozenNum}</if>
+        <if test="price != null "> and price = #{price}</if>
+        <if test="commissionRate != null "> and commission_rate = #{commissionRate}</if>
+        <if test="subSideRate != null "> and sub_side_rate = #{subSideRate}</if>
+        <if test="subsidyRate != null "> and subsidy_rate = #{subsidyRate}</if>
+        <if test="finalRate != null "> and final_rate = #{finalRate}</if>
+        <if test="estimateCosPrice != null "> and estimate_cos_price = #{estimateCosPrice}</if>
+        <if test="estimateFee != null "> and estimate_fee = #{estimateFee}</if>
+        <if test="actualCosPrice != null "> and actual_cos_price = #{actualCosPrice}</if>
+        <if test="actualFee != null "> and actual_fee = #{actualFee}</if>
+        <if test="validCode != null "> and valid_code = #{validCode}</if>
+        <!-- 支持validCode多值查询 -->
+        <if test="validCodes != null and validCodes.length > 0">
+            and valid_code in
+            <foreach item="item" index="index" collection="validCodes" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="traceType != null "> and trace_type = #{traceType}</if>
+        <if test="positionId != null "> and position_id = #{positionId}</if>
+        <if test="siteId != null "> and site_id = #{siteId}</if>
+        <if test="unionAlias != null  and unionAlias != ''"> and union_alias like concat('%', #{unionAlias}, '%')</if>
+        <if test="pid != null  and pid != ''"> and pid = #{pid}</if>
+        <if test="cid1 != null "> and cid1 = #{cid1}</if>
+        <if test="cid2 != null "> and cid2 = #{cid2}</if>
+        <if test="cid3 != null "> and cid3 = #{cid3}</if>
+        <if test="subUnionId != null  and subUnionId != ''"> and sub_union_id = #{subUnionId}</if>
+        <if test="unionTag != null  and unionTag != ''"> and union_tag = #{unionTag}</if>
+        <if test="popId != null "> and pop_id = #{popId}</if>
+        <if test="ext1 != null  and ext1 != ''"> and ext1 = #{ext1}</if>
+        <if test="payMonth != null  and payMonth != ''"> and pay_month = #{payMonth}</if>
+        <if test="cpActId != null "> and cp_act_id = #{cpActId}</if>
+        <if test="unionRole != null "> and union_role = #{unionRole}</if>
+        <if test="giftCouponOcsAmount != null "> and gift_coupon_ocs_amount = #{giftCouponOcsAmount}</if>
+        <if test="giftCouponKey != null  and giftCouponKey != ''"> and gift_coupon_key = #{giftCouponKey}</if>
+        <if test="balanceExt != null  and balanceExt != ''"> and balance_ext = #{balanceExt}</if>
+        <if test="sign != null  and sign != ''"> and sign = #{sign}</if>
+        <if test="proPriceAmount != null "> and pro_price_amount = #{proPriceAmount}</if>
+        <if test="rid != null "> and rid = #{rid}</if>
+        <if test="goodsInfoId != null "> and goods_info_id = #{goodsInfoId}</if>
+        <if test="expressStatus != null "> and express_status = #{expressStatus}</if>
+        <if test="channelId != null "> and channel_id = #{channelId}</if>
+        <if test="skuTag != null  and skuTag != ''"> and sku_tag = #{skuTag}</if>
+        <if test="itemId != null  and itemId != ''"> and item_id = #{itemId}</if>
+        <if test="callerItemId != null  and callerItemId != ''"> and caller_item_id = #{callerItemId}</if>
+        <if test="orderTag != null  and orderTag != ''"> and order_tag = #{orderTag}</if>
+    </where>
+    order by order_time desc
+</select>
+
 
     <select id="selectOrderRowsById" parameterType="String" resultMap="OrderRowsResult">
         <include refid="selectOrderRowsVo"/>