Merge branch 'developer' into 'master'

Developer

See merge request !17

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/InvoiceDTO.java

@@ -56,6 +56,16 @@ public class InvoiceDTO implements Serializable{
      */
     private String shippingAddress;
 
+    /**
+     * 电子发票类型，接收人邮箱
+     */
+    private String email;
+
+    /**
+     * 营业执照 图片地址
+     */
+    private String businessLicense;
+
     public String getAccountName() {
         return accountName;
     }
@@ -127,4 +137,22 @@ public class InvoiceDTO implements Serializable{
     public void setShippingAddress(String shippingAddress) {
         this.shippingAddress = shippingAddress;
     }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public InvoiceDTO setEmail(String email) {
+        this.email = email;
+        return this;
+    }
+
+    public String getBusinessLicense() {
+        return businessLicense;
+    }
+
+    public InvoiceDTO setBusinessLicense(String businessLicense) {
+        this.businessLicense = businessLicense;
+        return this;
+    }
 }

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

@@ -239,8 +239,7 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "店铺配置类型值非法");
             }
             //新增
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(),
-                    WmStoreConfigTypeEnum.getMessageByCode(wmStoreConfigType) + "还未配置");
+            return ServiceResponse.success(new WmStoreConfigDTO());
         }
         return ServiceResponse.success(EntityUtil.changeEntityNew(WmStoreConfigDTO.class, config));
     }