Merge remote-tracking branch 'origin/master'

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/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-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,7 +35,7 @@ public class SysTenantAccountController extends BaseController {
     @GetMapping("/get")
     @PreAuthorize("@pcs.hasPermissions('sysTenantAccount/get')")
     public Object get(Integer teacherId) {
-        if (teacherId == null || teacherId <=0) {
+        if (teacherId == null || teacherId <= 0) {
             return failed("用户id必须大于0");
         }