Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into tzq

pom.xml

@@ -319,6 +319,14 @@
 			<version>1.1.0</version>
 		</dependency>
 
+		<!-- 支付宝Easy支付SDK -->
+		<!-- https://mvnrepository.com/artifact/com.alipay.sdk/alipay-easysdk -->
+		<dependency>
+		    <groupId>com.alipay.sdk</groupId>
+		    <artifactId>alipay-easysdk</artifactId>
+		    <version>1.1.3</version>
+		</dependency>
+
 		<!--springboot-quartz -->
 		<!-- <dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/cn/timer/api/bean/qyzx/QyzxFeebackAccessory.java

+package cn.timer.api.bean.qyzx;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+ 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import cn.timer.api.dto.login.QysDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+* @author Tang 2019-11-11
+*/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder(toBuilder=true)
+@ApiModel("反馈附件表")
+public class QyzxFeebackAccessory extends Model<QyzxFeebackAccessory> {
+
+	private static final long serialVersionUID = 3545665863196016627L;
+
+    @TableId (type = IdType.AUTO)
+	@ApiModelProperty(value="编号",example="1")
+    private Integer id;
+    
+	@ApiModelProperty(value="意见id",example="1")
+    private Integer feebackId;
+	
+	@ApiModelProperty(value = "附件url地址", example = "url")
+	private String opinionUrl;
+    
+}
\ No newline at end of file

src/main/java/cn/timer/api/bean/qyzx/QyzxSuggestionFeeback.java

+package cn.timer.api.bean.qyzx;
+
+import java.util.Date;
+ 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+* @author Tang 2019-11-11
+*/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder(toBuilder=true)
+@ApiModel("意见反馈表")
+public class QyzxSuggestionFeeback extends Model<QyzxSuggestionFeeback> {
+
+	private static final long serialVersionUID = 3545665863196016627L;
+
+    @TableId (type = IdType.AUTO)
+	@ApiModelProperty(value="编号",example="1")
+    private Integer id;
+    
+	@ApiModelProperty(value="员工编号",example="9688")
+    private Integer empNum;
+	
+	@ApiModelProperty(value="",example="不好用")
+    private String opinionText;
+	
+	@ApiModelProperty(value="",example="1")
+    private Integer bugType;
+	
+	@ApiModelProperty(value="",example="2020-4-20 08:00:00")
+    private Date createTime;
+    
+	@ApiModelProperty(value="",example="117")
+    private Integer orgCode;
+	
+	@ApiModelProperty(value="",example="那别用了")
+    private String reply;
+	
+	@ApiModelProperty(value="",example="2020-4-21 08:00:00")
+    private Date replyTime;
+}
\ No newline at end of file

src/main/java/cn/timer/api/bean/qyzx/businessService/QyzxBuyRecord.java

