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/qyzx/QyzxController.java

 package cn.timer.api.controller.qyzx;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -7,34 +8,35 @@ import java.util.stream.Stream;
 
 import javax.servlet.http.HttpSession;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.timer.api.bean.qyzx.QyzxAttaFpgl;
-import cn.timer.api.bean.qyzx.QyzxAttaFpzl;
 import cn.timer.api.bean.qyzx.QyzxAttaFwjsb;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEmpLogin;
 import cn.timer.api.bean.qyzx.QyzxEntAuth;
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
+import cn.timer.api.bean.qyzx.QyzxFeebackAccessory;
 import cn.timer.api.bean.qyzx.QyzxLogBuy;
 import cn.timer.api.bean.qyzx.QyzxPayServe;
+import cn.timer.api.bean.qyzx.QyzxSuggestionFeeback;
 import cn.timer.api.bean.zzgl.ZzglAuth;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;
 import cn.timer.api.config.annotation.CurrentUser;
@@ -43,16 +45,21 @@ import cn.timer.api.config.enums.CommonEnum;
 import cn.timer.api.dao.qyzx.QyzxAttaFpzlMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpLoginMapper;
+import cn.timer.api.dao.qyzx.QyzxEntAuthMapper;
 import cn.timer.api.dao.qyzx.QyzxEntInfoMMapper;
+import cn.timer.api.dao.qyzx.QyzxFeebackAccessoryMapper;
 import cn.timer.api.dao.qyzx.QyzxLogBuyMapper;
+import cn.timer.api.dao.qyzx.QyzxPayServeMapper;
+import cn.timer.api.dao.qyzx.QyzxSuggestionFeebackMapper;
 import cn.timer.api.dao.zzgl.ZzglBmgwMMapper;
 import cn.timer.api.dto.login.QysDto;
 import cn.timer.api.dto.qyzx.AdminListDto;
 import cn.timer.api.dto.qyzx.AttaFpglQueryDto;
+import cn.timer.api.dto.qyzx.EntauthDto;
 import cn.timer.api.dto.qyzx.LogBuyDto;
-import cn.timer.api.dto.qyzx.QyzxAttaFpzlQueryDto;
 import cn.timer.api.utils.Result;
 import cn.timer.api.utils.ResultUtil;
