From 316700063160de946cd9d0ed7d9af8e99d4d6c74 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Sun, 31 Jul 2022 10:57:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A3=80=E7=B4=A2=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/AdminOrderController.java           |  2 +-
 .../szwh/service/impl/OrderServiceImpl.java   | 36 +++++++------------
 .../resources/mapper/szwh/OrderMapper.xml     | 22 +++++++++---
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
index 9f2b1c8..23ca1a6 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
@@ -44,7 +44,7 @@ public class AdminOrderController extends BaseController {
             rqmap.put("batchcode",batchcode);
         }
         //委托方
-        String entrustName=request.getString("entrust_name");
+        String entrustName=request.getString("entrust_name").trim();
         //购买方
         String buyName=request.getString("buy_name");
 
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
index 430efa8..694d114 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
@@ -70,33 +70,23 @@ public class OrderServiceImpl implements OrderService {
         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();
+            List bclist = new ArrayList();
+            for(OrderUser ou:odulist){
+                bclist.add(ou.getBatchcode());
             }
-            //log.info("byarr :"+buyinArr);
-            // 购买者标识符
-            qumap.put("buyin","('"+buyinArr[0]+"')");
             // 该购买者的订单
-            qumap.put("bcin","('"+bcArr[0]+"')");
+            qumap.put("bcin",bclist);
         }
 
         // 委托方
         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();
+            List buyinArr = new ArrayList();
+            for(OrderUser ou:euolist){
+                buyinArr.add(ou.getBatchcode());
             }
-            //log.info("byarr :"+buyinArr);
-            // 购买者标识符
-            qumap.put("buyin","('"+buyinArr[0]+"')");
+            // 委托方购买订单号
+            qumap.put("bcin",buyinArr);
         }
 
         // 如果是商品名称
@@ -104,10 +94,10 @@ public class OrderServiceImpl implements OrderService {
         if(StringUtils.isNotBlank(gname)){
             List<OrderGoodsDetail> sogdlist = orderGoodsDetailMapper.searchOrderGoodsInKey("goods_name",gname);
             if (sogdlist!=null) {
-               String[] sbarr = new String[sogdlist.size()];
-                for(int i=0;i<sogdlist.size();i++){
-                    sbarr[i]=String.valueOf(sogdlist.get(i).getBatchcode());
-                }
+               List sbarr = new ArrayList();
+               for(OrderGoodsDetail ogd:sogdlist){
+                   sbarr.add(ogd.getBatchcode());
+               }
                 qumap.put("bcin",sbarr);
             }
         }
diff --git a/src/main/resources/mapper/szwh/OrderMapper.xml b/src/main/resources/mapper/szwh/OrderMapper.xml
index 1049f20..459925a 100644
--- a/src/main/resources/mapper/szwh/OrderMapper.xml
+++ b/src/main/resources/mapper/szwh/OrderMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="cn.chjyj.szwh.mapper.OrderMapper">
 
     <sql id="column">
-      id,user_id as userId,buy_islicode as buyIslicode,batchcode,account_ratio_id as accountRatioId,
+      cast(id as char) as id,user_id as userId,buy_islicode as buyIslicode,batchcode,account_ratio_id as accountRatioId,
       history_buy_name as historyBuyName,
       history_buy_code as historyBuyCode,total_service_charge as totalServiceCharge,total_money as totalMoney,
       `type`,`status`,transaction_islicode as transactionIslicode,ticketid,ticketmoney,ticketurl,ticketimage,
@@ -69,13 +69,19 @@
                         ${k}>#{v}
                     </if>
                     <if test="k=='buyin'">
-                        buy_islicode IN ${v}
+                        buy_islicode IN
+                        <foreach item="bisi" index="index" collection="v" open="(" separator="," close=")">
+                            #{bisi}
+                        </foreach>
                     </if>
                     <if test="k=='name'">
                         `name` like concat('%',#{v},'%')
                     </if>
                     <if test="k=='bcin'">
-                        batchcode in (${v})
+                        batchcode in
+                        <foreach item="btcode" index="index" collection="v" open="(" separator="," close=")">
+                            #{btcode}
+                        </foreach>
                     </if>
                 </foreach>
             </if>
@@ -113,10 +119,16 @@
                         ${k}>#{v}
                     </if>
                     <if test="k=='buyin'">
-                        buy_islicode in ${v}
+                        buy_islicode IN
+                        <foreach item="bisi" index="index" collection="v" open="(" separator="," close=")">
+                            #{bisi}
+                        </foreach>
                     </if>
                     <if test="k=='bcin'">
-                        batchcode in (#{v})
+                        batchcode in
+                        <foreach item="btcode" index="index" collection="v" open="(" separator="," close=")">
+                            #{btcode}
+                        </foreach>
                     </if>
                     <if test="k=='name'">
                         `name` like concat('%',#{v},'%')