submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOldOrderRepController.java

@@ -1,21 +1,30 @@
 package com.zhongzheng.controller.order;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.domain.model.TopLoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.common.utils.poi.EasyPoiUtil;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.web.service.TopTokenService;
 import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
 import com.zhongzheng.modules.top.order.bo.*;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderQuestionVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderRepDetailVo;
 import com.zhongzheng.modules.top.order.vo.TopOldOrderRepVo;
+import com.zhongzheng.modules.top.order.vo.TopQuestionImportVo;
+import com.zhongzheng.modules.user.bo.UserDataImportBo;
+import com.zhongzheng.modules.user.vo.UserExportVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -25,7 +34,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-04-20
  */
-@Api(value = "订单控制器", tags = {"订单管理"})
+@Api(value = "订单明细控制器", tags = {"订单明细控制器"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/top/order/rep")
@@ -113,4 +122,29 @@ public class TopOldOrderRepController extends BaseController {
     public AjaxResult<Void> delOrderQuestion(@PathVariable("id") Long id) {
         return toAjax(iTopOldOrderService.delOrderQuestion(id) ? 1 : 0);
     }
+
+    /**
+     * 账单记录
+     */
+    @ApiOperation("账单记录")
+    @GetMapping("/bill/export")
+    public AjaxResult<Void> billExport(TopOrderRepQueryBo queryBo) {
+        List<TopOrderBillExportVo> list = iTopOldOrderService.billExportList(queryBo);
+        ExcelUtil<TopOrderBillExportVo> util = new ExcelUtil<>(TopOrderBillExportVo.class);
+        return util.exportExcel(list,"账单明细");
+    }
+
+    /**
+     * 订单题库开通记录导入
+     */
+    @ApiOperation("订单题库开通记录导入")
+    @PostMapping("/import/question")
+    public AjaxResult<TopQuestionImportVo> importOrderQuestion(MultipartFile file) {
+        List<TopOrderQuestionImportBo> questionImportBos = EasyPoiUtil.importExcel(file,0,1,TopOrderQuestionImportBo.class);
+        if (CollectionUtils.isEmpty(questionImportBos)){
+            throw new CustomException("导入文件格式不正确或文件为空，请检查文件!");
+        }
+        TopQuestionImportVo vo = iTopOldOrderService.importOrderQuestion(questionImportBos);
+        return AjaxResult.success(vo);
+    }
 }

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

@@ -210,4 +210,9 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 	boolean saveOrderQuestion(TopOrderRepQuestionBo bo);
 
 	boolean delOrderQuestion(Long id);
+
+    List<TopOrderBillExportVo> billExportList(TopOrderRepQueryBo queryBo);
+
+	TopQuestionImportVo importOrderQuestion(List<TopOrderQuestionImportBo> questionImportBos);
+
 }

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

@@ -21,6 +21,7 @@ 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.TelPhoneUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.modules.course.domain.*;
@@ -4499,6 +4500,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             String name = topCourseBusinessService.getBusinessFullName(bo.getBusinessId());
             bo.setBusinessFullName(name);
         }
