Merge branch 'master' of https://github.com/roncoo/roncoo-education.git

roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/biz/auth/AuthApiCourseBiz.java

@@ -205,7 +205,7 @@ public class AuthApiCourseBiz extends BaseBiz {
 		PolyvSignResult signResult = PolyvUtil.getSignForH5(polyvSign, sys.getPolyvUseid(), sys.getPolyvSecretkey());
 		AuthCourseSignDTO dto = BeanUtil.copyProperties(signResult, AuthCourseSignDTO.class);
 		PolyvCode polyvCode = new PolyvCode();
-		polyvCode.setPeriodId(authCourseSignBO.getPeriodId());
+		polyvCode.setPeriodNo(authCourseSignBO.getPeriodId());
 		polyvCode.setUserNo(authCourseSignBO.getUserNo());
 		dto.setCode(PolyvUtil.getPolyvCode(polyvCode));
 		return dto;

roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/biz/callback/CallbackPolyvBiz.java

@@ -93,7 +93,7 @@ public class CallbackPolyvBiz extends BaseBiz {
 		}
 
 		// 课时校验
-		CourseChapterPeriod periodInfo = courseChapterPeriodDao.getById(polyvCode.getPeriodId());
+		CourseChapterPeriod periodInfo = courseChapterPeriodDao.getById(polyvCode.getPeriodNo());
 
 		// 章节校验
 		CourseChapter chapterInfo = courseChapterDao.getById(periodInfo.getChapterId());

roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/common/bo/auth/AuthOrderInfoContinuePayBO.java

@@ -24,7 +24,7 @@ public class AuthOrderInfoContinuePayBO implements Serializable {
     /***
      * 支付类型
      */
-    @ApiModelProperty(value = "支付方式(1微信支付，2支付宝支付，3积分支付)", required = true)
+    @ApiModelProperty(value = "支付方式：1微信支付，2支付宝支付", required = true)
     private Integer payType;
 
 }

roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/common/bo/auth/AuthOrderInfoListBO.java

@@ -18,9 +18,9 @@ public class AuthOrderInfoListBO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 订单状态1待支付，2成功支付，3支付失败，4已关闭，5已退款, 6订单解绑
+	 * 订单状态1待支付，2成功支付，3支付失败，4已关闭
 	 */
-	@ApiModelProperty(value = "订单状态(1待支付，2成功支付，3支付失败，4已关闭，5已退款, 6订单解绑)")
+	@ApiModelProperty(value = "订单状态(1待支付，2成功支付，3支付失败，4已关闭)")
 	private Integer orderStatus;
 
 	/**

roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/common/bo/auth/AuthOrderPayBO.java

@@ -23,10 +23,10 @@ public class AuthOrderPayBO implements Serializable {
 	@ApiModelProperty(value = "课程编号", required = true)
 	private Long courseId;
 
-	@ApiModelProperty(value = "支付方式(1微信支付，2支付宝支付，3积分支付)", required = true)
+	@ApiModelProperty(value = "支付方式：1微信支付，2支付宝支付", required = true)
 	private Integer payType;
 
-	@ApiModelProperty(value = "购买渠道：1web，2pp，3微信，4手工绑定", required = true)
+	@ApiModelProperty(value = "购买渠道：1web", required = true)
 	private Integer channelType;
 
 	@ApiModelProperty(value = "用户备注", required = false)	

roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/common/dto/auth/AuthOrderInfoDTO.java

@@ -39,14 +39,14 @@ public class AuthOrderInfoDTO implements Serializable {
 	@ApiModelProperty(value = "实际支付金额", required = true)
 	private BigDecimal pricePaid;
 	/**
-	 * 支付方式：1微信支付，2支付宝支付，3余额支付
+	 * 支付方式：1微信支付，2支付宝支付
 	 */
-	@ApiModelProperty(value = "支付方式(1:微信支付，2:支付宝支付，3:积分支付)", required = true)
+	@ApiModelProperty(value = "支付方式(1:微信支付，2:支付宝支付)", required = true)
 	private Integer payType;
 	/**
 	 * 订单状态：0待支付，1成功支付，2支付失败，3已关闭，4已退款
 	 */
-	@ApiModelProperty(value = "订单状态(1:待支付，2:支付成功，3:支付失败，4:已关闭，5:已退款, 6:订单解绑)", required = true)
+	@ApiModelProperty(value = "订单状态(1:待支付，2:支付成功，3:支付失败，4:已关闭)", required = true)
 	private Integer orderStatus;
 	/**
 	 * 支付时间

roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/common/dto/auth/AuthOrderInfoListDTO.java

@@ -68,11 +68,11 @@ public class AuthOrderInfoListDTO implements Serializable {
 	/**
 	 * 支付方式：1微信支付，2支付宝支付，3积分支付
 	 */
-	@ApiModelProperty(value = "支付方式：1微信支付，2支付宝支付，3积分支付,4手工录单")
+	@ApiModelProperty(value = "支付方式：1微信支付，2支付宝支付")
 	private Integer payType;
 	/**
 	 * 订单状态：1待支付，2成功支付，3支付失败，4已关闭，5已退款, 6订单解绑
 	 */
-	@ApiModelProperty(value = "订单状态：1待支付，2成功支付，3支付失败，4已关闭，5已退款, 6订单解绑")
+	@ApiModelProperty(value = "订单状态：1待支付，2成功支付，3支付失败，4已关闭")
 	private Integer orderStatus;
 }
