修正商品与订单关联查询

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

@@ -86,6 +86,12 @@ public class AdminOrderController extends BaseController {
             }
         }
 
+        //商品编号
+        String gdsid = request.getString("goods_isli");
+        if(StringUtils.isNotEmpty(gdsid)){
+            rqmap.put("goods_islicode",gdsid);
+        }
+
         //
         String spage=request.getString("page");
         int page= StringUtils.isNotBlank(spage)?Integer.valueOf(spage):1;

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

@@ -125,42 +125,32 @@ public class OrderServiceImpl implements OrderService {
         if (StringUtils.isNotBlank(gname)) {
             somap.put("goods_name", gname); //按名称搜索
             somap.put("goods_islicode", gname); //按编号搜索
-
-            List<OrderGoodsDetail> sogdlist = orderGoodsDetailMapper.searchOrderGoodsInKey(somap);
-            if (sogdlist != null) {
-                List sbarr = new ArrayList();
-                for (OrderGoodsDetail ogd : sogdlist) {
-                    sbarr.add(ogd.getBatchcode());
-                }
-                qumap.put("bcin", sbarr);
-            }
         }
-
         // 交易类型
         String gtype = (String) qumap.get("goods_entrust");
         if (gtype != null) {
             somap.put("goods_entrust", gtype);
-            List<OrderGoodsDetail> tsolist = orderGoodsDetailMapper.searchOrderGoodsInKey(somap);
-            if (tsolist != null) {
-                List tsarr = new ArrayList();
-                for (OrderGoodsDetail ogd : tsolist) {
-                    tsarr.add(ogd.getBatchcode());
-                }
-                qumap.put("bcin", tsarr);
-            }
         }
         // 商品服务费类型
         String chargeType = (String) qumap.get("charges_type");
         if (chargeType != null) {
             Integer ichargeType = Integer.valueOf(chargeType);
             somap.put("charges_type", ichargeType);
-            List<OrderGoodsDetail> tsolist = orderGoodsDetailMapper.searchOrderGoodsInKey(somap);
-            if (tsolist != null) {
-                List tsarr = new ArrayList();
-                for (OrderGoodsDetail ogd : tsolist) {
-                    tsarr.add(ogd.getBatchcode());
+        }
+        //商品编号
+        String gsid=(String) qumap.get("goods_islicode");
+        if(gsid!=null){
+            somap.put("goods_islicode",gsid);
+        }
+        // 如果订单商品查询条件存在
+        if(somap.size()>0){
+            List<OrderGoodsDetail> sogdlist = orderGoodsDetailMapper.searchOrderGoodsInKey(somap);
+            if (sogdlist != null && sogdlist.size()>0) {
+                List sbarr = new ArrayList();
+                for (OrderGoodsDetail ogd : sogdlist) {
+                    sbarr.add(ogd.getBatchcode());
                 }
-                qumap.put("bcin", tsarr);
+                qumap.put("bcin", sbarr);
             }
         }
 

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

@@ -69,7 +69,7 @@
                 <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!='createtime' and k!='ordstatus'
-                    and k!='goods_name' and k!='goods_entrust' and k!='paymenttime'">
+                    and k!='goods_name' and k!='goods_entrust' and k!='paymenttime' and k!='goods_islicode'">
                         ${k} = #{v}
                     </if>
                     <if test="k=='id'">
@@ -152,7 +152,7 @@
                 <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!='createtime' and k!='ordstatus'
-                    and k!='goods_name' and k!='goods_entrust'">
+                    and k!='goods_name' and k!='goods_entrust' and k!='goods_islicode'">
                         ${k} = #{v}
                     </if>
                     <if test="k=='id'">