录单详情 录单列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderInputController.java

@@ -56,7 +56,7 @@ public class OrderInputController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<OrderInputVo> list(OrderInputQueryBo bo) {
         startPage();
-        List<OrderInputVo> list = iOrderInputService.queryList(bo);
+        List<OrderInputVo> list = iOrderInputService.selectList(bo);
         return getDataTable(list);
     }
 
@@ -67,9 +67,9 @@ public class OrderInputController extends BaseController {
      */
     @ApiOperation("获取录单详细信息")
     @PreAuthorize("@ss.hasPermi('system:input:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<OrderInputVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iOrderInputService.queryById(id));
+    @GetMapping("/detail")
+    public AjaxResult<OrderInputVo> getInfo(OrderInputQueryBo bo) {
+        return AjaxResult.success(iOrderInputService.getInfo(bo));
     }
 
     /**
@@ -97,5 +97,22 @@ public class OrderInputController extends BaseController {
         return toAjax(iOrderInputService.updateByEditBo(bo) ? 1 : 0);
     }
 
+    @ApiOperation("查询录单详情用户列表")
+    @PreAuthorize("@ss.hasPermi('system:input:list')")
+    @GetMapping("/userList")
+    public TableDataInfo<OrderInputVo> getUserList(OrderInputQueryBo bo) {
+        startPage();
+        List<OrderInputVo> list = iOrderInputService.getUserList(bo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("查询录单用户商品列表")
+    @PreAuthorize("@ss.hasPermi('system:input:list')")
+    @GetMapping("/userGoodsList")
+    public TableDataInfo<OrderInputVo> getUserGoodsList(OrderInputQueryBo bo) {
+        startPage();
+        List<OrderInputVo> list = iOrderInputService.getUserGoodsList(bo);
+        return getDataTable(list);
+    }
 
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -82,4 +82,16 @@ public class ClassGradeController extends BaseController {
         bo.setUserId(loginUser.getUser().getUserId());
         return AjaxResult.success(iClassGradeUserService.changeGrade(bo));
     }
+
+    /**
+     * 检查用户是否学习过节
+     */
+    @ApiOperation("检查用户是否学习过节")
+    @PreAuthorize("@ss.hasPermi('grade:user:list')")
+    @GetMapping("/checkGoodsStudy")
+    public AjaxResult<Long> checkGoodsStudy(UserPeriodQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(iUserPeriodService.checkGoodsStudy(bo));
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseBusinessServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.course.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.zhongzheng.common.exception.CustomException;
@@ -8,6 +9,7 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.course.bo.CourseProjectTypeQueryBo;
 import com.zhongzheng.modules.course.vo.CourseProjectTypeVo;
+import org.apache.el.util.Validation;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -41,9 +43,8 @@ public class CourseBusinessServiceImpl extends ServiceImpl<CourseBusinessMapper,
     public CourseBusinessVo queryById(Long id){
         CourseBusinessQueryBo courseBusinessQueryBo = new CourseBusinessQueryBo();
         courseBusinessQueryBo.setId(id);
-        System.out.println(id+"业务ID");
         List<CourseBusinessVo> courseBusinessVos = entity2Vo(baseMapper.queryList(courseBusinessQueryBo));
-        if (CollectionUtils.isEmpty(courseBusinessVos)){
+        if (Validator.isEmpty(courseBusinessVos)||courseBusinessVos.size()<1){
             throw new IllegalArgumentException("请输入正确业务ID");
         }
         return BeanUtil.toBean(courseBusinessVos.get(0), CourseBusinessVo.class);

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

@@ -54,8 +54,7 @@ import java.util.stream.Collectors;
 @Service
 public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements IGoodsService {
 
-    @Autowired
-    private GoodsMapper goodsMapper;
+
 
     @Autowired
     private IGoodsCourseService iGoodsCourseService;
@@ -101,17 +100,17 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public List<GoodsVo> selectList(GoodsQueryBo bo) {
-        return goodsMapper.selectList(bo);
+        return baseMapper.selectList(bo);
     }
 
     @Override
     public GoodsVo selectDetail(Long goodsId) {
-        return goodsMapper.selectDetail(goodsId);
+        return baseMapper.selectDetail(goodsId);
     }
 
     @Override
     public Long getQuestionNum(Long goodsId) {
-        return goodsMapper.getQuestionNum(goodsId);
+        return baseMapper.getQuestionNum(goodsId);
     }
 
     @Override
@@ -423,7 +422,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public GoodsVo selectUserDetail(CourseQueryBo bo) {
-        GoodsVo goodsVo = goodsMapper.selectUserDetail(bo);
+        GoodsVo goodsVo = baseMapper.selectUserDetail(bo);
         //获得当前所在班级
         ClassGradeVo classGradeVo = courseMapper.gradeIdSelect(bo.getUserId(),bo.getGoodsId(),null);
         goodsVo.setGradeId(classGradeVo.getGradeId());

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

@@ -88,12 +88,6 @@ public class OrderAddBo {
     /** 录单订单编号 */
     @ApiModelProperty("录单订单编号")
     private String inputOrderSn;
-    /** 已收价格 */
-    @ApiModelProperty("已收价格")
-    private BigDecimal receivedPrice;
-    /** 已退价格 */
-    @ApiModelProperty("已退价格")
-    private BigDecimal refundPrice;
     /** 支付状态 0未收费，1部分付款  2完全付款 3免费 */
     @ApiModelProperty("支付状态 0未收费，1部分付款  2完全付款 3免费")
     private Integer payStatus;

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

@@ -102,12 +102,6 @@ public class OrderEditBo {
     /** 录单订单编号 */
     @ApiModelProperty("录单订单编号")
     private String inputOrderSn;
-    /** 已收价格 */
-    @ApiModelProperty("已收价格")
-    private BigDecimal receivedPrice;
-    /** 已退价格 */
-    @ApiModelProperty("已退价格")
-    private BigDecimal refundPrice;
     /** 支付状态 0未收费，1部分付款  2完全付款 3免费 */
     @ApiModelProperty("支付状态 0未收费，1部分付款  2完全付款 3免费")
     private Integer payStatus;

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

@@ -57,4 +57,10 @@ public class OrderInputQueryBo extends BaseEntity {
 	/** 项目ID */
 	@ApiModelProperty("项目ID")
 	private Long projectId;
+	@ApiModelProperty("搜索关键词")
+	private String searchKey;
+	@ApiModelProperty("订单开始时间")
+	private Long startTime;
+	@ApiModelProperty("订单结束时间")
+	private Long endTime;
 }

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

@@ -36,8 +36,9 @@ private static final long serialVersionUID=1L;
     public static final Integer ORDER_STATUS_PAY =1;  //1已支付(订单状态)
 
 
-    public static final Integer FROM_PLAT =1;  //业务员录单
-    public static final Integer FROM_SMALL =2;  //小程序订单
+    public static final Integer FROM_PLAT =1;  //业务员普通单
+    public static final Integer FROM_SMALL =2;  //祥粤云学堂小程序
+    public static final Integer FROM_INPUT =5;  //业务员录单
 
     /** $column.columnComment */
     @TableId(value = "order_id")
@@ -85,11 +86,8 @@ private static final long serialVersionUID=1L;
     private Long createSysUserId;
     /** 录单订单编号 */
     private String inputOrderSn;
-    /** 已收价格 */
-    private BigDecimal receivedPrice;
-    /** 已退价格 */
-    private BigDecimal refundPrice;
     /** 支付状态 0未收费，1部分付款  2完全付款 3免费 */
     private Integer payStatus;
 
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderInputMapper.java

@@ -1,8 +1,13 @@
 package com.zhongzheng.modules.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.bo.OrderInputQueryBo;
+import com.zhongzheng.modules.order.bo.OrderQueryBo;
 import com.zhongzheng.modules.order.domain.OrderInput;
 import com.zhongzheng.modules.order.vo.OrderInputVo;
+import com.zhongzheng.modules.order.vo.OrderListVo;
+
+import java.util.List;
 
 /**
  * 录单Mapper接口
@@ -11,6 +16,9 @@ import com.zhongzheng.modules.order.vo.OrderInputVo;
  * @date 2022-04-07
  */
 public interface OrderInputMapper extends BaseMapper<OrderInput> {
-
+    List<OrderInputVo> selectList(OrderInputQueryBo bo);
+    OrderInputVo getInfo(OrderInputQueryBo bo);
+    List<OrderInputVo> getUserList(OrderInputQueryBo bo);
+    List<OrderInputVo> getUserGoodsList(OrderInputQueryBo bo);
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderInputService.java

@@ -25,6 +25,10 @@ public interface IOrderInputService extends IService<OrderInput> {
 
 	OrderInput queryBySn(String inputOrderSn);
 
+	List<OrderInputVo> selectList(OrderInputQueryBo bo);
+
+	OrderInputVo getInfo(OrderInputQueryBo bo);
+
 	/**
 	 * 查询列表
 	 */
@@ -51,4 +55,8 @@ public interface IOrderInputService extends IService<OrderInput> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	List<OrderInputVo> getUserList(OrderInputQueryBo bo);
+
+	List<OrderInputVo> getUserGoodsList(OrderInputQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInputServiceImpl.java

@@ -42,6 +42,16 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
         return getOne(new LambdaQueryWrapper<OrderInput>().eq(OrderInput::getInputOrderSn,inputOrderSn));
     }
 
+    @Override
+    public List<OrderInputVo> selectList(OrderInputQueryBo bo) {
+        return this.baseMapper.selectList(bo);
+    }
+
+    @Override
+    public OrderInputVo getInfo(OrderInputQueryBo bo) {
+        return this.baseMapper.getInfo(bo);
+    }
+
     @Override
     public List<OrderInputVo> queryList(OrderInputQueryBo bo) {
         LambdaQueryWrapper<OrderInput> lqw = Wrappers.lambdaQuery();
@@ -110,4 +120,14 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public List<OrderInputVo> getUserList(OrderInputQueryBo bo) {
+        return this.baseMapper.getUserList(bo);
+    }
+
+    @Override
+    public List<OrderInputVo> getUserGoodsList(OrderInputQueryBo bo) {
+        return this.baseMapper.getUserGoodsList(bo);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -426,10 +426,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         }
 
         add.setOrderSn(out_trade_no);
-        add.setOrderFrom(Order.FROM_PLAT);
+        add.setOrderFrom(Order.FROM_INPUT);
         add.setPayPrice(payPrice);//需要支付价格
         add.setOrderPrice(totalPrice);//标准价格
-        add.setReceivedPrice(receivedPrice);//已支付
         //有已收费的商品,修改订单支付状态
         if((freeList.size()+payList.size())>0){
             add.setOrderStatus(Order.ORDER_STATUS_PAY);

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

@@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -52,4 +54,44 @@ public class OrderInputVo {
 	@Excel(name = "项目ID")
 	@ApiModelProperty("项目ID")
 	private Long projectId;
+
+	@ApiModelProperty("教育名称")
+	private String educationName;
+	@ApiModelProperty("项目名称")
+	private String projectName;
+	@ApiModelProperty("业务名称")
+	private String businessName;
+	/** 订单价格 */
+	@Excel(name = "订单价格")
+	@ApiModelProperty("订单标准价格")
+	private BigDecimal orderPrice;
+	/** 支付价格 */
+	@Excel(name = "支付价格")
+	@ApiModelProperty("成交价格")
+	private BigDecimal payPrice;
+	@Excel(name = "已收金额")
+	@ApiModelProperty("已收金额")
+	private BigDecimal goodsReceived;
+
+	@ApiModelProperty("用户人数")
+	private Integer userNum;
+	@ApiModelProperty("商品人数")
+	private Integer goodsNum;
+
+	private Long createTime;
+
+	@ApiModelProperty("姓名")
+	private String realname;
+
+	@ApiModelProperty("身份证")
+	private String idCard;
+
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+	@ApiModelProperty("订单编码")
+	private String orderSn;
 }

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

@@ -93,14 +93,6 @@ public class OrderVo {
 	@Excel(name = "录单订单编号")
 	@ApiModelProperty("录单订单编号")
 	private String inputOrderSn;
-	/** 已收价格 */
-	@Excel(name = "已收价格")
-	@ApiModelProperty("已收价格")
-	private BigDecimal receivedPrice;
-	/** 已退价格 */
-	@Excel(name = "已退价格")
-	@ApiModelProperty("已退价格")
-	private BigDecimal refundPrice;
 	/** 支付状态 0未收费，1部分付款  2完全付款 3免费 */
 	@Excel(name = "支付状态 0未收费，1部分付款  2完全付款 3免费")
 	@ApiModelProperty("支付状态 0未收费，1部分付款  2完全付款 3免费")

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -335,7 +335,6 @@ public class WxPayServiceImpl  implements IWxPayService {
             order.setPayTime(DateUtils.getNowTime());
             order.setTransid(transaction_id);
             order.setOrderGeneral(out_trade_no);
-            order.setReceivedPrice(order.getPayPrice());
             order.setStatus(1);
             if(iOrderService.updateById(order)){
                 Map<String,Object> map = new HashMap<>();

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -466,7 +466,7 @@
         (SELECT
         COUNT(DISTINCT up.course_id,up.module_id,up.chapter_id,up.section_id) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where ups.`status`
         =2 and ups.period_status = 1 and up.goods_id=#{goodsId} and up.grade_id = cg.grade_id and up.user_id = #{userId} and up.type = 2) as exam_pending,
-        (SELECT up.key_value FROM user_profile up where up.goods_id = #{goodsId} and up.user_id =#{userId} and up.current_status = 1 and up.type_status =1 LIMIT 1) as key_value
+        (SELECT up.key_value FROM user_profile up where up.goods_id = #{goodsId} and up.user_id =#{userId} and up.order_goods_id = cgu.order_goods_id and up.current_status = 1 and up.type_status =1 LIMIT 1) as key_value
         <if test="userId != null and userId !='' ">
             ,(SELECT MIN(first_start_time) from user_study_record where user_id = #{userId} and grade_id = #{gradeId}) as study_start_time,
             (SELECT MAX(end_time) from user_study_record where user_id = #{userId} and grade_id = #{gradeId}) as study_end_time

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

@@ -17,7 +17,130 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectId" column="project_id"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.order.vo.OrderInputVo" id="OrderInputVoResult">
+        <result property="id" column="id"/>
+        <result property="inputOrderSn" column="input_order_sn"/>
+        <result property="createUsername" column="create_username"/>
+        <result property="status" column="status"/>
+        <result property="createSysUserId" column="create_sys_user_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="educationTypeId" column="education_type_id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="projectId" column="project_id"/>
+        <result property="educationName" column="education_name"/>
+        <result property="projectName" column="project_name"/>
+        <result property="businessName" column="business_name"/>
+        <result property="userNum" column="user_num"/>
+        <result property="goodsNum" column="goods_num"/>
+        <result property="goodsReceived" column="goods_received"/>
+        <result property="orderPrice" column="order_price"/>
+        <result property="payPrice" column="pay_price"/>
+        <result property="realname" column="realname"/>
+        <result property="idCard" column="id_card"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="orderSn" column="order_sn"/>
+        <result property="userId" column="user_id"/>
+    </resultMap>
+
+    <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderInputQueryBo" resultMap="OrderInputVoResult">
+        SELECT
+            oi.input_order_sn,
+            count( DISTINCT o.user_id ) user_num,
+            count( DISTINCT og.goods_id ) goods_num,
+            any_value ( cet.education_name ) education_name,
+            any_value ( cpt.project_name ) project_name,
+            any_value ( cb.business_name ) business_name,
+            sum( og.goods_received ) goods_received,
+            sum( o.order_price ) order_price,
+            sum( o.pay_price ) pay_price,
+            any_value ( oi.create_username ) create_username,
+            any_value ( oi.create_time ) create_time
+        FROM
+            order_input oi
+                LEFT JOIN `order` o ON oi.input_order_sn = o.input_order_sn
+                LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+                LEFT JOIN course_education_type cet ON oi.education_type_id = cet.id
+                LEFT JOIN course_project_type cpt ON oi.project_id = cpt.id
+                LEFT JOIN course_business cb ON oi.business_id = cb.id
+        where 1=1
+        <if test="businessId != null and businessId != ''">
+        AND oi.business_id = #{businessId}
+        </if>
+        <if test="searchKey != null and searchKey != ''">
+            AND (oi.create_username like concat('%', #{searchKey}, '%') or oi.input_order_sn = #{searchKey})
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND oi.create_time >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND #{endTime} >= oi.create_time
+        </if>
+        GROUP BY
+            oi.input_order_sn
+    </select>
+
+
+    <select id="getInfo" parameterType="com.zhongzheng.modules.order.bo.OrderInputQueryBo" resultMap="OrderInputVoResult">
+        SELECT
+            oi.input_order_sn,
+            count( DISTINCT o.user_id ) user_num,
+            count( DISTINCT og.goods_id ) goods_num,
+            any_value ( cet.education_name ) education_name,
+            any_value ( cpt.project_name ) project_name,
+            any_value ( cb.business_name ) business_name,
+            sum( og.goods_received ) goods_received,
+            sum( o.order_price ) order_price,
+            sum( o.pay_price ) pay_price,
+            any_value ( oi.create_username ) create_username,
+            any_value ( oi.create_time ) create_time,
+            any_value ( oi.project_id ) project_id,
+            any_value ( oi.business_id ) business_id,
+            any_value ( oi.education_type_id ) education_type_id
+        FROM
+        order_input oi
+        LEFT JOIN `order` o ON oi.input_order_sn = o.input_order_sn
+        LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+        LEFT JOIN course_education_type cet ON oi.education_type_id = cet.id
+        LEFT JOIN course_project_type cpt ON oi.project_id = cpt.id
+        LEFT JOIN course_business cb ON oi.business_id = cb.id
+        where 1=1
+        AND oi.input_order_sn = #{inputOrderSn}
+        GROUP BY
+            oi.input_order_sn
+    </select>
 
+    <select id="getUserList" parameterType="com.zhongzheng.modules.order.bo.OrderInputQueryBo" resultMap="OrderInputVoResult">
+        SELECT
+            o.user_id,
+            u.realname,
+            u.id_card
+        FROM
+            order_input oi
+                LEFT JOIN `order` o ON oi.input_order_sn = o.input_order_sn
+                LEFT JOIN `user` u ON o.user_id = u.user_id
+        WHERE
+            1 = 1
+          AND oi.input_order_sn = #{inputOrderSn}
+        GROUP BY
+            o.user_id
+    </select>
 
+    <select id="getUserGoodsList" parameterType="com.zhongzheng.modules.order.bo.OrderInputQueryBo" resultMap="OrderInputVoResult">
+        SELECT
+            o.user_id,
+            g.goods_id,
+            g.goods_name,
+            o.order_sn
+        FROM
+            order_input oi
+                LEFT JOIN `order` o ON oi.input_order_sn = o.input_order_sn
+                LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+                LEFT JOIN goods g ON og.goods_id = g.goods_id
+        WHERE
+            1 = 1
+          AND oi.input_order_sn = #{inputOrderSn}
+          and o.user_id = #{userId}
+    </select>
 
 </mapper>

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

@@ -25,8 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createUsername" column="create_username"/>
         <result property="createSysUserId" column="create_sys_user_id"/>
         <result property="inputOrderSn" column="input_order_sn"/>
-        <result property="receivedPrice" column="received_price"/>
-        <result property="refundPrice" column="refund_price"/>
         <result property="payStatus" column="pay_status"/>
     </resultMap>
 
@@ -169,6 +167,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND u.user_id = #{userId}
             AND og.pay_status in (2,3)
         </if>
+        <if test="inputOrderSn != null">
+            AND o.input_order_sn = #{inputOrderSn}
+        </if>
         ORDER BY o.order_id DESC
     </select>