老师提现

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserWithdrawalServiceImpl.java

@@ -141,7 +141,7 @@ public class UserWithdrawalServiceImpl extends ServiceImpl<UserWithdrawalDao, Us
         if (null == detail) {
             throw new BizException("参数异常，未找到交易记录,param is {}", jsonStr);
         }
-        if(!TradeStatusEnum.pending.equals(detail.getStatus())){
+        if (!TradeStatusEnum.pending.equals(detail.getStatus())) {
             return;
         }
         if ("1".equals(callback.getStatus())) {
@@ -160,8 +160,9 @@ public class UserWithdrawalServiceImpl extends ServiceImpl<UserWithdrawalDao, Us
             accountRecordDto.setFrozenType(FrozenTypeEnum.FROZEN_DEDUCT);
             accountRecordDto.setSaveRecord(true);
             userAccountService.accountChange(accountRecordDto);
-
-        }else if("2".equals(callback.getStatus())){
+            //发生提现成功通知
+            successSend(detail.getUserId(), detail.getPhone());
+        } else if ("2".equals(callback.getStatus())) {
             //交易失败
             detail.setStatus(TradeStatusEnum.failed);
             detail.setErrorCode(callback.getErrorCode());
@@ -175,7 +176,7 @@ public class UserWithdrawalServiceImpl extends ServiceImpl<UserWithdrawalDao, Us
             accountRecordDto.setFrozenType(FrozenTypeEnum.FROZEN_BACK);
             accountRecordDto.setSaveRecord(false);
             userAccountService.accountChange(accountRecordDto);
-        }else{
+        } else {
             return;
         }
         detail.setCallbackJson(jsonStr);
@@ -186,11 +187,10 @@ public class UserWithdrawalServiceImpl extends ServiceImpl<UserWithdrawalDao, Us
         Map<Long, String> receivers = new HashMap<>();
         receivers.put(userId, phone);
         try {
-            String url = sysMessageService.selectConfigUrl(MessageTypeEnum.TEACHER_WITHDRAW_SUCCESS.getCode());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.VIP_EXPIRE,
-                    receivers, null, 0, url, ClientEnum.STUDENT.getCode());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_WITHDRAW_SUCCESS,
+                    receivers, null, 0, null, ClientEnum.TEACHER.getCode());
         } catch (Exception e) {
-            log.error("会员到期3天极光消息推送异常,userId={}", userId);
+            log.error("老师提现极光消息推送异常,userId={}", userId);
         }
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserWithdrawalVo.java

@@ -18,6 +18,8 @@ public class UserWithdrawalVo extends UserWithdrawal {
 	private String bankName;
 	@ApiModelProperty("提现人 ")
 	private String	withdrawaUser;
+	@ApiModelProperty("提现手机号 ")
+	private String phone;
 
 	public String getBankName() {
 		return bankName;
@@ -42,4 +44,12 @@ public class UserWithdrawalVo extends UserWithdrawal {
 	public void setBankCard(String bankCard) {
 		this.bankCard = bankCard;
 	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserWithdrawalMapper.xml

@@ -42,7 +42,8 @@
             <include refid="baseColumns"/>,
             bc.bank_name_ as bankName,
             bc.bank_card_ as bankCard,
-            u.username_  as withdrawaUser
+            bc.phone_ as phone,
+            u.username_  as withdrawaUser,
         FROM user_withdrawal t
         LEFT JOIN user_bank_card bc on t.bank_card_id_ = bc.id_ and t.user_id_ = bc.user_id_
         left join sys_user u on t.user_id_ = u.id_