订单搜索

README.md

@@ -154,4 +154,9 @@ int day_of_year = cal.get(Calendar.DAY_OF_YEAR);
      }
 ```
 
+```java
+// 去除stringbuffer最后一个的逗号
+sb.deleteCharAt(sb.length() - 1).toString()
+```
+
 

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

@@ -44,16 +44,13 @@ public class AdminOrderController extends BaseController {
             rqmap.put("batchcode",batchcode);
         }
         //委托方
-//        String entrustName=request.getString("entrust_name");
+        String entrustName=request.getString("entrust_name");
-//        if(StringUtils.isNotBlank(entrustName)){
+        if(StringUtils.isNotBlank(entrustName)){
-//            rqmap.put("entrust_name",entrustName);
+            rqmap.put("entrust_name",entrustName);
-//        }
+        }
 
         //购买方
-//        String buyName=request.getString("buy_name");
+        String buyName=request.getString("buy_name");
-//        if(StringUtils.isNotBlank(buyName)){
-//            rqmap.put("buy_name",buyName);
-//        }
 
         //商品名称
         String goodsName=request.getString("goods_name");
@@ -82,7 +79,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,page,limit);
+        Map map = orderService.getOrderList(rqmap,buyName,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/mapper/OrderUserMapper.java

@@ -42,4 +42,18 @@ public interface OrderUserMapper {
      * @return
      */
     int countOrderCs(@Param("map") Map map);
+
+    /**
+     * 多条件查询订单用户
+     * @param map
+     * @return
+     */
+    List<OrderUser> getOrderUserByMap(@Param("map")Map map);
+
+    /**
+     * 搜索姓名或授权码
+     * @param keyval
+     * @return
+     */
+    List<OrderUser> getSearchNameOrIslicode(String keyval);
 }

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

@@ -16,12 +16,16 @@ public interface OrderService {
      * @return
      */
     List<Order> getAllOrderList(int page);
+
     /**
-     * 根据条件查询订单列表
+     * 根据条件查询
      * @param qumap
+     * @param buyname
+     * @param page
+     * @param limit
      * @return
      */
-    Map<String,Object> getOrderList(Map<String,Object> qumap, int page, int limit);
+    Map<String,Object> getOrderList(Map<String,Object> qumap,String buyname, int page, int limit);
 
     /**
      * 商品详情

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

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

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

@@ -61,12 +61,18 @@
             <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'">
+                    <if test="v != null and v != '' and k!='id' and k!='charges_type' and k!='buyin' and k!='bcin'">
                         ${k} = #{v}
                     </if>
                     <if test="k=='id'">
                         ${k}>#{v}
                     </if>
+                    <if test="k=='buyin'">
+                        buy_islicode like concat('%',#{v},'%')
+                    </if>
+<!--                    <if test="k=='bcin'">-->
+<!--                        batchcode in (#{v})-->
+<!--                    </if>-->
                 </foreach>
             </if>
             <if test="map==null">
@@ -98,14 +104,24 @@
             <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'">
+                    <if test="v != null and v != '' and k!='id' and k!='charges_type' and k!='buyin' and k!='bcin'">
                         ${k} = #{v}
                     </if>
                     <if test="k=='id'">
                         ${k}>#{v}
                     </if>
+                    <if test="k=='buyin'">
+                        buy_islicode like concat('%',#{v},'%')
+<!--                        <foreach collection="#{v}" item="id" index="index" open="(" close=")" separator=",">-->
+<!--                            #{id}-->
+<!--                        </foreach>-->
+                    </if>
+<!--                    <if test="k=='bcin'">-->
+<!--                        batchcode in (#{v})-->
+<!--                    </if>-->
                 </foreach>
             </if>
+
             <if test="map==null">
                 id>#{startRs}
             </if>

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

@@ -81,11 +81,12 @@
         </where>
     </select>
 
-    <!--查询用户-->
+    <!-- 搜索姓名或授权码 -->
-    <select id="getSingleUserByOpenid" parameterType="java.lang.String" resultType="cn.chjyj.szwh.bean.Goods">
+    <select id="getSearchNameOrIslicode" parameterType="java.lang.String" resultType="cn.chjyj.szwh.bean.OrderUser">
-        select <include refid="column"/> from
+        select <include refid="column"/>
-        <include refid="tbName"/>
+        from <include refid="tbName"/>
-        where openid=#{openid};
+        where `name` like concat('%',#{keyval},'%')
+        OR islicode like concat('%',#{keyval},'%');
     </select>
 
     <!--新增用户-->

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);
     }