Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TenantPaymentOrder.java

@@ -1,9 +1,10 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
 import com.ym.mec.common.enums.BaseEnum;
 
 /**
@@ -41,7 +42,7 @@ public class TenantPaymentOrder {
 	/**  */
 	private Integer userId;
 	/**  */
-	private String username;
+	private SysUser user = new SysUser();
 
 	/** 分部id */
 	private Integer organId;
@@ -105,14 +106,6 @@ public class TenantPaymentOrder {
 	/**  */
 	private java.util.Date updateTime;
 
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
 	public void setId(Long id) {
 		this.id = id;
 	}
@@ -121,6 +114,14 @@ public class TenantPaymentOrder {
 		return this.id;
 	}
 
+	public SysUser getUser() {
+		return user;
+	}
+
+	public void setUser(SysUser user) {
+		this.user = user;
+	}
+
 	public Integer getActivitiesId() {
 		return activitiesId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TenantAccountDetailQueryInfo.java

@@ -5,6 +5,8 @@ import com.ym.mec.biz.dal.entity.SysTenantAccountDetail.TransType;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 public class TenantAccountDetailQueryInfo extends QueryInfo {
 
 	@ApiModelProperty(value = "类型",required = false)
@@ -15,10 +17,10 @@ public class TenantAccountDetailQueryInfo extends QueryInfo {
 	private Integer userId;
 
 	@ApiModelProperty(value = "开始时间",required = false)
-	private String startTime;
+	private Date startTime;
 
 	@ApiModelProperty(value = "结束时间",required = false)
-	private String endTime;
+	private Date endTime;
 
 	public TransType getTransType() {
 		return transType;
@@ -44,19 +46,19 @@ public class TenantAccountDetailQueryInfo extends QueryInfo {
 		this.userId = userId;
 	}
 
-	public String getStartTime() {
+	public Date getStartTime() {
 		return startTime;
 	}
 
-	public void setStartTime(String startTime) {
+	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
 	}
 
-	public String getEndTime() {
+	public Date getEndTime() {
 		return endTime;
 	}
 
-	public void setEndTime(String endTime) {
+	public void setEndTime(Date endTime) {
 		this.endTime = endTime;
 	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TenantPaymentOrderQueryInfo.java

@@ -19,6 +19,9 @@ public class TenantPaymentOrderQueryInfo extends QueryInfo {
 
 	@ApiModelProperty(value = "老师编号", required = false)
 	private Integer userId;
+	
+	@ApiModelProperty(value = "老师电话号码", required = false)
+	private String phone;
 
 	@ApiModelProperty(value = "交易状态", required = false)
 	private DealStatusEnum status;
@@ -61,6 +64,14 @@ public class TenantPaymentOrderQueryInfo extends QueryInfo {
 		this.userId = userId;
 	}
 
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
 	public DealStatusEnum getStatus() {
 		return status;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/TenantPaymentOrderService.java

@@ -1,9 +1,8 @@
 package com.ym.mec.biz.service;
 
-import java.util.Map;
-
 import com.ym.mec.biz.dal.entity.TenantPaymentOrder;
 import com.ym.mec.biz.dal.page.TenantPaymentOrderQueryInfo;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.service.BaseService;
 
 public interface TenantPaymentOrderService extends BaseService<Long, TenantPaymentOrder> {
@@ -12,9 +11,10 @@ public interface TenantPaymentOrderService extends BaseService<Long, TenantPayme
 	 * 下单
 	 * @param userId
 	 * @param activitiesId
+	 * @param isContinuePay 是否继续付款
 	 * @return
 	 */
-	public Map<String, Object> createOrder(Integer userId, Integer activitiesId);
+	public HttpResponseResult createOrder(Integer userId, Integer activitiesId, boolean isContinuePay);
 
 	/**
 	 * 回调

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseReviewServiceImpl.java

@@ -17,6 +17,7 @@ import com.ym.mec.im.ImFeignService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
@@ -169,7 +170,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public CourseScheduleReview addPracticeGroupReview(CourseScheduleReview courseScheduleReview) {
         Integer courseScheduleId = courseScheduleReview.getCourseScheduleId();
         if (courseScheduleId == null || courseScheduleId <= 0) {
@@ -207,16 +208,22 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
             if (StringUtils.isNotBlank(courseScheduleReview.getHomeWork()) && Objects.isNull(existHomework)) {
                 //新增课堂作业
                 CourseHomework courseHomework = new CourseHomework();
-                courseHomework.setContent(courseScheduleReview.getHomeWork());
-                courseHomework.setCourseScheduleId(courseSchedule.getId());
-                courseHomework.setMusicGroupId(courseSchedule.getMusicGroupId());
-                courseHomework.setGroupType(courseSchedule.getGroupType());
-                courseHomework.setClassGroupId(courseSchedule.getClassGroupId());
-                courseHomework.setExpiryDate(DateUtil.addDays(date, 7));
                 List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseSchedule.getId());
 
-                courseHomework.setExpectNum(CollectionUtils.isEmpty(courseScheduleStudentPayments) ? 0 : courseScheduleStudentPayments.size());
-                courseHomeworkService.insert(courseHomework);
+                if(Objects.nonNull(existHomework)){
+                    existHomework.setContent(courseScheduleReview.getHomeWork());
+                    existHomework.setExpiryDate(DateUtil.addDays(date, 7));
+                    courseHomeworkService.update(existHomework);
+                }else{
+                    courseHomework.setContent(courseScheduleReview.getHomeWork());
+                    courseHomework.setCourseScheduleId(courseSchedule.getId());
+                    courseHomework.setMusicGroupId(courseSchedule.getMusicGroupId());
+                    courseHomework.setGroupType(courseSchedule.getGroupType());
+                    courseHomework.setClassGroupId(courseSchedule.getClassGroupId());
+                    courseHomework.setExpiryDate(DateUtil.addDays(date, 7));
+                    courseHomework.setExpectNum(CollectionUtils.isEmpty(courseScheduleStudentPayments) ? 0 : courseScheduleStudentPayments.size());
+                    courseHomeworkService.insert(courseHomework);
+                }
 
                 if (!CollectionUtils.isEmpty(courseScheduleStudentPayments)) {
 //                    List<StudentCourseHomework> studentCourseHomeworks = new ArrayList<>();
@@ -224,15 +231,19 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
                     String dateStr = DateUtil.dateToString(DateUtil.addDays(date, 1), "MM月dd日");
                     for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
                         StudentCourseHomework studentCourseHomework = new StudentCourseHomework();
-                        studentCourseHomework.setCourseHomeworkId(courseHomework.getId());
-                        studentCourseHomework.setUserId(courseScheduleStudentPayment.getUserId());
-                        studentCourseHomework.setCourseScheduleId(courseSchedule.getId());
-                        studentCourseHomework.setCreateTime(date);
-                        studentCourseHomework.setUpdateTime(date);
-                        studentCourseHomework.setStatus(YesOrNoEnum.NO);
-                        studentCourseHomework.setIsView(YesOrNoEnum.NO);
-                        studentCourseHomework.setIsReplied(YesOrNoEnum.NO);
-                        studentCourseHomeworkDao.insert(studentCourseHomework);
+                        if(Objects.isNull(existHomework)){
+                            studentCourseHomework.setCourseHomeworkId(courseHomework.getId());
+                            studentCourseHomework.setUserId(courseScheduleStudentPayment.getUserId());
+                            studentCourseHomework.setCourseScheduleId(courseSchedule.getId());
+                            studentCourseHomework.setCreateTime(date);
+                            studentCourseHomework.setUpdateTime(date);
+                            studentCourseHomework.setStatus(YesOrNoEnum.NO);
+                            studentCourseHomework.setIsView(YesOrNoEnum.NO);
+                            studentCourseHomework.setIsReplied(YesOrNoEnum.NO);
+                            studentCourseHomeworkDao.insert(studentCourseHomework);
+                        }else{
+                            studentCourseHomework = studentCourseHomeworkDao.findByStudentAndCourseHomewok(existHomework.getId(), courseScheduleStudentPayment.getUserId());
+                        }
 
                         Map<Integer, String> userMap = new HashMap<>();
                         userMap.put(courseScheduleStudentPayment.getUserId(), courseScheduleStudentPayment.getUserId().toString());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkServiceImpl.java

@@ -87,7 +87,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         if (Objects.isNull(bean) || Objects.isNull(bean.getId()) || Objects.isNull(existHomework)) {
             throw new BizException("作业不存在");
         }
-        boolean push = Objects.isNull(bean.getAttachments());
+        boolean push = Objects.isNull(existHomework.getAttachments());
         super.update(bean);
         bean = studentCourseHomeworkDao.get(bean.getId());
         CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantPaymentOrderServiceImpl.java

@@ -10,15 +10,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.ym.mec.biz.dal.dto.PageInfoOrder;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
-import com.ym.mec.biz.dal.page.TenantPaymentOrderQueryInfo;
-import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.util.collection.MapUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,6 +24,7 @@ import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dao.TenantEntryActivitiesDao;
 import com.ym.mec.biz.dal.dao.TenantPaymentOrderDao;
+import com.ym.mec.biz.dal.dto.PageInfoOrder;
 import com.ym.mec.biz.dal.entity.SysTenantAccountDetail.TransType;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.entity.TenantEntryActivities;
@@ -36,10 +32,13 @@ import com.ym.mec.biz.dal.entity.TenantEntryActivities.SuitableUser;
 import com.ym.mec.biz.dal.entity.TenantPaymentOrder;
 import com.ym.mec.biz.dal.entity.TenantPaymentOrder.TenantPaymentType;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
+import com.ym.mec.biz.dal.page.TenantPaymentOrderQueryInfo;
 import com.ym.mec.biz.service.PayService;
 import com.ym.mec.biz.service.SysTenantAccountService;
 import com.ym.mec.biz.service.TenantPaymentOrderService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
@@ -48,6 +47,7 @@ import com.ym.mec.thirdparty.yqpay.Msg;
 import com.ym.mec.thirdparty.yqpay.RsqMsg;
 import com.ym.mec.thirdparty.yqpay.YqPayFeignService;
 import com.ym.mec.thirdparty.yqpay.YqPayUtil;
+import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 
 @Service
@@ -86,7 +86,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-	public Map<String, Object> createOrder(Integer userId, Integer activitiesId) {
+	public HttpResponseResult createOrder(Integer userId, Integer activitiesId, boolean isContinuePay) {
 
 		Teacher teacher = teacherDao.get(userId);
 		if (teacher == null) {
@@ -118,15 +118,26 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 			for (TenantPaymentOrder po : orderList) {
 				// 是否满足条件
 				if (tenantEntryActivities.getSuitableUser() == SuitableUser.NEW) {
+					if (po.getStatus() == DealStatusEnum.SUCCESS) {
+						throw new BizException("首充优惠活动每个用户限参与一次。");
+					}
+
 					if (po.getStatus() == DealStatusEnum.ING) {
 						int i = 35 - DateUtil.minutesBetween(po.getCreateTime(), date);
-						if(i <= 0){
-							throw new BizException("您的订单出现异常，请联系客服");
+						if (i <= 0) {
+							throw new BizException("您有支付中的订单出现异常，请联系客服");
+						}
+						// throw new BizException("您参加的首充活动正在处理中，预计于{}分钟后处理完毕，请稍后。", i);
+						if (isContinuePay == false) {
+							HttpResponseResult result = new HttpResponseResult(true, HttpStatus.CONTINUE, "您存在支付中的订单，是否重新付款？", null);
+							return result;
+						} else {
+							// 关闭原订单
+							po.setStatus(DealStatusEnum.CLOSE);
+							po.setMemo("用户主动关闭");
+							po.setUpdateTime(date);
+							tenantPaymentOrderDao.update(po);
 						}
-						throw new BizException("您参加的首充活动正在处理中，预计于{}分钟后处理完毕，请稍后。", i);
-					}
-					if (po.getStatus() == DealStatusEnum.SUCCESS) {
-						throw new BizException("首充优惠活动每个用户限参与一次。");
 					}
 				}
 			}
@@ -160,7 +171,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 
 			Map<String, Object> payMap = payService.getPayMap(tenantPaymentOrder.getExpectAmount(), tenantPaymentOrder.getOrderNo(), baseApiUrl
 					+ "/api-teacher/teacherOrder/notify", baseApiUrl + "/api-teacher/teacherOrder/paymentResult?orderNo=" + tenantPaymentOrder.getOrderNo(),
-					"商户入驻", "商户充值", userId, classFee, organId,"sdaya");
+					"商户入驻", "商户充值", userId, classFee, organId, "sdaya");
 
 			Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
 			tenantPaymentOrder.setComAmount(routingFee.get("COM"));
@@ -170,7 +181,8 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 			tenantPaymentOrder.setUpdateTime(date);
 			tenantPaymentOrderDao.update(tenantPaymentOrder);
 
-			return payMap;
+			HttpResponseResult result = new HttpResponseResult(true, HttpStatus.OK, payMap, null);
+			return result;
 		} catch (Exception e) {
 			throw new BizException("调用支付接口出错", e);
 		}
@@ -350,9 +362,9 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 		int count = this.findCount(params);
 		if (count > 0) {
 			TenantPaymentOrder orderMoneyAmount = tenantPaymentOrderDao.getOrderMoneyAmount(params);
-			if(orderMoneyAmount != null){
-				pageInfo.setTotalExpectAmount(orderMoneyAmount.getExpectAmount() !=null? orderMoneyAmount.getExpectAmount():BigDecimal.ZERO);
-				pageInfo.setTotalActualAmount(orderMoneyAmount.getActualAmount() !=null? orderMoneyAmount.getActualAmount():BigDecimal.ZERO);
+			if (orderMoneyAmount != null) {
+				pageInfo.setTotalExpectAmount(orderMoneyAmount.getExpectAmount() != null ? orderMoneyAmount.getExpectAmount() : BigDecimal.ZERO);
+				pageInfo.setTotalActualAmount(orderMoneyAmount.getActualAmount() != null ? orderMoneyAmount.getActualAmount() : BigDecimal.ZERO);
 			}
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());

mec-biz/src/main/resources/config/mybatis/SysTenantAccountDetailMapper.xml

@@ -35,7 +35,8 @@
 				and create_time_ >= #{startTime}
 			</if>
 			<if test="endTime != null">
-				<![CDATA[and create_time_ <= #{startTime}]]></if>
+				<![CDATA[and create_time_ <= #{endTime}]]>
+			</if>
 		</where>
 	</sql>
 

mec-biz/src/main/resources/config/mybatis/TenantPaymentOrderMapper.xml

@@ -8,7 +8,8 @@
 		<result column="id_" property="id" />
 		<result column="activities_id_" property="activitiesId" />
 		<result column="user_id_" property="userId" />
-		<result column="real_name_" property="username" />
+		<result column="real_name_" property="user.username" />
+		<result column="phone_" property="user.phone" />
 		<result column="organ_id_" property="organId" />
 		<result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="trans_minutes_" property="transMinutes" />
@@ -49,6 +50,9 @@
             <if test="userId != null">
                 AND tpo.user_id_ = #{userId}
             </if>
+            <if test="phone != null">
+                AND su.phone_ = #{phone}
+            </if>
             <if test="paymentChannel != null">
                 AND tpo.payment_channel_ NOT IN (#{paymentChannel})
             </if>
@@ -166,7 +170,7 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="TenantPaymentOrder"
 		parameterType="map">
-		SELECT tpo.*,su.real_name_ FROM tenant_payment_order tpo
+		SELECT tpo.*,su.real_name_,su.phone_ FROM tenant_payment_order tpo
 		LEFT JOIN sys_user su ON su.id_ = tpo.user_id_
         <include refid="queryPaymentOrder"/>
 		ORDER BY tpo.id_
@@ -176,6 +180,7 @@
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(tpo.id_) FROM tenant_payment_order tpo
+		LEFT JOIN sys_user su ON su.id_ = tpo.user_id_
         <include refid="queryPaymentOrder"/>
 	</select>
 	
@@ -200,6 +205,7 @@
     </select>
 	<select id="getOrderMoneyAmount" resultMap="TenantPaymentOrder">
 		SELECT SUM(expect_amount_) expect_amount_,SUM(actual_amount_) actual_amount_ FROM tenant_payment_order tpo
+		LEFT JOIN sys_user su ON su.id_ = tpo.user_id_
 		<include refid="queryPaymentOrder"/>
 	</select>
 </mapper>

mec-common/common-core/src/main/java/com/ym/mec/common/entity/HttpResponseResult.java

@@ -1,5 +1,7 @@
 package com.ym.mec.common.entity;
 
+import org.springframework.http.HttpStatus;
+
 /**
  * HttpResponse 返回结果
  */
@@ -19,6 +21,13 @@ public class HttpResponseResult {
 		this.code = code;
 	}
 
+	public HttpResponseResult(boolean status, HttpStatus resultCode, Object data, String message) {
+		this.status = status;
+		this.msg = message;
+		this.data = data;
+		this.code = resultCode.value();
+	}
+
 	public HttpResponseResult() {
 	}
 

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TenantPaymentOrderController.java

@@ -23,48 +23,51 @@ import com.ym.mec.common.controller.BaseController;
 @RestController
 public class TenantPaymentOrderController extends BaseController {
 
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-    
-    @Autowired
-    private TenantPaymentOrderService tenantPaymentOrderService;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
-    @ApiOperation(value = "下单")
-    @PostMapping("/createOrder")
-    public Object createOrder(Integer activitiesId){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
-        return succeed(tenantPaymentOrderService.createOrder(sysUser.getId(), activitiesId));
-    }
+	@Autowired
+	private TenantPaymentOrderService tenantPaymentOrderService;
 
-    @ApiOperation(value = "查询订单")
-    @GetMapping("/query")
-    public Object query(long id){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
-        TenantPaymentOrder order = tenantPaymentOrderService.get(id);
-        if(order == null){
-        	return failed("订单不存在");
-        }
-        return succeed(order);
-    }
+	@ApiOperation(value = "下单")
+	@PostMapping("/createOrder")
+	public Object createOrder(Integer activitiesId, Boolean isContinuePay) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (Objects.isNull(sysUser)) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		if (isContinuePay == null) {
+			isContinuePay = false;
+		}
+		return tenantPaymentOrderService.createOrder(sysUser.getId(), activitiesId, isContinuePay);
+	}
 
-    @ApiOperation(value = "查询订单")
-    @GetMapping("/queryByOrderNo")
-    public Object query(String orderNo){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(Objects.isNull(sysUser)){
-            return failed(HttpStatus.FORBIDDEN,"请登录");
-        }
-        TenantPaymentOrder order = tenantPaymentOrderService.queryByOrderNo(orderNo);
-        if(order == null){
-        	return failed("订单不存在");
-        }
-        return succeed(order);
-    }
+	@ApiOperation(value = "查询订单")
+	@GetMapping("/query")
+	public Object query(long id) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (Objects.isNull(sysUser)) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		TenantPaymentOrder order = tenantPaymentOrderService.get(id);
+		if (order == null) {
+			return failed("订单不存在");
+		}
+		return succeed(order);
+	}
+
+	@ApiOperation(value = "查询订单")
+	@GetMapping("/queryByOrderNo")
+	public Object query(String orderNo) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (Objects.isNull(sysUser)) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		TenantPaymentOrder order = tenantPaymentOrderService.queryByOrderNo(orderNo);
+		if (order == null) {
+			return failed("订单不存在");
+		}
+		return succeed(order);
+	}
 
 }

mec-web/src/main/java/com/ym/mec/web/controller/SysTenantAccountController.java

@@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
-
 @RequestMapping("sysTenantAccount")
 @Api(tags = "后台租客账户管理")
 @RestController
@@ -37,8 +35,8 @@ public class SysTenantAccountController extends BaseController {
     @GetMapping("/get")
     @PreAuthorize("@pcs.hasPermissions('sysTenantAccount/get')")
     public Object get(Integer teacherId) {
-        if (teacherId == null || teacherId <=0) {
-            return failed(HttpStatus.FORBIDDEN, "用户id必须大于0");
+        if (teacherId == null || teacherId <= 0) {
+            return failed("用户id必须大于0");
         }
 
         return succeed(sysTenantAccountService.get(teacherId));