订单搜索 fix2

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

@@ -45,10 +45,6 @@ public class AdminOrderController extends BaseController {
         }
         //委托方
         String entrustName=request.getString("entrust_name");
-        if(StringUtils.isNotBlank(entrustName)){
-            rqmap.put("entrust_name",entrustName);
-        }
-
         //购买方
         String buyName=request.getString("buy_name");
 
@@ -79,7 +75,7 @@ public class AdminOrderController extends BaseController {
         String slimit=request.getString("limit");
         int limit = StringUtils.isNotBlank(slimit)?Integer.valueOf(slimit):10;
 
-        Map map = orderService.getOrderList(rqmap,buyName,page,limit);
+        Map map = orderService.getOrderList(rqmap,buyName,entrustName,page,limit);
 
         jsonObject.put("code",200);
         jsonObject.put("msg","操作成功");

src/main/java/cn/chjyj/szwh/controller/api/OrderController.java

@@ -66,7 +66,7 @@ public class OrderController extends BaseController {
         int ips = Integer.valueOf(pagesize);
         int startrs = ipage > 0 ? (ipage - 1) * ips : 0;
         //List<Order> olist =orderService.getOrderList(qmap, startrs, ips);
-        Map outmap = orderService.getOrderList(qmap,"",startrs,ips);
+        Map outmap = orderService.getOrderList(qmap,"","",startrs,ips);
         //赋值
         jsonObject.put("code","200");
         jsonObject.put("data",outmap);

src/main/java/cn/chjyj/szwh/service/OrderService.java

@@ -25,7 +25,7 @@ public interface OrderService {
      * @param limit
      * @return
      */
-    Map<String,Object> getOrderList(Map<String,Object> qumap,String buyname, int page, int limit);
+    Map<String,Object> getOrderList(Map<String,Object> qumap,String buyname,String entrust_name, int page, int limit);
 
     /**
      * 商品详情

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

@@ -61,7 +61,7 @@ public class OrderServiceImpl implements OrderService {
      * @return
      */
     @Override
-    public Map<String,Object> getOrderList(Map<String, Object> qumap,String buyname,
+    public Map<String,Object> getOrderList(Map<String, Object> qumap,String buyname,String entrust_name,
                                            int page, int limit) {
         SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map retmap =new HashMap();
@@ -69,7 +69,7 @@ public class OrderServiceImpl implements OrderService {
         qumap.put("startrs",starrs);
 
         // 购买方
-        if(StringUtils.isNotBlank(buyname)){
+        if(StringUtils.isNotBlank(buyname) ){
           // 查找出用户的 islicode 标识符
             List<OrderUser> odulist =orderUserMapper.getSearchNameOrIslicode(buyname);
             // 购买者标识
@@ -82,11 +82,26 @@ public class OrderServiceImpl implements OrderService {
             }
             //log.info("byarr :"+buyinArr);
             // 购买者标识符
-            qumap.put("buyin",buyinArr[0]);
+            qumap.put("buyin","('"+buyinArr[0]+"')");
             // 该购买者的订单
-            qumap.put("bcin",bcArr[0]);
+            qumap.put("bcin","('"+bcArr[0]+"')");
         }
 
+        // 委托方
+        if(StringUtils.isNotBlank(entrust_name)){
+            List<OrderUser> euolist =orderUserMapper.getSearchNameOrIslicode(entrust_name);
+            // 购买者标识
+            String[] buyinArr=new String[euolist.size()];
+            //用户产生的订单
+            for(int i=0;i<euolist.size();i++){
+                buyinArr[i]=euolist.get(i).getIslicode();
+            }
+            //log.info("byarr :"+buyinArr);
+            // 购买者标识符
+            qumap.put("buyin","('"+buyinArr[0]+"')");
+        }
+
+
         // 重新组合筛选条件
         List<Order> orderList=orderMapper.getOrderList(qumap,starrs,limit);
 

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

@@ -61,18 +61,22 @@
             <if test="map!=null">
                 <!-- 查询条件封装在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'">
+                    <if test="v != null and v != '' and k!='id' and k!='charges_type'
+                    and k!='buyin' and k!='bcin' and k!='name'">
                         ${k} = #{v}
                     </if>
                     <if test="k=='id'">
                         ${k}>#{v}
                     </if>
                     <if test="k=='buyin'">
-                        buy_islicode like concat('%',#{v},'%')
+                        buy_islicode IN ${v}
+                    </if>
+                    <if test="k=='name'">
+                        `name` like concat('%',#{v},'%')
+                    </if>
+                    <if test="k=='bcin'">
+                        batchcode in ${v}
                     </if>
-<!--                    <if test="k=='bcin'">-->
-<!--                        batchcode in (#{v})-->
-<!--                    </if>-->
                 </foreach>
             </if>
             <if test="map==null">
@@ -104,21 +108,25 @@
             <if test="map!=null">
                 <!-- 查询条件封装在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'">
+                    <if test="v != null and v != '' and k!='id' and k!='charges_type'
+                    and k!='buyin' and k!='bcin' and k!='name'">
                         ${k} = #{v}
                     </if>
                     <if test="k=='id'">
                         ${k}>#{v}
                     </if>
                     <if test="k=='buyin'">
-                        buy_islicode like concat('%',#{v},'%')
+                        buy_islicode in ${v}
 <!--                        <foreach collection="#{v}" item="id" index="index" open="(" close=")" separator=",">-->
 <!--                            #{id}-->
 <!--                        </foreach>-->
                     </if>
-<!--                    <if test="k=='bcin'">-->
+                    <if test="k=='bcin'">
-<!--                        batchcode in (#{v})-->
+                        batchcode in (#{v})
-<!--                    </if>-->
+                    </if>
+                    <if test="k=='name'">
+                        `name` like concat('%',#{v},'%')
+                    </if>
                 </foreach>
             </if>
 

src/test/java/cn/chjyj/szwh/service/OrderServiceTest.java

@@ -28,7 +28,7 @@ public class OrderServiceTest {
         Map mp = new HashMap<>();
         int page =1;
         int limit =10;
-        Map<String,String> orderList = orderService.getOrderList(mp,"",page,limit);
+        Map<String,String> orderList = orderService.getOrderList(mp,"","",page,limit);
         System.out.println(orderList);
     }