+/**  
+* <p>Title: QyzxBuyRecord.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+package cn.timer.api.bean.qyzx.businessService;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**  
+* <p>Title: QyzxBuyRecord.java</p>  
+* <p>Description: 购买记录实体类</p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/
+@Entity
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Table(name="qyzx_buy_record")
+@ApiModel("购买记录表")
+public class QyzxBuyRecord extends Model<QyzxBuyRecord>{
+
+	private static final long serialVersionUID = -5059508638044339323L;
+
+	@Id
+    @GeneratedValue
+    @TableId (type = IdType.AUTO)
+	@ApiModelProperty(value="主键",example="1")
+    private Integer id;
+	
+	@ApiModelProperty(value="付费模块id",example="1")
+    private Integer mid;
+	
+	@ApiModelProperty(value="付费内容描述",example="短信")
+    private String content;
+	
+	@ApiModelProperty(value="购买单价",example="888")
+    private Double price;
+	
+	@ApiModelProperty(value="数量",example="500")
+    private Integer count;
+	
+	@ApiModelProperty(value="单位",example="条")
+    private String unit;
+	
+	@ApiModelProperty(value="到期时间",example="365天")
+    private Date expireDate;
+	
+	@ApiModelProperty(value="企业",example="117")
+    private Integer orgCode;
+	
+	@ApiModelProperty(value="排序",example="")
+    private Integer sort;
+	
+	@ApiModelProperty(value="模块状态",example="默认0-开启，1-关闭")
+	private Integer status;
+	
+	@ApiModelProperty(value="是否删除",example="默认0-未删除，1-删除")
+    private Integer isDelete;
+    
+	@TableField(fill = FieldFill.INSERT)
+	@ApiModelProperty(value="创建时间 ",example="")
+    private Date createTime;
+	
+	@ApiModelProperty(value="创建人 ",example="")
+    private Integer createUser;
+	
+	@TableField(fill = FieldFill.UPDATE)
+	@ApiModelProperty(value="修改时间 ",example="")
+    private Date modifyTime;
+	
+	@ApiModelProperty(value="修改人 ",example="")
+    private Integer modifyUser;
+
+}

src/main/java/cn/timer/api/bean/qyzx/businessService/QyzxInvoiceData.java

+/**  
+* <p>Title: QyzxInvoiceData.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+package cn.timer.api.bean.qyzx.businessService;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**  
+* <p>Title: QyzxInvoiceData.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/
+
+@Entity
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Table(name="qyzx_invoice_data")
+@ApiModel("发票资料表")
+public class QyzxInvoiceData extends Model<QyzxInvoiceData>{
+
+	private static final long serialVersionUID = 2890357568571822258L;
+	
+	@Id
+	@GeneratedValue
+	@TableId (type = IdType.AUTO)
+	@ApiModelProperty(value="主键",example="1")
+	private Integer id;
+	
+	@ApiModelProperty(value="购买记录id",example="1")
+    private Integer pcid;
+	
+	
+	@ApiModelProperty(value="发票抬头",example="广东优领")
+    private String invoiceTitle;
+	@ApiModelProperty(value="税号",example="915345164")
+	private String dutyParagraph;
+	@ApiModelProperty(value="公司地址",example="广东省")
+	private String companyAddress;
+	@ApiModelProperty(value="电话号码",example="18152456464")
+	private String companyPhone;
+	@ApiModelProperty(value="开户行",example="中信银行广州白云支行")
+	private String bankName;
+	@ApiModelProperty(value="银行账号",example="8110901011900785029")
+	private String bankAccount;
+	@ApiModelProperty(value="发票类型",example="0-普通 1-专用")
+	private Integer invoiceType;
+	@ApiModelProperty(value="开票项目",example="")
+	private String invoiceProject;
+	@ApiModelProperty(value="发票金额",example="")
+	private Double invoiceValue;
+	@ApiModelProperty(value="收货人",example="翁🐻")
+	private String consignee;
+	@ApiModelProperty(value="收货人电话",example="13144400255")
+	private String consigneePhone;
+	@ApiModelProperty(value="邮箱",example="13144400255@163.com")
+	private String email;
+	@ApiModelProperty(value="收货地址",example="白云东平伯曼酒店")
+	private String shippingAddress;
+	@ApiModelProperty(value="邮编",example="510080")
+	private String zipCode;
+	
+	
+	@ApiModelProperty(value="企业",example="117")
+    private Integer orgCode;
+	
+	@ApiModelProperty(value="模块状态",example="默认0-开启，1-关闭")
+    private Integer status;
+	
+	@ApiModelProperty(value="排序",example="")
+    private String sort;
+	
+	@ApiModelProperty(value="是否删除",example="默认0-未删除，1-删除")
+    private Integer isDelete;
+
+	@TableField(fill = FieldFill.INSERT)
+	@ApiModelProperty(value="创建时间 ",example="")
+	private Date createTime;
+
+	@ApiModelProperty(value="创建人 ",example="")
+	private Integer createUser;
+
+	@TableField(fill = FieldFill.UPDATE)
+	@ApiModelProperty(value="修改时间 ",example="")
+	private Date modifyTime;
+
+	@ApiModelProperty(value="修改人 ",example="")
+	private Integer modifyUser;
+}

src/main/java/cn/timer/api/bean/qyzx/businessService/QyzxPayContent.java

+/**  
+* <p>Title: QyzxPayContent.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+package cn.timer.api.bean.qyzx.businessService;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**  
+* <p>Title: QyzxPayContent.java</p>  
+* <p>Description: 付费内容实体类</p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/
+
+@Entity
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Table(name="qyzx_pay_content")
+@ApiModel("付费内容表")
+public class QyzxPayContent extends Model<QyzxPayContent>{
+
+	private static final long serialVersionUID = -8875991464695313175L;
+	
+	@Id
+    @GeneratedValue
+    @TableId (type = IdType.AUTO)
+	@ApiModelProperty(value="主键",example="1")
+    private Integer id;
+	
+	@ApiModelProperty(value="付费模块id",example="1")
+    private Integer mid;
+	
+	@ApiModelProperty(value="付费内容描述",example="短信")
+    private String content;
+	
+	@ApiModelProperty(value="数量",example="500")
+    private Integer count;
+	
+	@ApiModelProperty(value="单位",example="条")
+    private String unit;
+	
+	@ApiModelProperty(value="初始价格",example="998")
+    private Double originalPrice;
+	
+	@ApiModelProperty(value="现在价格",example="888")
+    private Double nowPrice;
+
+	@ApiModelProperty(value="排序",example="")
+    private Integer sort;
+	
+	@ApiModelProperty(value="模块状态",example="默认0-开启，1-关闭")
+    private Integer status;
+	
+	@ApiModelProperty(value="是否删除",example="默认0-未删除，1-删除")
+    private Integer isDelete;
+    
+	@TableField(fill = FieldFill.INSERT)
+	@ApiModelProperty(value="创建时间 ",example="")
+    private Date createTime;
+	
+	@ApiModelProperty(value="创建人 ",example="")
+    private Integer createUser;
+	
+	@TableField(fill = FieldFill.UPDATE)
+	@ApiModelProperty(value="修改时间 ",example="")
+    private Date modifyTime;
+	
+	@ApiModelProperty(value="修改人 ",example="")
+    private Integer modifyUser;
+
+}

src/main/java/cn/timer/api/bean/qyzx/businessService/QyzxPayModule.java

+package cn.timer.api.bean.qyzx.businessService;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**  
+* <p>Title: QyzxPayModule.java</p>  
+* <p>Description: 付费模块实体类</p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+@Entity
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Table(name="qyzx_pay_moudle")
+@ApiModel("付费模块表")
+public class QyzxPayModule extends Model<QyzxPayModule>{
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+    @GeneratedValue
+    @TableId (type = IdType.AUTO)
+	@ApiModelProperty(value="主键",example="1")
+    private Integer id;
+    
+	@ApiModelProperty(value="模块名称 ",example="名称")
+    private String moudleName;
+    
+	@ApiModelProperty(value="排序",example="1")
+	private Integer sort;
+	
+	@ApiModelProperty(value="模块状态",example="默认0-开启，1-关闭")
+    private Integer status;
+	
+	@ApiModelProperty(value="是否删除",example="默认0-未删除，1-删除")
+    private Integer isDelete;
+    
+	@TableField(fill = FieldFill.INSERT)
+	@ApiModelProperty(value="创建时间 ",example="")
+    private Date createTime;
+	
+	@ApiModelProperty(value="创建人 ",example="")
+    private Integer createUser;
+	
+	@TableField(fill = FieldFill.UPDATE)
+	@ApiModelProperty(value="修改时间 ",example="")
+    private Date modifyTime;
+	
+	@ApiModelProperty(value="修改人 ",example="")
+    private Integer modifyUser;
+	
+	
+    
+}
\ No newline at end of file

src/main/java/cn/timer/api/bean/qyzx/businessService/QyzxRemainingQuantity.java

+/**  
+* <p>Title: QyzxRemainingQuantity.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+package cn.timer.api.bean.qyzx.businessService;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**  
+* <p>Title: QyzxRemainingQuantity.java</p>  
+* <p>Description: 套餐余量表</p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/
+
+@Entity
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Table(name="qyzx_remaining_quantity")
+@ApiModel("套餐余量表")
+public class QyzxRemainingQuantity extends Model<QyzxRemainingQuantity>{
+
+	private static final long serialVersionUID = 4239660369766829265L;
+	
+	@Id
+    @GeneratedValue
+    @TableId (type = IdType.AUTO)
+	@ApiModelProperty(value="主键",example="1")
+    private Integer id;
+	
+	@ApiModelProperty(value="付费内容id",example="1")
+    private Integer pcid;
+	
+	@ApiModelProperty(value="到期时间",example="365天")
+    private Date expireDate;
+	
+	@ApiModelProperty(value="数量",example="500")
+    private Integer count;
+	
+	@ApiModelProperty(value="单位",example="条")
+    private Integer unit;
+	
+	@ApiModelProperty(value="排序",example="")
+    private String sort;
+	
+	@ApiModelProperty(value="模块状态",example="默认0-开启，1-关闭")
+    private Integer status;
+	
+	@ApiModelProperty(value="是否删除",example="默认0-未删除，1-删除")
+    private Integer isDelete;
+    
+	@TableField(fill = FieldFill.INSERT)
+	@ApiModelProperty(value="创建时间 ",example="")
+    private Date createTime;
+	
+	@ApiModelProperty(value="创建人 ",example="")
+    private Integer createUser;
+	
+	@TableField(fill = FieldFill.UPDATE)
+	@ApiModelProperty(value="修改时间 ",example="")
+    private Date modifyTime;
+	
+	@ApiModelProperty(value="修改人 ",example="")
+    private Integer modifyUser;
+
+
+}

src/main/java/cn/timer/api/bean/qyzx/businessService/QyzxScene.java

+/**  
+* <p>Title: QyzxScene.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+package cn.timer.api.bean.qyzx.businessService;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**  
+* <p>Title: QyzxScene.java</p>  
+* <p>Description: 付费使用场景枚举类</p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/
+@Getter
+@AllArgsConstructor
+public enum QyzxScene {
+	MSG_LOGIN(1, "短信登录"),
+	MSG_CHANGE_PWD(1, "修改密码"),
+	MSG_CHANGE_UNAME(1, "修改用户名"),
+	MSG_CHANGE_PHONE(1, "修改手机号"),
+	MSG_REMIND(1, "证照提醒"),
+	CONTRACT_SINGLE(2, "修改密码"),
+	CONTRACT_BOTH(2, "用户注册");
+
+	private final Integer code;
+	private final String message;
+	
+}

src/main/java/cn/timer/api/bean/qyzx/businessService/QyzxUseRecord.java

+/**  
+ * <p>Title: QyzxUseRecord.java</p>  
+ * <p>Description: </p>  
+ * @author dsc  
+ * @date 2020年4月21日  
+ * @version 1.0  
+ */  
+package cn.timer.api.bean.qyzx.businessService;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**  
+ * <p>Title: QyzxUseRecord.java</p>  
+ * <p>Description: 使用记录表</p>  
+ * @author dsc  
+ * @date 2020年4月21日  
+ * @version 1.0  
+ */
+
+@Entity
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Table(name="qyzx_use_record")
+@ApiModel("使用记录表")
+public class QyzxUseRecord extends Model<QyzxUseRecord>{
+
+	private static final long serialVersionUID = 8623518557970200924L;
+
+	@Id
+	@GeneratedValue
+	@TableId (type = IdType.AUTO)
+	@ApiModelProperty(value="主键",example="1")
+	private Integer id;
+	
+	@ApiModelProperty(value="模块id",example="1")
+    private Integer pmid;
+	
+	@ApiModelProperty(value="使用场景",example="1")
+    private Integer scene;
+	
+	@ApiModelProperty(value="原始数量",example="500")
+    private Integer originalCount;
+	
+	@ApiModelProperty(value="现在数量",example="499")
+    private Integer nowCount;
+	
+	@ApiModelProperty(value="模块状态",example="默认0-开启，1-关闭")
+    private Integer status;
+	
+	@ApiModelProperty(value="排序",example="")
+    private String sort;
+	
+	@ApiModelProperty(value="是否删除",example="默认0-未删除，1-删除")
+    private Integer isDelete;
+
+	@TableField(fill = FieldFill.INSERT)
+	@ApiModelProperty(value="创建时间 ",example="")
+	private Date createTime;
+
+	@ApiModelProperty(value="创建人 ",example="")
+	private Integer createUser;
+
+	@TableField(fill = FieldFill.UPDATE)
+	@ApiModelProperty(value="修改时间 ",example="")
+	private Date modifyTime;
+
+	@ApiModelProperty(value="修改人 ",example="")
+	private Integer modifyUser;
+}

