修改交易类型查询错误的bug

src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java

@@ -68,6 +68,11 @@ public class AdminOrderController extends BaseController {
         if(StringUtils.isNotBlank(transaction_status)){
             rqmap.put("status",transaction_status);
         }
+        // 交易类型
+        String entrustType=request.getString("entrust_type");
+        if(StringUtils.isNotBlank(entrustType)){
+            rqmap.put("goods_entrust",entrustType);
+        }
         //
         String spage=request.getString("page");
         int page= StringUtils.isNotBlank(spage)?Integer.valueOf(spage):1;

src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java

@@ -102,6 +102,19 @@ public class OrderServiceImpl implements OrderService {
             }
         }
 
+        // 交易类型
+        String gtype =(String)qumap.get("goods_entrust");
+        if(gtype !=null){
+            List<OrderGoodsDetail> tsolist = orderGoodsDetailMapper.searchOrderGoodsInKey("goods_entrust",gtype);
+            if(tsolist!=null){
+                List tsarr=new ArrayList();
+                for(OrderGoodsDetail ogd:tsolist){
+                    tsarr.add(ogd.getBatchcode());
+                }
+                qumap.put("bcin",tsarr);
+            }
+        }
+
         // 重新组合筛选条件
         List<Order> orderList=orderMapper.getOrderList(qumap,starrs,limit);
 

src/main/resources/mapper/szwh/OrderMapper.xml

@@ -62,7 +62,7 @@
                 <!-- 查询条件封装在map中，以k-v形式进行查询-->
                 <foreach collection="map" item="v" index="k" separator="and">
                     <if test="v != null and v != '' and k!='id' and k!='charges_type'
-                    and k!='buyin' and k!='bcin' and k!='name' and k!='goods_name'">
+                    and k!='buyin' and k!='bcin' and k!='name' and k!='goods_name' and k!='goods_entrust'">
                         ${k} = #{v}
                     </if>
                     <if test="k=='id'">
@@ -112,7 +112,7 @@
                 <!-- 查询条件封装在map中，以k-v形式进行查询-->
                 <foreach collection="map" item="v" index="k" separator="and">
                     <if test="v != null and v != '' and k!='id' and k!='charges_type'
-                    and k!='buyin' and k!='bcin' and k!='name' and k!='goods_name'">
+                    and k!='buyin' and k!='bcin' and k!='name' and k!='goods_name' and k!='goods_entrust'">
                         ${k} = #{v}
                     </if>
                     <if test="k=='id'">