Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysTenantAccountDetailDao.java

@@ -5,5 +5,5 @@ import com.ym.mec.common.dal.BaseDAO;
 
 public interface SysTenantAccountDetailDao extends BaseDAO<Long, SysTenantAccountDetail> {
 
-	
+	SysTenantAccountDetail queryByOrderNo(String orderNo);
 }

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

@@ -61,6 +61,8 @@ public class SysTenantAccountDetail {
 
 	/**  */
 	private Integer userId;
+	
+	private String orderNo;
 
 	/** 交易类型 */
 	private TransType transType;
@@ -177,6 +179,14 @@ public class SysTenantAccountDetail {
 		return this.updateTime;
 	}
 
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -34,7 +34,7 @@ public class TenantPaymentOrder {
 
 	/**  */
 	private Long id;
-	
+
 	private Integer activitiesId;
 
 	/**  */
@@ -46,6 +46,11 @@ public class TenantPaymentOrder {
 	/** 订单类型(购买) */
 	private TenantPaymentType type;
 
+	/** 交易的分钟数 */
+	private Integer transMinutes;
+
+	private Integer giveMinutes;
+
 	/** 预计金额 */
 	private java.math.BigDecimal expectAmount;
 
@@ -137,6 +142,22 @@ public class TenantPaymentOrder {
 		return this.type;
 	}
 
+	public Integer getTransMinutes() {
+		return transMinutes;
+	}
+
+	public void setTransMinutes(Integer transMinutes) {
+		this.transMinutes = transMinutes;
+	}
+
+	public Integer getGiveMinutes() {
+		return giveMinutes;
+	}
+
+	public void setGiveMinutes(Integer giveMinutes) {
+		this.giveMinutes = giveMinutes;
+	}
+
 	public void setExpectAmount(java.math.BigDecimal expectAmount) {
 		this.expectAmount = expectAmount;
 	}

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

@@ -12,11 +12,12 @@ public interface SysTenantAccountService extends BaseService<Integer, SysTenantA
 	 * 更新账户
 	 * @param userId 用户编号
 	 * @param minutes 修改的分钟数(正数相加，负数相减)
+	 * @param orderNo 订单号
 	 * @param type 交易类型
 	 * @param transNo 交易流水
 	 * @param cashAmount 交易金额
 	 * @param memo 备注
 	 * @return
 	 */
-	public boolean update(Integer userId, int minutes, TransType type, String transNo, BigDecimal cashAmount, String memo);
+	public boolean update(Integer userId, int minutes, String orderNo, TransType type, String transNo, BigDecimal cashAmount, String memo);
 }

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

@@ -15,7 +15,6 @@ import com.ym.mec.biz.dal.entity.SysTenantAccount.AccountStatus;
 import com.ym.mec.biz.dal.entity.SysTenantAccountDetail;
 import com.ym.mec.biz.dal.entity.SysTenantAccountDetail.TransStatus;
 import com.ym.mec.biz.dal.entity.SysTenantAccountDetail.TransType;
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.service.SysTenantAccountService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -37,7 +36,7 @@ public class SysTenantAccountServiceImpl extends BaseServiceImpl<Integer, SysTen
 
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-	public boolean update(Integer userId, int minutes, TransType type, String transNo, BigDecimal cashAmount, String memo) {
+	public boolean update(Integer userId, int minutes, String orderNo, TransType type, String transNo, BigDecimal cashAmount, String memo) {
 		SysTenantAccount tenantAccount = sysTenantAccountDao.getLocked(userId);
 		if (tenantAccount == null) {
 			throw new BizException("用户[{}]现金账户不存在", userId);
@@ -58,6 +57,7 @@ public class SysTenantAccountServiceImpl extends BaseServiceImpl<Integer, SysTen
 		sysTenantAccountDao.update(tenantAccount);
 
 		SysTenantAccountDetail detail = new SysTenantAccountDetail();
+		detail.setOrderNo(orderNo);
 		detail.setTransMinutes(minutes);
 		detail.setTotalAvailableMinutes(tenantAccount.getAvailableMinutes());
 		detail.setMemo(memo);

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

@@ -122,6 +122,8 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 
 		TenantPaymentOrder tenantPaymentOrder = new TenantPaymentOrder();
 		tenantPaymentOrder.setUserId(userId);
+		tenantPaymentOrder.setTransMinutes(tenantEntryActivities.getPurchaseMinutes());
+		tenantPaymentOrder.setGiveMinutes(tenantEntryActivities.getGiveMinutes());
 		tenantPaymentOrder.setOrderNo(idGeneratorService.generatorId("tenant_payment") + "");
 		tenantPaymentOrder.setType(TenantPaymentType.RECHARGE);
 		tenantPaymentOrder.setExpectAmount(tenantEntryActivities.getDiscountPrice());
@@ -145,8 +147,8 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 		try {
 
 			Map<String, Object> payMap = payService.getPayMap(tenantPaymentOrder.getExpectAmount(), tenantPaymentOrder.getOrderNo(), baseApiUrl
-					+ "/api-teacher/teacherOrder/notify", baseApiUrl + "/#/paymentResult?orderNo=" + tenantPaymentOrder.getOrderNo(),
-					"商户入驻", "商户充值", userId, classFee, organId);
+					+ "/api-teacher/teacherOrder/notify", baseApiUrl + "/#/paymentResult?orderNo=" + tenantPaymentOrder.getOrderNo(), "商户入驻", "商户充值", userId,
+					classFee, organId);
 
 			Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
 			tenantPaymentOrder.setComAmount(routingFee.get("COM"));
@@ -182,10 +184,10 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 			}
 
 			// 更新账户表信息
-			sysTenantAccountService.update(userId, tenantEntryActivities.getPurchaseMinutes() + tenantEntryActivities.getGiveMinutes(), TransType.RECHARGE, "",
-					tenantEntryActivities.getDiscountPrice(), "");
+			sysTenantAccountService.update(userId, tenantEntryActivities.getPurchaseMinutes() + tenantEntryActivities.getGiveMinutes(),
+					tenantPaymentOrder.getOrderNo(), TransType.RECHARGE, "", tenantEntryActivities.getDiscountPrice(), "");
 		} else {
-
+			
 		}
 
 		return true;

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

@@ -7,6 +7,7 @@
 		id="SysTenantAccountDetail">
 		<result column="id_" property="id" />
 		<result column="user_id_" property="userId" />
+		<result column="order_no_" property="orderNo" />
 		<result column="trans_type_" property="transType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="trans_status_" property="transStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="trans_no_" property="transNo" />
@@ -36,6 +37,10 @@
 	<select id="get" resultMap="SysTenantAccountDetail">
 		SELECT * FROM sys_tenant_account_detail WHERE id_ = #{id}
 	</select>
+	
+	<select id="queryByOrderNo" resultMap="SysTenantAccountDetail">
+		SELECT * FROM sys_tenant_account_detail WHERE order_no_ = #{orderNo}
+	</select>
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysTenantAccountDetail">
@@ -48,8 +53,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO sys_tenant_account_detail
-		(id_,user_id_,trans_type_,trans_status_,trans_no_,trans_cash_amount_,total_available_minutes_,trans_minutes_,memo_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{transType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transNo},#{transCashAmount},#{totalAvailableMinutes},#{transMinutes},#{memo},#{createTime},#{updateTime})
+		(id_,user_id_,order_no_,trans_type_,trans_status_,trans_no_,trans_cash_amount_,total_available_minutes_,trans_minutes_,memo_,create_time_,update_time_)
+		VALUES(#{id},#{userId},#{orderNo},#{transType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transNo},#{transCashAmount},#{totalAvailableMinutes},#{transMinutes},#{memo},#{createTime},#{updateTime})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -62,6 +67,9 @@
 			<if test="userId != null">
 				user_id_ = #{userId},
 			</if>
+			<if test="orderNo != null">
+				order_no_ = #{orderNo},
+			</if>
 			<if test="id != null">
 				id_ = #{id},
 			</if>

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

@@ -10,6 +10,8 @@
 		<result column="user_id_" property="userId" />
 		<result column="organ_id_" property="organId" />
 		<result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+		<result column="trans_minutes_" property="transMinutes" />
+		<result column="give_minutes_" property="giveMinutes" />
 		<result column="expect_amount_" property="expectAmount" />
 		<result column="actual_amount_" property="actualAmount" />
 		<result column="balance_payment_amount_" property="balancePaymentAmount" />
@@ -45,8 +47,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO tenant_payment_order
-		(id_,activities_id_,user_id_,organ_id_,type_,expect_amount_,actual_amount_,balance_payment_amount_,com_amount_,per_amount_,remit_fee_,trans_no_,status_,memo_,payment_channel_,payment_business_channel_,mer_nos_,order_no_,pay_time_,version_,create_time_,update_time_)
-		VALUES(#{id},#{activitiesId},#{userId},#{organId},#{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{expectAmount},#{actualAmount},#{balancePaymentAmount},#{comAmount},#{perAmount},#{remitFee},#{transNo},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{memo},#{paymentChannel},#{paymentBusinessChannel},#{merNos},#{orderNo},#{payTime},#{version},#{createTime},#{updateTime})
+		(id_,activities_id_,user_id_,organ_id_,type_,trans_minutes_,give_minutes_,expect_amount_,actual_amount_,balance_payment_amount_,com_amount_,per_amount_,remit_fee_,trans_no_,status_,memo_,payment_channel_,payment_business_channel_,mer_nos_,order_no_,pay_time_,version_,create_time_,update_time_)
+		VALUES(#{id},#{activitiesId},#{userId},#{organId},#{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transMinutes},#{giveMinutes},#{expectAmount},#{actualAmount},#{balancePaymentAmount},#{comAmount},#{perAmount},#{remitFee},#{transNo},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{memo},#{paymentChannel},#{paymentBusinessChannel},#{merNos},#{orderNo},#{payTime},#{version},#{createTime},#{updateTime})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -56,6 +58,12 @@
 			<if test="status != null">
 				status_ = #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
+			<if test="transMinutes != null">
+				trans_minutes_ = #{transMinutes},
+			</if>
+			<if test="giveMinutes != null">
+				give_minutes_ = #{giveMinutes},
+			</if>
 			<if test="organId != null">
 				organ_id_ = #{organId},
 			</if>

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

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.TenantPaymentOrder;
 import com.ym.mec.biz.service.TenantPaymentOrderService;
 import com.ym.mec.common.controller.BaseController;
 
@@ -37,4 +38,18 @@ public class TenantPaymentOrderController extends BaseController {
         return succeed(tenantPaymentOrderService.createOrder(sysUser.getId(), activitiesId));
     }
 
+    @ApiOperation(value = "查询订单")
+    @PostMapping("/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);
+    }
+
 }