merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderAddBo.java

@@ -182,4 +182,7 @@ public class TopOldOrderAddBo {
     /** 佣金 */
     @ApiModelProperty("佣金")
     private BigDecimal brokerage;
+
+    @ApiModelProperty("下单企业")
+    private String purchaseOrg;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/domain/TopOldOrder.java

@@ -148,4 +148,6 @@ private static final long serialVersionUID=1L;
     private Long checkTime;
     /** 账款结清时间 */
     private Long creditTime;
+    /** 下单企业 */
+    private String purchaseOrg;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -920,12 +920,15 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
     @Override
     public List<TopOldOrderGoodsListVo> getOrderGoodsList(TopOldOrderGoodsQuery query) {
-        TopOldOrder order = baseMapper.getOrderBySn(query.getOrderSn());
-        if (order.getOrderFrom() == 1) {
+        //学员数量
+        Integer userCount = 0;
+        List<TopOldOrderGoodsListVo> list;
+        if (query.getOrderFrom() == 1) {
             //新系统订单
-            List<TopOldOrderGoodsListVo> topOldOrderGoodsListVos = orderGoodsService.listByOrderSn(query);
-            if (CollectionUtils.isNotEmpty(topOldOrderGoodsListVos)) {
-                topOldOrderGoodsListVos.forEach(item -> {
+            list = orderGoodsService.listByOrderSn(query);
+            userCount = 1;
+            if (CollectionUtils.isNotEmpty(list)) {
+                list.forEach(item -> {
                     item.setUserCount(1);
                     //专业
                     if (StringUtils.isNotBlank(item.getSubjectIds())) {
@@ -953,66 +956,64 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     }
                 });
             }
-            return topOldOrderGoodsListVos;
-        }
-        //旧系统订单
-        List<TopOldOrderGoodsListVo> list = topOrderGoodsService.getListByQuery(query);
-        if (CollectionUtils.isNotEmpty(list)) {
-            //学员数量
-            Integer userCount = 0;
-            List<TopOldOrderGoods> goodsList = topOrderGoodsService
-                    .list(new LambdaQueryWrapper<TopOldOrderGoods>().eq(TopOldOrderGoods::getOrderSn, query.getOrderSn())
-                            .eq(TopOldOrderGoods::getStatus, 1)
-                            .ne(TopOldOrderGoods::getRefundStatus, 2)
-                            .in(TopOldOrderGoods::getPayStatus, Arrays.asList(2, 3, 4)));
-            if (CollectionUtils.isNotEmpty(goodsList)) {
-                userCount = goodsList.stream().map(TopOldOrderGoods::getUserCard).collect(Collectors.toSet()).size();
-            }
-            // 老系统查询学习状态
-            Map<String, String> params = new HashMap<>();
-            Long nowTime = DateUtils.getNowTime();
-            String sign = ToolsUtils.EncoderByMd5(query.getOrderSn() + nowTime.toString() + "pubilc2022");
-            params.put("stamp", nowTime.toString());
-            params.put("sign", sign);
-            params.put("orderSn", query.getOrderSn());
-            params.put("type", order.getOrderType().toString());
-            String respone = "";
-            try {
-                respone = HttpUtils.postFormBody(ORDER_STUDY, params);
-                if (!respone.contains("\"Status\":true")) {
-                    throw new CustomException("旧系统订单学员学习情况接口请求错误");
-                }
-                JSONObject jsonObject = JSONObject.parseObject(respone);
-                Object data = jsonObject.get("Data");
-                if (ObjectUtils.isNull(data)) {
-                    //data 为空
-                    list.forEach(x -> x.setStudyStatus("未开始"));
-                } else {
-                    List<TopOldOrderStudyVo> studyVos = JSONArray.parseArray(JSONObject.toJSONString(data), TopOldOrderStudyVo.class);
-                    list.forEach(item -> {
-                        item.setStudyStatus("未开始");
-                        TopOldOrderStudyVo studyVo = studyVos.stream().filter(x -> x.getUnderOrdeEnrollItemId().equals(item.getSignId())
-                                && x.getIdNum().equals(item.getUserCard())).findFirst().orElse(null);
-                        if (ObjectUtils.isNotNull(studyVo) && ObjectUtils.isNotNull(studyVo.getStudyHours())) {
-                            if (ObjectUtils.isNull(studyVo.getStudyHours()) && studyVo.getStudyHours() == 0) {
-                                item.setStudyStatus("未开始");
-                            } else if (studyVo.getStudyHours() < studyVo.getTotalHours()) {
-                                item.setStudyStatus("学习中");
-                            } else {
-                                item.setStudyStatus("已结束");
+        }else {
+            //旧系统订单
+            list = topOrderGoodsService.getListByQuery(query);
+            if (CollectionUtils.isNotEmpty(list)) {
+                List<TopOldOrderGoods> goodsList = topOrderGoodsService
+                        .list(new LambdaQueryWrapper<TopOldOrderGoods>().eq(TopOldOrderGoods::getOrderSn, query.getOrderSn())
+                                .eq(TopOldOrderGoods::getStatus, 1)
+                                .ne(TopOldOrderGoods::getCheckStatus, -1));
+                if (CollectionUtils.isNotEmpty(goodsList)) {
+                    userCount = goodsList.stream().map(TopOldOrderGoods::getUserCard).collect(Collectors.toSet()).size();
+                }
+                // 老系统查询学习状态
+                TopOldOrder order = getOne(new LambdaQueryWrapper<TopOldOrder>().eq(TopOldOrder::getOrderSn, query.getOrderSn()));
+                Map<String, String> params = new HashMap<>();
+                Long nowTime = DateUtils.getNowTime();
+                String sign = ToolsUtils.EncoderByMd5(query.getOrderSn() + nowTime.toString() + "pubilc2022");
+                params.put("stamp", nowTime.toString());
+                params.put("sign", sign);
+                params.put("orderSn", query.getOrderSn());
+                params.put("type", order.getOrderType().toString());
+                String respone = "";
+                try {
+                    respone = HttpUtils.postFormBody(ORDER_STUDY, params);
+                    if (!respone.contains("\"Status\":true")) {
+                        throw new CustomException("旧系统订单学员学习情况接口请求错误");
+                    }
+                    JSONObject jsonObject = JSONObject.parseObject(respone);
+                    Object data = jsonObject.get("Data");
+                    if (ObjectUtils.isNull(data)) {
+                        //data 为空
+                        list.forEach(x -> x.setStudyStatus("未开始"));
+                    } else {
+                        List<TopOldOrderStudyVo> studyVos = JSONArray.parseArray(JSONObject.toJSONString(data), TopOldOrderStudyVo.class);
+                        list.forEach(item -> {
+                            item.setStudyStatus("未开始");
+                            TopOldOrderStudyVo studyVo = studyVos.stream().filter(x -> x.getUnderOrdeEnrollItemId().equals(item.getSignId())
+                                    && x.getIdNum().equals(item.getUserCard())).findFirst().orElse(null);
+                            if (ObjectUtils.isNotNull(studyVo) && ObjectUtils.isNotNull(studyVo.getStudyHours())) {
+                                if (ObjectUtils.isNull(studyVo.getStudyHours()) && studyVo.getStudyHours() == 0) {
+                                    item.setStudyStatus("未开始");
+                                } else if (studyVo.getStudyHours() < studyVo.getTotalHours()) {
+                                    item.setStudyStatus("学习中");
+                                } else {
+                                    item.setStudyStatus("已结束");
+                                }
                             }
-                        }
-                    });
+                        });
+                    }
+                } catch (IOException e) {
+                    log.error("旧系统订单学员学习情况接口请求错误" + respone);
+                    throw new CustomException("旧系统订单学员学习情况接口请求错误");
                 }
-            } catch (IOException e) {
-                log.error("旧系统订单学员学习情况接口请求错误" + respone);
-                throw new CustomException("旧系统订单学员学习情况接口请求错误");
-            }
-            //数据处理
-            for (TopOldOrderGoodsListVo item : list) {
-                item.setUserCount(userCount);
             }
         }
+        //数据处理
+        for (TopOldOrderGoodsListVo item : list) {
+            item.setUserCount(userCount);
+        }
         return list;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderVo.java

@@ -270,4 +270,7 @@ public class TopOldOrderVo {
 
 	@ApiModelProperty("是否坏账")
 	private boolean badBill;
+
+	@ApiModelProperty("下单企业")
+	private String purchaseOrg;
 }

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND (
             vto.order_sn LIKE CONCAT( '%', #{keyword}, '%' )
             OR vto.create_no LIKE CONCAT( '%', #{keyword}, '%' )
-            OR vto.order_org LIKE CONCAT( '%', #{keyword}, '%' ))
+            OR vto.purchase_org LIKE CONCAT( '%', #{keyword}, '%' ))
         </if>
         order by vto.create_time DESC
     </select>
@@ -182,7 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND (
             ot.order_sn LIKE CONCAT( '%', #{keyword}, '%' )
             OR ot.create_no LIKE CONCAT( '%', #{keyword}, '%' )
-            OR ot.order_org LIKE CONCAT( '%', #{keyword}, '%' ))
+            OR ot.purchase_org LIKE CONCAT( '%', #{keyword}, '%' ))
         </if>
             ) + (SELECT
         COUNT( DISTINCT o.order_sn ) AS num