Merge branch 'developer' into 'master'

Developer

See merge request !18

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/WmStoreApiServiceImpl.java

@@ -209,7 +209,7 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
                 return result.getResult().toString();
             }
         }
-        return null;
+        return "微盟商铺未配置会员卡";
     }
 
     private ServiceResponse<TabWmStoreConfig> getWmConfig(Integer wmMallStoreId, WmStoreConfigTypeEnum typeEnum) {

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

@@ -204,6 +204,7 @@ public class BillingPayInfoController {
             params.setShippingName(invoiceDTO.getShippingName());
             params.setShippingAddress(invoiceDTO.getShippingAddress());
             params.setShippingPhone(invoiceDTO.getShippingPhone());
+            params.setBusinessLicense(invoiceDTO.getBusinessLicense());
             ServiceResponse invoice = invoiceManageApiService.applyInvoice(params);
             if (invoice.isSuccess()) {
                 ServiceResponse updateInvoiceStatus = billingPayInfoApiService.updateInvoiceStatus(serialNumbers);

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

@@ -153,6 +153,10 @@ public class InvoiceListVO implements Serializable {
         this.invoiceType = invoiceType;
     }
 
+    public Integer getInvoiceType() {
+        return invoiceType;
+    }
+
     public String getInvoiceTypeStr() {
         return InvoiceTypeEnum.getMessageByCode(invoiceType);
     }