Merge branch 'developer' into 'master'

Developer

See merge request !5

gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/EnterpriseWhiteListController.java

+package com.gic.finance.web.controller;
+
+import com.gic.enterprise.service.EnterpriseApiService;
+import com.gic.finance.web.vo.EnterpriseInfoOfSelectVO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.service.EnterpriseWhiteListApiService;
+import com.gic.enterprise.utils.ResultControllerUtils;
+
+@RestController
+@RequestMapping("/white-list")
+public class EnterpriseWhiteListController {
+    private static Logger LOGGER = LoggerFactory.getLogger(EnterpriseWhiteListController.class);
+
+    @Autowired
+    private EnterpriseWhiteListApiService enterpriseWhiteListApiService;
+    @Autowired
+    private EnterpriseApiService enterpriseApiService;
+
+
+    @RequestMapping("/save-white-list")
+    public RestResponse saveWhiteList(Integer enterpriseId) {
+        return ResultControllerUtils.commonResult(enterpriseWhiteListApiService.saveEnterpriseWhiteList(enterpriseId));
+    }
+
+    @RequestMapping("/list-enterprise-by-name")
+    public RestResponse listEnterpriseByName(String search) {
+        return ResultControllerUtils.commonResult(enterpriseApiService.listEnterpriseByName(search),
+                EnterpriseInfoOfSelectVO.class);
+    }
+
+    @RequestMapping("/remove-white-list")
+    public RestResponse removeWhiteList(Integer enterpriseId) {
+        return ResultControllerUtils.commonResult(enterpriseWhiteListApiService.removeEnterpriseWhiteList(enterpriseId));
+    }
+
+    @RequestMapping("/get-enterprise-balance")
+    public RestResponse getEnterpriseBalance(Integer enterpriseId) {
+        return ResultControllerUtils.commonResult(enterpriseWhiteListApiService.getEnterpriseBalance(enterpriseId));
+    }
+
+    @RequestMapping("/list-white-list")
+    public RestResponse listWhiteList(String search, @RequestParam(defaultValue = "1") int currentPage,
+                                      @RequestParam(defaultValue = "20") int pageSize) {
+        return ResultControllerUtils.commonResult(enterpriseWhiteListApiService
+                .pageEnterpriseWhiteList(search, currentPage, pageSize));
+    }
+
+}

gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/EnterpriseInfoOfSelectVO.java

+package com.gic.finance.web.vo;
+
+import java.io.Serializable;
+
+public class EnterpriseInfoOfSelectVO implements Serializable{
+
+    private static final long serialVersionUID = -1757627270407759229L;
+    private Integer enterpriseId;
+
+    private String enterpriseName;
+
+    private String companyName;
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+}

gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/InvoiceManagerDetailVO.java

@@ -201,6 +201,10 @@ public class InvoiceManagerDetailVO implements Serializable{
         this.invoiceStatus = invoiceStatus;
     }
 
+    public Integer getInvoiceStatus() {
+        return invoiceStatus;
+    }
+
     public String getInvoiceStatusStr() {
         return InvoiceStatusEnum.getMessageByCode(invoiceStatus);
     }

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

@@ -55,6 +55,7 @@
     <dubbo:reference interface="com.gic.enterprise.service.BillingOrderApiService" id="billingOrderApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.enterprise.service.BillingRechargeRecordApiService" id="billingRechargeRecordApiService" timeout="60000" />
+    <dubbo:reference interface="com.gic.enterprise.service.EnterpriseWhiteListApiService" id="enterpriseWhiteListApiService" timeout="60000" />
 
     <!--开放给平台订单详情-->
     <dubbo:reference interface="com.gic.open.api.service.OrderApiService" id="orderApiService" timeout="60000" />