--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/enums/member/LevelEnum.java

@@ -9,11 +9,11 @@ package com.zrqx.core.enums.member;
 public enum LevelEnum {
 
 	/** 机构会员用户 */
-	ORGAN(2,"机构会员用户"),
+	ORGAN(2,"机构会员"),
 	/** 专家会员用户*/
-	EXPERT(1,"专家会员用户"),
+	EXPERT(1,"专家会员"),
 	/** 个人会员用户 */
-	PERSONAL(0,"个人会员用户");
+	PERSONAL(0,"个人会员");
 	//状态码
 	private final Integer code;
 	private final String value;

com.zrqx.core/src/main/java/com/zrqx/core/enums/sysuser/member/MemberStatusEnum.java

 package com.zrqx.core.enums.sysuser.member;
 
+import org.apache.commons.lang3.StringUtils;
+
 public enum MemberStatusEnum {
 	/**
-	 * 关闭
+	 * 禁用
 	 */
-	STATUS_0(0,"关闭"),
+	STATUS_0(0,"禁用"),
 	/**
-	 * 开启
+	 * 启用
 	 */
-	STATUS_1(1,"开启");
+	STATUS_1(1,"启用");
 	
 	private final Integer value;
 	private final String description;
@@ -17,6 +19,40 @@ public enum MemberStatusEnum {
 		this.value = value;
 		this.description = description;
 	}
+	
+	/**
+	 * 通过ID获取中文名称
+	 * @param code
+	 * @return
+	 */
+	public static String getDescription(Integer value) {
+		if (value == null) {
+			return null;
+		}
+		for (MemberStatusEnum mt : values()) {
+			if (mt.getValue().equals(value)) {
+				return mt.getDescription();
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * 通过中文名称获取ID
+	 * @param code
+	 * @return
+	 */
+	public static Integer getValue(String description) {
+		if (StringUtils.isBlank(description)) {
+			return null;
+		}
+		for (MemberStatusEnum mt : values()) {
+			if (mt.getDescription().equals(description)) {
+				return mt.getValue();
+			}
+		}
+		return null;
+	}
 
 	public Integer getValue() {
 		return value;

com.zrqx.core/src/main/java/com/zrqx/core/enums/sysuser/organmember/OMType.java

@@ -2,6 +2,8 @@ package com.zrqx.core.enums.sysuser.organmember;
 
 import lombok.Getter;
 
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * 机构会员类型
  */
@@ -24,6 +26,45 @@ public enum OMType {
 		this.value = value;
 	}
 
+	/**
+	 * 通过ID获取中文名称
+	 * @param code
+	 * @return
+	 */
+	public static String getValue(Integer key) {
+		if (key == null) {
+			return null;
+		}
+		for (OMType mt : values()) {
+			if (mt.getKey().equals(key)) {
+				return mt.getValue();
+			}
+		}
+		return null;
+	}
 	
+	/**
+	 * 通过中文名称获取ID
+	 * @param code
+	 * @return
+	 */
+	public static Integer getKey(String value) {
+		if (StringUtils.isBlank(value)) {
+			return null;
+		}
+		for (OMType mt : values()) {
+			if (mt.getValue().equals(value)) {
+				return mt.getKey();
+			}
+		}
+		return null;
+	}
 	
+	public Integer getKey() {
+		return key;
+	}
+
+	public String getValue() {
+		return value;
+	}
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/order/bg/OrderRemarkHistoryForm.java

+package com.zrqx.core.form.order.bg;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 添加订单历史备注封装类
+ * @author ycw
+ * @date 2018年7月12日上午9:39:49
+ */
+@Data
+public class OrderRemarkHistoryForm {
+	
+	@ApiModelProperty(value="订单id")
+	private Integer orderId;
+	
+	@ApiModelProperty(value="备注信息")
+	private String remark;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/order/bg/UpdateOrderInvoiceForm.java

+package com.zrqx.core.form.order.bg;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UpdateOrderInvoiceForm {
+	
+	@ApiModelProperty("订单id")
+	private Integer orderId;
+	
+	@ApiModelProperty("是否需要开票")
+	private String needInvoice;
+	
+	@ApiModelProperty("开票状态（0未开票，1已开票）")
+	private String invoiceStatus;
+
+	@ApiModelProperty("发票邮箱")
+	private String invoiceEmail;
+	
+	@ApiModelProperty("银行账号")
+	private String invoiceBankAccount;
+	
+	@ApiModelProperty("开户行")
+	private String invoiceOpenBank;
+	
+	@ApiModelProperty("发票类型 1个人2公司")
+	private Integer invoiceType;
+	
+	@ApiModelProperty("纳税人识别号")
+	private String taxpayerIdentificationNumber;
+	
+	@ApiModelProperty("发票内容,1图书2明细3资料")
+	private String invoiceContext;
+	
+	@ApiModelProperty("发票电话")
+	private String invoiceTel;
+	
+	@ApiModelProperty("发票地址")
+	private String invoiceAddress;
+	
+	@ApiModelProperty("个人：姓名   公司：发票抬头")
+	private String invoiceTitle;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/order/Order.java

@@ -172,6 +172,9 @@ public class Order {
 	@ApiModelProperty("创建人名称")
 	private String createrName;
 	
+	@ApiModelProperty("用户类别：0 普通用户，1专家用户，2机构用户")
+	private Integer level;
+	
 	@ApiModelProperty("最后修改时间")
 	private Date updateTime;
 	

com.zrqx.core/src/main/java/com/zrqx/core/vo/member/bg/member/ExportOrganMemberListVO.java

+package com.zrqx.core.vo.member.bg.member;
+
+import java.util.Date;
+
+import lombok.Data;
+
+import com.zrqx.core.util.excelutil.ExcelResources;
+
+@Data
+public class ExportOrganMemberListVO {
+	@ExcelResources(title = "会员id", order=1)
+	private Integer id;
+	@ExcelResources(title = "会员名称", order=2)
+	private String account;
+	@ExcelResources(title = "机构名称", order=3)
+	private String name;
+	@ExcelResources(title = "会员状态", order=4)
+	private String status_zh;
+	@ExcelResources(title = "类型", order=5)
+	private String type_zh;
+	@ExcelResources(title = "注册时间", order=6)
+	private Date createTime;
+	@ExcelResources(title = "到期时间", order=7)
+	private Date endTime;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/order/bg/OrderVO.java

@@ -18,6 +18,9 @@ public class OrderVO {
 	@ApiModelProperty("下单会员")
 	private String createrName;
 	
+	@ApiModelProperty("会员类别：0 普通用户，1专家用户，2机构用户")
+	private String level_zh;
+	
 	@ApiModelProperty("订单编号")
 	private String code;
 	
@@ -54,6 +57,10 @@ public class OrderVO {
 	@ApiModelProperty("订单详情列表")
 	private List<OrderInfo> orderinfoList;
 	
+	/** @see BooleanStatusEnum */
+	@ApiModelProperty("开票状态（0未开票，1已开票）")
+	private String invoiceStatus;
+	
 	@ApiModelProperty("发票信息id")
 	private String invoiceId;
 	
@@ -66,6 +73,9 @@ public class OrderVO {
 	@ApiModelProperty("纳税人识别号")
 	private String taxpayerIdentificationNumber;
 	
+	@ApiModelProperty("发票内容,1图书2明细")
+	private String invoiceContext;
+	
 	@ApiModelProperty("备注")
 	private String note;
 }