dengsixing 3 лет назад
Родитель
Сommit
5111abdf24

+ 6 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/InvoiceController.java

@@ -8,6 +8,7 @@ import com.fdkankan.manage.service.IInvoiceService;
 import com.fdkankan.manage.vo.InvoicePageParamVO;
 import com.fdkankan.manage.vo.InvoiceVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -52,6 +53,11 @@ public class InvoiceController extends BaseController {
         return invoiceService.invoiceRegister(this.getUserId(), id, invoiceNum, shipNum, file);
     }
 
+    @PostMapping("/getInvoiceRegisterDetail")
+    public ResultData getInvoiceRegisterDetail(@RequestParam("id") Long id) throws Exception{
+        return invoiceService.getInvoiceRegisterDetail(id);
+    }
+
 
 
 }

+ 5 - 8
4dkankan-center-manage/src/main/java/com/fdkankan/manage/entity/Invoice.java

@@ -11,14 +11,6 @@ import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 
-/**
- * <p>
- * 发票表
- * </p>
- *
- * @author 
- * @since 2022-05-31
- */
 @Getter
 @Setter
 @TableName("t_invoice")
@@ -228,5 +220,10 @@ public class Invoice implements Serializable {
     @TableField("download_order_id")
     private Long downloadOrderId;
 
+    /**
+     * 开票状态(0-否,1-是)
+     */
+    @TableField("invoiced")
+    private Integer invoiced;
 
 }

+ 2 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/IInvoiceService.java

@@ -26,4 +26,6 @@ public interface IInvoiceService extends IService<Invoice> {
     ResultData invoiceRegister(Long userId, Long id, String invoiceNum,
         String shipNum,MultipartFile file) throws IOException;
 
+    ResultData getInvoiceRegisterDetail(@RequestParam("id") Long id);
+
 }

+ 22 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/service/impl/InvoiceServiceImpl.java

@@ -6,6 +6,7 @@ import com.fdkankan.common.annotation.Dict;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.InvoiceType;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.response.Result;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.manage.entity.Invoice;
@@ -15,6 +16,7 @@ import com.fdkankan.manage.service.IInvoiceRegisterService;
 import com.fdkankan.manage.service.IInvoiceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.vo.InvoicePageParamVO;
+import com.fdkankan.manage.vo.InvoiceRegisterDetailVO;
 import com.fdkankan.manage.vo.InvoiceVO;
 import java.io.File;
 import java.io.IOException;
@@ -101,4 +103,24 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
 
         return ResultData.ok();
     }
+
+    @Override
+    public ResultData getInvoiceRegisterDetail(Long id) {
+
+        Invoice invoice = this.getById(id);
+        if(Objects.isNull(invoice)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_9001);
+        }
+        InvoiceRegister invoiceRegister = invoiceRegisterService.getByInvoiceId(id);
+        if(Objects.isNull(invoice)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_9004);
+        }
+        return ResultData.ok(InvoiceRegisterDetailVO.builder()
+            .type(invoice.getType())
+            .email(invoice.getEmailAddress())
+            .invoiceNum(invoiceRegister.getInvoiceNum())
+            .invoiceUrl(invoiceRegister.getInvoiceUrl())
+            .shipNum(invoiceRegister.getShipNum())
+            .build());
+    }
 }

+ 32 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/InvoiceRegisterDetailVO.java

@@ -0,0 +1,32 @@
+package com.fdkankan.manage.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/6/2
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InvoiceRegisterDetailVO {
+
+    private Integer type;
+
+    private String email;
+
+    private String invoiceNum;
+
+    private String invoiceUrl;
+
+    private String shipNum;
+
+}

+ 5 - 0
4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/InvoiceVO.java

@@ -96,6 +96,11 @@ public class InvoiceVO {
      */
     private String email;
 
+    /**
+     * 开票状态(0-否,1-是)
+     */
+    private Integer invoiced;
+
 
 
 }

+ 6 - 3
4dkankan-center-manage/src/main/resources/mapper/manage/InvoiceMapper.xml

@@ -22,7 +22,8 @@
       i.`ship_name` as shipName,
       i.`ship_mobile` as shipMobile,
       i.`ship_address` as shipAddress,
-      i.`email_address` AS email
+      i.`email_address` AS email,
+      i.`invoiced`
       FROM t_invoice i
       LEFT JOIN t_order o ON i.`order_id` = o.`id`
       WHERE i.`consume_type` = 0 AND i.`rec_status` = 'A' AND o.`rec_status` = 'A' AND i.`type` != 1
@@ -61,7 +62,8 @@
       i.`ship_name` AS shipName,
       i.`ship_mobile` AS shipMobile,
       i.`ship_address` AS shipAddress,
-      i.`email_address` AS email
+      i.`email_address` AS email,
+      i.`invoiced`
       FROM t_invoice i
       LEFT JOIN t_increment_order o ON i.`increment_order_id` = o.`id`
       WHERE i.`consume_type` = 2 AND i.`rec_status` = 'A' AND o.`rec_status` = 'A' AND i.`type` != 1
@@ -100,7 +102,8 @@
       i.`ship_name` AS shipName,
       i.`ship_mobile` AS shipMobile,
       i.`ship_address` AS shipAddress,
-      i.`email_address` AS email
+      i.`email_address` AS email,
+      i.`invoiced`
       FROM t_invoice i
       LEFT JOIN t_download_order o ON i.`download_order_id` = o.`id`
       WHERE i.`consume_type` = 3 AND i.`rec_status` = 'A' AND o.`rec_status` = 'A' AND i.`type` != 1