删除注释代码

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

@@ -116,52 +116,6 @@ public class OrderServiceImpl implements OrderService {
             // 委托方购买订单号
             qumap.put("bcin", buyinArr);
         }
-
-
-//        //组织搜索条件
-//        Map somap = new HashMap();
-//        // 如果是商品名称
-//        String gname = (String) qumap.get("goods_name");
-//        if (StringUtils.isNotBlank(gname)) {
-//            somap.put("goods_name", gname); //按名称搜索
-//            somap.put("goods_islicode", gname); //按编号搜索
-//        }
-//        // 交易类型
-//        String gtype = (String) qumap.get("goods_entrust");
-//        if (gtype != null) {
-//            somap.put("goods_entrust", gtype);
-//        }
-//        // 商品服务费类型
-//        String chargeType = (String) qumap.get("charges_type");
-//        if (chargeType != null) {
-//            Integer ichargeType = Integer.valueOf(chargeType);
-//            somap.put("charges_type", ichargeType);
-//        }
-//        // 如果订单商品查询条件存在
-//        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", sbarr);
-//            }
-//            log.info("sogdlist is null");
-//        }
-
-        List<Order> orderList = new ArrayList<>();
-        //商品编号
-//        String gsid=(String) qumap.get("goods_islicode");
-//        if(gsid!=null){
-////            // 查询商品关联订单
-////            orderList = orderMapper.getGoodsInnerOrderList(gsid);
-////            somap.put("goods_islicode",gsid);
-////        }else {
-//            // 重新组合筛选条件
-//            orderList = orderMapper.getOrderList(qumap, starrs, limit);
-//        }
-
         // 管理系统订单
         List<AdOrderVO> adordlist = orderMapper.queryOrderList(qumap,starrs,limit);
 
@@ -211,65 +165,6 @@ public class OrderServiceImpl implements OrderService {
             relist.add(tomap);
         }
 
-        //拼装对象
-//        for (Order od : orderList) {
-//            Map tomap = new HashMap();
-//            //订单编号
-//            tomap.put("batchcode", od.getBatchcode());
-
-//            //下单时间
-//            tomap.put("createtime", sdf.format(od.getCreatetime()));
-//            //entrust_name 委托人信息,
-//            String entrustName = "";
-//            String entrustType = "";//委托类型
-//            String goodsName = ""; //商品名称
-//
-//            Set enset = new HashSet<>();// 存放商品的授权方式
-//
-//            List<OrderGoodsDetail> ogdlist = orderGoodsDetailMapper.getOrderGoodsDetailByBatchCode(od.getBatchcode());
-//            // 遍历
-//            for (OrderGoodsDetail ogd : ogdlist) {
-//                // 收费类型
-//                if (StringUtils.isNotBlank((String) qumap.get("charges_type"))) {
-//
-//                }
-//
-//                // 授权方信息
-//                JSONObject ujson = SzwhApiUtils.getApiUser(ogd.getEntrustIslicode());
-//                // 抽取出data,
-//                String udtjson = ujson.getString("data");
-//                if(StringUtils.isNotBlank(udtjson)){
-//                    Map userMap =JSON.parseObject(udtjson);
-//                    entrustName = (String)userMap.get("name");
-//                }
-//
-//                //商品名称
-//                if (StringUtils.isNotBlank(goodsName)) {
-//                    goodsName += "," + ogd.getGoodsName();
-//                } else {
-//                    goodsName = ogd.getGoodsName();
-//                }
-//
-//                //委托方式
-//                String tmptype = ogd.getGoodsEntrust() == 1 ? "转让" : "授权";
-//                enset.add(tmptype);
-//            }
-//            // set集合 转为字符串
-//            entrustType = String.join(",", enset);
-//            // 存放在map 中
-//            tomap.put("entrust_name", entrustName);
-//            tomap.put("entrust_type", entrustType);
-//            tomap.put("goods_name", goodsName);
-//            //订单金额
-//            tomap.put("total_money", od.getTotalMoney());
-//            tomap.put("type", od.getType());
-//            tomap.put("status", od.getStatus());
-//            tomap.put("id", od.getId());
-//
-//            //attention map 对象有小小的弊端
-//            relist.add(tomap);
-//        }
-
         // 记录总数
 
         retmap.put("total", total);