src/main/java/cn/timer/api/controller/LoginController.java

@@ -134,11 +134,11 @@ public class LoginController {
 	@ApiOperationSupport(order = 2)
 	public Result<String> authentication(@RequestBody EntRegisterDto entRegisterDto) {
 		String phone = entRegisterDto.getPhone();
-		String code = entRegisterDto.getCode();
+		String code = entRegisterDto.getCode().toString();
 		// String codeRedis = (String) redisTemplate.get(phone);
-		String codeRedis = (String) session.getAttribute(phone);
+		Integer codeRedis = (Integer) session.getAttribute(phone);
 
-		if (code == null || !code.toString().equals(codeRedis)) {
+		if (code == null || !code.equals(codeRedis.toString())) {
 			return ResultUtil.error("验证码不符");
 		}
 		return ResultUtil.success("验证码正确");
@@ -401,9 +401,9 @@ public class LoginController {
 		String phone = entRegisterDto.getPhone();
 
 		// Object codeRedis = redisTemplate.get(phone);
-		String codeRedis = (String) session.getAttribute(phone);
+		Integer codeRedis = (Integer) session.getAttribute(phone);
 
-		if (codeRedis == null || !code.toString().equals(codeRedis.toString()))
+		if (codeRedis == null || !code.equals(codeRedis.toString()))
 			return ResultUtil.error("验证码不符");
 
 		QyzxEmpLogin qyzxEmpLogin1 = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -240,7 +240,7 @@ public class YgglController {
 			// 添加三张表
 			// 员工权限表(未定)
 			// 员工企业关联表和员工档案,员工成长表(未定)
-			QyzxEmpEntAsso.builder().empNum(qyzxEmpLogin.getId()).orgCode(orgCode).userType(2).status(1).build().insert();// usertype2普通员工 status1正常
+			QyzxEmpEntAsso.builder().empNum(qyzxEmpLogin.getId()).orgCode(orgCode).userType(CommonEnum.U_TYPE_EMP.getType()).status(1).build().insert();// usertype2普通员工 status1正常
 			YgglMainEmp ygglMainEmp = YgglMainEmp.builder().name(name).phone(phone).zjType(zjType).zjNum(zjNum)
 					.jobType(jobType).rzTime(rzTime).syq(syq).sex(sex).empNum(qyzxEmpLogin.getId()).orgCode(orgCode)
 					.build();

src/main/java/cn/timer/api/dao/qyzx/QyzxEmpEntAssoMapper.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
+import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.dto.qyzx.AdminListDto;
 
 /**
@@ -24,5 +25,4 @@ public interface QyzxEmpEntAssoMapper extends BaseMapper<QyzxEmpEntAsso> {
 	 */
 	List<AdminListDto> adminlist(IPage<AdminListDto> page,Integer org_code);
 	
-
 }

src/main/java/cn/timer/api/dao/qyzx/QyzxFeebackAccessoryMapper.java

+package cn.timer.api.dao.qyzx;
+
+import org.springframework.stereotype.Repository;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+*  员工企业关联表
+* @author Tang 2019-11-11
+*/
+@Repository
+public interface QyzxFeebackAccessoryMapper extends BaseMapper<QyzxFeebackAccessoryMapper> {
+
+    
+}

src/main/java/cn/timer/api/dao/qyzx/QyzxSuggestionFeebackMapper.java

+package cn.timer.api.dao.qyzx;
+
+import org.springframework.stereotype.Repository;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+*  员工企业关联表
+* @author Tang 2019-11-11
+*/
+@Repository
+public interface QyzxSuggestionFeebackMapper extends BaseMapper<QyzxSuggestionFeebackMapper> {
+
+    
+}

src/main/java/cn/timer/api/dao/qyzx/businessService/QyzxBuyRecordMapper.java

+/**  
+* <p>Title: s.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+package cn.timer.api.dao.qyzx.businessService;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import cn.timer.api.bean.qyzx.businessService.QyzxBuyRecord;
+
+/**  
+* <p>Title: QyzxBuyRecordMapper.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/
+public interface QyzxBuyRecordMapper extends BaseMapper<QyzxBuyRecord> {
+
+}

src/main/java/cn/timer/api/dao/qyzx/businessService/QyzxInvoiceDataMapper.java

+/**  
+* <p>Title: QyzxInvoiceDataMapper.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+package cn.timer.api.dao.qyzx.businessService;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import cn.timer.api.bean.qyzx.businessService.QyzxInvoiceData;
+
+/**  
+* <p>Title: QyzxInvoiceDataMapper.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/
+public interface QyzxInvoiceDataMapper extends BaseMapper<QyzxInvoiceData>{
+
+}

src/main/java/cn/timer/api/dao/qyzx/businessService/QyzxPayContentMapper.java

+/**  
+* <p>Title: QyzxPayContentMapper.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+package cn.timer.api.dao.qyzx.businessService;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import cn.timer.api.bean.qyzx.businessService.QyzxPayContent;
+
+/**  
+* <p>Title: QyzxPayContentMapper.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/
+public interface QyzxPayContentMapper extends BaseMapper<QyzxPayContent>{
+
+}

src/main/java/cn/timer/api/dao/qyzx/businessService/QyzxPayModuleMapper.java

+/**  
+* <p>Title: QyzxPayModuleMapper.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+package cn.timer.api.dao.qyzx.businessService;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import cn.timer.api.bean.qyzx.businessService.QyzxPayModule;
+
+/**  
+* <p>Title: QyzxPayModuleMapper.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/
+public interface QyzxPayModuleMapper extends BaseMapper<QyzxPayModule>{
+
+}

src/main/java/cn/timer/api/dao/qyzx/businessService/QyzxRemainingQuantityMapper.java

+/**  
+* <p>Title: QyzxRemainingQuantityMapper.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+package cn.timer.api.dao.qyzx.businessService;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import cn.timer.api.bean.qyzx.businessService.QyzxRemainingQuantity;
+
+/**  
+* <p>Title: QyzxRemainingQuantityMapper.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/
+public interface QyzxRemainingQuantityMapper extends BaseMapper<QyzxRemainingQuantity>{
+
+}

src/main/java/cn/timer/api/dao/qyzx/businessService/QyzxUseRecordMapper.java

+/**  
+* <p>Title: QyzxUseRecordMapper.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+package cn.timer.api.dao.qyzx.businessService;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import cn.timer.api.bean.qyzx.businessService.QyzxUseRecord;
+
+/**  
+* <p>Title: QyzxUseRecordMapper.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/
+public interface QyzxUseRecordMapper extends BaseMapper<QyzxUseRecord>{
+
+}

src/main/java/cn/timer/api/dto/qyzx/EntauthDto.java

+/**
+ * @date 2019年11月14日  
+ * @author 翁东州
+ * @方法中文名称:
+ */
+package cn.timer.api.dto.qyzx;
+
+import java.io.Serializable;
+
+import cn.timer.api.config.swagger.IgnoreSwaggerParameter;
+import cn.timer.api.utils.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @date 2019年11月14日  
+ * @author 翁东州
+ * @方法中文名称:
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class EntauthDto extends Page implements Serializable{
+
+	private static final long serialVersionUID = 910573493694136770L;
+
+	@ApiModelProperty(value="组织机构代码",example="117")
+	private Integer orgCode;
+	
+	@ApiModelProperty(value="认证状态",example="2未通过或3通过")
+	private Integer authType;
+	
+	
+	
+	
+}

src/main/resources/application-dev.yml

@@ -89,7 +89,7 @@ spring:
 ######### Spring boot应用健康监控
 management:
    server:
-     port: 9090 # 如果设置端口号为-1，则隐藏监控短点
+     port: 11677 # 如果设置端口号为-1，则隐藏监控短点
    endpoints:
      web:
         exposure: