From 8285d925c5c84008700aedeffdeca57065df1b78 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Wed, 27 Jul 2022 18:08:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AE=A2=E5=8D=95=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=8C=89=E6=A0=87=E7=9A=84=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/controller/admin/AdminGoodsController.java  |  7 +------
 .../cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java |  8 ++++++++
 .../cn/chjyj/szwh/service/impl/OrderServiceImpl.java | 12 ++++++++++++
 .../resources/mapper/szwh/OrderGoodsDetailMapper.xml |  7 +++++++
 src/main/resources/mapper/szwh/OrderMapper.xml       |  9 +++------
 .../szwh/mapper/OrderGoodsDetailMapperTest.java      |  8 ++++++++
 6 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
index 7092271..93a17d8 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
@@ -66,7 +66,7 @@ public class AdminGoodsController extends BaseController {
         }
         // 商品名称
         String gname=request.getString("goods_name");
-        if(!StringUtils.isBlank(gname)){
+        if(StringUtils.isNotBlank(gname)){
             qmap.put("gd.goods_name",gname);
         }
         //
@@ -91,11 +91,6 @@ public class AdminGoodsController extends BaseController {
             //qmap.put("data_type",data_type);
             qmap.put("g.goods_status",data_type);
         }
-        // 商品名称
-        String goods= request.getString("goods");
-        if(StringUtils.isNotBlank(goods)){
-            qmap.put("gd.goods_name",goods);
-        }
         // 创建时间
         String createtime=request.getString("createtime");
         if(StringUtils.isNotBlank("createtime")){
diff --git a/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java b/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java
index 5cf53fd..666114c 100644
--- a/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java
+++ b/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java
@@ -78,4 +78,12 @@ public interface OrderGoodsDetailMapper {
      */
     List<OrderGoodsDetailDTO> orderGoodsDetailDTOList(@Param("startdt") String startdt,
                                                       @Param("enddt") String enddt);
+
+    /**
+     * search order goods detail in something field
+     * @param key
+     * @param soval
+     * @return
+     */
+    List<OrderGoodsDetail> searchOrderGoodsInKey(@Param("key") String key,@Param("soval") String soval);
 }
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 15268a6..430efa8 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
@@ -99,6 +99,18 @@ public class OrderServiceImpl implements OrderService {
             qumap.put("buyin","('"+buyinArr[0]+"')");
         }
 
+        // 如果是商品名称
+        String gname = (String)qumap.get("gd.goods_name");
+        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());
+                }
+                qumap.put("bcin",sbarr);
+            }
+        }
 
         // 重新组合筛选条件
         List<Order> orderList=orderMapper.getOrderList(qumap,starrs,limit);
diff --git a/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml b/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml
index 1bf125b..6b08b88 100644
--- a/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml
+++ b/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml
@@ -94,6 +94,13 @@
         LIMIT 10
     </select>
 
+    <!-- search in few somthing fields -->
+    <select id="searchOrderGoodsInKey" parameterType="java.lang.String" resultType="cn.chjyj.szwh.bean.OrderGoodsDetail">
+        select <include refid="column"/>
+        from <include refid="tbName"/>
+        where #{key} like concat ('%',#{soval},'%')
+    </select>
+
     <!--新增用户-->
     <insert id="addUser" parameterType="cn.chjyj.szwh.bean.Goods" useGeneratedKeys="true" keyColumn="uid">
         insert into <include refid="tbName"/>
diff --git a/src/main/resources/mapper/szwh/OrderMapper.xml b/src/main/resources/mapper/szwh/OrderMapper.xml
index f8c64fd..1049f20 100644
--- a/src/main/resources/mapper/szwh/OrderMapper.xml
+++ b/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!='buyin' and k!='bcin' and k!='name' and k!='goods_name'">
                         ${k} = #{v}
                     </if>
                     <if test="k=='id'">
@@ -75,7 +75,7 @@
                         `name` like concat('%',#{v},'%')
                     </if>
                     <if test="k=='bcin'">
-                        batchcode in ${v}
+                        batchcode in (${v})
                     </if>
                 </foreach>
             </if>
@@ -106,7 +106,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!='buyin' and k!='bcin' and k!='name' and k!='goods_name'">
                         ${k} = #{v}
                     </if>
                     <if test="k=='id'">
@@ -114,9 +114,6 @@
                     </if>
                     <if test="k=='buyin'">
                         buy_islicode in ${v}
-<!--                        <foreach collection="#{v}" item="id" index="index" open="(" close=")" separator=",">-->
-<!--                            #{id}-->
-<!--                        </foreach>-->
                     </if>
                     <if test="k=='bcin'">
                         batchcode in (#{v})
diff --git a/src/test/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapperTest.java
index 3e29997..11d0f22 100644
--- a/src/test/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapperTest.java
+++ b/src/test/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapperTest.java
@@ -62,4 +62,12 @@ public class OrderGoodsDetailMapperTest {
             System.out.println(od.getEntrust_islicode()+"|"+od.getTotalMoney());
         }
     }
+
+    @Test
+    public void searchOrderGoodsInKey(){
+        String key="goods_name";
+        String soval="7093";
+        List<OrderGoodsDetail> oglist = orderGoodsDetailMapper.searchOrderGoodsInKey(key,soval);
+        System.out.println(oglist.size());
+    }
 }
\ No newline at end of file