--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/constant/member/MemberRequestPath.java

@@ -17,5 +17,30 @@ public class MemberRequestPath extends BaseRequestPath {
 	public static final String O_MEMBER = "/o-member";
 	/** 机构管理*/
 	public static final String ORGAN = "/organ";
+	/** 站内信 **/
+	public static final String PM = "/pm";
+	
+	//前台模块
+	/** 登录与注册*/
+	public static final String PERMISSIONS 	= "/permissions";
+	/** 个人中心*/
+	public static final String PERSONAL_CENTER 	= "/personal-center";
+	
+	/** 登录*/
+	public static final String LOGIN 	= "/login";
+	/** 微信登录*/
+	public static final String WECHAT 	= "/wechat";
+	/** QQ登录*/
+	public static final String QQ 	= "/qq";
+	/** QQ登录*/
+	public static final String BIND 	= "/bind";
+	/** 登出*/
+	public static final String LOGOUT 	= "/logout";
+	/** 注册*/
+	public static final String REGISTER 	= "/register";
+	/** 验证码*/
+	public static final String CODE 	= "/code";
+	/** 手机短信验证码*/
+	public static final String CODE_PHONE 	= CODE+"-phone";
 	
 }

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

+package com.zrqx.core.enums.member;
+
+/**
+ * 
+ * @ClassName LevelEnum
+ * @Description: 会员用户级别枚举
+ *
+ */
+public enum LevelEnum {
+
+	/** 机构会员用户 */
+	ORGAN(2,"机构会员用户"),
+	/** 专家会员用户*/
+	EXPERT(1,"专家会员用户"),
+	/** 个人会员用户 */
+	PRESONAL(0,"个人会员用户");
+	//状态码
+	private final Integer code;
+	private final String value;
+	private LevelEnum(Integer code, String value) {
+		this.code = code;
+		this.value = value;
+	}
+	/**
+	 * 判断名称是否有效
+	 * @param code
+	 */
+	public static boolean isExist(Integer code) {
+		for (LevelEnum en : values()) {
+			if (en.code.equals(code)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	/**
+	 * 通过ID获取中文名称
+	 * @param code
+	 * @return
+	 */
+	public static String getName(Integer code) {
+		if (code == null) {
+			return null;
+		}
+		for (LevelEnum en : values()) {
+			if (en.getCode().equals(code)) {
+				return en.value;
+			}
+		}
+		return code.toString();
+	}
+	
+	public String getValue() {
+		return value;
+	}
+	public Integer getCode() {
+		return code;
+	}
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/exception/BaseException.java

@@ -2,47 +2,50 @@ package com.zrqx.core.exception;
 
 import com.zrqx.core.enums.ResponseCodeEnum;
 
-public class BaseException extends RuntimeException{
+public class BaseException extends RuntimeException {
 
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
 
-	private int code = ResponseCodeEnum.EXCEPTION.getCode();
+	private int code = ResponseCodeEnum.FAIL.getCode();
+	private Object data = null;
 
-	//无参构造方法
-    public BaseException(){
+	// 无参构造方法
+	public BaseException() {
 		super();
 	}
 
-    //有参的构造方法
-    public BaseException(String message){
+	// 有参的构造方法
+	public BaseException(String message) {
 		super(message);
 
 	}
-    //有参的构造方法
-    public BaseException(int code,String message){
+
+	public BaseException(int code, String message) {
 		super(message);
 		this.code = code;
 	}
 
+	public BaseException(int code, String message, Object data) {
+		super(message);
+		this.code = code;
+		this.data = data;
+	}
 
-	//有参的构造方法
-    public BaseException(ResponseCodeEnum res){
+	public BaseException(ResponseCodeEnum res) {
 		super(res.getMsg());
 		this.code = res.getCode();
 	}
 
 	// 用指定的详细信息和原因构造一个新的异常
-    public BaseException(String message, Throwable cause){
-
-        super(message,cause);
+	public BaseException(String message, Throwable cause) {
+		super(message, cause);
 	}
 
-    //用指定原因构造一个新的异常
+	// 用指定原因构造一个新的异常
 	public BaseException(Throwable cause) {
-
 		super(cause);
 	}
 
@@ -54,4 +57,12 @@ public class BaseException extends RuntimeException{
 		this.code = code;
 	}
 
+	public Object getData() {
+		return data;
+	}
+
+	public void setData(Object data) {
+		this.data = data;
+	}
+
 }
\ No newline at end of file

com.zrqx.core/src/main/java/com/zrqx/core/exception/LoginValidateException.java

 package com.zrqx.core.exception;
 
+import com.zrqx.core.enums.ResponseCodeEnum;
+
 /**
  * 登陆验证异常
  * @author ycw
@@ -12,9 +14,24 @@ public class LoginValidateException extends BaseException {
 	 */
 	private static final long serialVersionUID = 1L;
 
+	//无参构造方法
+	public LoginValidateException() {
+		super(ResponseCodeEnum.NO_LOGIN.getCode(), ResponseCodeEnum.NO_LOGIN.getMsg());
+	}
+
 	//有参的构造方法
 	public LoginValidateException(String message) {
-		super(message);
+		super(ResponseCodeEnum.NO_LOGIN.getCode(),message);
+	}
+
+	//有参的构造方法
+    public LoginValidateException(int code, String message){
+        super(code , message);
+    }
+
+	//有参的构造方法
+    public LoginValidateException(ResponseCodeEnum res){
+        super(res);
     }
 
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/member/bg/emember/SaveOrUpdateEMemberForm.java

+package com.zrqx.core.form.member.bg.emember;
+
+import javax.validation.constraints.NotNull;
+
+import com.zrqx.core.form.member.bg.member.SaveMemberForm;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class SaveOrUpdateEMemberForm extends SaveMemberForm{
+	@ApiModelProperty("头像地址")
+	private String img;
+	@ApiModelProperty("作者id/医家id")
+	@NotNull(message="作者id/医家id 不能为空！")
+	private Integer authorId;
+	@ApiModelProperty("真实姓名")
+	private String name;
+	@ApiModelProperty("机构名称 ")
+	private String organName;
+	@ApiModelProperty("用户性别 0 女 1男 2保密")
+	private Integer sex;
+	@ApiModelProperty("职称")
+	private Integer title;
+}
\ No newline at end of file

com.zrqx.core/src/main/java/com/zrqx/core/form/member/bg/member/SaveMemberForm.java

 package com.zrqx.core.form.member.bg.member;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class SaveMemberForm {
 	@ApiModelProperty("会员id，新增时不需填写")
 	private Integer id;

com.zrqx.core/src/main/java/com/zrqx/core/form/member/bg/pm/QueryPrivateMessageForm.java

+package com.zrqx.core.form.member.bg.pm;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class QueryPrivateMessageForm {
+	@ApiModelProperty(value="内容标题")
+	private String title;
+	@ApiModelProperty(value="开始发布时间")
+	private String biginReleaserTime;
+	@ApiModelProperty(value="结束发布时间")
+	private String endReleaserTime;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/member/bg/pmember/SaveOrUpdatePMemberForm.java

+package com.zrqx.core.form.member.bg.pmember;
+
+import com.zrqx.core.form.member.bg.member.SaveMemberForm;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class SaveOrUpdatePMemberForm extends SaveMemberForm{
+	@ApiModelProperty("会员id")
+	private Integer id;
+	@ApiModelProperty("会员账号")
+	private String account;
+	@ApiModelProperty("昵称")
+	private String nickName;
+	@ApiModelProperty("密码")
+	private String password;
+	@ApiModelProperty("手机号")
+	private String phone;
+	@ApiModelProperty("邮箱")
+	private String email;
+	@ApiModelProperty("用户状态 0 禁用 1启用")
+	private Integer status;
+	@ApiModelProperty("备注")
+	private String remark;
+	@ApiModelProperty("真实姓名")
+	private String name;
+	@ApiModelProperty("机构名称 ")
+	private String organName;
+	@ApiModelProperty("学历")
+	private Integer academic;
+	@ApiModelProperty("科室/部门")
+	private Integer dept;
+	@ApiModelProperty("职称")
+	private Integer title;
+	@ApiModelProperty("用户性别 0 女 1男 2保密")
+	private Integer sex;
+	@ApiModelProperty("头像地址")
+	private String img;
+}
\ No newline at end of file

com.zrqx.core/src/main/java/com/zrqx/core/form/member/fg/permissions/BindForm.java

+package com.zrqx.core.form.member.fg.permissions;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BindForm {
+	@ApiModelProperty("会员账号")
+	@NotNull
+	private String account;
+	@ApiModelProperty("微信Key")
+	private String wechatKey;
+	@ApiModelProperty("qqKey")
+	private String qqKey;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/member/fg/permissions/LoginForm.java

+package com.zrqx.core.form.member.fg.permissions;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LoginForm {
+	@ApiModelProperty(value="账号")
+	private String account;
+	@ApiModelProperty(value="密码")
+	private String password;
+	@ApiModelProperty(value="验证码UUID 账号或密码错误 5次以上 需填写")
+	private String uuid;
+	@ApiModelProperty(value="验证码 账号或密码错误 5次以上 需填写")
+	private String code;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/member/fg/permissions/LoginMemberInfo.java

+package com.zrqx.core.form.member.fg.permissions;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "LoginMemberInfo", description = "用户登录信息")
+public class LoginMemberInfo {
+	@ApiModelProperty("会员id")
+	private Integer id;
+	@ApiModelProperty("会员账号")
+	private String account;
+	@ApiModelProperty("昵称")
+	private String nickName;
+	@ApiModelProperty("用户类别：0 普通用户，1专家用户，2机构用户")
+	private Integer level;
+	@ApiModelProperty("用户状态 0 禁用 1启用")
+	private Integer status;
+	@ApiModelProperty("头像地址")
+	private String img;
+	@ApiModelProperty("作者id/医家id")
+	private Integer authorId;
+	@ApiModelProperty("机构用户所属机构id")
+	private Integer organId;
+	@ApiModelProperty("微信Key")
+	private String wechatKey;
+	@ApiModelProperty("qqKey")
+	private String qqKey;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/member/fg/permissions/SaveOMemberForm.java

+package com.zrqx.core.form.member.fg.permissions;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SaveOMemberForm {
+	@ApiModelProperty("会员账号")
+	private String account;
+	@ApiModelProperty("密码")
+	private String password;
+	@ApiModelProperty("机构码")
+	private String organCode;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/member/fg/permissions/SavePMemberForm.java

+package com.zrqx.core.form.member.fg.permissions;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SavePMemberForm {
+	@ApiModelProperty("会员账号")
+	private String account;
+	@ApiModelProperty("密码")
+	private String password;
+	@ApiModelProperty("手机号")
+	private String phone;
+	@ApiModelProperty("手机验证码")
+	private String code;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/BasePayForm.java

+package com.zrqx.core.form.third;
+
+import lombok.Data;
+
+/**
+ * 支付基础交互对象
+ * @author ydm
+ * @date 2018年8月17日上午10:29:55
+ */
+@Data
+public class BasePayForm {
+
+	/** 商品订单id*/
+	private String id;
+	/** 商户订单号 */
+	private String code;
+	/** 业务类型 */
+	private String businessType;
+	/** 支付类型 */
+	private String payType;
+	/**
+	 * 微信支付类型
+	 */
+	private Integer wechatPayType;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/alipay/AlipayForm.java

+package com.zrqx.core.form.third.alipay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class AlipayForm {
+	@ApiModelProperty(value="商户订单号，商户网站订单系统中唯一订单号，必填")
+	private String out_trade_no;
+	@ApiModelProperty(value="订单类型，必填")
+	private Integer type;
+	@ApiModelProperty(value="订单名称，必填")
+	private String subject;
+	@ApiModelProperty(value="商品描述，可空")
+	private String body;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/alipay/AlipayRefundForm.java

+package com.zrqx.core.form.third.alipay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class AlipayRefundForm {
+	@ApiModelProperty(value="商户订单号，商户网站订单系统中唯一订单号，必填")
+	private String out_trade_no;
+	@ApiModelProperty(value="需要退款的金额，该金额不能大于订单金额，必填")
+	private String refund_amount;
+	@ApiModelProperty(value="退款的原因说明")
+	private String refund_reason;
+	@ApiModelProperty(value="标识一次退款请求，同一笔交易多次退款需要保证唯一，如需部分退款，则此参数必传,请求退款接口时，传入的退款请求号，如果在退款请求时未传入，则该值为创建交易时的外部交易号，必填")
+	private String out_request_no;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/baiwang/BaiwangDestoryForm.java

+package com.zrqx.core.form.third.baiwang;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class BaiwangDestoryForm {
+	@ApiModelProperty(value="销方单位税号(纳税人识别号) 长度20，必填")
+	private String sellerTaxNo;
+	@ApiModelProperty(value="开票点编码 长度30，必填")
+	private String invoiceTerminalCode;
+	@ApiModelProperty(value="作废类型 0：空白票作废 1：已开票作废，必填")
+	private String invoiceInvalidType;
+	@ApiModelProperty(value="发票代码，必填")
+	private String invoiceCode;
+	@ApiModelProperty(value="发票号码，必填")
+	private String invoiceNo;
+	@ApiModelProperty(value="作废人，必填")
+	private String invoiceInvalidOperator;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/baiwang/BaiwangDetailForm.java

+package com.zrqx.core.form.third.baiwang;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BaiwangDetailForm {
+
+	
+	@ApiModelProperty(value="明细行号，必填")
+	private String goodsLineNo;
+	@ApiModelProperty(value="发票行性质，0：正常行 1：折扣行 2：被折扣行，必填")
+	private String goodsLineNature;
+	@ApiModelProperty(value="商品编码，必填")
+	private String goodsCode;
+	@ApiModelProperty(value="商品名称，必填")
+	private String goodsName;
+	@ApiModelProperty(value="商品数量")
+	private String goodsQuantity; 
+	@ApiModelProperty(value="计量单位")
+	private String goodsUnit;
+	@ApiModelProperty(value="商品单价")
+	private double goodsPrice; 
+	@ApiModelProperty(value="金额，必填")
+	private String goodsTotalPrice;
+	
+	@ApiModelProperty(value="商品税目")
+	private String goodsTaxItem;
+	
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/baiwang/BaiwangDownloadForm.java

+package com.zrqx.core.form.third.baiwang;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class BaiwangDownloadForm {
+	@ApiModelProperty(value="发票代码，二选一")
+	private String invoiceCode;
+	@ApiModelProperty(value="发票号码，二选一")
+	private String invoiceNo;
+	@ApiModelProperty(value="购房客户邮箱")
+	private String buyerEmail;
+	@ApiModelProperty(value="购方客户电话")
+	private String buyerPhone;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/baiwang/BaiwangForm.java

+package com.zrqx.core.form.third.baiwang;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("BaiwangForm")
+public class BaiwangForm {
+
+	
+	@ApiModelProperty(value="开票流水号，唯一标志开票请求。支持数字字母下划线组合。长度50，必填")
+	private String serialNo;
+	@ApiModelProperty(value="开票类型0:正数发票（蓝票） 1：负数发票（红票），必填，必填")
+	private String invoiceType;
+	@ApiModelProperty(value="购方单位名称，必填")
+	private String buyerName;
+	@ApiModelProperty(value="购方单位税号，必填")
+	private String buyerTaxNo;
+	@ApiModelProperty(value="购方地址及电话，专票必填")
+	private String buyerAddressPhone;
+	@ApiModelProperty(value="购方开户行及账号，专票必填")
+	private String buyerBankAccount;
+	@ApiModelProperty(value="合计金额，保留两位小数")
+	private String invoiceTotalPrice;
+	@ApiModelProperty(value="合计税额，保留两位小数")
+	private String invoiceTotalTax;
+	@ApiModelProperty(value="价税合计，保留两位小数")
+	private String invoiceTotalPriceTax;
+	@ApiModelProperty(value="原发票代码(开红票时传入)")
+	private String originalInvoiceCode;
+	@ApiModelProperty(value="原发票号码(开红票时传入)")
+	private String originalInvoiceNo;
+	@ApiModelProperty(value="备注最大长度168")
+	private String remarks;
+	
+	@ApiModelProperty(value="清单标志： 0：无清单 1：带清单 （发票明细大于等于8行必须带清单），必填")
+	private String invoiceListMark;
+	
+	
+	@ApiModelProperty(value="商品明细节点")
+	private List<BaiwangDetailForm> invoiceDetailsList;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/baiwang/BaiwangQueryForm.java

+package com.zrqx.core.form.third.baiwang;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class BaiwangQueryForm {
+	@ApiModelProperty(value="销方单位税号(纳税人识别号) 长度20，必填")
+	private String sellerTaxNo;
+	@ApiModelProperty(value="查询类型 1发票流水号查询  2发票号码和发票代码查询 3纳税人识别号【销方】  4开票终端标识 5开票日期起止  6.购方信息 7.机构代码 9.保单号 10.快递单号 11业务流水号")
+	private String invoiceQueryType;
+	@ApiModelProperty(value="开票日期起，格式：yyyyMMddHHmmss，选填")
+	private String invoiceStartDate;
+	@ApiModelProperty(value="开票日期止，格式：yyyyMMddHHmmss，选填")
+	private String invoiceEndDate;
+	@ApiModelProperty(value="发票代码，选填")
+	private String invoiceCode;
+	@ApiModelProperty(value="发票号码，选填")
+	private String invoiceNo;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/email/EmailForm.java

+package com.zrqx.core.form.third.email;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class EmailForm {
+	@ApiModelProperty(value="邮箱地址，必填")
+	private String email;
+	@ApiModelProperty(value="验证码，必填")
+	private String code;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/express100/ExpressInfoForm.java

+package com.zrqx.core.form.third.express100;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 物流信息提交form
+ * @author lw
+ * @date 2018年9月12日上午8:56:20
+ */
+@Data
+public class ExpressInfoForm {
+	
+	/** 快递公司编码 */
+	@ApiModelProperty(value = "快递公司编码", required = true)
+	private String company;
+	
+	/** 快递单号 */
+	@ApiModelProperty(value = "快递单号", required = true)
+	private String number;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/pay/CloseForm.java

+package com.zrqx.core.form.third.pay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * 关闭订单提交对象
+ * @author lw
+ * @date 2019年1月15日上午11:21:26
+ */
+@Data
+public class CloseForm {
+	
+	@ApiModelProperty(value = "商户订单号") 
+	String out_trade_no;
+	@ApiModelProperty(value = "支付宝交易号") 
+	String trade_no;
+	@ApiModelProperty("支付类型")
+	String payType;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/pay/PayResultForm.java

+package com.zrqx.core.form.third.pay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * 支付返回结果提交对象
+ * @author lw
+ * @date 2019年1月15日下午2:09:44
+ */
+@Data
+public class PayResultForm {
+	
+	@ApiModelProperty("支付类型")
+	private String payType;
+	
+	@ApiModelProperty("商户订单号")
+	private String out_trade_no;
+
+	public PayResultForm(String payType, String out_trade_no) {
+		super();
+		this.payType = payType;
+		this.out_trade_no = out_trade_no;
+	}
+
+	public PayResultForm() {
+		super();
+	}
+	
+	
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/pay/RefundForm.java

+package com.zrqx.core.form.third.pay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/*
+ * 退款提交对象
+ * @author lw
+ * @date 2019年1月15日上午10:50:49
+ */
+@Data
+public class RefundForm {
+	
+	@ApiModelProperty(value="商户订单号，商户网站订单系统中唯一订单号，必填")
+	private String out_trade_no;
+	@ApiModelProperty(value="需要退款的金额，该金额不能大于订单金额，必填")
+	private String refund_amount;
+	@ApiModelProperty(value="退款的原因说明")
+	private String refund_reason;
+	@ApiModelProperty(value="标识一次退款请求，同一笔交易多次退款需要保证唯一，如需部分退款，则此参数必传,请求退款接口时，传入的退款请求号，如果在退款请求时未传入，则该值为创建交易时的外部交易号，必填")
+	private String out_request_no;
+	
+	
+	@ApiModelProperty("交易流水号")
+	private String payCode;
+	@ApiModelProperty("退款金额")
+	private String p3_Amt;
+	
+	@ApiModelProperty("支付类型")
+	private String payType;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/pay/RefundQueryForm.java

+package com.zrqx.core.form.third.pay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 退款查询提交对象
+ * @author lw
+ * @date 2019年1月15日上午11:05:53
+ */
+@Data
+public class RefundQueryForm {
+	
+	@ApiModelProperty(value = "商户订单号")
+	String out_trade_no;
+	@ApiModelProperty(value = "退款请求号")
+	String out_request_no;
+	
+	@ApiModelProperty("付款类型")
+	String payType;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/pay/ToPayForm.java

+package com.zrqx.core.form.third.pay;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+@Data
+public class ToPayForm {
+
+	@ApiModelProperty(value="商户订单号，商户网站订单系统中唯一订单号，必填")
+	private String out_trade_no;
+	@ApiModelProperty(value="订单类型，必填")
+	private Integer type;
+	@ApiModelProperty(value="订单名称，必填")
+	private String subject;
+	@ApiModelProperty(value="商品描述，可空")
+	private String body;
+	@ApiModelProperty("订单金额")
+	private String total_amount;
+	
+	
+	@ApiModelProperty(value="商户订单号，必填")
+	private String p2_Order;
+	@ApiModelProperty(value="支付金額，必填")
+	private String p3_Amt;
+	@ApiModelProperty(value="商品名称，必填")
+	private String p5_Pid;
+	
+	
+	@ApiModelProperty("支付类型:枚举code")
+	private String payType;
+	
+	
+	
+	
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/sdksms/SdkSmsForm.java

+package com.zrqx.core.form.third.sdksms;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class SdkSmsForm {
+	@ApiModelProperty(value="待发送手机号，必填")
+	private String mobile;
+	@ApiModelProperty(value="内容")
+	private String content;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/sms/SmsForm.java

+package com.zrqx.core.form.third.sms;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class SmsForm {
+	@ApiModelProperty(value="待发送手机号，必填")
+	private String phone;
+	@ApiModelProperty(value="用户注册验证码为0，修改密码验证码为1，必填")
+	private Integer type;
+	@ApiModelProperty(value="用户名")
+	private String name;
+	@ApiModelProperty(value="outId为提供给业务方扩展字段,最终在短信回执消息中将此值带回给调用者")
+	private String outId;
+	@ApiModelProperty(value="验证码")
+	private String code;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/sms/SmsQueryForm.java

+package com.zrqx.core.form.third.sms;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class SmsQueryForm {
+	@ApiModelProperty(value="待查询手机号，必填")
+	private String phone;
+	@ApiModelProperty(value="流水号")
+	private String bizId;
+	@ApiModelProperty(value="时间，格式yyyyMMdd")
+	private String date;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/wechartpay/WeChartPayCallBackForm.java

+package com.zrqx.core.form.third.wechartpay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 调用订单服务推送的数据
+ * @author lw
+ * @date 2018年9月19日上午11:31:30
+ */
+@Data
+public class WeChartPayCallBackForm {
+	/** 订单编号 */
+	@ApiModelProperty("订单编号")
+	private String code;
+	@ApiModelProperty("交易订单号")
+	private String trade_no;
+	/** 订单总金额，单位为分 */
+	@ApiModelProperty("订单总金额，单位为分")
+	private String total_fee;
+	/** 支付返回类型
+	11, 支付宝支付,
+	12, 支付宝回调,
+	13, 支付宝退款,
+	21, 微信支付,
+	22, 微信回调,
+	23, 微信退款 */
+	@ApiModelProperty("支付返回类型")
+	private Integer type;
+	public WeChartPayCallBackForm(String code,String trade_no, String total_fee, Integer type) {
+		super();
+		this.code = code;
+		this.trade_no = trade_no;
+		this.total_fee = total_fee;
+		this.type = type;
+	}
+
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/wechartpay/WeChartPayForm.java

+package com.zrqx.core.form.third.wechartpay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class WeChartPayForm {
+	
+	@ApiModelProperty(value="商品描述，必填")
+	private String body;
+	@ApiModelProperty(value="类型，必填")
+	private Integer type;
+	@ApiModelProperty(value="商品ID，必填")
+	private String product_id;
+	@ApiModelProperty(value="订单号，必填")
+	private String out_trade_no;
+	@ApiModelProperty(value="支付方式:0(公众号支付)1(扫码支付)2(APP支付)，必填")
+	private String trade_type;
+	@ApiModelProperty(value="用户标识,如果是JSAPI必传")
+	private String openid;
+
+	
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/wechartpay/WeChartRefundForm.java

+package com.zrqx.core.form.third.wechartpay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class WeChartRefundForm {
+	
+	@ApiModelProperty(value="商户订单号，必填")
+	private String out_trade_no;
+	@ApiModelProperty(value="商户退款单号，必填")
+	private String out_refund_no;
+	@ApiModelProperty(value="订单金额，最多保留两位小数，必填")
+	private String total_fee;
+	@ApiModelProperty(value="退款金额，最多保留两位小数，必填")
+	private String refund_fee;
+	
+
+	
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/yeepay/YeePayForm.java

+package com.zrqx.core.form.third.yeepay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class YeePayForm {
+	@ApiModelProperty(value="商户订单号，必填")
+	private String p2_Order;
+	@ApiModelProperty(value="支付金額，必填")
+	private String p3_Amt;
+	@ApiModelProperty(value="商品名称，必填")
+	private String p5_Pid;
+
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/third/yeepay/YeeRefundForm.java

+package com.zrqx.core.form.third.yeepay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class YeeRefundForm {
+	@ApiModelProperty(value="易宝流水号，必填")
+	private String pb_TrxId;
+	@ApiModelProperty(value="退款金額，必填")
+	private String p3_Amt;
+
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/member/ExpertMember.java

@@ -21,4 +21,12 @@ public class ExpertMember {
 	@ApiModelProperty("作者id/医家id")
 	@NotNull(message="作者id/医家id 不能为空！")
 	private Integer authorId;
+	@ApiModelProperty("真实姓名")
+	private String name;
+	@ApiModelProperty("机构名称 ")
+	private String organName;
+	@ApiModelProperty("用户性别 0 女 1男 2保密")
+	private Integer sex;
+	@ApiModelProperty("职称")
+	private Integer title;
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/member/PmMember.java

+package com.zrqx.core.model.member;
+
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 站内信与会员关系表
+ *
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "m_private_message_member")
+@ApiModel(value="PmMember",description="站内信与会员关系表")
+public class PmMember {
+	@Id
+	@GeneratedValue(generator="JDBC")
+	@ApiModelProperty(value="站内信与会员关系表ID")
+	private Integer id;
+	@ApiModelProperty(value="会员id")
+	private Integer memberId;
+	@ApiModelProperty(value="站内信id")
+	private Integer pmId;
+	@ApiModelProperty(value="状态：0未读，1已读，2已删除")
+	private Integer status;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/member/PrivateMessage.java

+package com.zrqx.core.model.member;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 站内信
+ *
+ */
+@Data
+@Table(name = "m_private_message")
+@ApiModel(value="PrivateMessage",description="站内信")
+public class PrivateMessage {
+	@Id
+	@JsonIgnore
+	@GeneratedValue(generator="JDBC")
+	@ApiModelProperty(value="站内信ID")
+	private Integer id;
+	@ApiModelProperty(value="信息标题",required=true)
+	private String title;
+	@ApiModelProperty(value="内容",required=true)
+	private String content;
+	@ApiModelProperty(value="发送方式：0自动发送，1手动发送")
+	@JsonIgnore
+	private Integer sendType;
+	@ApiModelProperty(value="收信会员范围：0全部会员，1指定会员组，2指定会员",required=true)
+	private Integer acceptMember;
+	@ApiModelProperty(value="会员组 0 个人，1专家，2机构")
+	private Integer memberGroup;
+	@ApiModelProperty(value="2指定会员 会员id")
+	private List<Integer> memberIds;
+	@ApiModelProperty(value="发送时间")
+	@JsonIgnore
+	private Date sendTime;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/alipay/AlipayQueryReturn.java

+package com.zrqx.core.model.third.alipay;
+
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AlipayQueryReturn {
+
+	@ApiModelProperty(value="网关返回码，必填")
+	private String code;
+	@ApiModelProperty(value="网关返回码描述，必填")
+	private String msg;
+	@ApiModelProperty(value="支付宝交易号，必填")
+	private String trade_no;
+	@ApiModelProperty(value="商家订单号，必填")
+	private String out_trade_no;
+	@ApiModelProperty(value="买家支付宝账号，必填")
+	private String buyer_logon_id;
+	@ApiModelProperty(value="交易状态，必填")
+	private String trade_status;  
+	@ApiModelProperty(value="交易的订单金额，必填")
+	private String total_amount;
+	@ApiModelProperty(value="标价币种，选填")
+	private String trans_currency;
+	@ApiModelProperty(value="订单结算币种，选填")
+	private String settle_currency;
+	@ApiModelProperty(value="结算币种订单金额，选填")
+	private String settle_amount;
+	@ApiModelProperty(value="订单支付币种，选填")
+	private String pay_currency;
+	@ApiModelProperty(value="支付币种订单金额，选填")
+	private String pay_amount;
+	@ApiModelProperty(value="结算币种兑换标价币种汇率，选填")
+	private String settle_trans_rate;
+	@ApiModelProperty(value="标价币种兑换支付币种汇率，选填")
+	private String trans_pay_rate;
+	@ApiModelProperty(value="买家实付金额，选填")
+	private String buyer_pay_amount;
+	@ApiModelProperty(value="积分支付的金额，选填")
+	private String point_amount;
+	@ApiModelProperty(value="交易中用户支付的可开具发票的金额，选填")
+	private String invoice_amount;
+	@ApiModelProperty(value="本次交易打款给卖家的时间，选填")
+	private Date send_pay_date;
+	@ApiModelProperty(value="实收金额，选填")
+	private String receipt_ammount;
+	@ApiModelProperty(value="商户门店编号，选填")
+	private String store_id;
+	@ApiModelProperty(value="商户机具终端编号，选填")
+	private String terminal_id;
+	@ApiModelProperty(value="交易支付使用的资金渠道，选填")
+	private List<FundBillList> fund_bill_list;
+	@ApiModelProperty(value="请求交易支付中的商户店铺的名称，选填")
+	private String store_name;
+	@ApiModelProperty(value="买家在支付宝的用户id，必填")
+	private String buyer_user_id;
+	@ApiModelProperty(value="预授权支付模式，选填")
+	private String auth_trade_pay_mode;
+	@ApiModelProperty(value="买家用户类型，选填")
+	private String buyer_user_type;
+	@ApiModelProperty(value="商家优惠金额，选填")
+	private String mdiscount_amount;
+	@ApiModelProperty(value="平台优惠金额，选填")
+	private String discount_amount;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/alipay/AlipayRefundQueryReturn.java

+package com.zrqx.core.model.third.alipay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class AlipayRefundQueryReturn {
+
+	@ApiModelProperty(value="支付宝交易号")
+	private String trade_no;
+	@ApiModelProperty(value="商户订单号")
+	private String out_trade_no;
+	@ApiModelProperty(value="退款请求号")
+	private String out_request_no;
+	@ApiModelProperty(value="退款原因")
+	private String refund_reason;
+	@ApiModelProperty(value="交易总金额")
+	private String total_amount;
+	@ApiModelProperty(value="退款总金额")
+	private String refund_amount;
+	@ApiModelProperty(value="本次退款金额中买家退款金额，选填")
+	private String present_refund_buyer_amount;
+	@ApiModelProperty(value="本次退款中平台优惠退款金额，选填")
+	private String present_refund_discount_amount;
+	@ApiModelProperty(value="本次退款金额中商家优惠退款金额，选填")
+	private String present_refund_mdiscount_amount;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/alipay/FundBillList.java

+package com.zrqx.core.model.third.alipay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class FundBillList {
+
+	@ApiModelProperty(value="交易使用的资金渠道，必填")
+	private String fund_channel;
+	@ApiModelProperty(value="银行卡支付时的银行代码，可选")
+	private String bank_code;
+	@ApiModelProperty(value="该支付工具类型所使用的金额，必填")
+	private Integer ammount;
+	@ApiModelProperty(value="渠道实际付款金额，可选")
+	private String real_amount;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/alipay/RefundDetailItemList.java

+package com.zrqx.core.model.third.alipay;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class RefundDetailItemList {
+
+	@ApiModelProperty(value="交易使用的资金渠道，必填")
+	private String fund_channel;
+	@ApiModelProperty(value="该支付工具类型所使用的金额，必填")
+	private String amount;
+	@ApiModelProperty(value="渠道实际付款金额，可选")
+	private String real_amount;
+	@ApiModelProperty(value="渠道所使用的资金类型，可选")
+	private String fund_type;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/baiwang/BaiwangDownloadReturn.java

+package com.zrqx.core.model.third.baiwang;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BaiwangDownloadReturn {
+
+	@ApiModelProperty(value="版式文件下载路径")
+	private String message;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/baiwang/BaiwangPayReturn.java

+package com.zrqx.core.model.third.baiwang;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BaiwangPayReturn {
+
+	@ApiModelProperty(value="发票代码，必填")
+	private String invoiceCode;
+	@ApiModelProperty(value="发票号码，必填")
+	private String invoiceNo;
+	@ApiModelProperty(value="开票日期，必填")
+	private String invoiceDate;
+	@ApiModelProperty(value="税控码，必填")
+	private String taxControlCode;
+	@ApiModelProperty(value="校验码，必填")
+	private String invoiceCheckCode;
+	@ApiModelProperty(value="二维码，必填")
+	private String invoiceQrCode;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/baiwang/BaiwangQueryReturn.java

+package com.zrqx.core.model.third.baiwang;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class BaiwangQueryReturn {
+
+	@ApiModelProperty(value="设备类型")
+	private String deviceType;
+	@ApiModelProperty(value="开票流水号")
+	private String serialNo;
+	@ApiModelProperty(value="特殊票种标记")
+	private String invoiceSpecialMark; 
+	@ApiModelProperty(value="特殊票种标记")
+	private String invoiceTypeCode;
+	@ApiModelProperty(value="开票点编码")
+	private String invoiceTerminalCode;
+	@ApiModelProperty(value="销方纳税人识别号")
+	private String sellerTaxNo;
+	@ApiModelProperty(value="销方单位名称")
+	private String sellerName; 
+	@ApiModelProperty(value="销方地址及电话")
+	private String sellerAddressPhone; 
+	@ApiModelProperty(value="销方开户行及账号")
+	private String sellerBankAccount;
+	@ApiModelProperty(value="购方纳税人识别号")
+	private String buyerTaxNo;
+	@ApiModelProperty(value="购方单位名称")
+	private String buyerName;
+	@ApiModelProperty(value="购方地址及电话")
+	private String buyerAddressPhone; 
+	@ApiModelProperty(value="购方开户行及账号")
+	private String buyerBankAccount;
+	@ApiModelProperty(value="开票人")
+	private String drawer;
+	@ApiModelProperty(value="复核人")
+	private String checker;
+	@ApiModelProperty(value="收款人")
+	private String payee;
+	@ApiModelProperty(value="开票类型")
+	private String invoiceType;
+	@ApiModelProperty(value="清单标志，0：无清单 1：带清单")
+	private String invoiceListMark; 
+	@ApiModelProperty(value="红字信息表编号")
+	private String redInfoNo; 
+	@ApiModelProperty(value="原发票代码")
+	private String originalInvoiceCode;
+	@ApiModelProperty(value="原发票号码")
+	private String originalInvoiceNo;
+	@ApiModelProperty(value="征税方式，0：普通征税，2：差额征税")
+	private String taxationMode;
+	@ApiModelProperty(value="扣除额")
+	private Double deductibleAmount; 
+	@ApiModelProperty(value="合计金额")
+	private Double invoiceTotalPrice;
+	@ApiModelProperty(value="合计税额")
+	private Double invoiceTotalTax;
+	@ApiModelProperty(value="价税合计")
+	private Double invoiceTotalPriceTax;
+	@ApiModelProperty(value="签名值参数")
+	private String signatureParameter;
+	@ApiModelProperty(value="商品编码版本号")
+	private String goodsCodeVersion;
+	@ApiModelProperty(value="通知单编号")
+	private String notificationNo;
+	@ApiModelProperty(value="备注")
+	private String remarks;
+	@ApiModelProperty(value="发票代码")
+	private String invoiceCode;
+	@ApiModelProperty(value="发票号码")
+	private String invoiceNo;
+	@ApiModelProperty(value="开票日期")
+	private String invoiceDate;
+	@ApiModelProperty(value="税控码")
+	private String taxControlCode; 
+	@ApiModelProperty(value="校验码")
+	private String invoiceCheckCode;
+	@ApiModelProperty(value="二维码")
+	private String invoiceQrCode;
+	@ApiModelProperty(value="购方客户邮箱")
+	private String buyerEmail;
+	@ApiModelProperty(value="购方客户电话")
+	private String buyerPhone;
+	@ApiModelProperty(value="版式文件下载地址")
+	private String formatFileUrl;
+	@ApiModelProperty(value="作废原因")
+	private String invoiceInvalidReason;
+	@ApiModelProperty(value="作废人")
+	private String invoiceInvalidOperator;
+	@ApiModelProperty(value="发票状态，00开具成功 02空白发票作废 03:已开发票作废")
+	private String invoiceStatus;
+	@ApiModelProperty(value="上传标志，Y：已上传；N：未上传")
+	private String invoiceUploadMark;
+	@ApiModelProperty(value="签名标志，Y：已签名；N：未签名")
+	private String invoiceSignMark; 
+	@ApiModelProperty(value="验签标志，Y：已验签；N：未验签")
+	private String invoiceCheckMark;
+	@ApiModelProperty(value="组织编码")
+	private String organizationId;
+	@ApiModelProperty(value="租户编码")
+	private String tenantId;
+	@ApiModelProperty(value="商品明细")
+	private List<InvoiceDetailsList> invoiceDetailsList;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/baiwang/InvoiceDetailsList.java

+package com.zrqx.core.model.third.baiwang;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class InvoiceDetailsList {
+
+	@ApiModelProperty(value="明细行号")
+	private String goodsLineNo; 
+	@ApiModelProperty(value="发票行性质，0：正常行 1：折扣行 2：被折扣行")
+	private String goodsLineNature; 
+	@ApiModelProperty(value="商品编码发票代码，必填")
+	private String goodsCode;
+	@ApiModelProperty(value="自行编码")
+	private String goodsExtendCode; 
+	@ApiModelProperty(value="商品名称")
+	private String goodsName;
+	@ApiModelProperty(value="商品税目")
+	private String goodsTaxItem;
+	@ApiModelProperty(value="规格型号")
+	private String goodsSpecification; 
+	@ApiModelProperty(value="计量单位")
+	private String goodsUnit;
+	@ApiModelProperty(value="商品数量")
+	private String goodsQuantity;
+	@ApiModelProperty(value="商品单价")
+	private String goodsPrice;
+	@ApiModelProperty(value="金额")
+	private String goodsTotalPrice;
+	@ApiModelProperty(value="税额")
+	private String goodsTotalTax;
+	@ApiModelProperty(value="税率")
+	private String goodsTaxRate; 
+	@ApiModelProperty(value="折行对应行号")
+	private String goodsDiscountLineNo;
+	@ApiModelProperty(value="含税标志，0：不含税 1：含税")
+	private String priceTaxMark; 
+	@ApiModelProperty(value="增值税特殊管理")
+	private String vatSpecialManagement;
+	@ApiModelProperty(value="零税率标识，空代表无 1 出口免税和其他免税优惠政策 2 不征增值税 3 普通零税率")
+	private String freeTaxMark;
+	@ApiModelProperty(value="是否使用优惠政策， 0:未使用，1:使用")
+	private String preferentialMark;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/express100/ExpressResponse.java

+package com.zrqx.core.model.third.express100;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * 订阅响应
+ * @author lw
+ * @date 2018年9月12日上午9:51:03
+ */
+@Data
+public class ExpressResponse {
+	
+	@ApiModelProperty("响应结果")
+	private boolean result;
+	
+	@ApiModelProperty("响应编码")
+	private String returnCode;
+	
+	@ApiModelProperty("响应信息")
+	private String message;
+	
+	
+	
+	public static ExpressResponse success(){
+		return new ExpressResponse(true, "200", "成功");
+	}
+
+	public static ExpressResponse fail(){
+		return new ExpressResponse(false, "500", "失败");
+	}
+
+
+	public ExpressResponse(boolean result, String returnCode, String message) {
+		super();
+		this.result = result;
+		this.returnCode = returnCode;
+		this.message = message;
+	}
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/express100/LogisticsDetails.java

+package com.zrqx.core.model.third.express100;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 物流详情
+ * @author lw
+ * @date 2018年9月13日下午2:42:00
+ */
+@Data
+public class LogisticsDetails {
+	
+	/** 内容 */
+	@ApiModelProperty("内容")
+	private String context;
+	
+	/** 时间，原始格式 */
+	@ApiModelProperty("时间，原始格式")
+	private String time;
+	
+	/** 格式化后时间 */
+	@ApiModelProperty("格式化后时间")
+	private String ftime;
+	
+	/** 本数据元对应的签收状态 */
+	@ApiModelProperty("本数据元对应的签收状态。需要开通签收状态服务,且在订阅接口中提交resultv2标记后才会出现")
+	private String status; 
+	
+	/** 本数据元对应的行政区域的编码 */
+	@ApiModelProperty("本数据元对应的行政区域的编码，需要开通签收状态服务,且在订阅接口中提交resultv2标记后才会出现")
+	private String areaCode;
+	
+	/** 本数据元对应的行政区域的名称 */
+	@ApiModelProperty("本数据元对应的行政区域的名称，需要开通签收状态服务,且在订阅接口中提交resultv2标记后才会出现")
+	private String areaName;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/express100/LogisticsNewest.java

+package com.zrqx.core.model.third.express100;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 最新的查询结果
+ * @author lw
+ * @date 2018年9月13日下午2:36:16
+ */
+@Data
+public class LogisticsNewest {
+	
+	/** 消息体 */
+	@ApiModelProperty("消息体")
+	private String message;
+	
+	/** 快递单当前签收状态，包括0在途中、1已揽收、2疑难、3已签收、4退签、5同城派送中、6退回、7转单等7个状态，其中4-7需要另外开通才有效 */
+	@ApiModelProperty("快递单当前签收状态，包括0在途中、1已揽收、2疑难、3已签收、4退签、5同城派送中、6退回、7转单等7个状态，其中4-7需要另外开通才有效")
+	private String state;
+	
+	/** 是否签收标记 */
+	@ApiModelProperty("是否签收标记")
+	private String ischeck;
+	
+	/** 快递公司编码,一律用小写字母 */
+	@ApiModelProperty("快递公司编码,一律用小写字母")
+	private String com;
+	
+	/** 单号 */
+	@ApiModelProperty("单号")
+	private String nu;
+	
+	/** 详情 */
+	@ApiModelProperty("详情")
+	private List<LogisticsDetails> data;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/express100/LogisticsParam.java

+package com.zrqx.core.model.third.express100;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 物流信息实体
+ * @author lw
+ * @date 2018年9月13日下午2:27:11
+ */
+@Data
+public class LogisticsParam {
+	
+	/** 监控状态:polling:监控中，shutdown:结束，abort:中止，updateall：重新推送。
+	 * 其中当快递单为已签收时status=shutdown，当message为“3天查询无记录”或“60天无变化时”status= abort ，对于stuatus=abort的状度，需要增加额外的处理逻辑 */
+	@ApiModelProperty("监控状态:polling:监控中，shutdown:结束，abort:中止，updateall：重新推送。"
+			+ "其中当快递单为已签收时status=shutdown，当message为'3天查询无记录'或'60天无变化时'status= abort,对于stuatus=abort的状度，需要增加额外的处理逻辑")
+	private String status;
+	
+	/** 监控状态相关消息 */
+	@ApiModelProperty("监控状态相关消息")
+	private String message;
+	
+	/** 快递公司编码是否出错，0为本推送信息对应的是贵司提交的原始快递公司编码，1为本推送信息对应的是我方纠正后的新的快递公司编码 */
+	@ApiModelProperty("快递公司编码是否出错，0为本推送信息对应的是贵司提交的原始快递公司编码，1为本推送信息对应的是我方纠正后的新的快递公司编码")
+	private String autoCheck;
+	
+	/** 原始的快递公司编码 */
+	@ApiModelProperty("原始的快递公司编码")
+	private String comOld;
+	
+	/** 纠正后的新的快递公司编码 */
+	@ApiModelProperty("纠正后的新的快递公司编码")
+	private String comNew;
+	
+	/** 最新查询结果、全量、倒序 */
+	@ApiModelProperty("最新查询结果、全量、倒序")
+	private LogisticsNewest lastResult;
+	
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/express100/LogisticsRequsetParam.java

+package com.zrqx.core.model.third.express100;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LogisticsRequsetParam {
+	@ApiModelProperty("查询的快递公司的编码， 一律用小写字母")
+	private String com;
+	@ApiModelProperty("查询的快递单号")
+	private String num;
+	@ApiModelProperty("出发地城市")
+	private String from;
+	@ApiModelProperty("目的地城市")
+	private String to;
+	@ApiModelProperty("添加此字段表示开通行政区域解析功能")
+	private Integer resultv2;
+	
+	public LogisticsRequsetParam(String com, String num) {
+		super();
+		this.com = com;
+		this.num = num;
+	}	
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/express100/SubscribeParam.java

+package com.zrqx.core.model.third.express100;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 订阅请求参数
+ * @author lw
+ * @date 2018年9月12日上午9:26:07
+ */
+@Data
+public class SubscribeParam {
+	
+	/** 订阅的快递公司的编码 */
+	@ApiModelProperty("订阅的快递公司的编码")
+	@NotNull
+	private String company;
+	
+	/** 订阅的快递单号 */
+	@ApiModelProperty("订阅的快递单号")
+	@NotNull
+	private String number;
+
+	/** 授权码 */
+	@ApiModelProperty("授权码")
+	@NotNull
+	private String key;
+	
+	/** 附加参数信息 */
+	@ApiModelProperty("附加参数信息")
+	@NotNull
+	private SubscribeParameters parameters;
+
+	
+	public SubscribeParam(String company, String number, String key,
+			String callbackurl) {
+		this.company = company;
+		this.number = number;
+		this.key = key;
+		this.parameters = new SubscribeParameters(callbackurl);
+	}
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/express100/SubscribeParameters.java

+package com.zrqx.core.model.third.express100;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 附加参数信息
+ * @author lw
+ * @date 2018年9月12日上午9:29:40
+ */
+@Data
+public class SubscribeParameters {
+	
+	/** 回调接口的地址 */
+	@NotNull
+	@ApiModelProperty("回调接口的地址")
+	private String callbackurl;
+
+	public SubscribeParameters(String callbackurl){
+		this.callbackurl = callbackurl;
+	}
+		
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/qqlogin/QQThirdReturn.java

+/** 
+* @author ray
+* @date 2018年9月4日 上午11:57:19
+*/ 
+package com.zrqx.core.model.third.qqlogin;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+ /** 
+ * @author ray
+ * @date 2018年9月4日上午11:57:19
+ */
+@Data
+public class QQThirdReturn {
+	@ApiModelProperty(value="用户开放id，唯一")
+	private String openid;
+	@ApiModelProperty(value="昵称")
+	private String nickname;
+	@ApiModelProperty(value="头像")
+	private String headImgUrl;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/wechart/WecartPayReturn.java

+package com.zrqx.core.model.third.wechart;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WecartPayReturn {
+
+	@ApiModelProperty(value="返回状态码")
+	private String return_code;
+	@ApiModelProperty(value="返回信息")
+	private String return_msg;
+	@ApiModelProperty(value="公众账号ID")
+	private String appid;
+	@ApiModelProperty(value="商户号")
+	private String mch_id;
+	@ApiModelProperty(value="随机字符串")
+	private String nonce_str;
+	@ApiModelProperty(value="用户标识")
+	private String openid;
+	@ApiModelProperty(value="签名")
+	private String sign;
+	@ApiModelProperty(value="业务结果")
+	private String result_code;
+	@ApiModelProperty(value="预支付交易会话标识")
+	private String prepay_id;
+	@ApiModelProperty(value="交易类型")
+	private String trade_type;
+	@ApiModelProperty(value="二维码链接")
+	private String code_url;
+	@ApiModelProperty(value="时间戳,在支付方式为JSAPI时使用")
+	private String timestamp;
+
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/wechart/WecartQueryReturn.java

+package com.zrqx.core.model.third.wechart;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WecartQueryReturn {
+
+	@ApiModelProperty(value="返回状态码，必填")
+	private String return_code;
+	@ApiModelProperty(value="返回信息，必填")
+	private String return_msg;
+	@ApiModelProperty(value="公众账号ID，必填")
+	private String appid;
+	@ApiModelProperty(value="商户号，必填")
+	private String mch_id;
+	@ApiModelProperty(value="设备号")
+	private String device_info;
+	@ApiModelProperty(value="随机字符串，必填")
+	private String nonce_str;
+	@ApiModelProperty(value="签名，必填")
+	private String sign;
+	@ApiModelProperty(value="业务结果，必填")
+	private String result_code;
+	@ApiModelProperty(value="用户标识，必填")
+	private String openid;
+	@ApiModelProperty(value="是否关注公众账号，必填")
+	private String is_subscribe;
+	@ApiModelProperty(value="交易类型，必填")
+	private String trade_type;
+	@ApiModelProperty(value="付款银行，必填")
+	private String bank_type;
+	@ApiModelProperty(value="标价金额，必填")
+	private String total_fee;
+	@ApiModelProperty(value="标价币种，必填")
+	private String fee_type;
+	@ApiModelProperty(value="微信订单号，必填")
+	private String transaction_id;
+	@ApiModelProperty(value="商户订单号，必填")
+	private String out_trade_no;
+	@ApiModelProperty(value="附加数据")
+	private String attach;
+	@ApiModelProperty(value="支付完成时间")
+	private String time_end;
+	@ApiModelProperty(value="交易状态，必填")
+	private String trade_state;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/wechart/WecartRefundQueryReturn.java

+package com.zrqx.core.model.third.wechart;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class WecartRefundQueryReturn {
+
+	@ApiModelProperty(value="必填商户号，必填")
+	private String appid;
+	@ApiModelProperty(value="商户号，必填")
+	private String mch_id;
+	@ApiModelProperty(value="随机字符串，必填")
+	private String nonce_str;
+	@ApiModelProperty(value="商户退款单号，必填")
+	private String out_refund_no_0;
+	@ApiModelProperty(value="微信支付订单号，必填")
+	private String out_trade_no;
+	@ApiModelProperty(value="退款笔数，必填")
+	private String refund_count;
+	@ApiModelProperty(value="申请退款金额，必填")
+	private String refund_fee_0;
+	@ApiModelProperty(value="微信退款单号，必填")
+	private String refund_id_0;
+	@ApiModelProperty(value="退款状态，必填")
+	private String refund_status_0;
+	@ApiModelProperty(value="业务结果，必填")
+	private String result_code;
+	@ApiModelProperty(value="返回状态码，必填")
+	private String return_code;
+	@ApiModelProperty(value="返回信息，必填")
+	private String return_msg;
+	@ApiModelProperty(value="签名，必填")
+	private String sign;
+	@ApiModelProperty(value="微信支付订单号，必填")
+	private String transaction_id;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/wechart/WechartCloseReturn.java

+package com.zrqx.core.model.third.wechart;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class WechartCloseReturn {
+
+	@ApiModelProperty(value="返回状态码，必填")
+	private String return_code;
+	@ApiModelProperty(value="返回信息，必填")
+	private String return_msg;
+	@ApiModelProperty(value="公众账号ID，必填")
+	private String appid;
+	@ApiModelProperty(value="商户号，必填")
+	private String mch_id;
+	@ApiModelProperty(value="随机字符串，必填")
+	private String nonce_str;
+	@ApiModelProperty(value="签名，必填")
+	private String sign;
+	@ApiModelProperty(value="业务结果，必填")
+	private String result_code;
+	@ApiModelProperty(value="业务结果描述 ，必填")
+	private String result_msg;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/wechart/WechartRefundReturn.java

+package com.zrqx.core.model.third.wechart;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WechartRefundReturn {
+
+	@ApiModelProperty(value="返回状态码，必填")
+	private String return_code;
+	@ApiModelProperty(value="返回信息，必填")
+	private String return_msg;
+	@ApiModelProperty(value="公众账号ID，必填")
+	private String appid;
+	@ApiModelProperty(value="商户号，必填")
+	private String mch_id;
+	@ApiModelProperty(value="随机字符串，必填")
+	private String nonce_str;
+	@ApiModelProperty(value="签名，必填")
+	private String sign;
+	@ApiModelProperty(value="返回业务状态码，必填")
+	private String result_code;
+	@ApiModelProperty(value="返回错误状态码")
+	private String err_code;
+	@ApiModelProperty(value="返回错误描述")
+	private String err_code_des;
+	@ApiModelProperty(value="微信订单号，必填")
+	private String transaction_id;
+	@ApiModelProperty(value="商户订单号，必填")
+	private String out_trade_no;
+	@ApiModelProperty(value="商户退款单号，必填")
+	private String out_refund_no;
+	@ApiModelProperty(value="微信退款单号，必填")
+	private String refund_id;
+	@ApiModelProperty(value="交易使用的资金渠道，必填")
+	private String refund_channel;
+	@ApiModelProperty(value="申请退款金额，必填")
+	private String refund_fee;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/third/wechartlogin/WeChartThirdReturn.java

+/** 
+* @author ray
+* @date 2018年9月4日 上午11:57:19
+*/ 
+package com.zrqx.core.model.third.wechartlogin;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+ /** 
+ * @author ray
+ * @date 2018年9月4日上午11:57:19
+ */
+@Data
+public class WeChartThirdReturn {
+	@ApiModelProperty(value="用户开放id，唯一")
+	private String openid;
+	@ApiModelProperty(value="昵称")
+	private String nickname;
+	@ApiModelProperty(value="头像")
+	private String headImgUrl;
+}

com.zrqx.core/src/main/java/com/zrqx/core/util/PasswordUtil.java

+package com.zrqx.core.util;
+
+import java.util.Random;
+
+import com.zrqx.core.util.datatype.UUIDUtil;
+/**
+ * 随意有规则的字符串
+ * @author Administrator
+ *
+ */
+public class PasswordUtil {
+
+	static final char[] STR = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+			'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B',
+			'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+			'X', 'Y', 'Z' };
+	/**
+	 * 数字数组
+	 */
+	static final char[] STR_NUMBER = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+	/**
+	 * 小写字母数组
+	 */
+	static final char[] STR_XZM = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
+			'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
+	/**
+	 * 大写字母数组
+	 */
+	static final char[] STR_DZM = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q',
+			'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y' };
+	/**
+	 * 纯数字
+	 */
+	static final int LEVEL_ONE = 1;
+	/**
+	 * 小写字母加数字
+	 */
+	static final int LEVEL_TOW = 2;
+	/**
+	 * 大小写字母加数字
+	 */
+	static final int LEVEL_THREE = 3;
+	static Random rand = new Random();
+
+	public static void main(String[] args) {
+		String pwd = createPassword(8, 1);
+		System.out.println(pwd);
+	}
+
+	public static String createPassword(int length, int level) {
+		char[] chars = new char[length];
+		for (int i = 0; i < length; i++) {
+			if (i % level == 2) {
+				chars[i] = randomChar(STR_DZM);
+			} else if (i % level == 1) {
+				chars[i] = randomChar(STR_XZM);
+			} else {
+				chars[i] = randomChar(STR_NUMBER);
+			}
+		}
+		if(LEVEL_THREE != level){
+			for (int i = 0; i < chars.length; i++) {
+				int p = rand.nextInt(i+1); 
+				char tmp = chars[i];  
+				chars[i] = chars[p];  
+				chars[p] = tmp;  
+			}
+		}
+		return new String(chars);
+	}
+
+	public static char randomChar(char[] str) {
+		// 从字符数组中随机取出 对应下标字符拼接
+		return str[rand.nextInt(str.length)];
+	}
+
+	public static String[] chars = new String[] { "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n",
+			"o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8",
+			"9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
+			"U", "V", "W", "X", "Y", "Z" };
+	public static String[] base24 = new String[] { 
+			"B", "C", "D", "F", "G", 
+			"H", "J", "K", "M", "P", 
+			"Q", "R", "T", "V", "W", 
+			"X", "Y","2", "3", "4", 
+			"6", "7", "8", "9"};
+	public static String generateShortUuid() {
+		StringBuffer shortBuffer = new StringBuffer();
+		String uuid = UUIDUtil.getUUID();
+		for (int i = 0; i < 8; i++) {
+			String str = uuid.substring(i * 4, i * 4 + 4);
+			int x = Integer.parseInt(str, 16);
+			shortBuffer.append(chars[x % 0x3E]);
+		}
+		return shortBuffer.toString();
+	}
+	public static String generateShortUuid(int length) {
+		StringBuffer shortBuffer = new StringBuffer();
+		for (int i = 0; i < length; i++) {
+			shortBuffer.append(base24[rand.nextInt(24)]);
+		}
+		return shortBuffer.toString();
+	}
+}

com.zrqx.core/src/main/java/com/zrqx/core/util/VerifyUtil.java

+package com.zrqx.core.util;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Random;
+ 
+import javax.imageio.ImageIO;
+ 
+/**
+ * 图形验证码生成
+ */
+public class VerifyUtil {
+	// 验证码字符集  
+		private static final char[] chars = {   
+			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',   
+			'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',  
+			'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',  
+			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',   
+			'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'};  
+		// 字符数量  
+		private static final int SIZE = 4;  
+		// 干扰线数量  
+		private static final int LINES = 5;  
+		// 宽度  
+		private static final int WIDTH = 80;  
+		// 高度  
+		private static final int HEIGHT = 40;  
+		// 字体大小  
+		private static final int FONT_SIZE = 30;  
+ 
+		/** 
+		 * 生成随机验证码及图片 
+		 * Object[0]：验证码字符串； 
+		 * Object[1]：验证码图片。 
+		 */  
+		public static Object[] createImage() {  
+			StringBuffer sb = new StringBuffer();  
+			// 1.创建空白图片  
+			BufferedImage image = new BufferedImage(  
+					WIDTH, HEIGHT, BufferedImage.TYPE_INT_RGB);  
+			// 2.获取图片画笔  
+			Graphics graphic = image.getGraphics();  
+			// 3.设置背景颜色  
+			graphic.setColor(Color.WHITE);  
+			// 4.绘制矩形背景  
+			graphic.fillRect(0, 0, WIDTH, HEIGHT);  
+			// 5.画随机字符  
+			Random ran = new Random();  
+			for (int i = 0; i <SIZE; i++) {  
+				// 取随机字符索引  
+				int n = ran.nextInt(chars.length);  
+				// 随机设置画笔颜色  
+				graphic.setColor(getRandomColor());  
+				// 设置字体大小  
+				graphic.setFont(new Font(  
+						null, Font.BOLD + Font.ITALIC, FONT_SIZE));  
+				// 画字符  
+				graphic.drawString(  
+						chars[n] + "", i * WIDTH / SIZE, HEIGHT*2/3);  
+				// 记录字符  
+				sb.append(chars[n]);  
+			}  
+			// 6.画干扰线  
+			for (int i = 0; i < LINES; i++) {  
+				// 设置随机颜色  
+				graphic.setColor(getRandomColor());  
+				// 随机画线  
+				graphic.drawLine(ran.nextInt(WIDTH), ran.nextInt(HEIGHT),  
+						ran.nextInt(WIDTH), ran.nextInt(HEIGHT));  
+			}  
+			// 7.返回验证码和图片  
+			return new Object[]{sb.toString(), image};  
+		}  
+ 
+		/** 
+		 * 随机取色 
+		 */  
+		public static Color getRandomColor() {  
+			Random ran = new Random();  
+			Color color = new Color(ran.nextInt(256),   
+					ran.nextInt(256), ran.nextInt(256));  
+			return color;  
+		}  
+ 
+		public static void main(String[] args) throws IOException {  
+			Object[] objs = createImage();  
+			BufferedImage image = (BufferedImage) objs[1];  
+			OutputStream os = new FileOutputStream("d:/1.png");  
+			ImageIO.write(image, "png", os);  
+			os.close();  
+		}  
+}
\ No newline at end of file

com.zrqx.core/src/main/java/com/zrqx/core/util/ip/CusAccessObjectUtil.java

+package com.zrqx.core.util.ip;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class CusAccessObjectUtil {
+	/**
+	 * 获取用户真实IP地址，不使用request.getRemoteAddr();的原因是有可能用户使用了代理软件方式避免真实IP地址,
+	 * 
+	 * 可是，如果通过了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP值，究竟哪个才是真正的用户端的真实IP呢？
+	 * 答案是取X-Forwarded-For中第一个非unknown的有效IP字符串。
+	 * 
+	 * 如：X-Forwarded-For：192.168.1.110, 192.168.1.120, 192.168.1.130, 192.168.1.100
+	 * 
+	 * 用户真实IP为： 192.168.1.110
+	 * 
+	 * @param request
+	 * @return
+	 */
+	public static String getIpAddress(HttpServletRequest request) {
+		String ip = request.getHeader("x-forwarded-for");
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("WL-Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("HTTP_CLIENT_IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getRemoteAddr();
+		}
+		return ip;
+	}
+
+}

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

+package com.zrqx.core.vo.member.bg.member;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "EMemberVO", description = "专家用户列表")
+public class EMemberVO {
+	@ApiModelProperty("会员id")
+	private Integer id;
+	@ApiModelProperty("会员账号")
+	private String account;
+	@ApiModelProperty("昵称")
+	private String nickName;
+	@ApiModelProperty("手机号")
+	private String phone;
+	@ApiModelProperty("用户状态 0 禁用 1启用")
+	private Integer status;
+	@ApiModelProperty("邮箱")
+	private String email;
+	@ApiModelProperty("备注")
+	private String remark;
+	
+	@ApiModelProperty("作者id/医家id")
+	private Integer authorId;
+	@ApiModelProperty("职称")
+	private Integer title;
+	@ApiModelProperty("真实姓名")
+	private String name;
+	@ApiModelProperty("机构名称 ")
+	private String organName;
+	@ApiModelProperty("用户性别 0 女 1男 2保密")
+	private Integer sex;
+	@ApiModelProperty("头像地址")
+	private String img;
+}

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

@@ -13,6 +13,8 @@ public class MemberListVO {
 	private Integer id;
 	@ApiModelProperty("会员账号")
 	private String account;
+	@ApiModelProperty("会员账号")
+	private String phone;
 	@ApiModelProperty("用户状态 0 禁用 1启用")
 	private Integer status;
 	@ApiModelProperty("用户类别：0 普通用户，1专家用户，2机构用户")

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

@@ -11,6 +11,8 @@ public class OrganMemberVO {
 	private Integer id;
 	@ApiModelProperty("会员账号")
 	private String account;
+	@ApiModelProperty("昵称")
+	private String nickName;
 	@ApiModelProperty(value = "机构名称")
 	private String name;
 	@ApiModelProperty("用户状态 0 禁用 1启用")

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

+package com.zrqx.core.vo.member.bg.member;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "PMemberVO", description = "普通用户列表")
+public class PMemberVO {
+	@ApiModelProperty("会员id")
+	private Integer id;
+	@ApiModelProperty("会员账号")
+	private String account;
+	@ApiModelProperty("手机号")
+	private String phone;
+	@ApiModelProperty("用户状态 0 禁用 1启用")
+	private Integer status;
+	@ApiModelProperty("邮箱")
+	private String email;
+	@ApiModelProperty("备注")
+	private String remark;
+	
+	@ApiModelProperty("真实姓名")
+	private String name;
+	@ApiModelProperty("机构名称 ")
+	private String organName;
+	@ApiModelProperty("学历")
+	private Integer academic;
+	@ApiModelProperty("科室/部门")
+	private Integer dept;
+	@ApiModelProperty("职称")
+	private Integer title;
+	@ApiModelProperty("用户性别 0 女 1男 2保密")
+	private Integer sex;
+	@ApiModelProperty("头像地址")
+	private String img;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/member/bg/pm/PrivateMessageListVO.java

+package com.zrqx.core.vo.member.bg.pm;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PrivateMessageListVO {
+	@ApiModelProperty(value="站内信ID")
+	private Integer id;
+	@ApiModelProperty(value="信息标题")
+	private String title;
+	@ApiModelProperty(value="发送方式：0自动发送，1手动发送")
+	private Integer sendType;
+	@ApiModelProperty(value="发送时间")
+	private Date sendTime;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/member/bg/pm/PrivateMessageVO.java

+package com.zrqx.core.vo.member.bg.pm;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PrivateMessageVO {
+	@ApiModelProperty(value="站内信ID")
+	private Integer id;
+	@ApiModelProperty(value="信息标题")
+	private String title;
+	@ApiModelProperty(value="内容")
+	private String content;
+	@ApiModelProperty(value="收信会员范围：0全部会员，1指定会员组，2指定会员")
+	private Integer acceptMember;
+	@ApiModelProperty(value="会员组 0 个人，1专家，2机构")
+	private Integer memberGroup;
+	@ApiModelProperty(value="2指定会员 会员id")
+	private List<String> memberAccount;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/member/fg/pm/FgPrivateMessageListVO.java

+package com.zrqx.core.vo.member.fg.pm;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FgPrivateMessageListVO {
+	@ApiModelProperty(value="站内信ID，查询使用")
+	private Integer id;
+	@ApiModelProperty(value="站内信与用户关系ID，删除使用")
+	private Integer pmmId;
+	@ApiModelProperty(value="信息标题")
+	private String title;
+	@ApiModelProperty(value="内容")
+	private String content;
+	@ApiModelProperty(value="发送时间")
+	private String sendTime;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/member/fg/pm/FgPrivateMessageVO.java

+package com.zrqx.core.vo.member.fg.pm;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FgPrivateMessageVO {
+	@ApiModelProperty(value="信息标题")
+	private String title;
+	@ApiModelProperty(value="内容")
+	private String content;
+	@ApiModelProperty(value="发送时间")
+	private String sendTime;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/third/SmsResponseVo.java

+package com.zrqx.core.vo.third;
+
+import lombok.Data;
+
+@Data
+public class SmsResponseVo {
+	//请求ID
+	private String requestId;
+	//状态码-返回OK代表请求成功,其他错误码详见错误码列表
+	private String bizId;
+	//状态码的描述
+	private String code;
+	//发送回执ID,可根据该ID查询具体的发送状态
+	private String message;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/third/pay/PayQueryReturnVo.java

+package com.zrqx.core.vo.third.pay;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import lombok.Data;
+
+/**
+ * 支付查询结果对象
+ * @author lw
+ * @date 2019年1月15日下午2:46:49
+ */
+@Data
+public class PayQueryReturnVo {
+	
+	@ApiModelProperty("支付类型")
+	private String payType;	
+	@ApiModelProperty("是否支付成功")
+	private boolean isPay;
+	@ApiModelProperty("支付流水号")
+	private String payCode;
+	@ApiModelProperty("支付时间")
+	private Date payTime;
+	@ApiModelProperty("支付金额")
+	private String payment;
+	@ApiModelProperty("商家订单号")
+	private String code;
+	@ApiModelProperty("错误信息")
+	private String errorMsg;
+	
+	public PayQueryReturnVo(String payType, boolean isPay, String payCode,
+			Date payTime, String payment, String code, String errorMsg) {
+		super();
+		this.payType = payType;
+		this.isPay = isPay;
+		this.payCode = payCode;
+		this.payTime = payTime;
+		this.payment = payment;
+		this.code = code;
+		this.errorMsg = errorMsg;
+	}
+	public PayQueryReturnVo() {
+		super();
+	}
+	
+	
+		
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/third/pay/RefundQueryReturnVo.java

+package com.zrqx.core.vo.third.pay;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+/**
+ * 退款查询响应对象
+ * @author lw
+ * @date 2019年1月15日上午11:11:25
+ */
+@Data
+public class RefundQueryReturnVo {
+	
+	@ApiModelProperty(value="支付宝交易号")
+	private String trade_no;
+	@ApiModelProperty(value="商户订单号")
+	private String out_trade_no;
+	@ApiModelProperty(value="退款请求号")
+	private String out_request_no;
+	@ApiModelProperty(value="退款原因")
+	private String refund_reason;
+	@ApiModelProperty(value="交易总金额")
+	private String total_amount;
+	@ApiModelProperty(value="退款总金额")
+	private String refund_amount;
+	@ApiModelProperty(value="本次退款金额中买家退款金额，选填")
+	private String present_refund_buyer_amount;
+	@ApiModelProperty(value="本次退款中平台优惠退款金额，选填")
+	private String present_refund_discount_amount;
+	@ApiModelProperty(value="本次退款金额中商家优惠退款金额，选填")
+	private String present_refund_mdiscount_amount;
+	
+}