+        //过滤C端订单
+        bo.setOrderFrom(1);
 
         List<TopOldOrderRepVo> orderRepList = baseMapper.queryOrderRepList(bo);
         if (CollectionUtils.isEmpty(orderRepList)){
@@ -4579,6 +4582,50 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 vo.setProceedsCheckDate(replenish.getProceedsCheckDate());
                 vo.setProceedsChange(replenish.getProceedsChange());
                 vo.setCost(replenish.getCost());
+            }else {
+                BigDecimal uncollected = vo.getPriceTotal();
+                vo.setUncollected(uncollected);
+                vo.setReceived(vo.getPriceTotal().subtract(uncollected));
+                //已退
+                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);
+                vo.setPractical(vo.getPriceTotal().subtract(refunded));
+                //发票
+                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;
@@ -4587,7 +4634,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     @Override
     public List<TopOldOrderRepDetailVo> getOrderDetailList(TopOrderRepGoodsQueryBo queryBo) {
         List<TopOldOrderRepDetailVo> list;
-        if (queryBo.getOrderForm() == 1) {
+        if (queryBo.getOrderFrom() == 1) {
             //新系统订单
             list = orderGoodsService.listRepByOrderSn(queryBo);
             if (CollectionUtils.isNotEmpty(list)) {
@@ -4735,6 +4782,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 //未收
                 orderReplenish.setOrderResidue(orderBySn.getOrderPrice().subtract(reduce));
                 orderReplenish.setProceedsJson(JSON.toJSONString(editBo.getProceedsJson()));
+            }else {
+                //未收
+                orderReplenish.setOrderResidue(orderBySn.getOrderPrice());
             }
             orderReplenish.setStatus(1);
             orderReplenish.setCreateTime(DateUtils.getNowTime());
@@ -4772,7 +4822,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     replenish.setOrderResidue(orderBySn.getOrderPrice().subtract(reduce));
                     replenish.setProceedsJson(JSON.toJSONString(editBo.getProceedsJson()));
                 }
+            }
 
+            if (ObjectUtils.isNull(replenish.getOrderResidue())){
+                replenish.setOrderResidue(orderBySn.getOrderPrice());
             }
             replenish.setUpdateTime(DateUtils.getNowTime());
             topOldOrderReplenishService.updateById(replenish);
@@ -4860,6 +4913,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             questionVo.setMajorName(majorName);
             questionVo.setOpenDate(s.getOpenDate());
             questionVo.setRemark(s.getRemark());
+            questionVo.setSign(s.getSign());
             resultList.add(questionVo);
         }
         return resultList;