+import cn.timer.api.utils.aliyun.OSSUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +90,21 @@ public class QyzxController {
 	@Autowired
 	private QyzxAttaFpzlMapper qyzxAttaFpzlMapper;
 
+	@Autowired
+	private QyzxEntAuthMapper qyzxEntAuthMapper;
+
+	@Autowired
+	private ZzglBmgwMMapper zzglBmgwMMapper;
+	
+	@Autowired
+	private QyzxPayServeMapper qyzxPayServeMapper;
+	
+	@Autowired
+	private QyzxSuggestionFeebackMapper qyzxSuggestionFeebackMapper;
+	
+	@Autowired
+	private QyzxFeebackAccessoryMapper qyzxFeebackAccessoryMapper;
+
 	/**
 	 * 获取企业信息
 	 * 
@@ -99,30 +121,17 @@ public class QyzxController {
 	}
 
 	/**
-	 * 返回类名
-	 * 
-	 * @return
-	 */
-	/*
-	 * private String className() { return this.getClass().getName(); }
-	 */
-
-	/**
 	 * 企业认证-申请
 	 * 
 	 * @param qyzxEntAuth
 	 * @return
 	 */
-
 	@PostMapping(value = "/entauth")
 	@ApiOperation(value = "企业认证", httpMethod = "POST", notes = "接口发布说明")
 	public Result<QyzxEntAuth> entauth(@CurrentUser UserBean userBean, @RequestBody QyzxEntAuth qyzxEntAuth) {
-		// 查询表结果
-		// QyzxEntAuth result = qyzxEntAuth.selectById();
-		// System.err.println(result);
-		// if (result == null) {
 		// 设置审核状态
 		qyzxEntAuth.setAuthType(CommonEnum.AUTH_TYPE_UNDEREVIEW.getType());
+		qyzxEntAuth.setId(userBean.getOrgCode());
 		// 插入数据
 		qyzxEntAuth.insert();
 		// }
@@ -136,14 +145,13 @@ public class QyzxController {
 	 * @return
 	 */
 	@PostMapping(value = "/entauthcheck")
-	@ApiOperation(value = "企业认证", httpMethod = "POST", notes = "接口发布说明")
+	@ApiOperation(value = "企业认证-审核-通过/未通过", httpMethod = "POST", notes = "接口发布说明")
 	public Result<QyzxEntAuth> entauthcheck1(@CurrentUser UserBean userBean, @RequestBody QyzxEntAuth qyzxEntAuth) {
 		Integer id = qyzxEntAuth.getId();
 		Integer authType = qyzxEntAuth.getAuthType();
 		if (id == null || authType == null) {
 			return ResultUtil.error("参数缺少/异常");
 		}
-
 		QyzxEntAuth entAuth = QyzxEntAuth.builder().id(id).authType(authType).build();
 		boolean b = entAuth.updateById();
 		if (b) {
@@ -151,7 +159,47 @@ public class QyzxController {
 		} else {
 			return ResultUtil.error("企业认证-审批失败");
 		}
+	}
+
+	/**
+	 * 运营管理 企业认证-审核-通过/不通过(weng)
+	 * 
+	 * @param qyzxEntAuth
+	 * @return
+	 */
+	@PostMapping(value = "/entauthpass")
+	@ApiOperation(value = "企业认证-审核-通过", httpMethod = "POST", notes = "接口发布说明")
+	public Result<String> entauthpass(@RequestBody EntauthDto entauthDto) {// 2未通过,3通过
+		String msg = "企业认证不通过";
+		Integer type = entauthDto.getAuthType();
+		if (type != 2) {
+			type = 3;
+			msg = "企业认证成功";
+		}
+		boolean b = new LambdaUpdateChainWrapper<QyzxEntAuth>(qyzxEntAuthMapper)
+				.eq(QyzxEntAuth::getId, entauthDto.getOrgCode()).set(QyzxEntAuth::getAuthType, type).update();
+		if (b) {
+			return ResultUtil.data(msg);
+		}
+		return ResultUtil.error("企业认证未通过");
+	}
 
+	/**
+	 * 显示企业的超级管理员
+	 * 
+	 * @param qyzxEntAuth
+	 * @return
+	 */
+	@GetMapping(value = "/smanagerphone")
+	@ApiOperation(value = "显示超管头像和电话号码", httpMethod = "GET", notes = "接口发布说明")
+	public Result<QyzxEmpLogin> smanagerphone(@CurrentUser UserBean userBean) {
+		QyzxEmpEntAsso smanagerid = new LambdaQueryChainWrapper<QyzxEmpEntAsso>(qyzxEmpEntAssoMapper)
+				.select(QyzxEmpEntAsso::getEmpNum).eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode())
+				.eq(QyzxEmpEntAsso::getStatus, 0).one();
+		QyzxEmpLogin smanagerphone = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
+				.select(QyzxEmpLogin::getPhone, QyzxEmpLogin::getHeadUrl)
+				.eq(QyzxEmpLogin::getId, smanagerid.getEmpNum()).one();
+		return ResultUtil.data(smanagerphone, "企业超管头像和电话号码");
 	}
 
 	/**
@@ -172,9 +220,6 @@ public class QyzxController {
 		return ResultUtil.data(qyzxEntInfoMs, "获取企业信息成功");
 	}
 
-	@Autowired
-	ZzglBmgwMMapper zzglBmgwMMapper;
-
 	/**
 	 * 切换企业
 	 * 
@@ -186,12 +231,12 @@ public class QyzxController {
 	public Result<List<String>> changeent(@CurrentUser UserBean userBean, @PathVariable Integer orgCode) {
 		// 查询该员工加入的企业id列表
 		QyzxEmpLogin emp = userBean.getQyzxEmpLogin();
-		Stream<QysDto> s = emp.getQys().stream().filter(o ->orgCode.equals( o.getId()));
+		Stream<QysDto> s = emp.getQys().stream().filter(o -> orgCode.equals(o.getId()));
 		// 判断 切换目标企业id 是否包含在 企业id列表 内
 		if (s != null) {
 			List<String> menus = new ArrayList<>();
 			QysDto ctrl = s.findFirst().get();
-			if (  CommonEnum.U_TYPE_ADMIN.getType().equals(ctrl.getUserType())
+			if (CommonEnum.U_TYPE_ADMIN.getType().equals(ctrl.getUserType())
 					|| CommonEnum.U_TYPE_C_ADMIN.getType().equals(ctrl.getUserType())) {
 			} else {
 				// 获取权限
@@ -205,10 +250,10 @@ public class QyzxController {
 					wp.select(ZzglAuth::getMenuId).eq(ZzglAuth::getOrgCode, ctrl.getId())
 							.and(i -> i.in(ZzglAuth::getBmgwId, list.toArray()));
 					List<ZzglAuth> zas = ZzglAuth.builder().build().selectList(wp);
-					if(zas.size()==0)
+					if (zas.size() == 0)
 						return ResultUtil.error(null, "切换企业失败，在该公司没有权限");
 					zas.stream().forEach(o -> menus.add(o.getMenuId()));
-				}else{
+				} else {
 					return ResultUtil.error(null, "切换企业失败，在该公司没有权限");
 				}
 			}
@@ -225,167 +270,230 @@ public class QyzxController {
 	 * 获取开票资料
 	 */
 	/*
+	 * 
 	 * @Override public Result<QyzxEntInfoM> selectfpzl() { Integer orgCode =
 	 * List<QyzxAttaFpzl> qyzxAttaFpzl =
 	 * QyzxAttaFpzl.builder().build().selectList(new
 	 * QueryWrapper<QyzxAttaFpzl>().eq("org_code", orgCode)); return new
 	 * ResultUtil.data("获取发票资料成功", qyzxAttaFpzl); }
-	 */
-
-	/**
+	 * 
+	 * 
+	 *//**
 		 * 添加/修改开票资料
 		 * 
 		 * @param
 		 * @return
 		 */
-	@PostMapping(value = "/fpzl")
-	@ApiOperation(value = "添加/修改发票资料", httpMethod = "POST", notes = "接口发布说明")
-	public Result<QyzxAttaFpzl> addfpzl(@CurrentUser UserBean userBean, @RequestBody QyzxAttaFpzl qyzxAttaFpzl) {
-		qyzxAttaFpzl.setOrgCode(userBean.getOrgCode());
-		qyzxAttaFpzl.insertOrUpdate();
-		return ResultUtil.data(qyzxAttaFpzl, "添加/修改发票资料成功");
-	}
-
-	/**
+	/*
+	 * @PostMapping(value = "/fpzl")
+	 * 
+	 * @ApiOperation(value = "添加/修改发票资料", httpMethod = "POST", notes = "接口发布说明")
+	 * public Result<QyzxAttaFpzl> addfpzl(@CurrentUser UserBean
+	 * userBean, @RequestBody QyzxAttaFpzl qyzxAttaFpzl) {
+	 * qyzxAttaFpzl.setOrgCode(userBean.getOrgCode());
+	 * qyzxAttaFpzl.insertOrUpdate(); return ResultUtil.data(qyzxAttaFpzl,
+	 * "添加/修改发票资料成功"); }
+	 * 
+	 *//**
 		 * 设置默认发票
 		 * 
 		 * @param
 		 * @return
 		 */
-	@GetMapping(value = "/defaultfp/{id}")
-	@ApiOperation(value = "设置默认发票", httpMethod = "GET", notes = "接口发布说明")
-	public Result<Void> setdef(@CurrentUser UserBean userBean, @PathVariable("id") Integer id) {
-		// 将所有地址设为非默认
-		UpdateWrapper<QyzxAttaFpzl> updateWrapper = new UpdateWrapper<QyzxAttaFpzl>();
-		QyzxAttaFpzl q = QyzxAttaFpzl.builder().orgCode(userBean.getOrgCode()).isDefault(2).build();
-		qyzxAttaFpzlMapper.update(q, updateWrapper);
-
-		// 根据id将发票设为默认
-		updateWrapper.eq("id", id);
-		QyzxAttaFpzl w = QyzxAttaFpzl.builder().orgCode(userBean.getOrgCode()).id(id).isDefault(1).build();
-		qyzxAttaFpzlMapper.update(w, updateWrapper);
-
-		// 返回成功
-		return ResultUtil.success("设置成功");
-	}
-
-	/**
+	/*
+	 * @GetMapping(value = "/defaultfp/{id}")
+	 * 
+	 * @ApiOperation(value = "设置默认发票", httpMethod = "GET", notes = "接口发布说明") public
+	 * Result<Void> setdef(@CurrentUser UserBean userBean, @PathVariable("id")
+	 * Integer id) { // 将所有地址设为非默认 UpdateWrapper<QyzxAttaFpzl> updateWrapper = new
+	 * UpdateWrapper<QyzxAttaFpzl>(); QyzxAttaFpzl q =
+	 * QyzxAttaFpzl.builder().orgCode(userBean.getOrgCode()).isDefault(2).build();
+	 * qyzxAttaFpzlMapper.update(q, updateWrapper);
+	 * 
+	 * // 根据id将发票设为默认 updateWrapper.eq("id", id); QyzxAttaFpzl w =
+	 * QyzxAttaFpzl.builder().orgCode(userBean.getOrgCode()).id(id).isDefault(1).
+	 * build(); qyzxAttaFpzlMapper.update(w, updateWrapper);
+	 * 
+	 * // 返回成功 return ResultUtil.success("设置成功"); }
+	 * 
+	 *//**
 		 * 删除开票资料
 		 * 
 		 * @param
 		 * @return
 		 */
-	@DeleteMapping(value = "/fpzl/{id}")
-	@ApiOperation(value = "删除发票资料", httpMethod = "DELETE", notes = "接口发布说明")
-	public Result<Integer> deletefpzl(@PathVariable Integer id) {
-		QyzxAttaFpzl.builder().build().deleteById(id);
-		return ResultUtil.data(id, "删除发票资料成功");
-	}
-
-	// 获取发票管理
 	/*
+	 * @DeleteMapping(value = "/fpzl/{id}")
+	 * 
+	 * @ApiOperation(value = "删除发票资料", httpMethod = "DELETE", notes = "接口发布说明")
+	 * public Result<Integer> deletefpzl(@PathVariable Integer id) {
+	 * QyzxAttaFpzl.builder().build().deleteById(id); return ResultUtil.data(id,
+	 * "删除发票资料成功"); }
+	 * 
+	 * // 获取发票管理
+	 * 
 	 * @Override public Result<QyzxEntInfoM> selectfpgl() { Integer orgCode =
 	 * qyzxAttaFpgl = QyzxAttaFpgl.builder().build().selectList(new
 	 * QueryWrapper<QyzxAttaFpgl>().eq("org_code", orgCode)); return new
 	 * ResultUtil.data("获取发票管理成功", qyzxAttaFpgl); }
-	 */
-
-	/**
+	 * 
+	 * 
+	 *//**
 		 * 添加/修改发票管理
 		 * 
 		 * @param
 		 * @return
 		 */
-	@PostMapping(value = "/fpgl")
-	@ApiOperation(value = "添加/修改发票管理", httpMethod = "POST", notes = "接口发布说明")
-	public Result<QyzxAttaFpgl> addfpgl(@CurrentUser UserBean userBean, @RequestBody QyzxAttaFpgl qyzxAttaFpgl) {
-		qyzxAttaFpgl.setOrgCode(userBean.getOrgCode());
-		qyzxAttaFpgl.insertOrUpdate();
-		return ResultUtil.data(qyzxAttaFpgl, "添加/修改发票管理成功");
-	}
-
-	/**
+	/*
+	 * @PostMapping(value = "/fpgl")
+	 * 
+	 * @ApiOperation(value = "添加/修改发票管理", httpMethod = "POST", notes = "接口发布说明")
+	 * public Result<QyzxAttaFpgl> addfpgl(@CurrentUser UserBean
+	 * userBean, @RequestBody QyzxAttaFpgl qyzxAttaFpgl) {
+	 * qyzxAttaFpgl.setOrgCode(userBean.getOrgCode());
+	 * qyzxAttaFpgl.insertOrUpdate(); return ResultUtil.data(qyzxAttaFpgl,
+	 * "添加/修改发票管理成功"); }
+	 * 
+	 *//**
 		 * 删除开票资料
 		 * 
 		 * @param
 		 * @return
 		 */
-	@DeleteMapping(value = "/fpgl/{id}")
-	@ApiOperation(value = "删除发票管理", httpMethod = "DELETE", notes = "接口发布说明")
-	public Result<Integer> deletefpgl(@PathVariable Integer id) {
-		QyzxAttaFpgl.builder().build().deleteById(id);
-		return ResultUtil.data(id, "删除发票管理成功");
-	}
-
-	/**
+	/*
+	 * @DeleteMapping(value = "/fpgl/{id}")
+	 * 
+	 * @ApiOperation(value = "删除发票管理", httpMethod = "DELETE", notes = "接口发布说明")
+	 * public Result<Integer> deletefpgl(@PathVariable Integer id) {
+	 * QyzxAttaFpgl.builder().build().deleteById(id); return ResultUtil.data(id,
+	 * "删除发票管理成功"); }
+	 * 
+	 *//**
 		 * 开票资料查询
 		 * 
 		 * @param
 		 * @return
 		 */
-	@PostMapping(value = "/fpzlquery")
-	@ApiOperation(value = "发票资料查询", httpMethod = "POST", notes = "接口发布说明")
-	public Result<Object> queryfpzl(@CurrentUser UserBean userBean,
-			@RequestBody QyzxAttaFpzlQueryDto qyzxAttaFpzlQueryDto) {
-		String titleOrAddress = qyzxAttaFpzlQueryDto.getNameOrAddress();
-
-		Page<QyzxAttaFpzl> page = new Page<QyzxAttaFpzl>(
-				qyzxAttaFpzlQueryDto.getCurrentPage() == null ? 1 : qyzxAttaFpzlQueryDto.getCurrentPage(),
-				qyzxAttaFpzlQueryDto.getTotalPage() == null ? 10 : qyzxAttaFpzlQueryDto.getTotalPage());
-
-		QueryWrapper<QyzxAttaFpzl> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("org_code", userBean.getOrgCode()).and(!StrUtil.hasBlank(titleOrAddress),
-				wq -> wq.likeRight("address", titleOrAddress).or().likeRight("title", titleOrAddress));
-		IPage<QyzxAttaFpzl> qyzxAttaFpzlPage = QyzxAttaFpzl.builder().build().selectPage(page, queryWrapper);
-		List<QyzxAttaFpzl> qyzxAttaFpzls = qyzxAttaFpzlPage.getRecords();
-		qyzxAttaFpzlPage.getCurrent();
-		qyzxAttaFpzlPage.getPages();
-		qyzxAttaFpzlPage.getTotal();
-		qyzxAttaFpzlPage.getSize();
-		return ResultUtil.data(qyzxAttaFpzlPage, qyzxAttaFpzls, "发票资料查询成功");
-	}
-
-	/**
+	/*
+	 * @PostMapping(value = "/fpzlquery")
+	 * 
+	 * @ApiOperation(value = "发票资料查询", httpMethod = "POST", notes = "接口发布说明") public
+	 * Result<Object> queryfpzl(@CurrentUser UserBean userBean,
+	 * 
+	 * @RequestBody QyzxAttaFpzlQueryDto qyzxAttaFpzlQueryDto) { String
+	 * titleOrAddress = qyzxAttaFpzlQueryDto.getNameOrAddress();
+	 * 
+	 * Page<QyzxAttaFpzl> page = new Page<QyzxAttaFpzl>(
+	 * qyzxAttaFpzlQueryDto.getCurrentPage() == null ? 1 :
+	 * qyzxAttaFpzlQueryDto.getCurrentPage(), qyzxAttaFpzlQueryDto.getTotalPage() ==
+	 * null ? 10 : qyzxAttaFpzlQueryDto.getTotalPage());
+	 * 
+	 * QueryWrapper<QyzxAttaFpzl> queryWrapper = new QueryWrapper<>();
+	 * queryWrapper.eq("org_code",
+	 * userBean.getOrgCode()).and(!StrUtil.hasBlank(titleOrAddress), wq ->
+	 * wq.likeRight("address", titleOrAddress).or().likeRight("title",
+	 * titleOrAddress)); IPage<QyzxAttaFpzl> qyzxAttaFpzlPage =
+	 * QyzxAttaFpzl.builder().build().selectPage(page, queryWrapper);
+	 * List<QyzxAttaFpzl> qyzxAttaFpzls = qyzxAttaFpzlPage.getRecords();
+	 * qyzxAttaFpzlPage.getCurrent(); qyzxAttaFpzlPage.getPages();
+	 * qyzxAttaFpzlPage.getTotal(); qyzxAttaFpzlPage.getSize(); return
+	 * ResultUtil.data(qyzxAttaFpzlPage, qyzxAttaFpzls, "发票资料查询成功"); }
+	 * 
+	 *//**
 		 * 发票管理查询
 		 * 
 		 * @param
 		 * @return
-	 */
-	@PostMapping(value = "/fpglquery")
-	@ApiOperation(value = "发票管理查询", httpMethod = "POST", notes = "接口发布说明")
-	public Result<Object> queryfpgl(@CurrentUser UserBean userBean, @RequestBody AttaFpglQueryDto attaFpglQueryDto) {
-		String query = attaFpglQueryDto.getQuery();
-		String startTime = attaFpglQueryDto.getStartTime();
-		String endTime = attaFpglQueryDto.getEndTime();
-		Page<QyzxAttaFpgl> page = new Page<QyzxAttaFpgl>(
-				attaFpglQueryDto.getCurrentPage() == null ? 1 : attaFpglQueryDto.getCurrentPage(),
-				attaFpglQueryDto.getTotalPage() == null ? 10 : attaFpglQueryDto.getTotalPage());
-		Integer orgCode = userBean.getOrgCode();
-		QueryWrapper<QyzxAttaFpgl> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("org_code", orgCode).gt(!StrUtil.hasBlank(startTime), "create_time", startTime)
-				.lt(!StrUtil.hasBlank(endTime), "create_time", endTime)
-				.and(!StrUtil.hasBlank(query), wq -> wq.likeRight("title", query).or().likeRight("project", query));
-		List<QyzxAttaFpgl> qyzxAttaFpgls = QyzxAttaFpgl.builder().build().selectList(queryWrapper);
-		/*
+		 *//*
+			 * @PostMapping(value = "/fpglquery")
+			 * 
+			 * @ApiOperation(value = "发票管理查询", httpMethod = "POST", notes = "接口发布说明") public
+			 * Result<Object> queryfpgl(@CurrentUser UserBean userBean, @RequestBody
+			 * AttaFpglQueryDto attaFpglQueryDto) { String query =
+			 * attaFpglQueryDto.getQuery(); String startTime =
+			 * attaFpglQueryDto.getStartTime(); String endTime =
+			 * attaFpglQueryDto.getEndTime(); Page<QyzxAttaFpgl> page = new
+			 * Page<QyzxAttaFpgl>( attaFpglQueryDto.getCurrentPage() == null ? 1 :
+			 * attaFpglQueryDto.getCurrentPage(), attaFpglQueryDto.getTotalPage() == null ?
+			 * 10 : attaFpglQueryDto.getTotalPage()); Integer orgCode =
+			 * userBean.getOrgCode(); QueryWrapper<QyzxAttaFpgl> queryWrapper = new
+			 * QueryWrapper<>(); queryWrapper.eq("org_code",
+			 * orgCode).gt(!StrUtil.hasBlank(startTime), "create_time", startTime)
+			 * .lt(!StrUtil.hasBlank(endTime), "create_time", endTime)
+			 * .and(!StrUtil.hasBlank(query), wq -> wq.likeRight("title",
+			 * query).or().likeRight("project", query)); List<QyzxAttaFpgl> qyzxAttaFpgls =
+			 * QyzxAttaFpgl.builder().build().selectList(queryWrapper);
+			 * 
 			 * queryWrapper.eq("org_code", orgCode) .between(!StrUtil.hasBlank(startTime) &&
 			 * !StrUtil.hasBlank(endTime), "create_time", !StrUtil.hasBlank(startTime) ?
 			 * startTime : "1000-01-01 00:00:00", !StrUtil.hasBlank(endTime) ? endTime :
 			 * "9999-01-01 00:00:00") .and(!StrUtil.hasBlank(query), wq ->
 			 * wq.likeRight("title", query).or().likeRight("project", query));
-		 */
-
-		/*
+			 * 
+			 * 
+			 * 
 			 * IPage<QyzxAttaFpgl> qyzxAttaFpglPage =
 			 * QyzxAttaFpgl.builder().build().selectPage(page, queryWrapper);
 			 * List<QyzxAttaFpgl> qyzxAttaFpgls = qyzxAttaFpglPage.getRecords();
 			 * qyzxAttaFpglPage.getCurrent(); qyzxAttaFpglPage.getPages();
 			 * qyzxAttaFpglPage.getTotal(); qyzxAttaFpglPage.getSize();
+			 * 
+			 * 
+			 * return ResultUtil.data(page, qyzxAttaFpgls, "发票资料查询成功"); }
+			 */
+
+	// 下载系统使用手册 直接提供（OSS公共读权限文件）url地址到前端按钮
+	/**
+	 * 意见反馈
 	 */
+	@PostMapping(value = "/feedback")
+	@ApiOperation(value = "意见反馈)", httpMethod = "POST", notes = "接口发布说明")
+	public Result<QyzxLogBuy> feedback(@CurrentUser UserBean userBean, @RequestParam(required = false) String moudle,
+			@RequestParam(required = false) String opinionText,@Param("files") List<MultipartFile> files) {
+		String url = null;
+		List<String> list = new ArrayList<String>();
+		for (MultipartFile file : files) {
+			String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" + file.getOriginalFilename();
+			if (file == null || file.getSize() <= 0) {
+				return ResultUtil.error("上传的文件为空，请重新选择！");
+			} else {
+				try {
+					url = OSSUtil.uploadFile(path, file.getInputStream());
+					list.add(url);
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		QyzxSuggestionFeeback feeback = new QyzxSuggestionFeeback();
+		feeback.setEmpNum(userBean.getEmpNum());
+		feeback.setOpinionText(opinionText);
+		feeback.setCreateTime(new Date());
+		feeback.setOrgCode(userBean.getOrgCode());
+		boolean a = feeback.insert();
+		if (a && list.size()>0) {
+			for (String opinionUrl : list) {
+				QyzxFeebackAccessory.builder().feebackId(feeback.getId()).opinionUrl(opinionUrl).build().insert();
+			}
+		}
+		return ResultUtil.success("意见反馈成功！");
+	}
 	
-		return ResultUtil.data(page, qyzxAttaFpgls, "发票资料查询成功");
+	
+	
+	
+	/**
+	 * 查看服务列表
+	 */
+	@GetMapping(value = "/servelist")
+	@ApiOperation(value = "查看服务列表",httpMethod = "GET",notes = "接口发布说明")
+	public Result<List<QyzxPayServe>> servelist(){
+		 List<QyzxPayServe> list = new LambdaQueryChainWrapper<QyzxPayServe>(qyzxPayServeMapper)
+		.select(QyzxPayServe::getName,QyzxPayServe::getNum,QyzxPayServe::getSpecialPrice,QyzxPayServe::getOriginalPrice,
+				QyzxPayServe::getSort,QyzxPayServe::getUnit,QyzxPayServe::getRemark).orderByAsc(QyzxPayServe::getId).list();
+		return ResultUtil.data(list, "查看服务列表成功");
 	}
 	
-	// 下载系统使用手册 直接提供（OSS公共读权限文件）url地址到前端按钮
 	
 	/**
 	 * 购买服务(添加服务计算,添加购买记录)
@@ -393,9 +501,9 @@ public class QyzxController {
 	 * @param
 	 * @return
 	 */
-	@PostMapping(value = "/gmfw")
-	@ApiOperation(value = " 购买服务(添加服务计算,添加购买记录)", httpMethod = "POST", notes = "接口发布说明")
-	public Result<QyzxLogBuy> addgmfw(@CurrentUser UserBean userBean, @RequestBody QyzxLogBuy qyzxLogBuy) {
+	@PostMapping(value = "/buyserve")
+	@ApiOperation(value = "购买服务(添加服务计算,添加购买记录)", httpMethod = "POST", notes = "接口发布说明")
+	public Result<QyzxLogBuy> buyserve(@CurrentUser UserBean userBean, @RequestBody QyzxLogBuy qyzxLogBuy) {
 		Integer payServeId = qyzxLogBuy.getPayServeId();// 套餐的付费服务的id
 		Integer num = qyzxLogBuy.getNum();// 套餐的购买次数
 		QyzxPayServe qyzxPayServe = QyzxPayServe.builder().id(payServeId).build().selectById();
@@ -509,10 +617,10 @@ public class QyzxController {
 	 */
 	@GetMapping(value = "/adminlist/{page}/{limit}")
 	@ApiOperation(value = "获取账号", httpMethod = "GET", notes = "接口发布说明")
-	public Result<Object> adminlist(@CurrentUser UserBean userBean ,@PathVariable("page") Integer page ,@PathVariable("limit") Integer limit) {
-		IPage<AdminListDto> page1  = new Page<AdminListDto>(page,limit );
-		return ResultUtil.data(page1, qyzxEmpEntAssoMapper.adminlist(page1,userBean.getOrgCode()), "获取账号");
+	public Result<Object> adminlist(@CurrentUser UserBean userBean, @PathVariable("page") Integer page,
+			@PathVariable("limit") Integer limit) {
+		IPage<AdminListDto> page1 = new Page<AdminListDto>(page, limit);
+		return ResultUtil.data(page1, qyzxEmpEntAssoMapper.adminlist(page1, userBean.getOrgCode()), "获取账号");
 	}
 
-
 }

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: