|
|
@@ -21,11 +21,11 @@ import com.zhongzheng.common.core.page.TableDataInfo;
|
|
|
import com.zhongzheng.common.exception.CustomException;
|
|
|
import com.zhongzheng.common.type.EncryptHandler;
|
|
|
import com.zhongzheng.common.utils.DateUtils;
|
|
|
-import com.zhongzheng.common.utils.SecurityUtils;
|
|
|
+import com.zhongzheng.common.utils.TelPhoneUtils;
|
|
|
import com.zhongzheng.common.utils.ToolsUtils;
|
|
|
import com.zhongzheng.common.utils.http.HttpUtils;
|
|
|
-import com.zhongzheng.modules.course.domain.CourseSubject;
|
|
|
-import com.zhongzheng.modules.course.service.ICourseSubjectService;
|
|
|
+import com.zhongzheng.modules.course.domain.*;
|
|
|
+import com.zhongzheng.modules.course.service.*;
|
|
|
import com.zhongzheng.modules.goods.domain.Goods;
|
|
|
import com.zhongzheng.modules.goods.service.IGoodsService;
|
|
|
import com.zhongzheng.modules.grade.domain.ClassGradeUser;
|
|
|
@@ -60,7 +60,12 @@ import com.zhongzheng.modules.top.goods.mapper.TopOldOrderMapper;
|
|
|
import com.zhongzheng.modules.top.goods.service.*;
|
|
|
import com.zhongzheng.modules.top.goods.vo.*;
|
|
|
import com.zhongzheng.modules.top.order.bo.*;
|
|
|
+import com.zhongzheng.modules.top.order.domain.TopOldOrderQuestion;
|
|
|
+import com.zhongzheng.modules.top.order.domain.TopOldOrderReplenish;
|
|
|
import com.zhongzheng.modules.top.order.domain.TopOrderBankPay;
|
|
|
+import com.zhongzheng.modules.top.order.bo.TopOrderRepQueryBo;
|
|
|
+import com.zhongzheng.modules.top.order.service.ITopOldOrderQuestionService;
|
|
|
+import com.zhongzheng.modules.top.order.service.ITopOldOrderReplenishService;
|
|
|
import com.zhongzheng.modules.top.order.service.ITopOrderBankPayService;
|
|
|
import com.zhongzheng.modules.top.order.vo.*;
|
|
|
import com.zhongzheng.modules.top.order.vo.TopOrderStatisticsTwoVo;
|
|
|
@@ -74,8 +79,9 @@ import com.zhongzheng.modules.top.user.service.ITopSysRoleService;
|
|
|
import com.zhongzheng.modules.top.user.service.ITopSysUserRoleService;
|
|
|
import com.zhongzheng.modules.top.user.service.ITopSysUserService;
|
|
|
import com.zhongzheng.modules.user.domain.User;
|
|
|
+import com.zhongzheng.modules.user.domain.UserSubscribe;
|
|
|
import com.zhongzheng.modules.user.service.IUserService;
|
|
|
-import org.springframework.beans.BeanUtils;
|
|
|
+import com.zhongzheng.modules.user.service.IUserSubscribeService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -84,7 +90,6 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import java.io.IOException;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
import java.util.stream.Stream;
|
|
|
@@ -107,6 +112,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
@Autowired
|
|
|
private IOrderGoodsService orderGoodsService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IOrderGoodsRefundService orderGoodsRefundService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private ICourseSubjectService courseSubjectService;
|
|
|
|
|
|
@@ -161,6 +169,18 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
@Autowired
|
|
|
private IGoodsService goodsService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IMajorService majorService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ICourseEducationTypeService courseEducationTypeService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ICourseProjectTypeService courseProjectTypeService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ICourseBusinessService courseBusinessService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private ITopOldOrderCheckService topOldOrderCheckService;
|
|
|
|
|
|
@@ -206,9 +226,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
@Autowired
|
|
|
private ITopOrderBankPayService topOrderBankPayService;
|
|
|
|
|
|
- @Autowired
|
|
|
- private IOrderGoodsRefundService orderGoodsRefundService;
|
|
|
-
|
|
|
@Autowired
|
|
|
private ITopSysConfigService topConfigService;
|
|
|
|
|
|
@@ -233,6 +250,15 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
@Autowired
|
|
|
private ISysOldOrgService iSysOldOrgService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ITopOldOrderReplenishService topOldOrderReplenishService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ITopOldOrderQuestionService topOldOrderQuestionService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IUserSubscribeService userSubscribeService;
|
|
|
+
|
|
|
@Value("${oldOrder.studyRecord}")
|
|
|
private String ORDER_STUDY;
|
|
|
|
|
|
@@ -266,6 +292,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
@Value("${oldOrder.updateRemark}")
|
|
|
private String UPDATE_REMARK;
|
|
|
|
|
|
+ @Value("${oldOrder.getResitTimes}")
|
|
|
+ private String GET_RESIT_TIMES;
|
|
|
+
|
|
|
@Value("${shared.statistics}")
|
|
|
private String SHARED_STATISTICS;
|
|
|
|
|
|
@@ -4456,6 +4485,707 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<TopOldOrderRepVo> queryOrderRepList(TopOrderRepQueryBo bo) {
|
|
|
+ //查询视图 v_top_order
|
|
|
+ if (ObjectUtils.isNotNull(bo.getEducationTypeId())) {
|
|
|
+ TopCourseEducationType educationType = topCourseEducationTypeService.getById(bo.getEducationTypeId());
|
|
|
+ if (StringUtils.isNotBlank(educationType.getSchemeName())) {
|
|
|
+ bo.setBusinessFullName(educationType.getSchemeName() + educationType.getEducationName());
|
|
|
+ } else {
|
|
|
+ bo.setBusinessFullName(educationType.getEducationName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (ObjectUtils.isNotNull(bo.getBusinessId())) {
|
|
|
+ String name = topCourseBusinessService.getBusinessFullName(bo.getBusinessId());
|
|
|
+ bo.setBusinessFullName(name);
|
|
|
+ }
|
|
|
+ //过滤C端订单
|
|
|
+ bo.setOrderFrom(1);
|
|
|
+
|
|
|
+ List<TopOldOrderRepVo> orderRepList = baseMapper.queryOrderRepList(bo);
|
|
|
+ if (CollectionUtils.isEmpty(orderRepList)){
|
|
|
+ return new ArrayList<>();
|
|
|
+ }
|
|
|
+ for (TopOldOrderRepVo vo : orderRepList) {
|
|
|
+ //成交数量
|
|
|
+ Integer count = topOrderGoodsService.count(new LambdaQueryWrapper<TopOldOrderGoods>()
|
|
|
+ .eq(TopOldOrderGoods::getOrderSn, vo.getOrderSn())
|
|
|
+ .eq(TopOldOrderGoods::getStatus, 1)
|
|
|
+ .eq(TopOldOrderGoods::getCheckStatus, 1));
|
|
|
+ vo.setConcludeNum(count);
|
|
|
+ //业务层次
|
|
|
+ if (StringUtils.isNotBlank(vo.getBusinessFullName())){
|
|
|
+ String substring = vo.getBusinessFullName().substring(4, 8);
|
|
|
+ String substring2 = vo.getBusinessFullName().substring(8);
|
|
|
+ vo.setBusinessName(substring2);
|
|
|
+ vo.setEduName(substring);
|
|
|
+ }
|
|
|
+ //每月收款明细
|
|
|
+ TopOldOrderReplenish replenish = topOldOrderReplenishService
|
|
|
+ .getOne(new LambdaQueryWrapper<TopOldOrderReplenish>()
|
|
|
+ .eq(TopOldOrderReplenish::getOrderSn, vo.getOrderSn())
|
|
|
+ .eq(TopOldOrderReplenish::getStatus, 1)
|
|
|
+ .last("limit 1"));
|
|
|
+ if (ObjectUtils.isNotNull(replenish)){
|
|
|
+ BigDecimal received = BigDecimal.ZERO;
|
|
|
+ if (StringUtils.isNotBlank(replenish.getProceedsJson())){
|
|
|
+ String proceedsJson = replenish.getProceedsJson();
|
|
|
+ Map map = JSON.parseObject(proceedsJson, Map.class);
|
|
|
+ vo.setProceedsJsonMap((Map<String,BigDecimal>)map);
|
|
|
+ //总收款
|
|
|
+ for (Object value : map.values()) {
|
|
|
+ received = received.add(new BigDecimal(value.toString()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //已退
|
|
|
+ BigDecimal refunded = new BigDecimal("0.00");
|
|
|
+ TopOldOrder orderBySn = baseMapper.getOrderBySn(vo.getOrderSn());
|
|
|
+ if (orderBySn.getOrderFrom() == 1 || orderBySn.getOrderFrom() == 4){
|
|
|
+ //新系统订单
|
|
|
+ List<OrderGoodsRefund> list = orderGoodsRefundService.list(new LambdaQueryWrapper<OrderGoodsRefund>()
|
|
|
+ .eq(OrderGoodsRefund::getOrderSn, orderBySn.getOrderSn())
|
|
|
+ .eq(OrderGoodsRefund::getStatus, 1)
|
|
|
+ .eq(OrderGoodsRefund::getPeriodStatus, 3));
|
|
|
+ if (CollectionUtils.isNotEmpty(list)){
|
|
|
+ refunded = list.stream().map(OrderGoodsRefund::getRefundFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ List<TopOldOrderRefund> list = topOldOrderRefundService.list(new LambdaQueryWrapper<TopOldOrderRefund>()
|
|
|
+ .eq(TopOldOrderRefund::getOrderSn, orderBySn.getOrderSn())
|
|
|
+ .eq(TopOldOrderRefund::getStatus, 1)
|
|
|
+ .eq(TopOldOrderRefund::getPeriodStatus, 3));
|
|
|
+ if (CollectionUtils.isNotEmpty(list)){
|
|
|
+ refunded = list.stream().map(TopOldOrderRefund::getRefundFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ vo.setRefunded(refunded);
|
|
|
+ //实际
|
|
|
+ BigDecimal practical = vo.getPriceTotal().subtract(refunded);
|
|
|
+ vo.setPractical(practical);
|
|
|
+ vo.setReceived(received);
|
|
|
+ vo.setUncollected(practical.subtract(received));
|
|
|
+ vo.setProceedsRecord(replenish.getProceedsRecord());
|
|
|
+ //发票
|
|
|
+ List<TopNuoMplatformLog> fromLogs = topNuoMplatformLogService
|
|
|
+ .list(new LambdaQueryWrapper<TopNuoMplatformLog>()
|
|
|
+ .like(TopNuoMplatformLog::getOrderNoList, vo.getOrderSn())
|
|
|
+ .eq(TopNuoMplatformLog::getStatus, 2));
|
|
|
+ if (CollectionUtils.isNotEmpty(fromLogs)){
|
|
|
+ for (TopNuoMplatformLog fromLog : fromLogs) {
|
|
|
+ OrderInvoiceHostBo invoiceBo = JSONObject.parseObject(fromLog.getContent(), OrderInvoiceHostBo.class);
|
|
|
+ if (ObjectUtils.isNotNull(invoiceBo) && ObjectUtils.isNotNull(invoiceBo.getOrder())){
|
|
|
+ OrderInvoiceBo order = invoiceBo.getOrder();
|
|
|
+ vo.setInvoiceApplyTime(order.getInvoiceDate());
|
|
|
+ vo.setInvoiceType(
|
|
|
+ StringUtils.isNotBlank(order.getInvoiceLine()) && order.getInvoiceLine().equals("bs")?"专票":"普票"
|
|
|
+ );
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ vo.setIntegral(replenish.getIntegral());
|
|
|
+ vo.setProceedsDate(replenish.getProceedsDate());
|
|
|
+ vo.setProceedsCheckDate(replenish.getProceedsCheckDate());
|
|
|
+ vo.setProceedsChange(replenish.getProceedsChange());
|
|
|
+ vo.setCost(replenish.getCost());
|
|
|
+ }else {
|
|
|
+ //已退
|
|
|
+ BigDecimal refunded = new BigDecimal("0.00");
|
|
|
+ TopOldOrder orderBySn = baseMapper.getOrderBySn(vo.getOrderSn());
|
|
|
+ if (orderBySn.getOrderFrom() == 1 || orderBySn.getOrderFrom() == 4){
|
|
|
+ //新系统订单
|
|
|
+ List<OrderGoodsRefund> list = orderGoodsRefundService.list(new LambdaQueryWrapper<OrderGoodsRefund>()
|
|
|
+ .eq(OrderGoodsRefund::getOrderSn, orderBySn.getOrderSn())
|
|
|
+ .eq(OrderGoodsRefund::getStatus, 1)
|
|
|
+ .eq(OrderGoodsRefund::getPeriodStatus, 3));
|
|
|
+ if (CollectionUtils.isNotEmpty(list)){
|
|
|
+ refunded = list.stream().map(OrderGoodsRefund::getRefundFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ List<TopOldOrderRefund> list = topOldOrderRefundService.list(new LambdaQueryWrapper<TopOldOrderRefund>()
|
|
|
+ .eq(TopOldOrderRefund::getOrderSn, orderBySn.getOrderSn())
|
|
|
+ .eq(TopOldOrderRefund::getStatus, 1)
|
|
|
+ .eq(TopOldOrderRefund::getPeriodStatus, 3));
|
|
|
+ if (CollectionUtils.isNotEmpty(list)){
|
|
|
+ refunded = list.stream().map(TopOldOrderRefund::getRefundFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ vo.setRefunded(refunded);
|
|
|
+ //实际
|
|
|
+ BigDecimal practical = vo.getPriceTotal().subtract(refunded);
|
|
|
+ vo.setUncollected(practical);
|
|
|
+ vo.setReceived(BigDecimal.ZERO);
|
|
|
+ vo.setPractical(practical);
|
|
|
+ //发票
|
|
|
+ List<TopNuoMplatformLog> fromLogs = topNuoMplatformLogService
|
|
|
+ .list(new LambdaQueryWrapper<TopNuoMplatformLog>()
|
|
|
+ .like(TopNuoMplatformLog::getOrderNoList, vo.getOrderSn())
|
|
|
+ .eq(TopNuoMplatformLog::getStatus, 2));
|
|
|
+ if (CollectionUtils.isNotEmpty(fromLogs)){
|
|
|
+ for (TopNuoMplatformLog fromLog : fromLogs) {
|
|
|
+ OrderInvoiceHostBo invoiceBo = JSONObject.parseObject(fromLog.getContent(), OrderInvoiceHostBo.class);
|
|
|
+ if (ObjectUtils.isNotNull(invoiceBo) && ObjectUtils.isNotNull(invoiceBo.getOrder())){
|
|
|
+ OrderInvoiceBo order = invoiceBo.getOrder();
|
|
|
+ vo.setInvoiceApplyTime(order.getInvoiceDate());
|
|
|
+ vo.setInvoiceType(
|
|
|
+ StringUtils.isNotBlank(order.getInvoiceLine()) && order.getInvoiceLine().equals("bs")?"专票":"普票"
|
|
|
+ );
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return orderRepList;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public List<TopOldOrderRepDetailVo> getOrderDetailList(TopOrderRepGoodsQueryBo queryBo) {
|
|
|
+ List<TopOldOrderRepDetailVo> list;
|
|
|
+ if (queryBo.getOrderFrom() == 1) {
|
|
|
+ //新系统订单
|
|
|
+ list = orderGoodsService.listRepByOrderSn(queryBo);
|
|
|
+ if (CollectionUtils.isNotEmpty(list)) {
|
|
|
+ for (TopOldOrderRepDetailVo item : list) {
|
|
|
+ item.setApplyNum(0);
|
|
|
+ item.setUserCard(EncryptHandler.decryptTwo(item.getUserCard()));
|
|
|
+ //补考次数
|
|
|
+ int count = userSubscribeService.count(new LambdaQueryWrapper<UserSubscribe>()
|
|
|
+ .eq(UserSubscribe::getOrderGoodsId, item.getOrderGoodsId())
|
|
|
+ .eq(UserSubscribe::getSubscribeStatus, 1)
|
|
|
+ .ne(UserSubscribe::getExamStatus, 0));
|
|
|
+ if (count > 0){
|
|
|
+ item.setApplyNum(count - 1);
|
|
|
+ }
|
|
|
+ List<TopOldOrderQuestion> questions = topOldOrderQuestionService
|
|
|
+ .list(new LambdaQueryWrapper<TopOldOrderQuestion>()
|
|
|
+ .eq(TopOldOrderQuestion::getOrderSn, item.getOrderSn())
|
|
|
+ .eq(TopOldOrderQuestion::getOrderGoodsId, item.getOrderGoodsId())
|
|
|
+ .eq(TopOldOrderQuestion::getStatus, 1));
|
|
|
+ if (CollectionUtils.isNotEmpty(questions)){
|
|
|
+ item.setQuestionRecord(questions.size());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ //旧系统订单
|
|
|
+ list = topOrderGoodsService.listRepByOrderSn(queryBo);
|
|
|
+ if (CollectionUtils.isNotEmpty(list)) {
|
|
|
+ List<TopOrderRequestVo> requestVos = new ArrayList<>();
|
|
|
+ if (queryBo.getOrderBase() != 1){
|
|
|
+ List<TopOrderRequestDetailBo> collect = list.stream().map(x -> {
|
|
|
+ TopOrderRequestDetailBo requestBo = new TopOrderRequestDetailBo();
|
|
|
+ requestBo.setIdNum(EncryptHandler.decryptTwo(x.getUserCard()));
|
|
|
+ requestBo.setMajorName(x.getMajorName());
|
|
|
+ return requestBo;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ //旧系统查询补考次数
|
|
|
+ TopOrderRequestBo requestBo = new TopOrderRequestBo();
|
|
|
+ Long nowTime = DateUtils.getNowTime();
|
|
|
+ String sign = ToolsUtils.EncoderByMd5(nowTime.toString() + "pubilc2022");
|
|
|
+ requestBo.setSign(sign);
|
|
|
+ requestBo.setStamp(nowTime);
|
|
|
+ requestBo.setQueryList(collect);
|
|
|
+ String respone = "";
|
|
|
+ try {
|
|
|
+ respone = HttpUtils.sendPost(GET_RESIT_TIMES, JSONObject.parseObject(JSON.toJSONString(requestBo)));
|
|
|
+ if (!respone.contains("\"Status\":true")) {
|
|
|
+ throw new CustomException("旧系统查询补考次数接口请求错误！");
|
|
|
+ }
|
|
|
+ JSONObject jsonObject = JSONObject.parseObject(respone);
|
|
|
+ if (ObjectUtils.isNotNull(jsonObject) && ObjectUtils.isNotNull(jsonObject.get("Data"))){
|
|
|
+ requestVos = JSONArray.parseArray(JSONArray.toJSONString(jsonObject.get("Data")),TopOrderRequestVo.class);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("旧系统修改备注接口请求错误" + respone);
|
|
|
+ throw new CustomException("旧系统修改备注接口请求错误");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for (TopOldOrderRepDetailVo item : list) {
|
|
|
+ item.setUserCard(EncryptHandler.decryptTwo(item.getUserCard()));
|
|
|
+ item.setApplyNum(0);
|
|
|
+ //补考次数
|
|
|
+ if (queryBo.getOrderBase() == 1){
|
|
|
+ TopOldOrder order = getOne(new LambdaQueryWrapper<TopOldOrder>().eq(TopOldOrder::getOrderSn, queryBo.getOrderSn()));
|
|
|
+ User user = userService.getByCardNoTenant(EncryptHandler.decryptTwo(item.getUserCard()));
|
|
|
+ Order orderOne = orderService.getOne(new LambdaQueryWrapper<Order>()
|
|
|
+ .eq(Order::getInputOrderSn, order.getInputOrderSn())
|
|
|
+ .eq(Order::getUserId,user.getUserId())
|
|
|
+ .last("limit 1"));
|
|
|
+ if (ObjectUtils.isNotNull(orderOne)){
|
|
|
+ OrderGoods orderGoodsOne = orderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>()
|
|
|
+ .eq(OrderGoods::getOrderSn, orderOne.getOrderSn())
|
|
|
+ .eq(OrderGoods::getGoodsId, item.getGoodsId())
|
|
|
+ .ne(OrderGoods::getRefundStatus,2)
|
|
|
+ .ne(OrderGoods::getPayStatus,1)
|
|
|
+ .last("limit 1"));
|
|
|
+ if (ObjectUtils.isNotNull(orderGoodsOne)){
|
|
|
+ int count = userSubscribeService.count(new LambdaQueryWrapper<UserSubscribe>()
|
|
|
+ .eq(UserSubscribe::getOrderGoodsId, orderGoodsOne.getOrderGoodsId())
|
|
|
+ .eq(UserSubscribe::getSubscribeStatus, 1)
|
|
|
+ .ne(UserSubscribe::getExamStatus, 0));
|
|
|
+ if (count > 0){
|
|
|
+ item.setApplyNum(count - 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else if (CollectionUtils.isNotEmpty(requestVos)){
|
|
|
+ TopOrderRequestVo topOrderRequestVo = requestVos.stream()
|
|
|
+ .filter(x -> x.getIdNum().equals(item.getUserCard()) && x.getMajorName().equals(item.getMajorName())).findFirst().orElse(null);
|
|
|
+ if (ObjectUtils.isNotNull(topOrderRequestVo)){
|
|
|
+ item.setApplyNum(topOrderRequestVo.getCount());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ List<TopOldOrderQuestion> questions = topOldOrderQuestionService
|
|
|
+ .list(new LambdaQueryWrapper<TopOldOrderQuestion>()
|
|
|
+ .eq(TopOldOrderQuestion::getOrderSn, item.getOrderSn())
|
|
|
+ .eq(TopOldOrderQuestion::getOrderGoodsId, item.getOrderGoodsId())
|
|
|
+ .eq(TopOldOrderQuestion::getStatus, 1));
|
|
|
+ if (CollectionUtils.isNotEmpty(questions)){
|
|
|
+ item.setQuestionRecord(questions.size());
|
|
|
+ }
|
|
|
+ //退款状态
|
|
|
+ List<TopOldOrderRefund> oldOrderRefunds = topOldOrderRefundService
|
|
|
+ .list(new LambdaQueryWrapper<TopOldOrderRefund>()
|
|
|
+ .eq(TopOldOrderRefund::getOrderSn, item.getOrderSn())
|
|
|
+ .eq(TopOldOrderRefund::getOrderGoodsId, item.getOrderGoodsId())
|
|
|
+ .eq(TopOldOrderRefund::getStatus, 1));
|
|
|
+ if (CollectionUtils.isNotEmpty(oldOrderRefunds) &&
|
|
|
+ oldOrderRefunds.stream().anyMatch(x -> x.getPeriodStatus() == 3)){
|
|
|
+ Long refundTime = oldOrderRefunds.stream().filter(x -> x.getPeriodStatus() == 3).findFirst().get().getRefundTime();
|
|
|
+ item.setRefundStatus(2);
|
|
|
+ item.setRefundTime(refundTime);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return list;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public boolean editOrderRepList(TopOrderRepEditBo editBo) {
|
|
|
+ TopOldOrder orderBySn = baseMapper.getOrderBySn(editBo.getOrderSn());
|
|
|
+ if (ObjectUtils.isNull(orderBySn)){
|
|
|
+ throw new CustomException("订单号不存在！");
|
|
|
+ }
|
|
|
+ //已退
|
|
|
+ BigDecimal refunded = new BigDecimal("0.00");
|
|
|
+ if (orderBySn.getOrderFrom() == 1 || orderBySn.getOrderFrom() == 4){
|
|
|
+ //新系统订单
|
|
|
+ List<OrderGoodsRefund> list = orderGoodsRefundService.list(new LambdaQueryWrapper<OrderGoodsRefund>()
|
|
|
+ .eq(OrderGoodsRefund::getOrderSn, orderBySn.getOrderSn())
|
|
|
+ .eq(OrderGoodsRefund::getStatus, 1)
|
|
|
+ .eq(OrderGoodsRefund::getPeriodStatus, 3));
|
|
|
+ if (CollectionUtils.isNotEmpty(list)){
|
|
|
+ refunded = list.stream().map(OrderGoodsRefund::getRefundFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ List<TopOldOrderRefund> list = topOldOrderRefundService.list(new LambdaQueryWrapper<TopOldOrderRefund>()
|
|
|
+ .eq(TopOldOrderRefund::getOrderSn, orderBySn.getOrderSn())
|
|
|
+ .eq(TopOldOrderRefund::getStatus, 1)
|
|
|
+ .eq(TopOldOrderRefund::getPeriodStatus, 3));
|
|
|
+ if (CollectionUtils.isNotEmpty(list)){
|
|
|
+ refunded = list.stream().map(TopOldOrderRefund::getRefundFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ TopOldOrderReplenish replenish = topOldOrderReplenishService
|
|
|
+ .getOne(new LambdaQueryWrapper<TopOldOrderReplenish>()
|
|
|
+ .eq(TopOldOrderReplenish::getOrderSn, editBo.getOrderSn())
|
|
|
+ .last("limit 1"));
|
|
|
+ if (ObjectUtils.isNull(replenish)){
|
|
|
+ //新增
|
|
|
+ TopOldOrderReplenish orderReplenish = new TopOldOrderReplenish();
|
|
|
+ orderReplenish.setOrderSn(editBo.getOrderSn());
|
|
|
+ orderReplenish.setOrderFrom(orderBySn.getOrderFrom());
|
|
|
+ orderReplenish.setProceedsRecord(editBo.getProceedsRecord());
|
|
|
+ orderReplenish.setIntegral(editBo.getIntegral());
|
|
|
+ orderReplenish.setProceedsDate(editBo.getProceedsDate());
|
|
|
+ orderReplenish.setProceedsCheckDate(editBo.getProceedsCheckDate());
|
|
|
+ orderReplenish.setProceedsChange(editBo.getProceedsChange());
|
|
|
+ orderReplenish.setCost(editBo.getCost());
|
|
|
+ //每月收款记录
|
|
|
+ if (CollectionUtils.isNotEmpty(editBo.getProceedsJson())){
|
|
|
+ //总收款
|
|
|
+ BigDecimal reduce = editBo.getProceedsJson().values().stream().reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ //未收
|
|
|
+ orderReplenish.setOrderResidue(orderBySn.getOrderPrice().subtract(reduce).subtract(refunded));
|
|
|
+ orderReplenish.setProceedsJson(JSON.toJSONString(editBo.getProceedsJson()));
|
|
|
+ }else {
|
|
|
+ //未收
|
|
|
+ orderReplenish.setOrderResidue(orderBySn.getOrderPrice().subtract(refunded));
|
|
|
+ }
|
|
|
+ orderReplenish.setStatus(1);
|
|
|
+ orderReplenish.setCreateTime(DateUtils.getNowTime());
|
|
|
+ orderReplenish.setUpdateTime(DateUtils.getNowTime());
|
|
|
+ topOldOrderReplenishService.save(orderReplenish);
|
|
|
+ }else {
|
|
|
+ //修改
|
|
|
+ replenish.setOrderSn(editBo.getOrderSn());
|
|
|
+ replenish.setOrderFrom(orderBySn.getOrderFrom());
|
|
|
+ replenish.setProceedsRecord(editBo.getProceedsRecord());
|
|
|
+ replenish.setIntegral(editBo.getIntegral());
|
|
|
+ replenish.setProceedsDate(editBo.getProceedsDate());
|
|
|
+ replenish.setProceedsCheckDate(editBo.getProceedsCheckDate());
|
|
|
+ replenish.setProceedsChange(editBo.getProceedsChange());
|
|
|
+ replenish.setCost(editBo.getCost());
|
|
|
+ //每月收款记录
|
|
|
+ if (CollectionUtils.isNotEmpty(editBo.getProceedsJson())){
|
|
|
+ if (StringUtils.isNotBlank(replenish.getProceedsJson())){
|
|
|
+ Map map = JSON.parseObject(replenish.getProceedsJson(), Map.class);
|
|
|
+ editBo.getProceedsJson().forEach((k,v) -> {
|
|
|
+ map.put(k,v);
|
|
|
+ });
|
|
|
+ //总收款
|
|
|
+ BigDecimal reduce = new BigDecimal("0.00");
|
|
|
+ for (Object value : map.values()) {
|
|
|
+ reduce = reduce.add(new BigDecimal(value.toString()));
|
|
|
+ }
|
|
|
+ //未收
|
|
|
+ replenish.setOrderResidue(orderBySn.getOrderPrice().subtract(reduce).subtract(refunded));
|
|
|
+ replenish.setProceedsJson(JSON.toJSONString(map));
|
|
|
+ }else {
|
|
|
+ //总收款
|
|
|
+ BigDecimal reduce = editBo.getProceedsJson().values().stream().reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ //未收
|
|
|
+ replenish.setOrderResidue(orderBySn.getOrderPrice().subtract(reduce).subtract(refunded));
|
|
|
+ replenish.setProceedsJson(JSON.toJSONString(editBo.getProceedsJson()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (ObjectUtils.isNull(replenish.getOrderResidue())){
|
|
|
+ replenish.setOrderResidue(orderBySn.getOrderPrice());
|
|
|
+ }
|
|
|
+ replenish.setUpdateTime(DateUtils.getNowTime());
|
|
|
+ topOldOrderReplenishService.updateById(replenish);
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public boolean editOrderRepDetail(TopOrderRepDetailEditBo editBo) {
|
|
|
+ TopOldOrder oldOrder = baseMapper.getOrderBySn(editBo.getOrderSn());
|
|
|
+ if (ObjectUtils.isNull(oldOrder)){
|
|
|
+ throw new CustomException("订单查询有误");
|
|
|
+ }
|
|
|
+ if (oldOrder.getOrderFrom() == 1){
|
|
|
+ orderGoodsService.update(new LambdaUpdateWrapper<OrderGoods>()
|
|
|
+ .eq(OrderGoods::getOrderSn,editBo.getOrderSn())
|
|
|
+ .eq(OrderGoods::getOrderGoodsId,editBo.getOrderGoodsId())
|
|
|
+ .set(OrderGoods::getFinishTime,editBo.getFinishTime())
|
|
|
+ .set(OrderGoods::getAcquireTime,editBo.getAcquireTime())
|
|
|
+ .set(OrderGoods::getPublicityTime,editBo.getPublicityTime())
|
|
|
+ );
|
|
|
+ }else {
|
|
|
+ topOrderGoodsService.update(new LambdaUpdateWrapper<TopOldOrderGoods>()
|
|
|
+ .eq(TopOldOrderGoods::getOrderSn,editBo.getOrderSn())
|
|
|
+ .eq(TopOldOrderGoods::getOrderGoodsId,editBo.getOrderGoodsId())
|
|
|
+ .set(TopOldOrderGoods::getFinishTime,editBo.getFinishTime())
|
|
|
+ .set(TopOldOrderGoods::getAcquireTime,editBo.getAcquireTime())
|
|
|
+ .set(TopOldOrderGoods::getPublicityTime,editBo.getPublicityTime())
|
|
|
+ );
|
|
|
+
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public List<TopOldOrderQuestionVo> getOrderQuestionList(TopRepQuestionQueryBo queryBo) {
|
|
|
+ List<TopOldOrderQuestion> questions = topOldOrderQuestionService
|
|
|
+ .list(new LambdaQueryWrapper<TopOldOrderQuestion>()
|
|
|
+ .eq(TopOldOrderQuestion::getOrderSn, queryBo.getOrderSn())
|
|
|
+ .eq(TopOldOrderQuestion::getOrderGoodsId, queryBo.getOrderGoodsId())
|
|
|
+ .eq(TopOldOrderQuestion::getStatus, 1));
|
|
|
+ if (CollectionUtils.isEmpty(questions)){
|
|
|
+ return new ArrayList<>();
|
|
|
+ }
|
|
|
+ TopOldOrder orderBySn = baseMapper.getOrderBySn(queryBo.getOrderSn());
|
|
|
+ String majorName = "";
|
|
|
+ String eduName = "";
|
|
|
+ String businessName = "";
|
|
|
+ String userName = "";
|
|
|
+ String userCard = "";
|
|
|
+ if (orderBySn.getOrderFrom() == 1){
|
|
|
+ OrderGoods orderGoods = orderGoodsService.getById(queryBo.getOrderGoodsId());
|
|
|
+ Goods goods = goodsService.getById(orderGoods.getGoodsId());
|
|
|
+ Major major = majorService.getById(goods.getMajorId());
|
|
|
+ majorName = major.getCategoryName();
|
|
|
+ CourseEducationType educationType = courseEducationTypeService.getById(goods.getEducationTypeId());
|
|
|
+ eduName = educationType.getEducationName();
|
|
|
+ CourseProjectType projectType = courseProjectTypeService.getById(goods.getProjectId());
|
|
|
+ CourseBusiness business = courseBusinessService.getById(goods.getBusinessId());
|
|
|
+ businessName = business.getBusinessName()+projectType.getProjectName();
|
|
|
+ Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderSn, queryBo.getOrderSn()));
|
|
|
+ User user = userService.getById(order.getUserId());
|
|
|
+ userCard = EncryptHandler.decryptTwo(user.getIdCard());
|
|
|
+ userName = user.getRealname();
|
|
|
+ }else {
|
|
|
+ TopOldOrderGoods orderGoods = topOrderGoodsService.getById(queryBo.getOrderGoodsId());
|
|
|
+ majorName = orderGoods.getMajorName();
|
|
|
+ String businessFullName = orderGoods.getBusinessFullName();
|
|
|
+ eduName = businessFullName.substring(4,8);
|
|
|
+ businessName = businessFullName.substring(8);
|
|
|
+ userCard = EncryptHandler.decryptTwo(orderGoods.getUserCard());
|
|
|
+ userName = orderGoods.getUserName();
|
|
|
+ }
|
|
|
+
|
|
|
+ List<TopOldOrderQuestionVo> resultList = new ArrayList<>();
|
|
|
+ for (TopOldOrderQuestion s : questions) {
|
|
|
+ TopOldOrderQuestionVo questionVo = new TopOldOrderQuestionVo();
|
|
|
+ questionVo.setId(s.getId());
|
|
|
+ questionVo.setUserName(userName);
|
|
|
+ questionVo.setUserCard(userCard);
|
|
|
+ questionVo.setBusinessName(businessName);
|
|
|
+ questionVo.setEduName(eduName);
|
|
|
+ questionVo.setOrderSn(s.getOrderSn());
|
|
|
+ questionVo.setOrderGoodsId(s.getOrderGoodsId());
|
|
|
+ questionVo.setMajorName(majorName);
|
|
|
+ questionVo.setOpenDate(s.getOpenDate());
|
|
|
+ questionVo.setRemark(s.getRemark());
|
|
|
+ questionVo.setSign(s.getSign());
|
|
|
+ resultList.add(questionVo);
|
|
|
+ }
|
|
|
+ return resultList;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public TopOldOrderQuestionVo getOrderQuestionDetail(TopRepQuestionQueryBo queryBo) {
|
|
|
+ TopOldOrderQuestionVo vo = new TopOldOrderQuestionVo();
|
|
|
+ TopOldOrder orderBySn = baseMapper.getOrderBySn(queryBo.getOrderSn());
|
|
|
+ String majorName = "";
|
|
|
+ String eduName = "";
|
|
|
+ String businessName = "";
|
|
|
+ String userName = "";
|
|
|
+ String userCard = "";
|
|
|
+ if (orderBySn.getOrderFrom() == 1){
|
|
|
+ OrderGoods orderGoods = orderGoodsService.getById(queryBo.getOrderGoodsId());
|
|
|
+ Goods goods = goodsService.getById(orderGoods.getGoodsId());
|
|
|
+ Major major = majorService.getById(goods.getMajorId());
|
|
|
+ majorName = major.getCategoryName();
|
|
|
+ CourseEducationType educationType = courseEducationTypeService.getById(goods.getEducationTypeId());
|
|
|
+ eduName = educationType.getEducationName();
|
|
|
+ CourseProjectType projectType = courseProjectTypeService.getById(goods.getProjectId());
|
|
|
+ CourseBusiness business = courseBusinessService.getById(goods.getBusinessId());
|
|
|
+ businessName = business.getBusinessName()+projectType.getProjectName();
|
|
|
+ Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderSn, queryBo.getOrderSn()));
|
|
|
+ User user = userService.getById(order.getUserId());
|
|
|
+ userName = user.getRealname();
|
|
|
+ userCard = EncryptHandler.decryptTwo(user.getIdCard());
|
|
|
+ }else {
|
|
|
+ TopOldOrderGoods orderGoods = topOrderGoodsService.getById(queryBo.getOrderGoodsId());
|
|
|
+ majorName = orderGoods.getMajorName();
|
|
|
+ String businessFullName = orderGoods.getBusinessFullName();
|
|
|
+ eduName = businessFullName.substring(4,8);
|
|
|
+ businessName = businessFullName.substring(8);
|
|
|
+ userName = orderGoods.getUserName();
|
|
|
+ userCard = EncryptHandler.decryptTwo(orderGoods.getUserCard());
|
|
|
+ }
|
|
|
+ vo.setUserName(userName);
|
|
|
+ vo.setUserCard(userCard);
|
|
|
+ vo.setBusinessName(businessName);
|
|
|
+ vo.setEduName(eduName);
|
|
|
+ vo.setOrderSn(queryBo.getOrderSn());
|
|
|
+ vo.setOrderGoodsId(queryBo.getOrderGoodsId());
|
|
|
+ vo.setMajorName(majorName);
|
|
|
+ return vo;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public boolean saveOrderQuestion(TopOrderRepQuestionBo bo) {
|
|
|
+ TopOldOrderQuestion question = BeanUtil.toBean(bo, TopOldOrderQuestion.class);
|
|
|
+ question.setStatus(1);
|
|
|
+ question.setCreateTime(DateUtils.getNowTime());
|
|
|
+ question.setUpdateTime(DateUtils.getNowTime());
|
|
|
+ return topOldOrderQuestionService.save(question);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public boolean delOrderQuestion(Long id) {
|
|
|
+ TopOldOrderQuestion orderQuestion = topOldOrderQuestionService.getById(id);
|
|
|
+ if (ObjectUtils.isNull(orderQuestion)){
|
|
|
+ throw new CustomException("数据有误！");
|
|
|
+ }
|
|
|
+ orderQuestion.setStatus(0);
|
|
|
+ return topOldOrderQuestionService.updateById(orderQuestion);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public List<TopOrderBillExportVo> billExportList(TopOrderRepQueryBo bo) {
|
|
|
+ //查询视图 v_top_order
|
|
|
+ if (ObjectUtils.isNotNull(bo.getEducationTypeId())) {
|
|
|
+ TopCourseEducationType educationType = topCourseEducationTypeService.getById(bo.getEducationTypeId());
|
|
|
+ if (StringUtils.isNotBlank(educationType.getSchemeName())) {
|
|
|
+ bo.setBusinessFullName(educationType.getSchemeName() + educationType.getEducationName());
|
|
|
+ } else {
|
|
|
+ bo.setBusinessFullName(educationType.getEducationName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (ObjectUtils.isNotNull(bo.getBusinessId())) {
|
|
|
+ String name = topCourseBusinessService.getBusinessFullName(bo.getBusinessId());
|
|
|
+ bo.setBusinessFullName(name);
|
|
|
+ }
|
|
|
+ //过滤C端订单
|
|
|
+ bo.setOrderFrom(1);
|
|
|
+ List<TopOldOrderRepVo> orderRepList = baseMapper.queryOrderRepList(bo);
|
|
|
+ if (CollectionUtils.isEmpty(orderRepList)){
|
|
|
+ return new ArrayList<>();
|
|
|
+ }
|
|
|
+ List<TopOrderBillExportVo> result = new ArrayList<>();
|
|
|
+ for (TopOldOrderRepVo repVo : orderRepList) {
|
|
|
+ TopOldOrderReplenish replenish = topOldOrderReplenishService
|
|
|
+ .getOne(new LambdaQueryWrapper<TopOldOrderReplenish>()
|
|
|
+ .eq(TopOldOrderReplenish::getOrderSn, repVo.getOrderSn())
|
|
|
+ .eq(TopOldOrderReplenish::getStatus, 1)
|
|
|
+ .last("limit 1"));
|
|
|
+ if (ObjectUtils.isNotNull(replenish) && replenish.getOrderResidue().compareTo(BigDecimal.ZERO) <= 0){
|
|
|
+ //已完成收款
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ //订单学员信息
|
|
|
+ List<TopOldOrderGoods> orderGoods = topOrderGoodsService
|
|
|
+ .list(new LambdaQueryWrapper<TopOldOrderGoods>()
|
|
|
+ .eq(TopOldOrderGoods::getOrderSn, repVo.getOrderSn())
|
|
|
+ .eq(TopOldOrderGoods::getCheckStatus, 1)
|
|
|
+ .eq(TopOldOrderGoods::getStatus, 1));
|
|
|
+ if (CollectionUtils.isEmpty(orderGoods)){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ List<TopOrderBillExportVo> collect = orderGoods.stream().map(item -> {
|
|
|
+ TopOrderBillExportVo vo = new TopOrderBillExportVo();
|
|
|
+ vo.setCreateNo(repVo.getCreateNo());
|
|
|
+ vo.setPurchaseOrg(repVo.getPurchaseOrg());
|
|
|
+ String businessFullName = item.getBusinessFullName();
|
|
|
+ vo.setEduName(businessFullName.substring(4, 8));
|
|
|
+ vo.setBusinessName(businessFullName.substring(8));
|
|
|
+ vo.setUserName(item.getUserName());
|
|
|
+ vo.setUserCard(hideIDCard(EncryptHandler.decryptTwo(item.getUserCard())));
|
|
|
+ vo.setMajorName(item.getMajorName());
|
|
|
+ vo.setOrderTime(DateUtils.timestampToDateFormat(repVo.getOrderTime(), "yyyy/MM/dd"));
|
|
|
+ vo.setUnitPrice(item.getGoodsRealPrice().toString());
|
|
|
+ return vo;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ result.addAll(collect);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(result)){
|
|
|
+ return new ArrayList<>();
|
|
|
+ }
|
|
|
+ List<TopOrderBillExportVo> list = new ArrayList<>();
|
|
|
+ Map<String, List<TopOrderBillExportVo>> collect = result.stream().filter(x -> StringUtils.isNotBlank(x.getCreateNo())).collect(Collectors.groupingBy(TopOrderBillExportVo::getCreateNo));
|
|
|
+ collect.forEach((k,v) -> {
|
|
|
+ for (int i = 0; i < v.size(); i++) {
|
|
|
+ if (i == v.size() - 1){
|
|
|
+ //最后一个
|
|
|
+ TopOrderBillExportVo vo = v.get(i);
|
|
|
+ vo.setOrderNum(v.size()+"");
|
|
|
+ BigDecimal reduce = v.stream().map(x -> new BigDecimal(x.getUnitPrice())).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ vo.setPriceTotal(reduce.toString());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ list.addAll(v);
|
|
|
+ });
|
|
|
+ return list;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public TopQuestionImportVo importOrderQuestion(List<TopOrderQuestionImportBo> questionImportBos) {
|
|
|
+ TopQuestionImportVo vo = new TopQuestionImportVo();
|
|
|
+ //正确的数据集合
|
|
|
+ List<TopOldOrderQuestionVo> questionVos = new ArrayList<>();
|
|
|
+
|
|
|
+ Map<String, List<TopOrderQuestionImportBo>> collect =
|
|
|
+ questionImportBos.stream().collect(Collectors.groupingBy(TopOrderQuestionImportBo::getCreateNo));
|
|
|
+ collect.forEach((k,v) -> {
|
|
|
+ TopOldOrder oldOrder = topOldOrderService.getOne(new LambdaQueryWrapper<TopOldOrder>()
|
|
|
+ .eq(TopOldOrder::getCreateNo, k)
|
|
|
+ .last("limit 1"));
|
|
|
+ if (ObjectUtils.isNull(oldOrder)){
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ List<TopOldOrderGoods> list = topOrderGoodsService
|
|
|
+ .list(new LambdaQueryWrapper<TopOldOrderGoods>()
|
|
|
+ .eq(TopOldOrderGoods::getOrderSn, oldOrder.getOrderSn())
|
|
|
+ .eq(TopOldOrderGoods::getStatus, 1));
|
|
|
+ if (CollectionUtils.isEmpty(list)){
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ for (TopOldOrderGoods orderGoods : list) {
|
|
|
+ String businessFullName = orderGoods.getBusinessFullName();
|
|
|
+ if (!businessFullName.contains("考前培训") && !businessFullName.contains("施工现场专业人员")){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ List<TopOldOrderQuestion> questionList = topOldOrderQuestionService
|
|
|
+ .list(new LambdaQueryWrapper<TopOldOrderQuestion>()
|
|
|
+ .eq(TopOldOrderQuestion::getOrderSn, oldOrder.getOrderSn())
|
|
|
+ .eq(TopOldOrderQuestion::getOrderGoodsId, orderGoods.getOrderGoodsId())
|
|
|
+ .eq(TopOldOrderQuestion::getStatus, 1));
|
|
|
+ v.forEach(item -> {
|
|
|
+ if (item.getUserName().equals(orderGoods.getUserName())
|
|
|
+ && item.getUserCard().equals(EncryptHandler.decryptTwo(orderGoods.getUserCard())) && item.getMajorName().equals(orderGoods.getMajorName())){
|
|
|
+ //判断是否已开通
|
|
|
+ if (questionList.stream().anyMatch(x -> x.getOpenDate().equals(DateUtils.dateTimeSec("yyyy/MM/dd",item.getOpenDate())))){
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ //正确的
|
|
|
+ TopOldOrderQuestionVo questionVo = new TopOldOrderQuestionVo();
|
|
|
+ questionVo.setOrderSn(orderGoods.getOrderSn());
|
|
|
+ questionVo.setOrderGoodsId(orderGoods.getOrderGoodsId());
|
|
|
+ questionVo.setCreateNo(item.getCreateNo());
|
|
|
+ questionVo.setOpenDate(DateUtils.dateTimeSec("yyyy/MM/dd", item.getOpenDate()));
|
|
|
+ questionVo.setSign(item.getSign());
|
|
|
+ questionVo.setRemark(item.getRemark());
|
|
|
+ questionVo.setUserName(item.getUserName());
|
|
|
+ questionVo.setUserCard(item.getUserCard());
|
|
|
+ questionVo.setMajorName(item.getMajorName());
|
|
|
+ questionVo.setEduName("考前培训");
|
|
|
+ questionVo.setBusinessName("施工现场专业人员");
|
|
|
+ questionVo.setCheck(1);
|
|
|
+ questionVos.add(questionVo);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+ List<TopOldOrderQuestionVo> collect1 = questionImportBos.stream().map(item -> {
|
|
|
+ if (CollectionUtils.isNotEmpty(questionVos)) {
|
|
|
+ TopOldOrderQuestionVo questionVo = questionVos.stream().filter(x -> x.getUserName().equals(item.getUserName())
|
|
|
+ && x.getUserCard().equals(EncryptHandler.decryptTwo(item.getUserCard()))
|
|
|
+ && x.getMajorName().equals(item.getMajorName())
|
|
|
+ && x.getCreateNo().equals(item.getCreateNo())).findFirst().orElse(null);
|
|
|
+ if (ObjectUtils.isNotNull(questionVo)) {
|
|
|
+ return questionVo;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ TopOldOrderQuestionVo questionVo = BeanUtil.toBean(item, TopOldOrderQuestionVo.class);
|
|
|
+ questionVo.setOpenDate(DateUtils.dateTimeSec("yyyy/MM/dd", item.getOpenDate()));
|
|
|
+ questionVo.setCheck(2);
|
|
|
+ return questionVo;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ //正确的数量
|
|
|
+ Long count = collect1.stream().filter(x -> ObjectUtils.isNotNull(x.getCheck()) && x.getCheck() == 1).count();
|
|
|
+ vo.setTotal(collect1.size());
|
|
|
+ vo.setErrorNum(collect1.size() - count.intValue());
|
|
|
+ vo.setCorrectNum(count.intValue());
|
|
|
+ vo.setDataList(collect1);
|
|
|
+ return vo;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public boolean batchSaveOrderQuestion(List<TopOrderRepQuestionBo> bos) {
|
|
|
+ List<TopOldOrderQuestion> collect = bos.stream().map(item -> {
|
|
|
+ TopOldOrderQuestion question = BeanUtil.toBean(item, TopOldOrderQuestion.class);
|
|
|
+ question.setStatus(1);
|
|
|
+ question.setCreateTime(DateUtils.getNowTime());
|
|
|
+ question.setUpdateTime(DateUtils.getNowTime());
|
|
|
+ return question;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ return topOldOrderQuestionService.saveBatch(collect);
|
|
|
+ }
|
|
|
+
|
|
|
+ private String hideIDCard(String idCard) {
|
|
|
+ if (idCard == null || idCard.length() != 18) {
|
|
|
+ return idCard;
|
|
|
+ }
|
|
|
+ return idCard.substring(0, 6) + "******" + idCard.substring(14);
|
|
|
+ }
|
|
|
+
|
|
|
private List<Long> getDayTime(Long startTime,Long endTime){
|
|
|
List<Long> tiemList = new ArrayList<>();
|
|
|
Long zeroTime = DateUtils.getScheduleTimeZeroTime(startTime);
|
