add 录单计费单

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

@@ -106,13 +106,13 @@ public class OrderBillSheetController extends BaseController {
     /**
      * 修改订单计费单
      */
-   /* @ApiOperation("修改订单计费单")
+   @ApiOperation("修改订单计费单")
     @PreAuthorize("@ss.hasPermi('system:sheet:edit')")
     @Log(title = "订单计费单", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody OrderBillSheetEditBo bo) {
         return toAjax(iOrderBillSheetService.updateByEditBo(bo) ? 1 : 0);
-    }*/
+    }
 
     /**
      * 删除订单计费单
@@ -158,4 +158,15 @@ public class OrderBillSheetController extends BaseController {
     public AjaxResult<Void> edit(@RequestBody OrderBillGoodsEditBo bo) {
         return toAjax(iOrderBillGoodsService.updateByEditBo(bo) ? 1 : 0);
     }
+
+    /**
+     * 修改订单计费单
+     */
+    @ApiOperation("修改录单总单计费单")
+    @PreAuthorize("@ss.hasPermi('system:sheet:edit')")
+    @Log(title = "修改录单总单计费单", businessType = BusinessType.UPDATE)
+    @PostMapping("/input/edit")
+    public AjaxResult<Void> editInput(@RequestBody OrderBillSheetEditBo bo) {
+        return toAjax(iOrderBillSheetService.updateByInputEditBo(bo) ? 1 : 0);
+    }
 }

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

@@ -79,11 +79,11 @@ public class OrderInputController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:input:add')")
     @Log(title = "录单", businessType = BusinessType.INSERT)
     @PostMapping()
-    public AjaxResult<Void> add(@RequestBody OrderInputAddBo bo) {
+    public AjaxResult<String> add(@RequestBody OrderInputAddBo bo) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         bo.setCreateSysUserId(loginUser.getUser().getUserId());
         bo.setCreateUsername(SecurityUtils.getUsername());
-        return toAjax(iOrderInputService.insertByAddBo(bo) ? 1 : 0);
+        return AjaxResult.success("录单单号",iOrderInputService.insertByAddBo(bo));
     }
 
     /**

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

@@ -230,4 +230,13 @@ public class GoodsUserQuestionVo {
 	private Long doNum;
 
 	private Long totalNum;
+
+	/** 服务有效期开始 */
+	@Excel(name = "服务有效期开始")
+	@ApiModelProperty("服务有效期开始")
+	private Long serviceStartTime;
+	/** 服务有效期结束 */
+	@Excel(name = "服务有效期结束")
+	@ApiModelProperty("服务有效期结束")
+	private Long serviceEndTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -378,7 +378,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
 
     @Override
     public Long todayStudySectionNum(UserPeriodQueryBo bo) {
-        long current=System.currentTimeMillis()/1000;
+        long current=System.currentTimeMillis();
         long zero=current/(1000*3600*24)*(1000*3600*24)-TimeZone.getDefault().getRawOffset();//今天零点零分零秒的毫秒数
         long twelve=zero+24*60*60*1000-1;//今天23点59分59秒的毫秒数
         bo.setTodayStartTime(zero/1000);

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

@@ -49,4 +49,7 @@ public class OrderBillGoodsAddBo {
     /** 状态 1正常 0关闭 */
     @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

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

@@ -59,4 +59,7 @@ public class OrderBillGoodsEditBo {
     @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
 
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

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

@@ -61,4 +61,7 @@ public class OrderBillGoodsQueryBo extends BaseEntity {
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
+	/** 订单商品ID */
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
 }

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

@@ -66,4 +66,7 @@ public class OrderBillSheetAddBo {
     /** 系统订单操作人 */
     @ApiModelProperty("系统订单操作人")
     private String createBy;
+    /** 录单订单编号 */
+    @ApiModelProperty("录单订单编号")
+    private String inputOrderSn;
 }

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

@@ -77,4 +77,7 @@ public class OrderBillSheetEditBo {
     @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
 
+    @ApiModelProperty("录单总编号")
+    private String inputOrderSn;
+
 }

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

@@ -70,5 +70,7 @@ public class OrderBillSheetQueryBo extends BaseEntity {
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
-
+	/** 录单订单编号 */
+	@ApiModelProperty("录单订单编号")
+	private String inputOrderSn;
 }

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

@@ -48,4 +48,6 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
     /** 状态 1正常 0关闭 */
     private Integer status;
+    /** 订单商品ID */
+    private Long orderGoodsId;
 }

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

@@ -59,4 +59,6 @@ private static final long serialVersionUID=1L;
     /** 系统订单操作人 */
     @TableField(fill = FieldFill.INSERT)
     private String createBy;
+    /** 录单订单编号 */
+    private String inputOrderSn;
 }

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

@@ -51,4 +51,6 @@ public interface IOrderBillGoodsService extends IService<OrderBillGoods> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+
 }

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

@@ -55,4 +55,8 @@ public interface IOrderBillSheetService extends IService<OrderBillSheet> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
 	Map<String, Object> placeBillOrder(OrderBillSheetAddBo bo);
+
+	Map<String, Object> placeBillInputOrder(OrderBillSheetAddBo bo);
+
+	Boolean updateByInputEditBo(OrderBillSheetEditBo bo);
 }

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

@@ -35,7 +35,7 @@ public interface IOrderInputService extends IService<OrderInput> {
 	 * @param bo 录单新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(OrderInputAddBo bo);
+	String insertByAddBo(OrderInputAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改录单

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

@@ -1,7 +1,9 @@
 package com.zhongzheng.modules.order.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.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
@@ -227,6 +229,95 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
         return result;
     }
 
+    /**
+     * 录单商品计费单收费
+     * @param bo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> placeBillInputOrder(OrderBillSheetAddBo bo) {
+        List<OrderBillGoodsAddBo> goodsList = bo.getGoodsList();
+        if(goodsList==null||goodsList.size()<1){
+            throw new CustomException("商品列表为空",510);
+        }
+        OrderBillSheet add = BeanUtil.toBean(bo, OrderBillSheet.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        //计费订单号
+        String sheet_no = DateUtils.getDateOrderSn();
+        add.setSheetSn(sheet_no);
+        //生成订单
+        Collection<OrderBillGoods> coll = new HashSet<>();
+        for (OrderBillGoodsAddBo g : goodsList) {
+            //计费单商品
+            OrderBillGoods orderGoods = BeanUtil.toBean(g, OrderBillGoods.class);
+            orderGoods.setOrderSn(g.getOrderSn());
+            orderGoods.setSheetSn(sheet_no);
+            orderGoods.setCreateTime(DateUtils.getNowTime());
+            orderGoods.setUpdateTime(DateUtils.getNowTime());
+            coll.add(orderGoods);
+
+            //订单商品
+            OrderGoods goods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderSn, g.getOrderSn()).eq(OrderGoods::getGoodsId,g.getGoodsId()));
+            if(goods==null){
+                throw new CustomException("订单商品错误",510);
+            }
+            Order order = iOrderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderSn, g.getOrderSn()));
+            if(order==null){
+                throw new CustomException("订单错误",510);
+            }
+            //计费单已收费用累加
+            if(goods.getGoodsRealPrice().compareTo(goods.getGoodsReceived()) == 0){
+                //完全收费
+                goods.setPayStatus(OrderGoods.PAY_FULL);
+            }
+            else{
+                //部分收费
+                goods.setPayStatus(OrderGoods.PAY_PART);
+            }
+            //设置商品服务期
+            goods = iWxPayService.setServiceTime(goods);
+            order.setStatus(1);//订单生效
+            order.setUpdateTime(DateUtils.getNowTime());
+            iOrderService.updateById(order);
+            goods.setUpdateTime(DateUtils.getNowTime());
+            iOrderGoodsService.updateById(goods);
+            iWxPayService.joinLockGrade(order.getOrderSn(),goods.getGoodsId(),goods.getOrderGoodsId());
+            iWxPayService.updateUserExamGoods(goods,order);
+        }
+        iOrderBillGoodsService.saveBatch(coll);
+        this.save(add);
+        Map<String, Object> result = new HashMap<>();
+        result.put("sheetId",add.getSheetId());
+        result.put("sheetSn",sheet_no);
+        return result;
+    }
+
+    @Override
+    public Boolean updateByInputEditBo(OrderBillSheetEditBo bo) {
+        if(Validator.isEmpty(bo.getInputOrderSn())){
+            throw new CustomException("缺少录单单号");
+        }
+
+        LambdaUpdateWrapper<OrderBillSheet> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        objectLambdaUpdateWrapper.eq(OrderBillSheet::getInputOrderSn,bo.getInputOrderSn());
+
+        objectLambdaUpdateWrapper.set(OrderBillSheet::getPayer,bo.getPayer());
+        objectLambdaUpdateWrapper.set(OrderBillSheet::getPayerTel,bo.getPayerTel());
+        objectLambdaUpdateWrapper.set(OrderBillSheet::getPayType,bo.getPayType());
+        objectLambdaUpdateWrapper.set(OrderBillSheet::getPayAccount,bo.getPayAccount());
+        objectLambdaUpdateWrapper.set(OrderBillSheet::getPayee,bo.getPayee());
+        objectLambdaUpdateWrapper.set(OrderBillSheet::getCollectionAccount,bo.getCollectionAccount());
+        objectLambdaUpdateWrapper.set(OrderBillSheet::getPayChannel,bo.getPayChannel());
+        objectLambdaUpdateWrapper.set(OrderBillSheet::getPosNumber,bo.getPosNumber());
+        objectLambdaUpdateWrapper.set(OrderBillSheet::getVoucherNo,bo.getVoucherNo());
+        objectLambdaUpdateWrapper.set(OrderBillSheet::getRefNo,bo.getRefNo());
+        objectLambdaUpdateWrapper.set(OrderBillSheet::getUpdateTime,DateUtils.getNowTime());
+        return this.update(null,objectLambdaUpdateWrapper);
+    }
+
 
     /**
      * 修改订单商品支付状态为完全支付

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

@@ -76,13 +76,14 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
     }
 
     @Override
-    public Boolean insertByAddBo(OrderInputAddBo bo) {
+    public String insertByAddBo(OrderInputAddBo bo) {
         OrderInput add = BeanUtil.toBean(bo, OrderInput.class);
         add.setInputOrderSn(DateUtils.getDateInputOrderSn());
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        this.save(add);
+        return add.getInputOrderSn();
     }
 
     @Override

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

@@ -119,6 +119,9 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
             for(int i=0;i<bo.getOrderGoodsIds().size();i++){
                 OrderInvoiceOrderAddBo item = new OrderInvoiceOrderAddBo();
                 item.setInvoiceId(add.getInvoiceId());
+                if(Validator.isEmpty(bo.getOrderGoodsIds().get(i))){
+                    throw new CustomException("订单商品ID缺失");
+                }
                 item.setOrderGoodsId(bo.getOrderGoodsIds().get(i));
                 iOrderInvoiceOrderService.insertByAddBo(item);
             }

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

@@ -32,10 +32,7 @@ import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.domain.OrderInput;
 import com.zhongzheng.modules.order.mapper.OrderMapper;
-import com.zhongzheng.modules.order.service.IOrderBusinessService;
-import com.zhongzheng.modules.order.service.IOrderGoodsService;
-import com.zhongzheng.modules.order.service.IOrderInputService;
-import com.zhongzheng.modules.order.service.IOrderService;
+import com.zhongzheng.modules.order.service.*;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderInputVo;
 import com.zhongzheng.modules.order.vo.OrderListVo;
@@ -83,7 +80,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     private IClassGradeGoodsService iClassGradeGoodsService;
 
     @Autowired
-    private IInformRemindService informRemindService;
+    private IOrderBillSheetService iOrderBillSheetService;
 
     @Autowired
     private IProfileTpService iProfileTpService;
@@ -358,14 +355,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //订单商品
             Goods goods = iGoodsService.getOne(new LambdaQueryWrapper<Goods>().eq(Goods::getGoodsId,g.getGoodsId()));
             if(goods.getGoodsStatus()!=1){
-                throw new CustomException("商品尚未上架");
+                throw new CustomException("商品尚未上架",510);
             }
             OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
             orderGoods.setOrderSn(out_trade_no);
             if(g.getGoodsInputData()!=null){
                 orderGoods.setGoodsInputData(JSON.toJSONString(g.getGoodsInputData()));
             }
-
+            if(g.getGoodsReceived().compareTo(g.getGoodsRealPrice())==1){
+                throw new CustomException("已收费大于成交价",510);
+            }
             //成交价
             orderGoods.setGoodsRealPrice(g.getGoodsRealPrice());
 
@@ -431,7 +430,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         add.setPayPrice(payPrice);//需要支付价格
         add.setOrderPrice(totalPrice);//标准价格
         add.setReceivedPrice(receivedPrice);//已支付
-        //有已收费的商品
+        //有已收费的商品,修改订单支付状态
         if((freeList.size()+payList.size())>0){
             add.setOrderStatus(Order.ORDER_STATUS_PAY);
             if(payPrice.compareTo(BigDecimal.ZERO)==0){
@@ -450,9 +449,23 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
         this.save(add);
         //处理收费商品,生成计费单
-        for( OrderGoods orderGoods : payList){
-
+        Map<String, Object> billRs = null;
+        if(payList.size()>0){
+            OrderBillSheetAddBo billSheetAddBo = new OrderBillSheetAddBo();
+            billSheetAddBo.setInputOrderSn(bo.getInputOrderSn());
+            List<OrderBillGoodsAddBo> billGoodsList = new ArrayList<>();
+            for( OrderGoods orderGoods : payList){
+                OrderBillGoodsAddBo billGoodsAddBo = new OrderBillGoodsAddBo();
+                billGoodsAddBo.setOrderSn(add.getOrderSn());
+                billGoodsAddBo.setGoodsId(orderGoods.getGoodsId());
+                billGoodsAddBo.setOrderGoodsId(orderGoods.getOrderGoodsId());
+                billGoodsAddBo.setAmount(orderGoods.getGoodsReceived());
+                billGoodsList.add(billGoodsAddBo);
+            }
+            billSheetAddBo.setGoodsList(billGoodsList);
+            billRs = iOrderBillSheetService.placeBillInputOrder(billSheetAddBo);
         }
+
         //处理免费商品
         for( OrderGoods orderGoods : freeList){
             dealFreeGoods(orderGoods,add);
@@ -460,6 +473,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         Map<String, Object> result = new HashMap<>();
         result.put("orderId",add.getOrderId());
         result.put("orderSn",out_trade_no);
+        result.put("sheetId",null);
+        result.put("sheetSn",null);
+        if(Validator.isNotEmpty(billRs)){
+            result.put("sheetId",billRs.get("sheetId"));
+            result.put("sheetSn",billRs.get("sheetSn"));
+        }
         return result;
     }
 

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

@@ -57,4 +57,8 @@ public class OrderBillGoodsVo {
 	@Excel(name = "状态 1正常 0关闭")
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
+	/** 订单商品ID */
+	@Excel(name = "订单商品ID")
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
 }

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

