Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

# Conflicts:
#	gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/billing/InvoiceStatusEnum.java

+package com.gic.enterprise.constant.billing;
+
+/**
+ * 已开票单据状态
+ * @ClassName: InvoiceStatusEnum

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/8/16 10:45 AM

+ */
+public enum  InvoiceStatusEnum {
+    CANCEL(1, "已取消"),
+    REJECT(2, "已拒绝"),
+    APPLYING(3, "申请中"),
+    COMPLETE(4, "已完成");
+
+    private int code;
+    private String message;
+
+    private InvoiceStatusEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public static String getMessageByCode(Integer code) {
+        if (code == null) {
+            return "未知";
+        }
+        for (InvoiceStatusEnum typeEnum : values()) {
+            if (code.intValue() == typeEnum.getCode()) {
+                return typeEnum.getMessage();
+            }
+        }
+        return "未知";
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/qo/InvoiceListQueryQO.java

+package com.gic.enterprise.qo;
+/**
+ * 已申请开票单据查询列表参数
+ * @ClassName: InvoiceListQueryQO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/8/16 10:42 AM

+ */
+public class InvoiceListQueryQO extends PageQO{
+    private static final long serialVersionUID = 7556537704957995656L;
+
+    private String startTime;
+
+    private String endTime;
+    /**
+     * 发票状态
+     */
+    private Integer invoiceStatus;
+
+    private Integer enterpriseId;
+    /**
+     * 发票类型
+     */
+    private Integer invoiceType;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getInvoiceStatus() {
+        return invoiceStatus;
+    }
+
+    public void setInvoiceStatus(Integer invoiceStatus) {
+        this.invoiceStatus = invoiceStatus;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getInvoiceType() {
+        return invoiceType;
+    }
+
+    public void setInvoiceType(Integer invoiceType) {
+        this.invoiceType = invoiceType;
+    }
+}

gic-platform-enterprise-web/pom.xml

@@ -85,6 +85,11 @@
             <version>${gic-platform-enterprise-api}</version>
         </dependency>
         <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-platform-finance-api</artifactId>
+            <version>${gic-platform-finance-api}</version>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <version>2.1.5.RELEASE</version>

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/BillingPayInfoController.java

 package com.gic.enterprise.web.controller;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.gic.api.base.commons.Page;
+import com.gic.enterprise.web.vo.billing.InvoiceListVO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,10 +14,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.constant.PayTypeEnum;
+import com.gic.enterprise.dto.InvoiceDTO;
 import com.gic.enterprise.qo.BillListQueryQO;
+import com.gic.enterprise.qo.InvoiceListQueryQO;
 import com.gic.enterprise.service.BillingPayInfoApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.web.vo.BillListVO;
+import com.gic.enterprise.constant.billing.InvoiceStatusEnum;
+import com.gic.finance.service.InvoiceManageApiService;
 
 @RestController
 @RequestMapping("/billing-pay-info")
@@ -19,10 +31,80 @@ public class BillingPayInfoController {
 
     @Autowired
     private BillingPayInfoApiService billingPayInfoApiService;
+    @Autowired
+    private InvoiceManageApiService invoiceManageApiService;
 
+    /**
+     * 为开票单据列表
+     * @Title: listBill

+     * @Description:
+    
 * @author guojuxing
+     * @param params

+     * @return  com.gic.commons.webapi.reponse.RestResponse

+    
 */
     @RequestMapping("/list-bill")
     public RestResponse listBill(BillListQueryQO params) {
+        params.setEnterpriseId(1111);
         return ResultControllerUtils.commonPageResult(billingPayInfoApiService.listBill(params), BillListVO.class);
     }
 
+    @RequestMapping("/list-pay-type")
+    public RestResponse listPayType() {
+        Map<Integer, String> resultMap = new HashMap<>(16);
+        for (PayTypeEnum payTypeEnum : PayTypeEnum.values()) {
+            resultMap.put(payTypeEnum.getCode(), payTypeEnum.getMessage());
+        }
+        return RestResponse.success(resultMap);
+    }
+
+    @RequestMapping("/list-invoice-status")
+    public RestResponse listInvoiceStatus() {
+        Map<Integer, String> resultMap = new HashMap<>(16);
+        for (InvoiceStatusEnum invoiceStatusEnum : InvoiceStatusEnum.values()) {
+            resultMap.put(invoiceStatusEnum.getCode(), invoiceStatusEnum.getMessage());
+        }
+        return RestResponse.success(resultMap);
+    }
+
+    /**
+     * 开票
+     * @Title: applyInvoice

+     * @Description:
+    
 * @author guojuxing
+     * @param invoiceDTO
+     * @param billingAmount
+     * @param invoiceType

+     * @return  com.gic.commons.webapi.reponse.RestResponse

+    
 */
+    @RequestMapping("/apply-invoice")
+    public RestResponse applyInvoice(InvoiceDTO invoiceDTO, Double billingAmount, Integer invoiceType, String serialNumber) {
+        //todo 调用发起开票申请
+        //todo 更改支付信息中的发票状态未已开具
+        return RestResponse.success();
+    }
+
+    @RequestMapping("/cancel-invoice")
+    public RestResponse cancelInvoice(Integer invoiceManageId) {
+        //todo 调用开票取消
+        return RestResponse.success();
+    }
+
+    /**
+     * 已申请开票单据列表
+     * @Title: listInvoice

+     * @Description:
+    
 * @author guojuxing
+     * @param params

+     * @return  com.gic.commons.webapi.reponse.RestResponse

+    
 */
+    @RequestMapping("/list-invoice")
+    public RestResponse listInvoice(InvoiceListQueryQO params) {
+        //todo 发票列表
+        Page page = new Page();
+        List<InvoiceListVO> voList = new ArrayList<>(2);
+        voList.add(new InvoiceListVO());
+        page.setResult(voList);
+        return RestResponse.success(page);
+    }
+
 }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/billing/InvoiceListVO.java

+package com.gic.enterprise.web.vo.billing;
+
+import com.gic.finance.constant.InvoiceStatusEnum;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 已申请开票收据列表
+ * @ClassName: InvoiceListVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/8/16 1:42 PM

+ */
+public class InvoiceListVO implements Serializable {
+    private static final long serialVersionUID = 62938149871191351L;
+    /**
+     *
+     */
+    private Integer invoiceManageId;
+
+    /**
+     *
+     */
+    private Date createTime;
+    /**
+     * 申请单流水号
+     */
+    private String invoiceApplySerial;
+    /**
+     * 开票金额
+     */
+    private Double billingAmount;
+    /**
+     * 发票状态 1:待开具 2:待邮寄 3:已邮寄 4:已驳回 5:已取消
+     */
+    private Integer invoiceStatus;
+    /**
+     * 发票状态名称
+     */
+    private String invoiceStatusStr;
+    /**
+     * 快递公司
+     */
+    private String expressMailName;
+
+    /**
+     * 快递单号
+     */
+    private String expressMailNumber;
+    /**
+     * 驳回理由
+     */
+    private String rejectReason;
+
+    public Integer getInvoiceManageId() {
+        return invoiceManageId;
+    }
+
+    public void setInvoiceManageId(Integer invoiceManageId) {
+        this.invoiceManageId = invoiceManageId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getInvoiceApplySerial() {
+        return invoiceApplySerial;
+    }
+
+    public void setInvoiceApplySerial(String invoiceApplySerial) {
+        this.invoiceApplySerial = invoiceApplySerial;
+    }
+
+    public Double getBillingAmount() {
+        return billingAmount;
+    }
+
+    public void setBillingAmount(Double billingAmount) {
+        this.billingAmount = billingAmount;
+    }
+
+    public void setInvoiceStatus(Integer invoiceStatus) {
+        this.invoiceStatus = invoiceStatus;
+    }
+
+    public String getInvoiceStatusStr() {
+        if (invoiceStatus == null) {
+            return "--";
+        }
+        if (InvoiceStatusEnum.TO_BE_ISSUED.getCode() == invoiceStatus.intValue()
+                || InvoiceStatusEnum.TO_BE_MAILED.getCode() == invoiceStatus.intValue()) {
+            return "申请中";
+        }
+        if (InvoiceStatusEnum.CANCEL.getCode() == invoiceStatus.intValue()) {
+            return InvoiceStatusEnum.CANCEL.getMessage();
+        }
+        if (InvoiceStatusEnum.REJECT.getCode() == invoiceStatus.intValue()) {
+            return "已拒绝";
+        }
+        if (InvoiceStatusEnum.MAILED.getCode() == invoiceStatus.intValue()) {
+            return "已完成";
+        }
+        return "--";
+    }
+
+    public String getExpressMailName() {
+        return expressMailName;
+    }
+
+    public void setExpressMailName(String expressMailName) {
+        this.expressMailName = expressMailName;
+    }
+
+    public String getExpressMailNumber() {
+        return expressMailNumber;
+    }
+
+    public void setExpressMailNumber(String expressMailNumber) {
+        this.expressMailNumber = expressMailNumber;
+    }
+
+    public String getRejectReason() {
+        return rejectReason;
+    }
+
+    public void setRejectReason(String rejectReason) {
+        this.rejectReason = rejectReason;
+    }
+}

gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml

@@ -35,8 +35,10 @@
     <dubbo:reference interface="com.gic.store.service.ProvincesApiService" id="provincesApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.store.service.StoreStatusSettingApiService" id="storeStatusSettingApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.log.api.service.LogApiService" id="logApiService" timeout="60000" />
-
+    <!--支付信息-->
     <dubbo:reference interface="com.gic.enterprise.service.BillingPayInfoApiService" id="billingPayInfoApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.enterprise.service.PackApiService" id="packApiService" timeout="60000" />
+    <!--发票管理-->
+    <dubbo:reference interface="com.gic.finance.service.InvoiceManageApiService" id="invoiceManageApiService" timeout="60000" />
 
 </beans>
\ No newline at end of file