@@ -4926,6 +4980,142 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         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();
+        vo.setTotal(questionImportBos.size());
+        Integer correct = 0;
+        Integer errorNum = 0;
+        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<TopOrderQuestionImportBo> collect1 = v.stream().filter(x -> x.getUserName().equals(orderGoods.getUserName())
+                        && x.getUserCard().equals(EncryptHandler.decryptTwo(orderGoods.getUserCard())) && x.getMajorName().equals(orderGoods.getMajorName())).collect(Collectors.toList());
+                if (CollectionUtils.isEmpty(collect1)){
+                    continue;
+                }
+                //新增题库开通记录
+                List<TopOldOrderQuestion> collect2 = collect1.stream().map(i -> {
+                    TopOldOrderQuestion question = new TopOldOrderQuestion();
+                    question.setOrderSn(orderGoods.getOrderSn());
+                    question.setOrderGoodsId(orderGoods.getOrderGoodsId());
+                    question.setOpenDate(DateUtils.dateTimeSec("yyyy/MM/dd", i.getOpenDate()));
+                    question.setSign(i.getSign());
+                    question.setRemark(i.getRemark());
+                    question.setStatus(1);
+                    question.setCreateTime(DateUtils.getNowTime());
+                    question.setUpdateTime(DateUtils.getNowTime());
+                    return question;
+                }).collect(Collectors.toList());
+            }
+        });
+        return vo;
+    }
+
+    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);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderBillExportVo.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.top.order.bo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2024年06月04日 15:00
+ */
+@Data
+public class TopOrderBillExportVo implements Serializable {
+
+    @Excel(name = "业务单号")
+    private String createNo;
+
+    @Excel(name = "所属客户")
+    private String purchaseOrg;
+
+    @Excel(name = "教育类型")
+    private String eduName;
+
+    @Excel(name = "业务层次")
+    private String businessName;
+
+    @Excel(name = "姓名")
+    private String userName;
+
+    @Excel(name = "身份证号码")
+    private String userCard;
+
+    @Excel(name = "专业")
+    private String majorName;
+
+    @Excel(name = "申请日期")
+    private String orderTime;
+
+    @Excel(name = "数量")
+    private String orderNum;
+
+    @Excel(name = "单价")
+    private String unitPrice;
+
+    @Excel(name = "金额")
+    private String priceTotal;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderQuestionImportBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.top.order.bo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2024年06月04日 15:00
+ */
+@Data
+public class TopOrderQuestionImportBo implements Serializable {
+
+    @Excel(name = "业务号")
+    private String createNo;
+
+    @Excel(name = "标签")
+    private String sign;
+
+    @Excel(name = "姓名")
+    private String userName;
+
+    @Excel(name = "身份证号码")
+    private String userCard;
+
+    @Excel(name = "专业")
+    private String majorName;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    @Excel(name = "日期")
+    private String openDate;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderRepGoodsQueryBo.java

@@ -28,7 +28,7 @@ public class TopOrderRepGoodsQueryBo implements Serializable {
     @ApiModelProperty("订单号")
     private String orderSn;
     @ApiModelProperty("订单来源 1新系统C端订单，2旧系统C端订单，3旧系统B端订单，4新系统后台题库订单，5新B端订单")
-    private Integer orderForm;
+    private Integer orderFrom;
     @ApiModelProperty("底单：1新系统，2旧系统")
     private Integer orderBase;
     @ApiModelProperty("C端订单过滤时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderRepQueryBo.java

@@ -37,6 +37,8 @@ public class TopOrderRepQueryBo implements Serializable {
     private String orderOrg;
     @ApiModelProperty("账款状态：0未结清，1已结清")
     private Integer creditStatus;
+    @ApiModelProperty("订单来源")
+    private Integer orderFrom;
     @ApiModelProperty("开始时间")
     private Long startTime;
     @ApiModelProperty("结束时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/bo/TopOrderRepQuestionBo.java

@@ -21,6 +21,8 @@ public class TopOrderRepQuestionBo implements Serializable {
     private Long orderGoodsId;
     @ApiModelProperty("开通时间")
     private Long openDate;
+    @ApiModelProperty("标签")
+    private String sign;
     @ApiModelProperty("备注")
     private String remark;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/domain/TopOldOrderQuestion.java

@@ -29,6 +29,8 @@ public class TopOldOrderQuestion implements Serializable {
     private Long orderGoodsId;
     /** 开通日期 */
     private Long openDate;
+    /** 标签 */
+    private String sign;
     /** 备注 */
     private String remark;
     /** 1有效 0无效 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOldOrderQuestionVo.java

@@ -48,7 +48,13 @@ public class TopOldOrderQuestionVo implements Serializable {
 	@ApiModelProperty("开通时间")
 	private Long openDate;
 
+	@ApiModelProperty("备注")
+	private String sign;
+
 	@ApiModelProperty("备注")
 	private String remark;
 
+	@ApiModelProperty("标签：1正确 2错误")
+	private Integer check;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopQuestionImportVo.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.top.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 订单视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("订单题库导入")
+public class TopQuestionImportVo implements Serializable {
+
+	@ApiModelProperty("总条数")
+	private Integer total;
+
+	@ApiModelProperty("正确")
+	private Integer correctNum;
+
+	@ApiModelProperty("错误")
+	private Integer errorNum;
+
+	@ApiModelProperty("数据")
+	private List<TopOldOrderQuestionVo> dataList;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -1004,7 +1004,7 @@
     <select id="listRepByOrderSn" parameterType="com.zhongzheng.modules.top.order.bo.TopOrderRepGoodsQueryBo"
             resultType="com.zhongzheng.modules.top.order.vo.TopOldOrderRepDetailVo">
         SELECT
-            og.order_sn
+            og.order_sn,
             og.order_goods_id,
             og.goods_id,
             u.user_id,

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

@@ -2681,6 +2681,9 @@
         <if test="orderOrg != null and orderOrg != ''">
             AND vto.order_org  = #{orderOrg}
         </if>
+        <if test="orderFrom != null and orderFrom != ''">
+            AND vto.order_from  != #{orderFrom}
+        </if>
         <if test="startTime != null and startTime != ''">
             AND vto.create_time <![CDATA[ >= ]]> #{startTime}
         </if>
@@ -2742,6 +2745,9 @@
         <if test="endTime != null and endTime != ''">
             AND ot.create_time <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="orderFrom != null and orderFrom != ''">
+            AND ot.order_from != #{orderFrom}
+        </if>
         <if test="keyword != null and keyword != ''">
             AND (
             ot.order_sn LIKE CONCAT( '%', #{keyword}, '%' )
@@ -2813,6 +2819,9 @@
         <if test="endTime != null and endTime != ''">
             AND o.create_time <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="orderFrom != null and orderFrom != ''">
+            AND 1 != #{orderFrom}
+        </if>
         <if test="keyword != null and keyword != ''">
             AND o.order_sn LIKE CONCAT( '%', #{keyword}, '%' )
         </if>