@@ -77,4 +77,9 @@ public class OrderBillSheetVo {
 	@Excel(name = "订单创建时间")
 	@ApiModelProperty("订单创建时间")
 	private Long createTime;
+
+	/** 录单订单编号 */
+	@Excel(name = "录单订单编号")
+	@ApiModelProperty("录单订单编号")
+	private String inputOrderSn;
 }

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -158,6 +158,8 @@
         <result property="studyCount" column="study_count"/>
         <result property="makeGoodsName" column="make_goods_name"/>
         <result property="makeGoodsCode" column="make_goods_code"/>
+        <result property="serviceStartTime" column="service_start_time"/>
+        <result property="serviceEndTime" column="service_end_time"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.bank.bo.QuestionQueryBo" resultMap="QuestionResultVo">
@@ -261,7 +263,9 @@
             ( SELECT gs.goods_name FROM goods gs WHERE 1 = 1 AND g.make_goods_id = gs.goods_id ) AS make_goods_name,
             ( SELECT gs.CODE FROM goods gs WHERE 1 = 1 AND g.make_goods_id = gs.goods_id ) AS make_goods_code,
             o.user_id,
-            og.create_time as order_create_time
+            og.create_time as order_create_time,
+            og.service_start_time,
+            og.service_end_time
         FROM
             goods g
                 LEFT JOIN pay_supply ps ON g.supply_id = ps.supply_id

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

@@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and up.create_time >= #{todayStartTime}
         </if>
         <if test="todayEndTime != null ">
-            and #{todayEndTime} > up.create_time
+            and #{todayEndTime} >= up.create_time
         </if>
     </select>
 </mapper>

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

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
 </mapper>

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

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
         <result property="createBy" column="create_by"/>
+        <result property="inputOrderSn" column="input_order_sn"/>
     </resultMap>
 
 

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

@@ -254,7 +254,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order_invoice oi
         LEFT JOIN order_invoice_order oio ON oi.invoice_id = oio.invoice_id
         WHERE
-        oi.period_status IN ( 1, 3 ) and  oi.user_id = #{userId} and oi.status != -1)
+        oi.period_status IN ( 1, 3 ) and  oi.user_id = #{userId} and oi.status != -1 and oio.order_goods_id is not NULL)
         <if test="refundStatusList != null and refundStatusList.size()!=0 ">
             AND og.refund_status in
             <foreach collection="refundStatusList" item="item" index="index" open="(" close=")" separator=",">

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

@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN order_invoice_order oio ON oi.invoice_id = oio.invoice_id
         WHERE
             oio.order_goods_id = #{orderGoodsId}
-          AND oi.period_status != 2
+          AND oi.period_status != 2 and  oi.`status` = 1
     </select>