\ No newline at end of file

roncoo-education-util/src/main/java/com/roncoo/education/util/enums/ChannelTypeEnum.java

@@ -12,7 +12,7 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum ChannelTypeEnum {
-	PC(1, "PC端"), APP(2, "APP端"), WEIXIN(3, "微信端"), MANUAL(4, "手工绑定");
+	PC(1, "PC端");
 
 	private Integer code;
 

roncoo-education-util/src/main/java/com/roncoo/education/util/enums/OrderStatusEnum.java

@@ -13,7 +13,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum OrderStatusEnum {
 
-    WAIT(1, "待支付"), SUCCESS(2, "支付成功"), FAIL(3, "支付失败"), CLOSE(4, "已关闭"), REFUND(5, "已退款"),UNBIND(6,"已解绑");
+    WAIT(1, "待支付"), SUCCESS(2, "支付成功"), FAIL(3, "支付失败"), CLOSE(4, "已关闭");
 
     private Integer code;
 

roncoo-education-util/src/main/java/com/roncoo/education/util/enums/PayTypeEnum.java

@@ -13,7 +13,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum PayTypeEnum {
 
-	WEIXIN(1, "微信支付"), ALIPAY(2, "支付宝支付"), INTEGRAL(3, "积分支付"), MANUAL(4, "手工录单");
+	WEIXIN(1, "微信支付"), ALIPAY(2, "支付宝支付");
 
 	private Integer code;
 

roncoo-education-util/src/main/java/com/roncoo/education/util/polyv/PolyvCode.java

@@ -11,7 +11,7 @@ public class PolyvCode implements Serializable {
 
 	private Long userNo;
 
-	private Long periodId;
+	private Long periodNo;
 
 	public Long getUserNo() {
 		return userNo;
@@ -21,12 +21,12 @@ public class PolyvCode implements Serializable {
 		this.userNo = userNo;
 	}
 
-	public Long getPeriodId() {
-		return periodId;
+	public Long getPeriodNo() {
+		return periodNo;
 	}
 
-	public void setPeriodId(Long periodId) {
-		this.periodId = periodId;
+	public void setPeriodNo(Long periodNo) {
+		this.periodNo = periodNo;
 	}
 
 }

roncoo-education-web-boss/src/main/java/com/roncoo/education/web/boss/service/SysUserService.java

@@ -8,6 +8,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
+import com.roncoo.education.user.common.bean.qo.UserQO;
+import com.roncoo.education.user.common.bean.vo.UserVO;
+import com.roncoo.education.user.feign.IBossUser;
 import com.roncoo.education.util.base.BaseException;
 import com.roncoo.education.util.base.Page;
 import com.roncoo.education.util.base.PageUtil;
@@ -34,6 +37,9 @@ public class SysUserService {
 
 	@Autowired
 	private SysRoleUserDao sysRoleUserDao;
+	
+	@Autowired
+	private IBossUser bossUser;
 
 	public Page<SysUserVO> listForPage(SysUserQO qo) {
 		SysUserExample example = new SysUserExample();
@@ -64,7 +70,17 @@ public class SysUserService {
 		return BeanUtil.copyProperties(record, SysUserVO.class);
 	}
 
+	@Transactional
 	public int updateById(SysUserQO qo) {
+		SysUser sysUser = dao.getById(qo.getId());
+		UserVO user = bossUser.getByMobile(sysUser.getMobile());
+		if (user == null) {
+			throw new BaseException("找不到用户信息");
+		}
+		UserQO userQO = new UserQO();
+		userQO.setId(user.getId());
+		userQO.setMobile(qo.getMobile());
+		bossUser.updateById(userQO);
 		SysUser record = BeanUtil.copyProperties(qo, SysUser.class);
 		return dao.updateById(record);
 	}