发票 优化

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -560,7 +560,9 @@ public class IoOrderDetailBizController extends BaseController {
     @Log(title = "发票管理", businessType = BusinessType.DELETE)
     public BaseResponse deleteById(@RequestBody IoOrderInvoiceEntity ioOrderInvoiceEntity) {
 
-        ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId()+"");
+
+        IoOrderInvoiceResponse ioOrderInvoiceResponse = orderDetailBizService.selectByinvoiceId(ioOrderInvoiceEntity.getId());
+
         //更改 登记状态
         IoOrderDetailCodeEntity ioOrderDetailBizEntity = new IoOrderDetailCodeEntity();
 
@@ -570,10 +572,11 @@ public class IoOrderDetailBizController extends BaseController {
 
         ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
 
-        ioOrderDetailBizEntity.setId(ioOrderInvoiceEntity.getRegId());
+        ioOrderDetailBizEntity.setId(ioOrderInvoiceResponse.getBizIdFk().intValue());
 
+        ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId()+"");
         List<IoOrderInvoiceResponse> list = orderDetailBizService.filterListInv(filterOrderDetailBizRequest);
-        if(list == null && list.size()==0){
+        if(list.size()==0){
             ioOrderDetailBizEntity.setRegStatus(false);
         }
         orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity);

src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java

@@ -24,6 +24,7 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
     List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
+    IoOrderInvoiceResponse selectByinvoiceId(Long id);
 
     /**
      * 查询单条单据业务详情

src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java

@@ -138,13 +138,13 @@ public class IoOrderDetailCodeEntity {
      * 单据数量
      */
     @TableField(value = "`count`")
-    private int count;
+    private Integer count;
 
     /**
      * 扫码数量
      */
     @TableField(value = "reCount")
-    private int reCount;
+    private Integer reCount;
 
     /**
      * 备注

src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java

@@ -86,6 +86,7 @@ public class IoOrderInvoiceResponse {
 
     private String ggxh;
     private String licenseUrl;
+    private Long bizIdFk;
 
 
     public static final String COL_ID = "id";

src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java

@@ -43,6 +43,7 @@ public interface IoOrderDetailBizService {
     List<IoOrderDetailBizEntity> checkOrderList(String orderId);
 
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
+    IoOrderInvoiceResponse selectByinvoiceId(Long id);
 
     Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity);
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -178,6 +178,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return ioOrderDetailBizDao.filterListInv(orderDetailBizRequest);
     }
 
+    @Override
+    public IoOrderInvoiceResponse selectByinvoiceId(Long id) {
+        return ioOrderDetailBizDao.selectByinvoiceId(id);
+    }
+
     @Override
     public Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity) {
         return ioOrderDetailBizDao.updateById(ioOrderDetailBizEntity) > 0;

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -73,6 +73,10 @@
         GROUP BY ic.id
     </select>
 
+    <select id="selectByinvoiceId" parameterType="java.lang.Long"  resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
+        select * from io_order_invoice where id= #{id}
+    </select>
+
     <select id="selectOrderDetailBiz" resultType="com.glxp.api.entity.inout.IoOrderDetailBizEntity">
         select *
         from io_order_detail_biz