diff --git a/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java b/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java index 6f945e3..1456869 100644 --- a/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java @@ -41,6 +41,8 @@ public class OrdersServiceImpl extends ServiceImpl impleme private TCustomerApplyCurriculumMapper customerApplyCurriculumMapper; @Autowired private TCustomerTaihuClassMapper customerTaihuClassMapper; + @Autowired + private WumenUserDao wumenUserDao; @Override public void importWumenOrder() { @@ -295,9 +297,10 @@ public class OrdersServiceImpl extends ServiceImpl impleme List taihuOrderIds = courseOrders.stream().filter(o -> o.get("source").equals("一路健康")) .map(map->map.get("orderOldId").toString()).collect(Collectors.toList()); Map> taihuClassMap = customerApplyCurriculumMapper.selectMaps(new MPJLambdaWrapper() + .leftJoin("t_customer t1 on t1.oid = t.customerOid") .in("t.oid", taihuOrderIds) .apply("t.valid=1 and t.status = '50'") - .select("t.oid,if(t.point>0,t.point,t.money) fee,curriculumID")) + .select("t.oid,if(t.point>0,t.point,t.money) fee,curriculumID,if(t1.nameCN is null,'',t1.nameCN) name")) .stream().collect(Collectors.toMap(m -> m.get("oid").toString(), m -> m)); //订单开课记录 Map> ctc = customerTaihuClassMapper.selectMaps(new MPJLambdaWrapper() @@ -312,10 +315,11 @@ public class OrdersServiceImpl extends ServiceImpl impleme List> buyOrdersList = buyOrderMapper.selectMaps(new MPJLambdaWrapper() .leftJoin("user_course_buy_log t1 on (t1.order_sn = t.order_sn )") .leftJoin("user_course_buy t2 on t2.id = t1.user_course_buy_id") + .leftJoin("user t3 on t3.id = t.user_id") .in("t.order_id",wumenOrderIds) .gt(BuyOrder::getRealMoney,0) .select("t.order_id oid,t1.id ucblid,if(t1.fee is null,t.real_money,t1.fee) fee,t1.days,t1.begin_day," + - "DATE_FORMAT(t2.start_time, '%Y-%m-%d %H:%i:%s') startTime,t.order_sn")); + "DATE_FORMAT(t2.start_time, '%Y-%m-%d %H:%i:%s') startTime,t.order_sn,if(t3.name != '',t3.name,if(t3.nickname is null,'',t3.nickname)) name")); Map buyOrdersMap = new HashMap<>(); for (Map m : buyOrdersList) { List> l = new ArrayList<>(); @@ -338,6 +342,7 @@ public class OrdersServiceImpl extends ServiceImpl impleme Map taihuClass = taihuClassMap.get(courseOrder.get("orderOldId").toString()); Map tc = ctc.entrySet().stream().filter(e -> e.getKey() .contains(taihuClass.get("curriculumID").toString())).map(Map.Entry::getValue).findFirst().orElse(null); + res.put("name",taihuClass.get("name")); res.put("fee",courseOrder.get("realMoney")); if (tc != null&&tc.get("startDate")!=null) { res.put("startTime",tc.get("startDate")); @@ -354,6 +359,7 @@ public class OrdersServiceImpl extends ServiceImpl impleme for (int i=0;i res = new HashMap<>(); Map m = l.get(i); + res.put("name",m.get("name").toString()); if (m.get("ucblid")!=null){ if (new BigDecimal(m.get("fee").toString()).compareTo(BigDecimal.ZERO)>0){ res.put("fee",m.get("fee")); @@ -390,6 +396,7 @@ public class OrdersServiceImpl extends ServiceImpl impleme } }else { Map res = new HashMap<>(); + res.put("name",""); res.put("fee",courseOrder.get("realMoney")); res.put("startTime",orderTime); res.put("endTime",orderTime); @@ -398,6 +405,15 @@ public class OrdersServiceImpl extends ServiceImpl impleme } }else { FinanceOrder financeOrder = financeOrderMapper.selectById(courseOrder.get("orderOldId").toString()); + WumenUser user = wumenUserDao.selectOne(new MPJLambdaWrapper() + .and(t->t.eq(WumenUser::getTel,financeOrder.getTel()) + .or().eq(WumenUser::getEmail,financeOrder.getTel())) + .select(WumenUser::getName,WumenUser::getNickname)); + if (user!=null){ + courseOrder.put("name","".equals(user.getName())?(user.getNickname()==null?"":user.getNickname()):user.getName()); + }else { + courseOrder.put("name",""); + } courseOrder.put("fee",financeOrder.getRealMoney()); courseOrder.put("startTime",sdfday.format(financeOrder.getStartTime())); courseOrder.put("endTime",sdfday.format(financeOrder.getEndTime())); @@ -466,10 +482,11 @@ public class OrdersServiceImpl extends ServiceImpl impleme m.put("01时间",map.get("orderTime")); m.put("02来源",map.get("source")); m.put("03类型",map.get("type")); - m.put("04电话",map.get("tel")); - m.put("05订单编号",map.get("order_sn")); - m.put("06订单金额",map.get("realMoney")); - m.put("07金额",map.get("fee")); + m.put("04姓名",map.get("name")); + m.put("05电话",map.get("tel")); + m.put("06订单编号",map.get("order_sn")); + m.put("07订单金额",map.get("realMoney")); + m.put("08金额",map.get("fee")); m.put("09开始时间",map.get("startTime")==null?"":map.get("startTime").toString()); m.put("10结束时间",map.get("endTime")==null?"":map.get("endTime").toString()); m.put("11已摊销",map.get("already"));