更新申请开票接口

citu-module-member/citu-module-member-api/src/main/java/com/citu/module/member/enums/ErrorCodeConstants.java

@@ -61,4 +61,11 @@ public interface ErrorCodeConstants {
 
     ErrorCode INVOICE_LIST_NOT_EXISTS = new ErrorCode(1_004_014_001, "发票清单不存在");
 
+    ErrorCode INVOICE_LIST_ORDER_NOT_EXISTS = new ErrorCode(1_004_014_002, "待发票的订单不存在");
+
+    ErrorCode INVOICE_EXISTS = new ErrorCode(1_004_014_003, "已经存在开发票的记录!");
+
+
+
+
 }

citu-module-member/citu-module-member-biz/pom.xml

@@ -35,6 +35,12 @@
             <artifactId>citu-module-member-api</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-module-pay-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.citu</groupId>
             <artifactId>citu-module-system-api</artifactId>

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/controller/app/invoice/InvoiceListController.java

@@ -43,25 +43,25 @@ public class InvoiceListController {
 
     @PostMapping("/create")
     @Operation(summary = "创建发票")
-    public CommonResult<String> createInvoiceList(@Valid @RequestBody InvoiceListSaveReqVO createReqVO) {
+    public CommonResult<Long> createInvoiceList(@Valid @RequestBody InvoiceListSaveReqVO createReqVO) {
         return success(invoiceListService.createInvoiceList(createReqVO));
     }
 
-    @PutMapping("/update")
-    @Operation(summary = "更新发票清单")
-    @PreAuthorize("@ss.hasPermission('member:invoice-list:update')")
-    public CommonResult<Boolean> updateInvoiceList(@Valid @RequestBody InvoiceListSaveReqVO updateReqVO) {
-        invoiceListService.updateInvoiceList(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除发票清单")
-    @Parameter(name = "id", description = "编号", required = true)
-    public CommonResult<Boolean> deleteInvoiceList(@RequestParam("id") String id) {
-        invoiceListService.deleteInvoiceList(id);
-        return success(true);
-    }
+//    @PutMapping("/update")
+//    @Operation(summary = "更新发票清单")
+//    @PreAuthorize("@ss.hasPermission('member:invoice-list:update')")
+//    public CommonResult<Boolean> updateInvoiceList(@Valid @RequestBody InvoiceListSaveReqVO updateReqVO) {
+//        invoiceListService.updateInvoiceList(updateReqVO);
+//        return success(true);
+//    }
+
+//    @DeleteMapping("/delete")
+//    @Operation(summary = "删除发票清单")
+//    @Parameter(name = "id", description = "编号", required = true)
+//    public CommonResult<Boolean> deleteInvoiceList(@RequestParam("id") String id) {
+//        invoiceListService.deleteInvoiceList(id);
+//        return success(true);
+//    }
 
     @GetMapping("/get")
     @Operation(summary = "获得发票清单")
@@ -80,17 +80,17 @@ public class InvoiceListController {
         return success(BeanUtils.toBean(pageResult, InvoiceListRespVO.class));
     }
 
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出发票清单 Excel")
-//    @PreAuthorize("@ss.hasPermission('member:invoice-list:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportInvoiceListExcel(@Valid InvoiceListPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<InvoiceListDO> list = invoiceListService.getInvoiceListPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "发票清单.xls", "数据", InvoiceListRespVO.class,
-                        BeanUtils.toBean(list, InvoiceListRespVO.class));
-    }
+//    @GetMapping("/export-excel")
+//    @Operation(summary = "导出发票清单 Excel")
+////    @PreAuthorize("@ss.hasPermission('member:invoice-list:export')")
+//    @ApiAccessLog(operateType = EXPORT)
+//    public void exportInvoiceListExcel(@Valid InvoiceListPageReqVO pageReqVO,
+//              HttpServletResponse response) throws IOException {
+//        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+//        List<InvoiceListDO> list = invoiceListService.getInvoiceListPage(pageReqVO).getList();
+//        // 导出 Excel
+//        ExcelUtils.write(response, "发票清单.xls", "数据", InvoiceListRespVO.class,
+//                        BeanUtils.toBean(list, InvoiceListRespVO.class));
+//    }
 
 }

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/dal/dataobject/invoice/InvoiceListDO.java

@@ -23,8 +23,8 @@ public class InvoiceListDO extends BaseDO {
     /**
      * 主键
      */
-    @TableId(type = IdType.INPUT)
-    private String id;
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
     /**
      * 0.个人  1.企业
      */

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/dal/dataobject/invoice/InvoiceTitleDO.java

@@ -25,7 +25,7 @@ public class InvoiceTitleDO extends BaseDO {
     /**
      * 主键
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 0.个人  1.企业

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/framework/rpc/config/RpcConfiguration.java

@@ -1,5 +1,6 @@
 package com.citu.module.member.framework.rpc.config;
 
+import com.citu.module.pay.api.order.PayOrderApi;
 import com.citu.module.system.api.logger.LoginLogApi;
 import com.citu.module.system.api.sms.SmsCodeApi;
 import com.citu.module.system.api.social.SocialClientApi;
@@ -8,6 +9,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = {SmsCodeApi.class, LoginLogApi.class, SocialUserApi.class, SocialClientApi.class})
+@EnableFeignClients(clients = {PayOrderApi.class,SmsCodeApi.class, LoginLogApi.class, SocialUserApi.class, SocialClientApi.class})
 public class RpcConfiguration {
 }

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/service/invoice/InvoiceListService.java

@@ -22,7 +22,7 @@ public interface InvoiceListService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    String createInvoiceList(@Valid InvoiceListSaveReqVO createReqVO);
+    Long createInvoiceList(@Valid InvoiceListSaveReqVO createReqVO);
 
     /**
      * 更新发票清单

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/service/invoice/InvoiceListServiceImpl.java

@@ -1,9 +1,14 @@
 package com.citu.module.member.service.invoice;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.citu.framework.security.core.util.SecurityFrameworkUtils;
 import com.citu.module.member.controller.app.invoice.vo.InvoiceListPageReqVO;
 import com.citu.module.member.controller.app.invoice.vo.InvoiceListSaveReqVO;
 import com.citu.module.member.dal.dataobject.invoice.InvoiceListDO;
 import com.citu.module.member.dal.mysql.invoice.InvoiceListMapper;
+import com.citu.module.pay.api.order.PayOrderApi;
+import com.citu.module.pay.api.order.dto.PayOrderBaseRespDTO;
+import com.citu.module.pay.api.order.dto.PayOrderRespDTO;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -31,8 +36,30 @@ public class InvoiceListServiceImpl implements InvoiceListService {
     @Resource
     private InvoiceListMapper invoiceListMapper;
 
+    @Resource
+    private PayOrderApi payOrderApi;
+
+
     @Override
-    public String createInvoiceList(InvoiceListSaveReqVO createReqVO) {
+    public Long createInvoiceList(InvoiceListSaveReqVO createReqVO) {
+
+        PayOrderBaseRespDTO data = payOrderApi.getOrder2(Long.valueOf(createReqVO.getPayOrderId())).getData();
+        if(null==data){
+            throw   exception(INVOICE_LIST_ORDER_NOT_EXISTS);
+        }
+        // 非本人订单
+        if(!SecurityFrameworkUtils.getLoginUserId().toString().equals( data.getChannelUserId())){
+            throw   exception(INVOICE_LIST_ORDER_NOT_EXISTS);
+        }
+
+
+
+        InvoiceListDO invoiceListDO = invoiceListMapper.selectOne(new LambdaQueryWrapper<InvoiceListDO>().eq(InvoiceListDO::getPayOrderId, createReqVO.getPayOrderId()));
+
+        if(null!=invoiceListDO){
+          throw    exception(INVOICE_EXISTS);
+        }
+
         // 插入
         InvoiceListDO invoiceList = BeanUtils.toBean(createReqVO, InvoiceListDO.class);
         invoiceListMapper.insert(invoiceList);
@@ -70,6 +97,7 @@ public class InvoiceListServiceImpl implements InvoiceListService {
 
     @Override
     public PageResult<InvoiceListDO> getInvoiceListPage(InvoiceListPageReqVO pageReqVO) {
+        pageReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
         return invoiceListMapper.selectPage(pageReqVO);
     }