Skip to content

F
fit-finance
Commit 85a7b6d7 by baihe
Options

updated

parent 5e1bb2a0
Showing with 12 additions and 39 deletions
app/src/main/resources/application.yml
...@@ -116,4 +116,4 @@ weChat: ...@@ -116,4 +116,4 @@ weChat:
domain: wechat-xmfit domain: wechat-xmfit
rpc: rpc:
apps: fcfos,fcauth,fcapi,fccfg apps: fcfos,fcauth,fcapi,fccfg,fcmsg
\ No newline at end of file \ No newline at end of file
service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java
...@@ -10,6 +10,7 @@ import com.jiejing.common.utils.collection.CollectionUtil; ...@@ -10,6 +10,7 @@ import com.jiejing.common.utils.collection.CollectionUtil;
import com.jiejing.common.utils.convert.BeanUtil; import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.fitness.enums.finance.EmbededXcxEnum; import com.jiejing.fitness.enums.finance.EmbededXcxEnum;
import com.jiejing.fitness.enums.finance.PartyTypeEnum; import com.jiejing.fitness.enums.finance.PartyTypeEnum;
import com.jiejing.fitness.enums.message.ReceiveTypeEnum;
import com.jiejing.fitness.finance.api.merchant.request.model.BrandResourceInfo; import com.jiejing.fitness.finance.api.merchant.request.model.BrandResourceInfo;
import com.jiejing.fitness.finance.api.merchant.vo.StudioEmbeddedXcxVO; import com.jiejing.fitness.finance.api.merchant.vo.StudioEmbeddedXcxVO;
import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantApplyVO; import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantApplyVO;
...@@ -35,7 +36,6 @@ import com.jiejing.fitness.finance.service.merchant.params.ApplyStudioMerchantPa ...@@ -35,7 +36,6 @@ import com.jiejing.fitness.finance.service.merchant.params.ApplyStudioMerchantPa
import com.jiejing.fitness.finance.service.merchant.params.PageStudioMerchantApplyParams; import com.jiejing.fitness.finance.service.merchant.params.PageStudioMerchantApplyParams;
import com.jiejing.fitness.finance.service.rpc.DelayTaskRpcService; import com.jiejing.fitness.finance.service.rpc.DelayTaskRpcService;
import com.jiejing.fitness.finance.service.rpc.MerchantRpcService; import com.jiejing.fitness.finance.service.rpc.MerchantRpcService;
import com.jiejing.fitness.finance.service.rpc.MessageRpcService;
import com.jiejing.fitness.finance.service.rpc.ResourceRpcService; import com.jiejing.fitness.finance.service.rpc.ResourceRpcService;
import com.jiejing.fitness.finance.service.rpc.StudioRpcService; import com.jiejing.fitness.finance.service.rpc.StudioRpcService;
import com.jiejing.fitness.studio.FitVerifyCodeRpcService; import com.jiejing.fitness.studio.FitVerifyCodeRpcService;
...@@ -114,9 +114,6 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -114,9 +114,6 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
private ConfigService configService; private ConfigService configService;
@Resource @Resource
private MessageRpcService messageRpcService;
@Resource
private StudioEmbeddedXcxApplyRpService studioEmbeddedXcxApplyRpService; private StudioEmbeddedXcxApplyRpService studioEmbeddedXcxApplyRpService;
@Resource @Resource
...@@ -700,7 +697,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -700,7 +697,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
paramMap.put("studioId", apply.getStudioId()); paramMap.put("studioId", apply.getStudioId());
studioMsgRpcService.sendMessage(apply.getBrandId(), apply.getStudioId(), "OPEN_MERCHANT_FAIL", studioMsgRpcService.sendMessage(apply.getBrandId(), apply.getStudioId(), "OPEN_MERCHANT_FAIL",
Lists.newArrayList(MsgChannelEnum.SMS), "ADMIN", apply.getOperatorId(), paramMap); Lists.newArrayList(MsgChannelEnum.SMS), ReceiveTypeEnum.ADMIN, apply.getOperatorId(), paramMap);
} }
private void sendOpenSuccessMessage(StudioMerchantApplyVO apply) { private void sendOpenSuccessMessage(StudioMerchantApplyVO apply) {
...@@ -708,7 +705,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -708,7 +705,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
paramMap.put("studioId", apply.getStudioId()); paramMap.put("studioId", apply.getStudioId());
studioMsgRpcService.sendMessage(apply.getBrandId(), apply.getStudioId(), "OPEN_MERCHANT_SUCCESS", studioMsgRpcService.sendMessage(apply.getBrandId(), apply.getStudioId(), "OPEN_MERCHANT_SUCCESS",
Lists.newArrayList(MsgChannelEnum.SMS), "ADMIN", apply.getOperatorId(), paramMap); Lists.newArrayList(MsgChannelEnum.SMS), ReceiveTypeEnum.ADMIN, apply.getOperatorId(), paramMap);
} }
private void doOpenMerchantProcess(Long id) { private void doOpenMerchantProcess(Long id) {
...@@ -717,7 +714,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -717,7 +714,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
} }
private void validSmsCode(String phone, String smsCode) { private void validSmsCode(String phone, String smsCode) {
messageRpcService.validSmsCode(phone, smsCode, "FINANCE_MERCHANT"); fitVerifyCodeRpcService.checkVerifyCode(phone, "FINANCE_MERCHANT", smsCode);
} }
private StudioMerchantApply saveApply(ApplyStudioMerchantParams params) { private StudioMerchantApply saveApply(ApplyStudioMerchantParams params) {
......
service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java
...@@ -11,6 +11,7 @@ import com.jiejing.common.utils.collection.CollectionUtil; ...@@ -11,6 +11,7 @@ import com.jiejing.common.utils.collection.CollectionUtil;
import com.jiejing.common.utils.convert.BeanUtil; import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.fitness.enums.auth.AuthDomainEnum; import com.jiejing.fitness.enums.auth.AuthDomainEnum;
import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum; import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
import com.jiejing.fitness.enums.message.ReceiveTypeEnum;
import com.jiejing.fitness.event.finance.CashierEvent; import com.jiejing.fitness.event.finance.CashierEvent;
import com.jiejing.fitness.finance.repository.entity.StudioCashierRecord; import com.jiejing.fitness.finance.repository.entity.StudioCashierRecord;
import com.jiejing.fitness.finance.repository.entity.PartyToMerchant; import com.jiejing.fitness.finance.repository.entity.PartyToMerchant;
...@@ -253,7 +254,7 @@ public class PayServiceImpl implements PayService { ...@@ -253,7 +254,7 @@ public class PayServiceImpl implements PayService {
paramMap.put("amount", e.getAmount()); paramMap.put("amount", e.getAmount());
paramMap.put("appUrl", appUrlProperties.getTransDetail() + e.getTransNo()); paramMap.put("appUrl", appUrlProperties.getTransDetail() + e.getTransNo());
studioMsgRpcService.sendMessageBatch(null, studioId, "CASHIER_PAY_SUCCESS", studioMsgRpcService.sendMessageBatch(null, studioId, "CASHIER_PAY_SUCCESS",
Lists.newArrayList(MsgChannelEnum.APP_PUSH), "ADMIN", targetIds, paramMap, new HashMap<>(), null); Lists.newArrayList(MsgChannelEnum.APP_PUSH), ReceiveTypeEnum.ADMIN, targetIds, paramMap, new HashMap<>(), null);
} }
private boolean isPaying(BrandCashierTransStateEnum state) { private boolean isPaying(BrandCashierTransStateEnum state) {
......
service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/RefundServiceImpl.java
...@@ -14,6 +14,7 @@ import com.jiejing.common.utils.text.StringUtil; ...@@ -14,6 +14,7 @@ import com.jiejing.common.utils.text.StringUtil;
import com.jiejing.common.utils.time.TimeUtil; import com.jiejing.common.utils.time.TimeUtil;
import com.jiejing.fitness.enums.auth.AuthDomainEnum; import com.jiejing.fitness.enums.auth.AuthDomainEnum;
import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum; import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
import com.jiejing.fitness.enums.message.ReceiveTypeEnum;
import com.jiejing.fitness.event.finance.CashierEvent; import com.jiejing.fitness.event.finance.CashierEvent;
import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantCheckRefundVO; import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantCheckRefundVO;
import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantCheckRefundVO.CheckRefundCodeEnum; import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantCheckRefundVO.CheckRefundCodeEnum;
...@@ -242,12 +243,12 @@ public class RefundServiceImpl implements RefundService { ...@@ -242,12 +243,12 @@ public class RefundServiceImpl implements RefundService {
if (null != memberId && wx) { if (null != memberId && wx) {
studioMsgRpcService.sendMessage(record.getBrandId(), record.getStudioId(), bizType, studioMsgRpcService.sendMessage(record.getBrandId(), record.getStudioId(), bizType,
Lists.newArrayList(MsgChannelEnum.WX_MP), "MEMBER", memberId, paramMap); Lists.newArrayList(MsgChannelEnum.WX_MP), ReceiveTypeEnum.MEMBER, memberId, paramMap);
} }
if (sms) { if (sms) {
studioMsgRpcService.sendMessageToTargetKey(record.getBrandId(), record.getStudioId(), bizType, studioMsgRpcService.sendMessageToTargetKey(record.getBrandId(), record.getStudioId(), bizType,
Lists.newArrayList(MsgChannelEnum.SMS), "MEMBER", record.getBuyerPhone(), false, paramMap); Lists.newArrayList(MsgChannelEnum.SMS), ReceiveTypeEnum.MEMBER, record.getBuyerPhone(), false, paramMap);
} }
} }
...@@ -264,7 +265,7 @@ public class RefundServiceImpl implements RefundService { ...@@ -264,7 +265,7 @@ public class RefundServiceImpl implements RefundService {
paramMap.put("appUrl", appUrlProperties.getTransDetail() + e.getTransNo()); paramMap.put("appUrl", appUrlProperties.getTransDetail() + e.getTransNo());
studioMsgRpcService.sendMessageBatch(record.getBrandId(), record.getStudioId(), bizType, studioMsgRpcService.sendMessageBatch(record.getBrandId(), record.getStudioId(), bizType,
Lists.newArrayList(MsgChannelEnum.SMS), "ADMIN", targetIds, paramMap, new HashMap<>(), null Lists.newArrayList(MsgChannelEnum.SMS), ReceiveTypeEnum.ADMIN, targetIds, paramMap, new HashMap<>(), null
); );
} }
......
service/src/main/java/com/jiejing/fitness/finance/service/rpc/MessageRpcService.java deleted 100644 → 0
package com.jiejing.fitness.finance.service.rpc;
import com.jiejing.message.api.SendMessageApi;
import com.jiejing.message.api.request.VerifyCodeCheckRequest;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* @author chengyubing
* @since 2024/4/2 10:00
*/
@Slf4j
@Service
public class MessageRpcService {
@Resource
private SendMessageApi sendMessageApi;
public void validSmsCode(String phone, String code, String bizType) {
VerifyCodeCheckRequest request = VerifyCodeCheckRequest.builder().phone(phone).bizType(bizType).code(code)
.build();
sendMessageApi.verifyCodeCheck(request).assertSuccess();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment